Revert of Add tokens and entry points for KHR_blend_equation_advanced

src/gpu/gl/GrGLAssembleInterface.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGLAssembleInterface.h"
@@ skipping 52 matching lines @@
 
     GET_PROC(ActiveTexture);
     GET_PROC(AttachShader);
     GET_PROC(BindAttribLocation);
     GET_PROC(BindBuffer);
     if (glVer >= GR_GL_VER(3,0)) {
         GET_PROC(BindFragDataLocation);
     }
     GET_PROC(BeginQuery);
     GET_PROC(BindTexture);
+    GET_PROC(BlendFunc);
 
-    if (extensions.has("GL_KHR_blend_equation_advanced")) {
-        GET_PROC_SUFFIX(BlendBarrier, KHR);
-    } else if (extensions.has("GL_NV_blend_equation_advanced")) {
-        GET_PROC_SUFFIX(BlendBarrier, NV);
+    if (glVer >= GR_GL_VER(1,4) ||
+        extensions.has("GL_ARB_imaging") ||
+        extensions.has("GL_EXT_blend_color")) {
+        GET_PROC(BlendColor);
     }
 
-    if (glVer >= GR_GL_VER(1,4) ||
-        extensions.has("GL_ARB_imaging")) {
-        GET_PROC(BlendColor);
-    } else if (extensions.has("GL_EXT_blend_color")) {
-        GET_PROC_SUFFIX(BlendColor, EXT);
-    }
-
-    if (glVer >= GR_GL_VER(1,4) ||
-        extensions.has("GL_ARB_imaging")) {
-        GET_PROC(BlendEquation);
-    } else if (extensions.has("GL_EXT_blend_subtract")) {
-        GET_PROC_SUFFIX(BlendEquation, EXT);
-    }
-
-    GET_PROC(BlendFunc);
     GET_PROC(BufferData);
     GET_PROC(BufferSubData);
     GET_PROC(Clear);
     GET_PROC(ClearColor);
     GET_PROC(ClearStencil);
     GET_PROC(ColorMask);
     GET_PROC(CompileShader);
     GET_PROC(CompressedTexImage2D);
     GET_PROC(CompressedTexSubImage2D);
     GET_PROC(CopyTexSubImage2D);
@@ skipping 243 matching lines @@
 
     GrGLInterface* interface = SkNEW(GrGLInterface);
     GrGLInterface::Functions* functions = &interface->fFunctions;
 
     GET_PROC(ActiveTexture);
     GET_PROC(AttachShader);
     GET_PROC(BindAttribLocation);
     GET_PROC(BindBuffer);
     GET_PROC(BindTexture);
     GET_PROC_SUFFIX(BindVertexArray, OES);
-
-    if (extensions.has("GL_KHR_blend_equation_advanced")) {
-        GET_PROC_SUFFIX(BlendBarrier, KHR);
-    } else if (extensions.has("GL_NV_blend_equation_advanced")) {
-        GET_PROC_SUFFIX(BlendBarrier, NV);
-    }
-
     GET_PROC(BlendColor);
-    GET_PROC(BlendEquation);
     GET_PROC(BlendFunc);
     GET_PROC(BufferData);
     GET_PROC(BufferSubData);
     GET_PROC(Clear);
     GET_PROC(ClearColor);
     GET_PROC(ClearStencil);
     GET_PROC(ColorMask);
     GET_PROC(CompileShader);
     GET_PROC(CompressedTexImage2D);
     GET_PROC(CompressedTexSubImage2D);
@@ skipping 179 matching lines @@
 
     if (extensions.has("GL_NV_framebuffer_mixed_samples")) {
         GET_PROC_SUFFIX(CoverageModulation, NV);
     }
 
     interface->fStandard = kGLES_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
     return interface;
 }