diff options
| author |  tomhudson <tomhudson@google.com> | 2015-04-21 14:16:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-21 14:16:53 -0700 |
| commit | 2575f317d3fa977676279097332955c20ad46044 (patch) | |
| tree | 533e80063699daff6fe0333861a4b880645b1a03 /src/gpu/gl/GrGLNoOpInterface.cpp | |
| parent | a7c6389ebf19cf58926f7a1616f0e5554c56aa84 (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/GrGLNoOpInterface.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLNoOpInterface.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gpu/gl/GrGLNoOpInterface.cpp b/src/gpu/gl/GrGLNoOpInterface.cpp index f588046455..6b8880ed81 100644 --- a/src/gpu/gl/GrGLNoOpInterface.cpp +++ b/src/gpu/gl/GrGLNoOpInterface.cpp @@ -27,6 +27,7 @@ static const char* kExtensions[] = { "GL_ARB_timer_query", "GL_ARB_draw_buffers", "GL_ARB_occlusion_query", + "GL_EXT_blend_color", "GL_EXT_stencil_wrap" }; @@ -47,18 +48,15 @@ const GrGLubyte* combined_extensions_string() { } } -GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBindFragDataLocation(GrGLuint program, - GrGLuint colorNumber, - const GrGLchar* name) { -} - GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBlendColor(GrGLclampf red, GrGLclampf green, GrGLclampf blue, GrGLclampf alpha) { } -GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBlendEquation(GrGLenum mode) { +GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBindFragDataLocation(GrGLuint program, + GrGLuint colorNumber, + const GrGLchar* name) { } GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBlendFunc(GrGLenum sfactor, |