diff options
| author |  skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-27 07:01:06 +0000 |
|---|---|---|
| committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-27 07:01:06 +0000 |
| commit | aeefb2afe74c010c7236f3572e21a8f8a6aee1bd (patch) | |
| tree | 5c4262452fc04cb4a9368f3eb696a980b29222e6 /src | |
| parent | 149f4f5b4013f3d28017fd548e43b69133be83c3 (diff) | |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@10398 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 98db317109..cc9994385a 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -1553,7 +1553,7 @@ void GrGpuGL::flushRenderTarget(const SkIRect* bound) { if (NULL == bound || !bound->isEmpty()) { rt->flagAsNeedingResolve(bound); } - + GrTexture *texture = rt->asTexture(); if (texture) { texture->dirtyMipMaps(true); @@ -2029,9 +2029,9 @@ void GrGpuGL::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTextur }; newTexParams.fMinFilter = glMinFilterModes[params.filterMode()]; newTexParams.fMagFilter = glMagFilterModes[params.filterMode()]; - + #ifndef SKIA_IGNORE_GPU_MIPMAPS - if (params.filterMode() == GrTextureParams::kMipMap_FilterMode && + if (params.filterMode() == GrTextureParams::kMipMap_FilterMode && texture->mipMapsAreDirty()) { // GL_CALL(Hint(GR_GL_GENERATE_MIPMAP_HINT,GR_GL_NICEST)); GL_CALL(GenerateMipmap(GR_GL_TEXTURE_2D)); |