commit a9aaef0c99c015a98e1f67c74dc10bcf6e7fe420
author Brian Osman <brianosman@google.com> Mon May 06 20:07:20 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon May 06 20:07:27 2019 +0000
tree 053305ca50e3f8956fe3287ae8fd23225f2792c6
parent 77af4ecd3546e38e8b6ca6e0efbc6b9df65dc83a

Revert "Support GL_EXT_draw_buffers"

This reverts commit 77af4ecd3546e38e8b6ca6e0efbc6b9df65dc83a.

Reason for revert: iOS errors and bad images on Gold

Original change's description:
> Support GL_EXT_draw_buffers
> 
> Change-Id: I078aa7c42de4368602b0ef43bd7e18efbfd1e049
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212182
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com

Change-Id: Ib8759d4a1009f9a8774365a699e211834d634cff
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212264
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/gl/GrGLInterfaceAutogen.cpp

diff --git a/src/gpu/gl/GrGLInterfaceAutogen.cpp b/src/gpu/gl/GrGLInterfaceAutogen.cpp
index a404ee6..c2c8a5e 100644
--- a/src/gpu/gl/GrGLInterfaceAutogen.cpp
+++ b/src/gpu/gl/GrGLInterfaceAutogen.cpp
@@ -220,21 +220,11 @@
 
     if (GR_IS_GR_GL(fStandard) ||
        (GR_IS_GR_GL_ES(fStandard) && (
-          (glVer >= GR_GL_VER(3,0)) ||
-          fExtensions.has("GL_EXT_draw_buffers"))) ||
-       (GR_IS_GR_WEBGL(fStandard) && (
-          (glVer >= GR_GL_VER(2,0))))) {
-        if (!fFunctions.fDrawBuffers) {
-            RETURN_FALSE_INTERFACE;
-        }
-    }
-
-    if (GR_IS_GR_GL(fStandard) ||
-       (GR_IS_GR_GL_ES(fStandard) && (
           (glVer >= GR_GL_VER(3,0)))) ||
        (GR_IS_GR_WEBGL(fStandard) && (
           (glVer >= GR_GL_VER(2,0))))) {
-        if (!fFunctions.fReadBuffer) {
+        if (!fFunctions.fDrawBuffers ||
+            !fFunctions.fReadBuffer) {
             RETURN_FALSE_INTERFACE;
         }
     }