Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Unified Diff: src/gpu/gl/GrGLAssembleInterface.cpp

Issue 1101593002: Revert of Add tokens and entry points for KHR_blend_equation_advanced (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/gpu/gl/GrGLInterface.h ('k') | src/gpu/gl/GrGLCreateNullInterface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLAssembleInterface.cpp
diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index 89b21fdec3567169f6d93c73ebb75329d5cc0501..b0f0430ffb3e20bca1e0cbbe945fa8556f501499 100644
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -70,28 +70,14 @@
}
GET_PROC(BeginQuery);
GET_PROC(BindTexture);
-
- 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(BlendFunc);
if (glVer >= GR_GL_VER(1,4) ||
- extensions.has("GL_ARB_imaging")) {
+ extensions.has("GL_ARB_imaging") ||
+ extensions.has("GL_EXT_blend_color")) {
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);
@@ -355,15 +341,7 @@
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);
« no previous file with comments | « include/gpu/gl/GrGLInterface.h ('k') | src/gpu/gl/GrGLCreateNullInterface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698