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 /gpu/GLES2 | |
| 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 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt | 13 | ||||
| -rw-r--r-- | gpu/GLES2/gl2extchromium.h | 4 |
2 files changed, 4 insertions, 13 deletions
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt index 101c0f6..5e15d3a 100644 --- a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt +++ b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt @@ -33,7 +33,7 @@ New Procedures and Functions The command - void glCopyTextureCHROMIUM (GLenum target, GLenum source_id, + void glCopyTextureCHROMIUM (GLenum source_id, GLenum dest_id, GLint internal_format, GLenum dest_type, GLboolean unpack_flip_y, @@ -70,8 +70,6 @@ New Procedures and Functions The format type of the destination texture is converted to that specified by <dest_type>. - <target> uses the same parameters as TexImage2D. - If <flip_y> is true, vertically flip texture image data. If <unpack_premultiply_alpha> and <unpack_unmultiply_alpha> are true, @@ -84,8 +82,6 @@ New Procedures and Functions INVALID_OPERATION is generated if the internal format of <source_id> is not one of formats from the table above. - INVALID_VALUE is generated if <target> is not GL_TEXTURE_2D. - INVALID_VALUE is generated if <source_id> or <dest_id> are not valid texture objects. @@ -100,7 +96,7 @@ New Procedures and Functions The command - void glCopySubTextureCHROMIUM (GLenum target, GLenum source_id, + void glCopySubTextureCHROMIUM (GLenum source_id, GLenum dest_id, GLint xoffset, GLint yoffset, GLint x, GLint y, @@ -112,7 +108,7 @@ New Procedures and Functions Copies the sub contents of texture referred to by <source_id> to <dest_id> texture without redefining <dest_id> texture. - See CopyTextureCHROMIUM for the interpretation of the <target>, <flip_y>, + See CopyTextureCHROMIUM for the interpretation of the <flip_y>, <premultiply_alpha>, and <unmultiply_alpha> arguments. <xoffset> and <yoffset> specify a texel offset in the x and y direction @@ -128,8 +124,6 @@ New Procedures and Functions INVALID_OPERATION is generated if source internal_format and destination internal_format are not one of the valid formats described above. - INVALID_VALUE is generated if <target> is not GL_TEXTURE_2D. - INVALID_OPERATION is generated if the destination texture has not been defined. @@ -170,3 +164,4 @@ Revision History 16/7/2014 Add GL_TEXTURE_RECTANGLE_ARB as valid source_id target 19/6/2015 Add arguments unpack_flip_y, unpack_premultiply_alpha, and unpack_unmultiply_alpha to both commands. + 4/1/2016 Removed the argument target. diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h index 2d8a449..a7b5e05 100644 --- a/gpu/GLES2/gl2extchromium.h +++ b/gpu/GLES2/gl2extchromium.h @@ -367,7 +367,6 @@ typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERCHROMIUMPROC) (GLint srcX0, GLint #ifdef GL_GLEXT_PROTOTYPES GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM( - GLenum target, GLenum source_id, GLenum dest_id, GLint internalformat, @@ -377,7 +376,6 @@ GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM( GLboolean unpack_unmultiply_alpha); GL_APICALL void GL_APIENTRY glCopySubTextureCHROMIUM( - GLenum target, GLenum source_id, GLenum dest_id, GLint xoffset, @@ -391,7 +389,6 @@ GL_APICALL void GL_APIENTRY glCopySubTextureCHROMIUM( GLboolean unpack_unmultiply_alpha); #endif typedef void(GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUMPROC)( - GLenum target, GLenum source_id, GLenum dest_id, GLint internalformat, @@ -401,7 +398,6 @@ typedef void(GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUMPROC)( GLboolean unpack_unmultiply_alpha); typedef void(GL_APIENTRYP PFNGLCOPYSUBTEXTURECHROMIUMPROC)( - GLenum target, GLenum source_id, GLenum dest_id, GLint xoffset, |