AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change desktop and ES 3.0 to always use sized internal texture formats.

Browse Source 
Review URL: https://codereview.chromium.org/806943002
This commit is contained in:
jvanverth 2014-12-16 05:45:49 -08:00 committed by Commit bot
parent af7aac81b4
commit bc02bf0ee4
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gpu/gl/GrGpuGL.cpp
View File

@ -558,17 +558,10 @@ bool GrGpuGL::uploadTexData(const GrSurfaceDesc& desc,
GrGLenum externalFormat = 0x0; // suprress warning
GrGLenum externalType = 0x0;// suprress warning
// 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;
}
// 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);
if (!this->configToGLFormats(dataConfig, useSizedFormat, &internalFormat,
&externalFormat, &externalType)) {
return false;