diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 00:16:21 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 00:16:21 +0000 |
| commit | ea64c0a1403399d5ff6f3ec5cb9856a213ef45d8 (patch) | |
| tree | 12cdb5d904aadba76b03c66409b1f88c0b2bffe3 /gpu/GLES2 | |
| parent | 1695ebf7d771db4f8641faf04b4e3788fe1b2cf8 (diff) | |
| download | chromium_src-ea64c0a1403399d5ff6f3ec5cb9856a213ef45d8.zip chromium_src-ea64c0a1403399d5ff6f3ec5cb9856a213ef45d8.tar.gz chromium_src-ea64c0a1403399d5ff6f3ec5cb9856a213ef45d8.tar.bz2 | |
Fix for gl2ext.h
TEST=hand tested with gles2_demo and simple_texture2d
BUG=none
Review URL: http://codereview.chromium.org/3039003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/gl2ext.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/gpu/GLES2/gl2ext.h b/gpu/GLES2/gl2ext.h index e05ce4e..6c94efe 100644 --- a/gpu/GLES2/gl2ext.h +++ b/gpu/GLES2/gl2ext.h @@ -801,16 +801,28 @@ typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask); /* GL_CHROMIUM_map_sub */ #ifndef GL_CHROMIUM_map_sub #define GL_CHROMIUM_map_sub 1 +#ifndef GL_READ_ONLY +#define GL_READ_ONLY 0x88B8 +#endif +#ifndef GL_WRITE_ONLY +#define GL_WRITE_ONLY 0x88B9 +#endif #ifdef GL_GLEXT_PROTOTYPES +#define glMapBufferSubData GLES2_GET_FUN(MapBufferSubData) +#define glUnmapBufferSubData GLES2_GET_FUN(UnmapBufferSubData) +#define glMapTexSubImage2D GLES2_GET_FUN(MapTexSubImage2D) +#define glUnmapTexSubImage2D GLES2_GET_FUN(UnmapTexSubImage2D) +#if !defined(GLES2_USE_CPP_BINDINGS) GL_APICALL void* GL_APIENTRY glMapBufferSubData (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access); GL_APICALL void GL_APIENTRY glUnmapBufferSubData (const void* mem); GL_APICALL void* GL_APIENTRY glMapTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access); GL_APICALL void GL_APIENTRY glUnmapTexSubImage2D (const void* mem); #endif -typedef void* (GL_APIENTRYP PFNGLMAPBUFFERSUBDATA (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access); -typedef void (GL_APIENTRYP PFNGLUNMAPBUFFERSUBDATA (const void* mem); -typedef void* (GL_APIENTRYP PFNGLMAPTEXSUBIMAGE2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access); -typedef void (GL_APIENTRYP PFNGLUNMAPTEXSUBIMAGE2D (const void* mem); +#else +typedef void* (GL_APIENTRYP PFNGLMAPBUFFERSUBDATA) (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access); +typedef void (GL_APIENTRYP PFNGLUNMAPBUFFERSUBDATA) (const void* mem); +typedef void* (GL_APIENTRYP PFNGLMAPTEXSUBIMAGE2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access); +typedef void (GL_APIENTRYP PFNGLUNMAPTEXSUBIMAGE2D) (const void* mem); #endif #endif |