| Index: gpu/GLES2/gl2extchromium.h
|
| diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h
|
| index 8c1f3df16cf2c70767066eb5e993236b90ad7a39..e38949b5757ec32233014a29090d457676255dfc 100644
|
| --- a/gpu/GLES2/gl2extchromium.h
|
| +++ b/gpu/GLES2/gl2extchromium.h
|
| @@ -84,14 +84,6 @@ GL_APICALL GLuint GL_APIENTRY glCreateImageCHROMIUM(ClientBuffer buffer,
|
| GLsizei height,
|
| GLenum internalformat);
|
| GL_APICALL void GL_APIENTRY glDestroyImageCHROMIUM(GLuint image_id);
|
| -GL_APICALL void GL_APIENTRY glBindTexImage2DCHROMIUM(GLenum target,
|
| - GLint imageId);
|
| -GL_APICALL void GL_APIENTRY
|
| -glBindTexImage2DWithInternalformatCHROMIUM(GLenum target,
|
| - GLenum internalformat,
|
| - GLint imageId);
|
| -GL_APICALL void GL_APIENTRY glReleaseTexImage2DCHROMIUM(GLenum target,
|
| - GLint imageId);
|
| #endif
|
| typedef GLuint(GL_APIENTRYP PFNGLCREATEIMAGECHROMIUMPROC)(
|
| ClientBuffer buffer,
|
| @@ -100,14 +92,6 @@ typedef GLuint(GL_APIENTRYP PFNGLCREATEIMAGECHROMIUMPROC)(
|
| GLenum internalformat);
|
| typedef void (
|
| GL_APIENTRYP PFNGLDESTROYIMAGECHROMIUMPROC)(GLuint image_id);
|
| -typedef void(GL_APIENTRYP PFNGLBINDTEXIMAGE2DCHROMIUMPROC)(GLenum target,
|
| - GLint imageId);
|
| -typedef void(GL_APIENTRYP PFNGLBINDTEXIMAGE2DWITHINTERNALFORMATCHROMIUMPROC)(
|
| - GLenum target,
|
| - GLenum internalformat,
|
| - GLint imageId);
|
| -typedef void(GL_APIENTRYP PFNGLRELEASETEXIMAGE2DCHROMIUMPROC)(GLenum target,
|
| - GLint imageId);
|
| #endif /* GL_CHROMIUM_image */
|
|
|
| #ifndef GL_RGB_YCRCB_420_CHROMIUM
|
| @@ -185,6 +169,21 @@ typedef void (GL_APIENTRYP PFNGLREQUESTEXTENSIONCHROMIUMPROC) (
|
| #endif
|
| #endif /* GL_CHROMIUM_get_error_query */
|
|
|
| +/* GL_CHROMIUM_texture_from_image */
|
| +#ifndef GL_CHROMIUM_texture_from_image
|
| +#define GL_CHROMIUM_texture_from_image 1
|
| +#ifdef GL_GLEXT_PROTOTYPES
|
| +GL_APICALL void GL_APIENTRY glBindTexImage2DCHROMIUM(
|
| + GLenum target, GLint imageId);
|
| +GL_APICALL void GL_APIENTRY glReleaseTexImage2DCHROMIUM(
|
| + GLenum target, GLint imageId);
|
| +#endif
|
| +typedef void (GL_APIENTRYP PFNGLBINDTEXIMAGE2DCHROMIUMPROC) (
|
| + GLenum target, GLint imageId);
|
| +typedef void (GL_APIENTRYP PFNGLRELEASETEXIMAGE2DCHROMIUMPROC) (
|
| + GLenum target, GLint imageId);
|
| +#endif /* GL_CHROMIUM_texture_from_image */
|
| +
|
| /* GL_CHROMIUM_post_sub_buffer */
|
| #ifndef GL_CHROMIUM_post_sub_buffer
|
| #define GL_CHROMIUM_post_sub_buffer 1
|
|
|