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

Uncomment glinterface asserts not that chrome has functions

Browse Source 
Bug: skia:
Change-Id: I4c90f8e6eb10389340155fcf7c76c7cb3a5163b3
Reviewed-on: https://skia-review.googlesource.com/28600
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Greg Daniel 2017-07-31 09:38:23 -04:00 committed by Skia Commit-Bot
parent 1af03d4396
commit 6bd729d8eb
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2108,14 +2108,12 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions,
} }
} }
bool hasInternalformatFunction = (bool)gli->fFunctions.fGetInternalformativ;
for (int i = 0; i < kGrPixelConfigCnt; ++i) { for (int i = 0; i < kGrPixelConfigCnt; ++i) {
if (ConfigInfo::kRenderableWithMSAA_Flag & fConfigTable[i].fFlags) { if (ConfigInfo::kRenderableWithMSAA_Flag & fConfigTable[i].fFlags) {
if (hasInternalformatFunction && // This check is temporary until chrome is updated if ((kGL_GrGLStandard == ctxInfo.standard() &&
((kGL_GrGLStandard == ctxInfo.standard() &&
(ctxInfo.version() >= GR_GL_VER(4,2) || (ctxInfo.version() >= GR_GL_VER(4,2) ||
ctxInfo.hasExtension("GL_ARB_internalformat_query"))) || ctxInfo.hasExtension("GL_ARB_internalformat_query"))) ||
(kGLES_GrGLStandard == ctxInfo.standard() && ctxInfo.version() >= GR_GL_VER(3,0)))) { (kGLES_GrGLStandard == ctxInfo.standard() && ctxInfo.version() >= GR_GL_VER(3,0))) {
int count; int count;
GrGLenum format = fConfigTable[i].fFormats.fInternalFormatRenderbuffer; GrGLenum format = fConfigTable[i].fFormats.fInternalFormatRenderbuffer;
GR_GL_GetInternalformativ(gli, GR_GL_RENDERBUFFER, format, GR_GL_NUM_SAMPLE_COUNTS, GR_GL_GetInternalformativ(gli, GR_GL_RENDERBUFFER, format, GR_GL_NUM_SAMPLE_COUNTS,

8
src/gpu/gl/GrGLInterface.cpp
View File

@ -757,8 +757,7 @@ bool GrGLInterface::validate() const {
if (kGL_GrGLStandard == fStandard) { if (kGL_GrGLStandard == fStandard) {
if (glVer >= GR_GL_VER(3, 2) || fExtensions.has("GL_ARB_sync")) { if (glVer >= GR_GL_VER(3, 2) || fExtensions.has("GL_ARB_sync")) {
if (!fFunctions.fFenceSync || if (!fFunctions.fFenceSync ||
// Is sync needs to be added to chrome before uncommenting !fFunctions.fIsSync ||
// !fFunctions.fIsSync ||
!fFunctions.fClientWaitSync || !fFunctions.fClientWaitSync ||
!fFunctions.fWaitSync || !fFunctions.fWaitSync ||
!fFunctions.fDeleteSync) { !fFunctions.fDeleteSync) {
@ -768,8 +767,7 @@ bool GrGLInterface::validate() const {
} else if (kGLES_GrGLStandard == fStandard) { } else if (kGLES_GrGLStandard == fStandard) {
if (glVer >= GR_GL_VER(3, 0) || fExtensions.has("GL_APPLE_sync")) { if (glVer >= GR_GL_VER(3, 0) || fExtensions.has("GL_APPLE_sync")) {
if (!fFunctions.fFenceSync || if (!fFunctions.fFenceSync ||
// Is sync needs to be added to chrome before uncommenting !fFunctions.fIsSync ||
// !fFunctions.fIsSync ||
!fFunctions.fClientWaitSync || !fFunctions.fClientWaitSync ||
!fFunctions.fWaitSync || !fFunctions.fWaitSync ||
!fFunctions.fDeleteSync) { !fFunctions.fDeleteSync) {
@ -817,7 +815,7 @@ bool GrGLInterface::validate() const {
(glVer >= GR_GL_VER(4,2) || fExtensions.has("GL_ARB_internalformat_query"))) || (glVer >= GR_GL_VER(4,2) || fExtensions.has("GL_ARB_internalformat_query"))) ||
(kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,0))) { (kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,0))) {
if (!fFunctions.fGetInternalformativ) { if (!fFunctions.fGetInternalformativ) {
// RETURN_FALSE_INTERFACE; RETURN_FALSE_INTERFACE;
} }
} }