Index: src/gpu/gl/GrGpuGL.cpp |
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp |
index 5845d7a673ac36c3b267084740ba5505acf8f9e7..64f4dfe9ea41c91f5bb00610037e9ce4b99e53ab 100644 |
--- a/src/gpu/gl/GrGpuGL.cpp |
+++ b/src/gpu/gl/GrGpuGL.cpp |
@@ -263,7 +263,7 @@ bool GrGpuGL::canWriteTexturePixels(const GrTexture* texture, GrPixelConfig srcC |
if (kIndex_8_GrPixelConfig == srcConfig || kIndex_8_GrPixelConfig == texture->config()) { |
return false; |
} |
- if (srcConfig != texture->config() && kES2_GrGLBinding == this->glBinding()) { |
+ if (srcConfig != texture->config() && kES_GrGLBinding == this->glBinding()) { |
// In general ES2 requires the internal format of the texture and the format of the src |
// pixels to match. However, It may or may not be possible to upload BGRA data to a RGBA |
// texture. It depends upon which extension added BGRA. The Apple extension allows it |
@@ -810,7 +810,7 @@ bool GrGpuGL::createRenderTargetObjects(int width, int height, |
!desc->fMSColorRenderbufferID || |
!this->configToGLFormats(desc->fConfig, |
// GLES requires sized internal formats |
- kES2_GrGLBinding == this->glBinding(), |
+ kES_GrGLBinding == this->glBinding(), |
&msColorFormat, |
NULL, |
NULL)) { |
@@ -2303,7 +2303,7 @@ inline bool can_copy_texsubimage(const GrSurface* dst, |
// Table 3.9 of the ES2 spec indicates the supported formats with CopyTexSubImage |
// and BGRA isn't in the spec. There doesn't appear to be any extension that adds it. Perhaps |
// many drivers would allow it to work, but ANGLE does not. |
- if (kES2_GrGLBinding == gpu->glBinding() && gpu->glCaps().bgraIsInternalFormat() && |
+ if (kES_GrGLBinding == gpu->glBinding() && gpu->glCaps().bgraIsInternalFormat() && |
(kBGRA_8888_GrPixelConfig == dst->config() || kBGRA_8888_GrPixelConfig == src->config())) { |
return false; |
} |
@@ -2364,7 +2364,7 @@ inline GrGLuint bind_surface_as_fbo(const GrGLInterface* gl, |
void GrGpuGL::initCopySurfaceDstDesc(const GrSurface* src, GrTextureDesc* desc) { |
// Check for format issues with glCopyTexSubImage2D |
- if (kES2_GrGLBinding == this->glBinding() && this->glCaps().bgraIsInternalFormat() && |
+ if (kES_GrGLBinding == this->glBinding() && this->glCaps().bgraIsInternalFormat() && |
kBGRA_8888_GrPixelConfig == src->config()) { |
// glCopyTexSubImage2D doesn't work with this config. We'll want to make it a render target |
// in order to call glBlitFramebuffer or to copy to it by rendering. |