diff options
| author |  dcheng <dcheng@chromium.org> | 2016-02-06 15:08:54 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-06 15:08:55 -0800 |
| commit | c4d196c9c87f226eb33b8091dc50053c45c4e752 (patch) | |
| tree | d4850f4715af4c3d5364e311f95fe6524d9a682b /src/gpu/gl/SkNullGLContext.cpp | |
| parent | 964eec67760196585954203ba625e440607f7e92 (diff) | |
Revert of Improve GLSL integer support (patchset #1 id:1 of https://codereview.chromium.org/1669853002/ )
Reason for revert:
MSAN bots are unhappy with this change: https://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20ChromeOS%20MSan%20Tests/builds/7068
Original issue's description:
> Improve GLSL integer support
>
> - Adds shader types for uint.
> - Adds a cap for integer support.
> - Uses glVertexAttribIPointer for integer attribs.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1669853002
>
> Committed: https://skia.googlesource.com/skia/+/3a2caf8ecf38124f4ad21a0f6c4dabfcfa17911a
TBR=bsalomon@google.com,egdaniel@google.com,ethannicholas@google.com,cdalton@nvidia.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1674813004
Diffstat (limited to 'src/gpu/gl/SkNullGLContext.cpp')
| -rw-r--r-- | src/gpu/gl/SkNullGLContext.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gpu/gl/SkNullGLContext.cpp b/src/gpu/gl/SkNullGLContext.cpp index 68b19ce990..dafa1ef0bc 100644 --- a/src/gpu/gl/SkNullGLContext.cpp +++ b/src/gpu/gl/SkNullGLContext.cpp @@ -514,9 +514,8 @@ static GrGLInterface* create_null_interface(State* state) { functions->fVertexAttrib2fv = noOpGLVertexAttrib2fv; functions->fVertexAttrib3fv = noOpGLVertexAttrib3fv; functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv; - functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor; - functions->fVertexAttribIPointer = noOpGLVertexAttribIPointer; functions->fVertexAttribPointer = noOpGLVertexAttribPointer; + functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor; functions->fViewport = nullGLViewport; functions->fBindFramebuffer = nullGLBindFramebuffer; functions->fBindRenderbuffer = nullGLBindRenderbuffer; |