Revert of Remove validation exceptions in GrGLInterface. These are all now set by...

Reason for revert:
Crashing bots

Original issue's description:
> Remove validation exceptions in GrGLInterface. These are all now set by Chromium.
>
> Committed: https://skia.googlesource.com/skia/+/42d9f35a8daf7f24ba542ba3783ec46fd965ef2f

TBR=joshualitt@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1093323005

diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index 8d00617..bc2600c 100644 (file)
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -115,7 +115,10 @@ bool GrGLInterface::validate() const {
         NULL == fFunctions.fBindBuffer ||
         NULL == fFunctions.fBindTexture ||
         NULL == fFunctions.fBlendColor ||      // -> GL >= 1.4 or extension, ES >= 2.0
+#if 0
+        // TODO: Re-enable validation for fBlendEquation when Chrome has it hooked up.
         NULL == fFunctions.fBlendEquation ||   // -> GL >= 1.4 or extension, ES >= 2.0
+#endif
         NULL == fFunctions.fBlendFunc ||
         NULL == fFunctions.fBufferData ||
         NULL == fFunctions.fBufferSubData ||
@@ -275,7 +278,9 @@ bool GrGLInterface::validate() const {
         (glVer >= GR_GL_VER(1,3)) ||
         fExtensions.has("GL_ARB_texture_compression")) {
         if (NULL == fFunctions.fCompressedTexImage2D
+#if 0
             || NULL == fFunctions.fCompressedTexSubImage2D
+#endif
             ) {
             RETURN_FALSE_INTERFACE
         }
@@ -320,17 +325,23 @@ bool GrGLInterface::validate() const {
         }
     }
 
+// FIXME: Remove this once Chromium is updated to provide this function
+#if 0
     if (fExtensions.has("GL_KHR_blend_equation_advanced") ||
         fExtensions.has("GL_NV_blend_equation_advanced")) {
         if (NULL == fFunctions.fBlendBarrier) {
             RETURN_FALSE_INTERFACE
         }
     }
+#endif
 
     if (fExtensions.has("GL_EXT_discard_framebuffer")) {
+// FIXME: Remove this once Chromium is updated to provide this function
+#if 0
         if (NULL == fFunctions.fDiscardFramebuffer) {
             RETURN_FALSE_INTERFACE
         }
+#endif
     }
 
     // FBO MSAA
@@ -479,9 +490,11 @@ bool GrGLInterface::validate() const {
 
     if (kGLES_GrGLStandard == fStandard || glVer >= GR_GL_VER(4,1) ||
         fExtensions.has("GL_ARB_ES2_compatibility")) {
+#if 0 // Enable this once Chrome gives us the function ptr
         if (NULL == fFunctions.fGetShaderPrecisionFormat) {
             RETURN_FALSE_INTERFACE
         }
+#endif
     }
 
     if (fExtensions.has("GL_NV_path_rendering")) {