diff options
| author | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:13:03 +0000 |
|---|---|---|
| committer | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:13:03 +0000 |
| commit | 0a1e9ad53f2f7f2fc6139644da122e272b88fb80 (patch) | |
| tree | 8fb141e572f89fd34844b8381c758a286853824f /third_party/khronos | |
| parent | dc03f987519668bcffac2c5ecd8d85feab7aa195 (diff) | |
| download | chromium_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 'third_party/khronos')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 45943a0..3b162b8 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -1966,10 +1966,10 @@ typedef void (GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUM) (GLenum target, GLs #ifdef GL_GLEXT_PROTOTYPES #define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM) #if !defined(GLES2_USE_CPP_BINDINGS) -GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM (GLenum target, GLenum source_id, GLenum dest_id, GLint level); +GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM (GLenum target, GLenum source_id, GLenum dest_id, GLint level, GLint internal_format); #endif #else -typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUM) (GLenum target, GLenum source_id, GLenum dest_id, GLint level); +typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUM) (GLenum target, GLenum source_id, GLenum dest_id, GLint level, GLint internal_format); #endif #endif |