diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-07-31 09:38:23 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-31 14:40:02 +0000 |
| commit | 6bd729d8ebc98548fd92e081e1d1163bbc2ec815 (patch) | |
| tree | de2ed43a87f81367b3d267842fc258c9a9db9cf0 /src | |
| parent | 1af03d4396a9567e3ca127830676eb4fd5a76266 (diff) | |
Uncomment glinterface asserts not that chrome has functions
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLInterface.cpp | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index bd7a9e476b..6becba8207 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -2108,14 +2108,12 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, } } - bool hasInternalformatFunction = (bool)gli->fFunctions.fGetInternalformativ; for (int i = 0; i < kGrPixelConfigCnt; ++i) { if (ConfigInfo::kRenderableWithMSAA_Flag & fConfigTable[i].fFlags) { - if (hasInternalformatFunction && // This check is temporary until chrome is updated - ((kGL_GrGLStandard == ctxInfo.standard() && + if ((kGL_GrGLStandard == ctxInfo.standard() && (ctxInfo.version() >= GR_GL_VER(4,2) || 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; GrGLenum format = fConfigTable[i].fFormats.fInternalFormatRenderbuffer; GR_GL_GetInternalformativ(gli, GR_GL_RENDERBUFFER, format, GR_GL_NUM_SAMPLE_COUNTS, diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp index 5d03b2b720..81c4569519 100644 --- a/src/gpu/gl/GrGLInterface.cpp +++ b/src/gpu/gl/GrGLInterface.cpp @@ -757,8 +757,7 @@ bool GrGLInterface::validate() const { if (kGL_GrGLStandard == fStandard) { if (glVer >= GR_GL_VER(3, 2) || fExtensions.has("GL_ARB_sync")) { if (!fFunctions.fFenceSync || - // Is sync needs to be added to chrome before uncommenting - // !fFunctions.fIsSync || + !fFunctions.fIsSync || !fFunctions.fClientWaitSync || !fFunctions.fWaitSync || !fFunctions.fDeleteSync) { @@ -768,8 +767,7 @@ bool GrGLInterface::validate() const { } else if (kGLES_GrGLStandard == fStandard) { if (glVer >= GR_GL_VER(3, 0) || fExtensions.has("GL_APPLE_sync")) { if (!fFunctions.fFenceSync || - // Is sync needs to be added to chrome before uncommenting - // !fFunctions.fIsSync || + !fFunctions.fIsSync || !fFunctions.fClientWaitSync || !fFunctions.fWaitSync || !fFunctions.fDeleteSync) { @@ -817,7 +815,7 @@ bool GrGLInterface::validate() const { (glVer >= GR_GL_VER(4,2) || fExtensions.has("GL_ARB_internalformat_query"))) || (kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,0))) { if (!fFunctions.fGetInternalformativ) { - // RETURN_FALSE_INTERFACE; + RETURN_FALSE_INTERFACE; } } |