diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 03:25:07 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 03:25:07 +0000 |
| commit | 0226c11e6cfd7510d97aaf4499aa2c10aad8c7e6 (patch) | |
| tree | 2ad5eae3d1915932745b4b99a872aebc79f4fe12 /gpu/GLES2 | |
| parent | 212a96285521d213cd7fe720f26a721cdae70d90 (diff) | |
| download | chromium_src-0226c11e6cfd7510d97aaf4499aa2c10aad8c7e6.zip chromium_src-0226c11e6cfd7510d97aaf4499aa2c10aad8c7e6.tar.gz chromium_src-0226c11e6cfd7510d97aaf4499aa2c10aad8c7e6.tar.bz2 | |
Add support for GL_CHROMIUM_flipy
Also fixed a couple of other related things
TEST=unit tests
BUG=89593
Review URL: http://codereview.chromium.org/7471032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/gl2ext.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gpu/GLES2/gl2ext.h b/gpu/GLES2/gl2ext.h index 1afb408..6fef647 100644 --- a/gpu/GLES2/gl2ext.h +++ b/gpu/GLES2/gl2ext.h @@ -902,10 +902,10 @@ typedef void (GL_APIENTRYP PFNGLUNMAPTEXSUBIMAGE2DCHROMIUM) (const void* mem); #ifdef GL_GLEXT_PROTOTYPES #define glCopyTextureToParentTextureCHROMIUM GLES2_GET_FUN(CopyTextureToParentTextureCHROMIUM) #if !defined(GLES2_USE_CPP_BINDINGS) -GL_APICALL void* GL_APIENTRY glCopyTextureToParentTextureCHROMIUM (GLuint id, GLuint id2); +GL_APICALL void GL_APIENTRY glCopyTextureToParentTextureCHROMIUM (GLuint id, GLuint id2); #endif #else -typedef void* (GL_APIENTRYP PFNGLCOPYTEXTURETOPARENTTEXTURECHROMIUM) (GLuint id, GLuint id2); +typedef void (GL_APIENTRYP PFNGLCOPYTEXTURETOPARENTTEXTURECHROMIUM) (GLuint id, GLuint id2); #endif #endif @@ -1001,7 +1001,7 @@ typedef void (GL_APIENTRYP PFNGLRATELIMITOFFSCREENCONTEXTCHROMIUM) (); #define glGetMultipleIntegervCHROMIUM GLES2_GET_FUN(GetMultipleIntegervCHROMIUM) #define glGetProgramInfoCHROMIUM GLES2_GET_FUN(GetProgramInfovCHROMIUM) #if !defined(GLES2_USE_CPP_BINDINGS) -GL_APICALL void GL_APIENTRY glGetMultipleIntegervCHROMIUM (void); +GL_APICALL void GL_APIENTRY glGetMultipleIntegervCHROMIUM (const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size); GL_APICALL void GL_APIENTRY glGetProgrmaInfoCHROMIUM (GLuint program, GLsizei bufsize, GLsizei* size, void* info); #endif #else @@ -1010,6 +1010,17 @@ typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUM) (); #endif #endif +/* GL_CHROMIUM_flipy */ +/* + * This extension provides GL_UNPACK_FLIP_Y_CHROMIUM as a parameter to + * glPixelStorei. When true images submitted to glTexImage2D and glTexSubImage2D + * are flipped vertically. + */ +#ifndef GL_CHROMIUM_flipy +#define GL_CHROMIUM_flipy 1 +#define GL_UNPACK_FLIP_Y_CHROMIUM 0x9240 +#endif + /* GL_ARB_robustness */ /* This extension is subsetted for the moment, incorporating only the * enums necessary to describe the reasons that we might encounter for |