diff options
| author | danakj <danakj@chromium.org> | 2016-03-17 14:28:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 21:29:40 +0000 |
| commit | 823b7378c01290d0a29e2052554d497e87530490 (patch) | |
| tree | 120a58974223b489f6e961492c67cc6c9acacde3 /gpu | |
| parent | 21bc97a226c7b49ace1c4209edba0b3003113d39 (diff) | |
| download | chromium_src-823b7378c01290d0a29e2052554d497e87530490.zip chromium_src-823b7378c01290d0a29e2052554d497e87530490.tar.gz chromium_src-823b7378c01290d0a29e2052554d497e87530490.tar.bz2 | |
Remove framebufferRenderbuffer and framebufferTexture* from WGC3D.
This removes the method from the WebGraphicsContext3D API, and makes
callers go directly to the GLES2Interface instead.
The DepthStencilTrackingGLES2Interface is introduced for the
DepthStencilTrackingContext to use in DrawingBufferTest, and code will
migrate to it as methods are replaced in WebGraphicsContext3D.
R=kbr@chromium.org
BUG=584497
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel
Review URL: https://codereview.chromium.org/1808933002
Cr-Commit-Position: refs/heads/master@{#381799}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.cc | 8 | ||||
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.h | 14 |
2 files changed, 0 insertions, 22 deletions
diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc index d4e0a65..ffabe1b 100644 --- a/gpu/blink/webgraphicscontext3d_impl.cc +++ b/gpu/blink/webgraphicscontext3d_impl.cc @@ -341,12 +341,6 @@ DELEGATE_TO_GL_1(enableVertexAttribArray, EnableVertexAttribArray, DELEGATE_TO_GL(finish, Finish) DELEGATE_TO_GL(flush, Flush) -DELEGATE_TO_GL_4(framebufferRenderbuffer, FramebufferRenderbuffer, - WGC3Denum, WGC3Denum, WGC3Denum, WebGLId) - -DELEGATE_TO_GL_5(framebufferTexture2D, FramebufferTexture2D, - WGC3Denum, WGC3Denum, WGC3Denum, WebGLId, WGC3Dint) - DELEGATE_TO_GL_1(frontFace, FrontFace, WGC3Denum) DELEGATE_TO_GL_1(generateMipmap, GenerateMipmap, WGC3Denum) @@ -1018,8 +1012,6 @@ WGC3Dsync WebGraphicsContext3DImpl::fenceSync(WGC3Denum condition, WGC3Dbitfield flags) { return reinterpret_cast<WGC3Dsync>(gl_->FenceSync(condition, flags)); } -DELEGATE_TO_GL_5(framebufferTextureLayer, FramebufferTextureLayer, WGC3Denum, - WGC3Denum, WGC3Duint, WGC3Dint, WGC3Dint) DELEGATE_TO_GL_5(getActiveUniformBlockName, GetActiveUniformBlockName, WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dchar *) DELEGATE_TO_GL_4(getActiveUniformBlockiv, GetActiveUniformBlockiv, WGC3Duint, diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h index e33e877..16eb3f7 100644 --- a/gpu/blink/webgraphicscontext3d_impl.h +++ b/gpu/blink/webgraphicscontext3d_impl.h @@ -144,15 +144,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl void enableVertexAttribArray(blink::WGC3Duint index) override; void finish() override; void flush() override; - void framebufferRenderbuffer(blink::WGC3Denum target, - blink::WGC3Denum attachment, - blink::WGC3Denum renderbuffertarget, - blink::WebGLId renderbuffer) override; - void framebufferTexture2D(blink::WGC3Denum target, - blink::WGC3Denum attachment, - blink::WGC3Denum textarget, - blink::WebGLId texture, - blink::WGC3Dint level) override; void frontFace(blink::WGC3Denum mode) override; void generateMipmap(blink::WGC3Denum target) override; @@ -685,11 +676,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl void endTransformFeedback(void) override; blink::WGC3Dsync fenceSync(blink::WGC3Denum condition, blink::WGC3Dbitfield flags) override; - void framebufferTextureLayer(blink::WGC3Denum target, - blink::WGC3Denum attachment, - blink::WGC3Duint texture, - blink::WGC3Dint level, - blink::WGC3Dint layer) override; void getActiveUniformBlockName(blink::WGC3Duint program, blink::WGC3Duint uniformBlockIndex, blink::WGC3Dsizei bufSize, |