aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/android
diff options
context:
space:
mode:
authorGravatar tomhudson <tomhudson@google.com>2015-04-21 14:16:53 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-04-21 14:16:53 -0700
commit2575f317d3fa977676279097332955c20ad46044 (patch)
tree533e80063699daff6fe0333861a4b880645b1a03 /src/gpu/gl/android
parenta7c6389ebf19cf58926f7a1616f0e5554c56aa84 (diff)
Revert of Add tokens and entry points for KHR_blend_equation_advanced (patchset #3 id:40001 of https://codereview.chromium.org/1039693004/)
Reason for revert: We're getting repeated crashes since this CL landed when we try to evaluate a roll into Chrome on our bots. (https://uberchromegw.corp.google.com/i/client.skia/builders/Linux%20Tests/builds/1902) Our initial reflex is to put a #if 0 around this code (just like the immediately following lines 334-338 in GrGLInterface.cpp), but the error isn't what the GPU team expected to see if that was all we needed, so we're reverting now and asking you to resubmit tomorrow after running more thorough tests. Original issue's description: > Add tokens and entry points for KHR_blend_equation_advanced > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/8e578859f80b46a63144add215955221017d3609 TBR=markkilgard@gmail.com,bsalomon@google.com,cdalton@nvidia.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1101593002
Diffstat (limited to 'src/gpu/gl/android')
-rw-r--r--src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp b/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
index 4569cc8f23..99219d0fd5 100644
--- a/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
+++ b/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
@@ -30,8 +30,6 @@ static GrGLFuncPtr android_get_gl_proc(void* ctx, const char name[]) {
return (GrGLFuncPtr) glBindTexture;
} else if (0 == strcmp("glBlendColor", name)) {
return (GrGLFuncPtr) glBlendColor;
- } else if (0 == strcmp("glBlendEquation", name)) {
- return (GrGLFuncPtr) glBlendEquation;
} else if (0 == strcmp("glBlendFunc", name)) {
return (GrGLFuncPtr) glBlendFunc;
} else if (0 == strcmp("glBufferData", name)) {