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

Fix BGRA GL texture format on iOS

Browse Source 
Bug: skia:
Change-Id: Ifb800bb4fccfc330017a80046e5054432f2a2617
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201002
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Jim Van Verth 2019-03-26 13:52:26 -04:00 committed by Skia Commit-Bot
parent 926fb89d7b
commit ce9a7af967
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gpu/gl/GrGLCaps.cpp
View File

@ -1523,7 +1523,7 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions,
fConfigTable[kBGRA_8888_GrPixelConfig].fFormatType = kNormalizedFixedPoint_FormatType;
// TexStorage requires using a sized internal format and BGRA8 is only supported if we have the
// GL_APPLE_texture_format_BGRA8888 extension or if we have GL_EXT_texutre_storage and
// GL_APPLE_texture_format_BGRA8888 extension or if we have GL_EXT_texture_storage and
// GL_EXT_texture_format_BGRA8888.
bool supportsBGRATexStorage = false;
@ -1563,8 +1563,10 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions,
// already too tricky. Instead, we opt not to support BGRA on ES2 with this extension.
// This also side-steps some ambiguous interactions with the texture storage extension.
if (version >= GR_GL_VER(3,0)) {
// The APPLE extension doesn't make this renderable.
fConfigTable[kBGRA_8888_GrPixelConfig].fFlags = ConfigInfo::kTextureable_Flag;
// The APPLE extension doesn't explicitly make this renderable, but
// internally it appears to use RGBA8, which we'll patch up below.
fConfigTable[kBGRA_8888_GrPixelConfig].fFlags = ConfigInfo::kTextureable_Flag |
allRenderFlags;
supportsBGRATexStorage = true;
}
}
@ -2037,7 +2039,13 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions,
// ES 3.0: the extension explicitly states GL_BGRA8 is not a valid internal format for
// glTexImage (just for glTexStorage).
if (useSizedTexFormats && this->bgraIsInternalFormat()) {
fConfigTable[kBGRA_8888_GrPixelConfig].fFormats.fInternalFormatTexImage = GR_GL_BGRA;
if (ctxInfo.hasExtension("GL_APPLE_texture_format_BGRA8888")) {
fConfigTable[kBGRA_8888_GrPixelConfig].fFormats.fInternalFormatTexImage = GR_GL_RGBA;
fConfigTable[kBGRA_8888_GrPixelConfig].fFormats.fInternalFormatRenderbuffer =
GR_GL_RGBA8;
} else {
fConfigTable[kBGRA_8888_GrPixelConfig].fFormats.fInternalFormatTexImage = GR_GL_BGRA;
}
}
// If we don't have texture swizzle support then the shader generator must insert the