diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-15 18:54:39 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-15 18:54:39 +0000 |
| commit | 791816a87a569969c98167ca197ad106543e7f92 (patch) | |
| tree | eb9320628258216eea0c651f4d04553fd9b4e2e8 /src/gpu/gl/GrGpuGL.cpp | |
| parent | 452ed43d50f9972d4756f5e3b4397fc02ecd90d8 (diff) | |
Rename kES2_GrGLBinding to kES_GrGLBinding. Step 0 for supporting ES3.
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/23185004
git-svn-id: http://skia.googlecode.com/svn/trunk@10747 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 5845d7a673..64f4dfe9ea 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. |