third_party/khronos/GLES2/gl2ext.h - Issue 10535174: Addition of unpremultiply setting to GL_CHROMIUM_copy_texture.

Side by Side Diff: third_party/khronos/GLES2/gl2ext.h

Issue 10535174: Addition of unpremultiply setting to GL_CHROMIUM_copy_texture. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Addressing review comments. Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc ('k') | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 #ifndef __gl2ext_h_	1 #ifndef __gl2ext_h_

2 #define __gl2ext_h_	2 #define __gl2ext_h_

3	3

4 /* $Revision: 16619 $ on $Date:: 2012-01-18 10:00:14 -0800 #$ */	4 /* $Revision: 16619 $ on $Date:: 2012-01-18 10:00:14 -0800 #$ */

5	5

6 #ifdef __cplusplus	6 #ifdef __cplusplus

7 extern "C" {	7 extern "C" {

8 #endif	8 #endif

9	9

10 /*	10 /*

(...skipping 1942 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1953 #else	1953 #else

1954 typedef void (GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUM) (GLenum target, GLs izei width, GLsizei height, GLuint ioSurfaceId, GLuint plane);	1954 typedef void (GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUM) (GLenum target, GLs izei width, GLsizei height, GLuint ioSurfaceId, GLuint plane);

1955 #endif	1955 #endif

1956 #endif	1956 #endif

1957	1957

1958 /* GL_CHROMIUM_copy_texture */	1958 /* GL_CHROMIUM_copy_texture */

1959 #ifndef GL_CHROMIUM_copy_texture	1959 #ifndef GL_CHROMIUM_copy_texture

1960 #ifndef GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM	1960 #ifndef GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM

1961 #define GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM 0x9241	1961 #define GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM 0x9241

1962 #endif	1962 #endif

	1963 #ifndef GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM

	1964 #define GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM 0x9242

	1965 #endif

1963 #ifndef GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM	1966 #ifndef GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM

1964 #define GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM 0x9243	1967 #define GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM 0x9243

1965 #endif	1968 #endif

1966 #ifdef GL_GLEXT_PROTOTYPES	1969 #ifdef GL_GLEXT_PROTOTYPES

1967 #define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM)	1970 #define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM)

1968 #if !defined(GLES2_USE_CPP_BINDINGS)	1971 #if !defined(GLES2_USE_CPP_BINDINGS)

1969 GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM (GLenum target, GLenum source_ id, GLenum dest_id, GLint level, GLint internal_format);	1972 GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM (GLenum target, GLenum source_ id, GLenum dest_id, GLint level, GLint internal_format);

1970 #endif	1973 #endif

1971 #else	1974 #else

1972 typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUM) (GLenum target, GLenum sour ce_id, GLenum dest_id, GLint level, GLint internal_format);	1975 typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUM) (GLenum target, GLenum sour ce_id, GLenum dest_id, GLint level, GLint internal_format);

(...skipping 27 matching lines...) Expand all Loading...
2000 typedef void (GL_APIENTRYP PFNGLPRODUCETEXTURECHROMIUM) (GLenum target, const GL byte* mailbox);	2003 typedef void (GL_APIENTRYP PFNGLPRODUCETEXTURECHROMIUM) (GLenum target, const GL byte* mailbox);

2001 typedef void (GL_APIENTRYP PFNGLCONSUMETEXTURECHROMIUM) (GLenum target, const G Lbyte* mailbox);	2004 typedef void (GL_APIENTRYP PFNGLCONSUMETEXTURECHROMIUM) (GLenum target, const G Lbyte* mailbox);

2002 #endif	2005 #endif

2003 #endif	2006 #endif

2004	2007

2005 #ifdef __cplusplus	2008 #ifdef __cplusplus

2006 }	2009 }

2007 #endif	2010 #endif

2008	2011

2009 #endif /* __gl2ext_h_ */	2012 #endif /* __gl2ext_h_ */

OLD	NEW