| Index: ppapi/lib/gl/include/GLES2/gl2ext.h
|
| diff --git a/ppapi/lib/gl/include/GLES2/gl2ext.h b/ppapi/lib/gl/include/GLES2/gl2ext.h
|
| index bef2b8ce8154fd9fe9ecd7f00661924077ec205a..d690a9dd5c18c93a07cc6338edb7e81aa29a84b5 100644
|
| --- a/ppapi/lib/gl/include/GLES2/gl2ext.h
|
| +++ b/ppapi/lib/gl/include/GLES2/gl2ext.h
|
| @@ -1820,17 +1820,6 @@ 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_CHROMIUM_texture_compression_dxt3 */
|
| #ifndef GL_CHROMIUM_texture_compression_dxt3
|
| #define GL_CHROMIUM_texture_compression_dxt3 1
|
| @@ -1955,28 +1944,52 @@ typedef void (GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUM) (GLenum target, GLs
|
| #define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM)
|
| #define glCopySubTextureCHROMIUM GLES2_GET_FUN(CopySubTextureCHROMIUM)
|
| #if !defined(GLES2_USE_CPP_BINDINGS)
|
| -GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM(GLenum target,
|
| - GLenum source_id,
|
| - GLenum dest_id,
|
| - GLint internalformat,
|
| - GLenum dest_type);
|
| -GL_APICALL void GL_APIENTRY glCopySubTextureCHROMIUM(GLenum target,
|
| - GLenum source_id,
|
| - GLenum dest_id,
|
| - GLint xoffset,
|
| - GLint yoffset);
|
| +GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM(
|
| + GLenum target,
|
| + GLenum source_id,
|
| + GLenum dest_id,
|
| + GLint internalformat,
|
| + GLenum dest_type,
|
| + GLboolean unpack_flip_y,
|
| + GLboolean unpack_premultiply_alpha,
|
| + GLboolean unpack_unmultiply_alpha);
|
| +GL_APICALL void GL_APIENTRY glCopySubTextureCHROMIUM(
|
| + GLenum target,
|
| + GLenum source_id,
|
| + GLenum dest_id,
|
| + GLint xoffset,
|
| + GLint yoffset,
|
| + GLint x,
|
| + GLint y,
|
| + GLsizei width,
|
| + GLsizei height,
|
| + GLboolean unpack_flip_y,
|
| + GLboolean unpack_premultiply_alpha,
|
| + GLboolean unpack_unmultiply_alpha);
|
| #endif
|
| #else
|
| -typedef void(GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUM)(GLenum target,
|
| - GLenum source_id,
|
| - GLenum dest_id,
|
| - GLint internalformat,
|
| - GLenum dest_type);
|
| -typedef void(GL_APIENTRYP PFNGLCOPYSUBTEXTURECHROMIUM)(GLenum target,
|
| - GLenum source_id,
|
| - GLenum dest_id,
|
| - GLint xoffset,
|
| - GLint yoffset);
|
| +typedef void(GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUM)(
|
| + GLenum target,
|
| + GLenum source_id,
|
| + GLenum dest_id,
|
| + GLint internalformat,
|
| + GLenum dest_type,
|
| + GLboolean unpack_flip_y,
|
| + GLboolean unpack_premultiply_alpha,
|
| + GLboolean unpack_unmultiply_alpha);
|
| +typedef void(GL_APIENTRYP PFNGLCOPYSUBTEXTURECHROMIUM)(
|
| + GLenum target,
|
| + GLenum source_id,
|
| + GLenum dest_id,
|
| + GLint xoffset,
|
| + GLint yoffset,
|
| + GLint x,
|
| + GLint y,
|
| + GLsizei width,
|
| + GLsizei height,
|
| + GLboolean unpack_flip_y,
|
| + GLboolean unpack_premultiply_alpha,
|
| + GLboolean unpack_unmultiply_alpha);
|
| #endif
|
| #endif
|
|
|
|
|