diff options
author | orglofch <orglofch@chromium.org> | 2014-11-06 16:07:14 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 00:07:46 +0000 |
commit | 1650e5447c7382948dc9659c39965489ed3af20a (patch) | |
tree | 59e9c15ac47bb8255ba7b324c70c4cc54ff6c319 /webkit | |
parent | e7faeb90115481ae4040f9344686136957a4e220 (diff) | |
download | chromium_src-1650e5447c7382948dc9659c39965489ed3af20a.zip chromium_src-1650e5447c7382948dc9659c39965489ed3af20a.tar.gz chromium_src-1650e5447c7382948dc9659c39965489ed3af20a.tar.bz2 |
Revert of Add subscribeUniform extension pipeline (patchset #7 id:460001 of https://codereview.chromium.org/659903002/)
Reason for revert:
buildbot memory failure on Linux Tests
Original issue's description:
> Add subscribeUniform extension pipeline
>
> BUG=422978
>
> Committed: https://crrev.com/80b40cc8eab5e6bef6221c0bc5c1d006059acd8f
> Cr-Commit-Position: refs/heads/master@{#303050}
TBR=kbr@chromium.org,bajones@chromium.org,piman@chromium.org,brianderson@chromium.org
BUG=422978
Review URL: https://codereview.chromium.org/706903004
Cr-Commit-Position: refs/heads/master@{#303131}
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/common/gpu/webgraphicscontext3d_impl.cc | 41 | ||||
-rw-r--r-- | webkit/common/gpu/webgraphicscontext3d_impl.h | 12 |
2 files changed, 0 insertions, 53 deletions
diff --git a/webkit/common/gpu/webgraphicscontext3d_impl.cc b/webkit/common/gpu/webgraphicscontext3d_impl.cc index 9e42509..3625de5 100644 --- a/webkit/common/gpu/webgraphicscontext3d_impl.cc +++ b/webkit/common/gpu/webgraphicscontext3d_impl.cc @@ -846,47 +846,6 @@ DELEGATE_TO_GL_2R(createAndConsumeTextureCHROMIUM, CreateAndConsumeTextureCHROMIUM, WGC3Denum, const WGC3Dbyte*, WebGLId) -DELEGATE_TO_GL_2(genValuebuffersCHROMIUM, - GenValuebuffersCHROMIUM, - WGC3Dsizei, - WebGLId*); - -WebGLId WebGraphicsContext3DImpl::createValuebufferCHROMIUM() { - GLuint o; - gl_->GenValuebuffersCHROMIUM(1, &o); - return o; -} - -DELEGATE_TO_GL_2(deleteValuebuffersCHROMIUM, - DeleteValuebuffersCHROMIUM, - WGC3Dsizei, - WebGLId*); - -void WebGraphicsContext3DImpl::deleteValuebufferCHROMIUM(WebGLId valuebuffer) { - gl_->DeleteValuebuffersCHROMIUM(1, &valuebuffer); -} - -DELEGATE_TO_GL_1RB(isValuebufferCHROMIUM, - IsValuebufferCHROMIUM, - WebGLId, - WGC3Dboolean) -DELEGATE_TO_GL_2(bindValuebufferCHROMIUM, - BindValuebufferCHROMIUM, - WGC3Denum, - WebGLId) -DELEGATE_TO_GL_2(subscribeValueCHROMIUM, - SubscribeValueCHROMIUM, - WGC3Denum, - WGC3Denum); -DELEGATE_TO_GL_1(populateSubscribedValuesCHROMIUM, - PopulateSubscribedValuesCHROMIUM, - WGC3Denum); -DELEGATE_TO_GL_3(uniformValuebufferCHROMIUM, - UniformValuebufferCHROMIUM, - WGC3Dint, - WGC3Denum, - WGC3Denum); - void WebGraphicsContext3DImpl::insertEventMarkerEXT( const WGC3Dchar* marker) { gl_->InsertEventMarkerEXT(0, marker); diff --git a/webkit/common/gpu/webgraphicscontext3d_impl.h b/webkit/common/gpu/webgraphicscontext3d_impl.h index 3ed0dd9..ee3cb36 100644 --- a/webkit/common/gpu/webgraphicscontext3d_impl.h +++ b/webkit/common/gpu/webgraphicscontext3d_impl.h @@ -483,18 +483,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DImpl virtual WebGLId createAndConsumeTextureCHROMIUM(WGC3Denum target, const WGC3Dbyte* mailbox); - virtual void genValuebuffersCHROMIUM(WGC3Dsizei count, WebGLId* ids); - virtual WebGLId createValuebufferCHROMIUM(); - virtual void deleteValuebuffersCHROMIUM(WGC3Dsizei count, WebGLId* ids); - virtual void deleteValuebufferCHROMIUM(WebGLId); - virtual void bindValuebufferCHROMIUM(WGC3Denum target, WebGLId valuebuffer); - virtual WGC3Dboolean isValuebufferCHROMIUM(WebGLId renderbuffer); - virtual void subscribeValueCHROMIUM(WGC3Denum target, WGC3Denum subscription); - virtual void populateSubscribedValuesCHROMIUM(WGC3Denum target); - virtual void uniformValuebufferCHROMIUM(WGC3Dint location, - WGC3Denum target, - WGC3Denum subscription); - virtual void insertEventMarkerEXT(const WGC3Dchar* marker); virtual void pushGroupMarkerEXT(const WGC3Dchar* marker); virtual void popGroupMarkerEXT(); |