summaryrefslogtreecommitdiffstats
path: root/gpu/GLES2
diff options
context:
space:
mode:
authortwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 21:13:03 +0000
committertwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 21:13:03 +0000
commit0a1e9ad53f2f7f2fc6139644da122e272b88fb80 (patch)
tree8fb141e572f89fd34844b8381c758a286853824f /gpu/GLES2
parentdc03f987519668bcffac2c5ecd8d85feab7aa195 (diff)
downloadchromium_src-0a1e9ad53f2f7f2fc6139644da122e272b88fb80.zip
chromium_src-0a1e9ad53f2f7f2fc6139644da122e272b88fb80.tar.gz
chromium_src-0a1e9ad53f2f7f2fc6139644da122e272b88fb80.tar.bz2
Addition of a set of basic unit tests for the GL_CHROMIUM_copy_texture extension.
This change also introduces a new parameter to the extension, internal_format. This is to bring the extension closer in functionality to glCopyTexImage. The tests uncovered state that was not being properly restored: GL_BLEND. This is also corrected. TEST=GLCopyTextureCHROMIUMTest.* BUG=126178 Review URL: http://codereview.chromium.org/10356004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
-rw-r--r--gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt
index c48ac39..0b22f6b 100644
--- a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt
+++ b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt
@@ -31,7 +31,8 @@ Overview
New Procedures and Functions
void glCopyTextureCHROMIUM (GLenum target, GLenum source_id,
- GLenum dest_id, GLint level)
+ GLenum dest_id, GLint level,
+ GLint internal_format)
Copies the contents of texture referred to by <source_id> to texture
<dest_id>.
@@ -39,6 +40,9 @@ New Procedures and Functions
Texture level 0 is copied from the source image to level <level> of the
destination texture.
+ The internal format of the destination texture is converted to that
+ specified by <internal_format>
+
<target> uses the same parameters as TexImage2D.
INVALID_VALUE is generated if <target> is not GL_TEXTURE_2D.
@@ -46,6 +50,9 @@ New Procedures and Functions
INVALID_VALUE is generated if <source_id> or <dest_id> are not valid texture
objects.
+ INVALID_VALUE is generated if textures corresponding to <source_id> and
+ <dest_id> have not been bound as GL_TEXTURE_2D objects.
+
INVALID_VALUE is generated if <level> is not a valid level of the
destination texture, or if level 0 of the source texture is not defined.