diff options
author | dbeam <dbeam@chromium.org> | 2016-03-21 21:38:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 04:39:36 +0000 |
commit | 0f1ab8d1aa55795c6c4eb5546c4dd24dbb2424c8 (patch) | |
tree | e309cb9a4055512eeda37a87f532e504435c9e49 /gpu | |
parent | d8fb03aaed3416b77589c154ae1e9c2c832bfa4b (diff) | |
download | chromium_src-0f1ab8d1aa55795c6c4eb5546c4dd24dbb2424c8.zip chromium_src-0f1ab8d1aa55795c6c4eb5546c4dd24dbb2424c8.tar.gz chromium_src-0f1ab8d1aa55795c6c4eb5546c4dd24dbb2424c8.tar.bz2 |
Revert of Remove create/delete methods from WebGraphicsContext3D. (patchset #6 id:100001 of https://codereview.chromium.org/1814263004/ )
Reason for revert:
FAILED: [snip]
../../third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp:255:27: error: unused variable 'webContext' [-Werror,-Wunused-variable]
WebGraphicsContext3D* webContext = context();
^
../../third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp:276:27: error: unused variable 'webContext' [-Werror,-Wunused-variable]
WebGraphicsContext3D* webContext = context();
^
2 errors generated.
Original issue's description:
> Remove create/delete methods from WebGraphicsContext3D.
>
> Have callers use the new Gen/Delete methods on GLES2Interface instead.
>
> R=bajones@chromium.org, chrishtr@chromium.org, kbr@chromium.org, pfeldman@chromium.org
> TBR=pfeldman
> BUG=584497
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
>
> Committed: https://crrev.com/d8fb03aaed3416b77589c154ae1e9c2c832bfa4b
> Cr-Commit-Position: refs/heads/master@{#382506}
TBR=chrishtr@chromium.org,bajones@chromium.org,kbr@chromium.org,pfeldman@chromium.org,piman@chromium.org,danakj@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=584497
Review URL: https://codereview.chromium.org/1817323003
Cr-Commit-Position: refs/heads/master@{#382507}
Diffstat (limited to 'gpu')
-rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.cc | 90 | ||||
-rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.h | 24 |
2 files changed, 114 insertions, 0 deletions
diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc index 4547528..da34cb5 100644 --- a/gpu/blink/webgraphicscontext3d_impl.cc +++ b/gpu/blink/webgraphicscontext3d_impl.cc @@ -330,6 +330,48 @@ void WebGraphicsContext3DImpl::shaderSource( gl_->ShaderSource(shader, 1, &string, &length); } +WebGLId WebGraphicsContext3DImpl::createBuffer() { + GLuint o; + gl_->GenBuffers(1, &o); + return o; +} + +WebGLId WebGraphicsContext3DImpl::createFramebuffer() { + GLuint o = 0; + gl_->GenFramebuffers(1, &o); + return o; +} + +WebGLId WebGraphicsContext3DImpl::createRenderbuffer() { + GLuint o; + gl_->GenRenderbuffers(1, &o); + return o; +} + +WebGLId WebGraphicsContext3DImpl::createTexture() { + GLuint o; + gl_->GenTextures(1, &o); + return o; +} + +void WebGraphicsContext3DImpl::deleteBuffer(WebGLId buffer) { + gl_->DeleteBuffers(1, &buffer); +} + +void WebGraphicsContext3DImpl::deleteFramebuffer( + WebGLId framebuffer) { + gl_->DeleteFramebuffers(1, &framebuffer); +} + +void WebGraphicsContext3DImpl::deleteRenderbuffer( + WebGLId renderbuffer) { + gl_->DeleteRenderbuffers(1, &renderbuffer); +} + +void WebGraphicsContext3DImpl::deleteTexture(WebGLId texture) { + gl_->DeleteTextures(1, &texture); +} + void WebGraphicsContext3DImpl::setErrorMessageCallback( WebGraphicsContext3D::WebGraphicsErrorMessageCallback* cb) { error_message_callback_ = cb; @@ -340,11 +382,43 @@ void WebGraphicsContext3DImpl::setContextLostCallback( context_lost_callback_ = cb; } +WebGLId WebGraphicsContext3DImpl::createQueryEXT() { + GLuint o; + gl_->GenQueriesEXT(1, &o); + return o; +} + +void WebGraphicsContext3DImpl::deleteQueryEXT( + WebGLId query) { + gl_->DeleteQueriesEXT(1, &query); +} + +WebGLId WebGraphicsContext3DImpl::createValuebufferCHROMIUM() { + GLuint o; + gl_->GenValuebuffersCHROMIUM(1, &o); + return o; +} + +void WebGraphicsContext3DImpl::deleteValuebufferCHROMIUM(WebGLId valuebuffer) { + gl_->DeleteValuebuffersCHROMIUM(1, &valuebuffer); +} + void WebGraphicsContext3DImpl::pushGroupMarkerEXT( const WGC3Dchar* marker) { gl_->PushGroupMarkerEXT(0, marker); } +WebGLId WebGraphicsContext3DImpl::createVertexArrayOES() { + GLuint array; + gl_->GenVertexArraysOES(1, &array); + return array; +} + +void WebGraphicsContext3DImpl::deleteVertexArrayOES( + WebGLId array) { + gl_->DeleteVertexArraysOES(1, &array); +} + DELEGATE_TO_GL_1(beginTransformFeedback, BeginTransformFeedback, WGC3Denum) DELEGATE_TO_GL_3(bindBufferBase, BindBufferBase, WGC3Denum, WGC3Duint, WGC3Duint) @@ -372,6 +446,22 @@ DELEGATE_TO_GL_5(copyBufferSubData, CopyBufferSubData, WGC3Denum, WGC3Denum, DELEGATE_TO_GL_9(copyTexSubImage3D, CopyTexSubImage3D, WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei) +WebGLId WebGraphicsContext3DImpl::createSampler() { + GLuint sampler; + gl_->GenSamplers(1, &sampler); + return sampler; +} +WebGLId WebGraphicsContext3DImpl::createTransformFeedback() { + GLuint tf; + gl_->GenTransformFeedbacks(1, &tf); + return tf; +} +void WebGraphicsContext3DImpl::deleteSampler(WebGLId sampler) { + gl_->DeleteSamplers(1, &sampler); +} +void WebGraphicsContext3DImpl::deleteTransformFeedback(WebGLId tf) { + gl_->DeleteTransformFeedbacks(1, &tf); +} DELEGATE_TO_GL(endTransformFeedback, EndTransformFeedback) DELEGATE_TO_GL_5(getActiveUniformBlockName, GetActiveUniformBlockName, WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dchar *) diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h index f799dde..733a5e8 100644 --- a/gpu/blink/webgraphicscontext3d_impl.h +++ b/gpu/blink/webgraphicscontext3d_impl.h @@ -52,6 +52,16 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl void shaderSource(blink::WebGLId shader, const blink::WGC3Dchar* string) override; + blink::WebGLId createBuffer() override; + blink::WebGLId createFramebuffer() override; + blink::WebGLId createRenderbuffer() override; + blink::WebGLId createTexture() override; + + void deleteBuffer(blink::WebGLId) override; + void deleteFramebuffer(blink::WebGLId) override; + void deleteRenderbuffer(blink::WebGLId) override; + void deleteTexture(blink::WebGLId) override; + blink::WebString getRequestableExtensionsCHROMIUM() override; blink::WebString getTranslatedShaderSourceANGLE( @@ -63,8 +73,18 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl void setErrorMessageCallback( WebGraphicsContext3D::WebGraphicsErrorMessageCallback* callback) override; + blink::WebGLId createQueryEXT() override; + void deleteQueryEXT(blink::WebGLId query) override; + + blink::WebGLId createValuebufferCHROMIUM() override; + void deleteValuebufferCHROMIUM(blink::WebGLId) override; + void pushGroupMarkerEXT(const blink::WGC3Dchar* marker) override; + // GL_OES_vertex_array_object + blink::WebGLId createVertexArrayOES() override; + void deleteVertexArrayOES(blink::WebGLId array) override; + // OpenGL ES 3.0 functions not represented by pre-existing extensions void beginTransformFeedback(blink::WGC3Denum primitiveMode) override; void bindBufferBase(blink::WGC3Denum target, @@ -125,6 +145,10 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl blink::WGC3Dint y, blink::WGC3Dsizei width, blink::WGC3Dsizei height) override; + blink::WebGLId createSampler() override; + blink::WebGLId createTransformFeedback() override; + void deleteSampler(blink::WebGLId sampler) override; + void deleteTransformFeedback(blink::WebGLId transformfeedback) override; void endTransformFeedback(void) override; void getActiveUniformBlockName(blink::WGC3Duint program, blink::WGC3Duint uniformBlockIndex, |