diff options
| author |  cblume <cblume@chromium.org> | 2016-03-01 14:08:28 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-01 14:08:28 -0800 |
| commit | 09bd2c09b6b36737df289fdb5fa38c280162cbb8 (patch) | |
| tree | 76b2cf57c1bb6e5a6890b3b98f4c7e1a09624e0c /src/gpu/gl/GrGLGpu.cpp | |
| parent | 5b9ad7620b36858f99fef0763d7fc04d024fd71d (diff) | |
Disabling calls to TexParameteri when the values do not exist on ES2.
BUG=590804
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1750833003
Review URL: https://codereview.chromium.org/1750833003
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 29841331c0..dc50c1429c 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -3344,14 +3344,17 @@ void GrGLGpu::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTextur GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MIN_FILTER, newTexParams.fMinFilter)); } if (setAll || newTexParams.fMaxMipMapLevel != oldTexParams.fMaxMipMapLevel) { - if (newTexParams.fMaxMipMapLevel != 0) { - this->setTextureUnit(unitIdx); - GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MIN_LOD, 0)); - GL_CALL(TexParameteri(target, GR_GL_TEXTURE_BASE_LEVEL, 0)); - GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MAX_LOD, - newTexParams.fMaxMipMapLevel)); - GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MAX_LEVEL, - newTexParams.fMaxMipMapLevel)); + // These are not supported in ES2 contexts + if (this->glCaps().mipMapLevelAndLodControlSupport()) { + if (newTexParams.fMaxMipMapLevel != 0) { + this->setTextureUnit(unitIdx); + GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MIN_LOD, 0)); + GL_CALL(TexParameteri(target, GR_GL_TEXTURE_BASE_LEVEL, 0)); + GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MAX_LOD, + newTexParams.fMaxMipMapLevel)); + GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MAX_LEVEL, + newTexParams.fMaxMipMapLevel)); + } } } if (setAll || newTexParams.fWrapS != oldTexParams.fWrapS) { |