diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-09 19:15:37 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-09 19:15:37 +0000 |
| commit | cea9abb001b07eaf4340a78db708bfac9e8c68c2 (patch) | |
| tree | c76c77464f703f9bff4a17316b2e300d74783e28 /src/gpu/gl | |
| parent | c9c0b1e90e3f1519d5bb78c9f36f6c4132004708 (diff) | |
Do not use GrBicubic effect when downscaling. Also, don't use glTexStorage as it interferes with deleyed mipmap generation.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/105353002
git-svn-id: http://skia.googlecode.com/svn/trunk@12576 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 00d27b31ef..4b5221c31b 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -552,7 +552,12 @@ bool GrGpuGL::uploadTexData(const GrGLTexture::Desc& desc, SkAutoSMalloc<128 * 128> tempStorage; // paletted textures cannot be partially updated - bool useTexStorage = isNewTexture && + // We currently lazily create MIPMAPs when the we see a draw with + // GrTextureParams::kMipMap_FilterMode. Using texture storage requires that the + // MIP levels are all created when the texture is created. So for now we don't use + // texture storage. + bool useTexStorage = false && + isNewTexture && desc.fConfig != kIndex_8_GrPixelConfig && this->glCaps().texStorageSupport(); @@ -638,8 +643,7 @@ bool GrGpuGL::uploadTexData(const GrGLTexture::Desc& desc, desc.fWidth == width && desc.fHeight == height) { CLEAR_ERROR_BEFORE_ALLOC(this->glInterface()); if (useTexStorage) { - // We never resize or change formats of textures. We don't use - // mipmaps currently. + // We never resize or change formats of textures. GL_ALLOC_CALL(this->glInterface(), TexStorage2D(GR_GL_TEXTURE_2D, 1, // levels |