diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 22:53:06 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 22:53:06 +0000 |
| commit | 269200b1c5008621167dbd619576281337b421a4 (patch) | |
| tree | 80b10bbac1a929710fd5340b44caafefec30ea9a /gpu/GLES2 | |
| parent | 4ea77949af577e920f8ee3dff283289d8c80b413 (diff) | |
| download | chromium_src-269200b1c5008621167dbd619576281337b421a4.zip chromium_src-269200b1c5008621167dbd619576281337b421a4.tar.gz chromium_src-269200b1c5008621167dbd619576281337b421a4.tar.bz2 | |
Renames Chrome only GL extension functions to follow
GL naming convention.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/5210001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/gl2ext.h | 30 | ||||
| -rw-r--r-- | gpu/GLES2/gles2_command_buffer.h | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/gpu/GLES2/gl2ext.h b/gpu/GLES2/gl2ext.h index ccfa910..287b122 100644 --- a/gpu/GLES2/gl2ext.h +++ b/gpu/GLES2/gl2ext.h @@ -879,33 +879,33 @@ typedef void (GL_APIENTRY PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXT) (GLenum target #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) +#define glMapBufferSubDataCHROMIUM GLES2_GET_FUN(MapBufferSubDataCHROMIUM) +#define glUnmapBufferSubDataCHROMIUM GLES2_GET_FUN(UnmapBufferSubDataCHROMIUM) +#define glMapTexSubImage2DCHROMIUM GLES2_GET_FUN(MapTexSubImage2DCHROMIUM) +#define glUnmapTexSubImage2DCHROMIUM GLES2_GET_FUN(UnmapTexSubImage2DCHROMIUM) #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); +GL_APICALL void* GL_APIENTRY glMapBufferSubDataCHROMIUM (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access); +GL_APICALL void GL_APIENTRY glUnmapBufferSubDataCHROMIUM (const void* mem); +GL_APICALL void* GL_APIENTRY glMapTexSubImage2DCHROMIUM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access); +GL_APICALL void GL_APIENTRY glUnmapTexSubImage2DCHROMIUM (const void* mem); #endif #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); +typedef void* (GL_APIENTRYP PFNGLMAPBUFFERSUBDATACHROMIUM) (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access); +typedef void (GL_APIENTRYP PFNGLUNMAPBUFFERSUBDATACHROMIUM) (const void* mem); +typedef void* (GL_APIENTRYP PFNGLMAPTEXSUBIMAGE2DCHROMIUM) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access); +typedef void (GL_APIENTRYP PFNGLUNMAPTEXSUBIMAGE2DCHROMIUM) (const void* mem); #endif /* GL_CHROMIUM_copy_texture_to_parent_texture */ #ifndef GL_CHROMIUM_copy_texture_to_parent_texture #define GL_CHROMIUM_copy_texture_to_parent_texture 1 #ifdef GL_GLEXT_PROTOTYPES -#define glCopyTextureToParentTexture GLES2_GET_FUN(CopyTextureToParentTexture) +#define glCopyTextureToParentTextureCHROMIUM GLES2_GET_FUN(CopyTextureToParentTextureCHROMIUM) #if !defined(GLES2_USE_CPP_BINDINGS) -GL_APICALL void* GL_APIENTRY glCopyTextureToParentTexture (GLuint id, GLuint id2); +GL_APICALL void* GL_APIENTRY glCopyTextureToParentTextureCHROMIUM (GLuint id, GLuint id2); #endif #else -typedef void* (GL_APIENTRYP PFNGLCOPYTEXTURETOPARENTTEXTURE) (GLuint id, GLuint id2); +typedef void* (GL_APIENTRYP PFNGLCOPYTEXTURETOPARENTTEXTURECHROMIUM) (GLuint id, GLuint id2); #endif #endif diff --git a/gpu/GLES2/gles2_command_buffer.h b/gpu/GLES2/gles2_command_buffer.h index 30bc7a7..c027afd 100644 --- a/gpu/GLES2/gles2_command_buffer.h +++ b/gpu/GLES2/gles2_command_buffer.h @@ -8,7 +8,7 @@ #ifndef GPU_GLES2_GLES2_COMMAND_BUFFER_H_ #define GPU_GLES2_GLES2_COMMAND_BUFFER_H_ -// constants for CommandBufferEnable command. +// constants for CommandBufferEnableCHROMIUM command. #define PEPPER3D_ALLOW_BUFFERS_ON_MULTIPLE_TARGETS \ "pepper3d_allow_buffers_on_multiple_targets" #define PEPPER3D_SUPPORT_FIXED_ATTRIBS \ |