diff options
| author | erikchen <erikchen@chromium.org> | 2016-01-06 11:35:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-06 19:36:22 +0000 |
| commit | 50b7660fa4b9aeb05d7e9b8919febeea5ccc1374 (patch) | |
| tree | 20cbe7a30cc6ab370670a673bcb4a178ea488629 /mojo | |
| parent | 8d8895cc227d9247c1172f235603c23d0be15ab4 (diff) | |
| download | chromium_src-50b7660fa4b9aeb05d7e9b8919febeea5ccc1374.zip chromium_src-50b7660fa4b9aeb05d7e9b8919febeea5ccc1374.tar.gz chromium_src-50b7660fa4b9aeb05d7e9b8919febeea5ccc1374.tar.bz2 | |
Remove the "target" argument from CopyTextureChromium.
The argument is meaningless, since the function also takes a source_id and
dest_id, each of which is already bound to a target. This is a refactor and has
no intended behavior change.
BUG=533617
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1551143002
Cr-Commit-Position: refs/heads/master@{#367878}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/gpu/mojo_gles2_impl_autogen.cc | 14 | ||||
| -rw-r--r-- | mojo/gpu/mojo_gles2_impl_autogen.h | 6 | ||||
| -rw-r--r-- | mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h | 12 |
3 files changed, 12 insertions, 20 deletions
diff --git a/mojo/gpu/mojo_gles2_impl_autogen.cc b/mojo/gpu/mojo_gles2_impl_autogen.cc index 7821ba8..d035fe1 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.cc +++ b/mojo/gpu/mojo_gles2_impl_autogen.cc @@ -1489,8 +1489,7 @@ void MojoGLES2Impl::TexImageIOSurface2DCHROMIUM(GLenum target, MojoGLES2MakeCurrent(context_); glTexImageIOSurface2DCHROMIUM(target, width, height, ioSurfaceId, plane); } -void MojoGLES2Impl::CopyTextureCHROMIUM(GLenum target, - GLenum source_id, +void MojoGLES2Impl::CopyTextureCHROMIUM(GLenum source_id, GLenum dest_id, GLint internalformat, GLenum dest_type, @@ -1498,12 +1497,11 @@ void MojoGLES2Impl::CopyTextureCHROMIUM(GLenum target, GLboolean unpack_premultiply_alpha, GLboolean unpack_unmultiply_alpha) { MojoGLES2MakeCurrent(context_); - glCopyTextureCHROMIUM(target, source_id, dest_id, internalformat, dest_type, + glCopyTextureCHROMIUM(source_id, dest_id, internalformat, dest_type, unpack_flip_y, unpack_premultiply_alpha, unpack_unmultiply_alpha); } -void MojoGLES2Impl::CopySubTextureCHROMIUM(GLenum target, - GLenum source_id, +void MojoGLES2Impl::CopySubTextureCHROMIUM(GLenum source_id, GLenum dest_id, GLint xoffset, GLint yoffset, @@ -1515,9 +1513,9 @@ void MojoGLES2Impl::CopySubTextureCHROMIUM(GLenum target, GLboolean unpack_premultiply_alpha, GLboolean unpack_unmultiply_alpha) { MojoGLES2MakeCurrent(context_); - glCopySubTextureCHROMIUM(target, source_id, dest_id, xoffset, yoffset, x, y, - width, height, unpack_flip_y, - unpack_premultiply_alpha, unpack_unmultiply_alpha); + glCopySubTextureCHROMIUM(source_id, dest_id, xoffset, yoffset, x, y, width, + height, unpack_flip_y, unpack_premultiply_alpha, + unpack_unmultiply_alpha); } void MojoGLES2Impl::CompressedCopyTextureCHROMIUM(GLenum target, GLenum source_id, diff --git a/mojo/gpu/mojo_gles2_impl_autogen.h b/mojo/gpu/mojo_gles2_impl_autogen.h index ce84596..b24a3e1 100644 --- a/mojo/gpu/mojo_gles2_impl_autogen.h +++ b/mojo/gpu/mojo_gles2_impl_autogen.h @@ -691,16 +691,14 @@ class MojoGLES2Impl : public gpu::gles2::GLES2Interface { GLsizei height, GLuint ioSurfaceId, GLuint plane) override; - void CopyTextureCHROMIUM(GLenum target, - GLenum source_id, + void CopyTextureCHROMIUM(GLenum source_id, GLenum dest_id, GLint internalformat, GLenum dest_type, GLboolean unpack_flip_y, GLboolean unpack_premultiply_alpha, GLboolean unpack_unmultiply_alpha) override; - void CopySubTextureCHROMIUM(GLenum target, - GLenum source_id, + void CopySubTextureCHROMIUM(GLenum source_id, GLenum dest_id, GLint xoffset, GLint yoffset, diff --git a/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h b/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h index 3344493..85c1016 100644 --- a/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h +++ b/mojo/public/c/gles2/gles2_call_visitor_chromium_extension_autogen.h @@ -183,16 +183,14 @@ VISIT_GL_CALL(TexImageIOSurface2DCHROMIUM, (target, width, height, ioSurfaceId, plane)) VISIT_GL_CALL(CopyTextureCHROMIUM, void, - (GLenum target, - GLenum source_id, + (GLenum source_id, GLenum dest_id, GLint internalformat, GLenum dest_type, GLboolean unpack_flip_y, GLboolean unpack_premultiply_alpha, GLboolean unpack_unmultiply_alpha), - (target, - source_id, + (source_id, dest_id, internalformat, dest_type, @@ -201,8 +199,7 @@ VISIT_GL_CALL(CopyTextureCHROMIUM, unpack_unmultiply_alpha)) VISIT_GL_CALL(CopySubTextureCHROMIUM, void, - (GLenum target, - GLenum source_id, + (GLenum source_id, GLenum dest_id, GLint xoffset, GLint yoffset, @@ -213,8 +210,7 @@ VISIT_GL_CALL(CopySubTextureCHROMIUM, GLboolean unpack_flip_y, GLboolean unpack_premultiply_alpha, GLboolean unpack_unmultiply_alpha), - (target, - source_id, + (source_id, dest_id, xoffset, yoffset, |