diff options
| author | zmo <zmo@chromium.org> | 2015-06-24 11:27:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-24 18:27:41 +0000 |
| commit | 2af27243cc33cf99c27b50b4552090140ce257e7 (patch) | |
| tree | e47d5cdc11aee5c05ec84f12c59b74780551d0f2 /gpu/blink | |
| parent | 2c021e94549b9a8a0f31e4a49b14585fc9590ac5 (diff) | |
| download | chromium_src-2af27243cc33cf99c27b50b4552090140ce257e7.zip chromium_src-2af27243cc33cf99c27b50b4552090140ce257e7.tar.gz chromium_src-2af27243cc33cf99c27b50b4552090140ce257e7.tar.bz2 | |
Remove flip_y, premultiply_alpha, unmultiply_alpha support in command buffer.
Except for client side PixelStorei, but it is an NO_OP for now.
BUG=502491
TEST=gpu bots
R=piman@chromium.org,dalecurtis@chromium.org
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1203793003
Cr-Commit-Position: refs/heads/master@{#335957}
Diffstat (limited to 'gpu/blink')
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.cc | 24 | ||||
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.h | 22 |
2 files changed, 2 insertions, 44 deletions
diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc index fb463b7..30fa260 100644 --- a/gpu/blink/webgraphicscontext3d_impl.cc +++ b/gpu/blink/webgraphicscontext3d_impl.cc @@ -71,30 +71,6 @@ void WebGraphicsContext3DErrorMessageCallback::OnErrorMessage( graphics_context_->OnErrorMessage(msg, id); } -void WebGraphicsContext3DImpl::copyTextureCHROMIUM( - blink::WGC3Denum target, - blink::WebGLId source_id, - blink::WebGLId dest_id, - blink::WGC3Denum internal_format, - blink::WGC3Denum dest_type) { - copyTextureCHROMIUM(target, source_id, dest_id, internal_format, dest_type, - false, false, false); -} - -void WebGraphicsContext3DImpl::copySubTextureCHROMIUM( - blink::WGC3Denum target, - blink::WebGLId source_id, - blink::WebGLId dest_id, - blink::WGC3Dint xoffset, - blink::WGC3Dint yoffset, - blink::WGC3Dint x, - blink::WGC3Dint y, - blink::WGC3Dsizei width, - blink::WGC3Dsizei height) { - copySubTextureCHROMIUM(target, source_id, dest_id, xoffset, yoffset, - x, y, width, height, false, false, false); -} - // Helper macros to reduce the amount of code. #define DELEGATE_TO_GL(name, glname) \ diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h index aaa5e1f..f3d03d3 100644 --- a/gpu/blink/webgraphicscontext3d_impl.h +++ b/gpu/blink/webgraphicscontext3d_impl.h @@ -518,24 +518,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl blink::WGC3Denum pname, blink::WGC3Duint* params); - // TODO(zmo): Remove the following two functions when blink side switch - // over to the correct version. - void copyTextureCHROMIUM(blink::WGC3Denum target, - blink::WebGLId source_id, - blink::WebGLId dest_id, - blink::WGC3Denum internal_format, - blink::WGC3Denum dest_type); - - void copySubTextureCHROMIUM(blink::WGC3Denum target, - blink::WebGLId source_id, - blink::WebGLId dest_id, - blink::WGC3Dint xoffset, - blink::WGC3Dint yoffset, - blink::WGC3Dint x, - blink::WGC3Dint y, - blink::WGC3Dsizei width, - blink::WGC3Dsizei height); - void copyTextureCHROMIUM( blink::WGC3Denum target, blink::WebGLId source_id, @@ -544,7 +526,7 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl blink::WGC3Denum dest_type, blink::WGC3Dboolean unpack_flip_y, blink::WGC3Dboolean unpack_premultiply_alpha, - blink::WGC3Dboolean unpack_unmultiply_alpha); + blink::WGC3Dboolean unpack_unmultiply_alpha) override; void copySubTextureCHROMIUM( blink::WGC3Denum target, @@ -558,7 +540,7 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl blink::WGC3Dsizei height, blink::WGC3Dboolean unpack_flip_y, blink::WGC3Dboolean unpack_premultiply_alpha, - blink::WGC3Dboolean unpack_unmultiply_alpha); + blink::WGC3Dboolean unpack_unmultiply_alpha) override; virtual void bindUniformLocationCHROMIUM(blink::WebGLId program, blink::WGC3Dint location, |