diff options
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
-rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 1fea77a096..3cb9ac5ff8 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -558,10 +558,17 @@ bool GrGLGpu::uploadTexData(const GrSurfaceDesc& desc, GrGLenum externalFormat = 0x0; // suppress warning GrGLenum externalType = 0x0; // suppress warning - // glTexStorage requires sized internal formats on both desktop and ES. - // ES2 requires an unsized format for glTexImage. On ES3 and desktop we default to sized. - bool useSizedFormat = useTexStorage || kGL_GrGLStandard == this->glStandard() || - this->glVersion() >= GR_GL_VER(3, 0); + // glTexStorage requires sized internal formats on both desktop and ES. ES2 requires an unsized + // format for glTexImage, unlike ES3 and desktop. However, we allow the driver to decide the + // size of the internal format whenever possible and so only use a sized internal format when + // using texture storage. + bool useSizedFormat = useTexStorage; + // Many versions of the ES3 drivers on various platforms will not accept GL_RED in + // glTexImage2D for the internal format but will accept GL_R8. + if (kGLES_GrGLStandard == this->glStandard() && this->glVersion() >= GR_GL_VER(3, 0) && + kAlpha_8_GrPixelConfig == dataConfig) { + useSizedFormat = true; + } if (!this->configToGLFormats(dataConfig, useSizedFormat, &internalFormat, &externalFormat, &externalType)) { return false; |