third_party/khronos/GLES2/gl2ext.h - Issue 10078006: Revert 132934 - this change seems to break many webgl related layout tests

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10078006: Revert 132934 - this change seems to break many webgl related layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 8 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

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 1937 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1948 #ifdef GL_GLEXT_PROTOTYPES	1948 #ifdef GL_GLEXT_PROTOTYPES

1949 #define glTexImageIOSurface2DCHROMIUM GLES2_GET_FUN(TexImageIOSurface2DCHROMIUM)	1949 #define glTexImageIOSurface2DCHROMIUM GLES2_GET_FUN(TexImageIOSurface2DCHROMIUM)

1950 #if !defined(GLES2_USE_CPP_BINDINGS)	1950 #if !defined(GLES2_USE_CPP_BINDINGS)

1951 GL_APICALL void GL_APIENTRY glTexImageIOSurface2DCHROMIUM (GLenum target, GLsize i width, GLsizei height, GLuint ioSurfaceId, GLuint plane);	1951 GL_APICALL void GL_APIENTRY glTexImageIOSurface2DCHROMIUM (GLenum target, GLsize i width, GLsizei height, GLuint ioSurfaceId, GLuint plane);

1952 #endif	1952 #endif

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 */

1959 #ifndef GL_CHROMIUM_copy_texture

1960 #ifndef GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM

1961 #define GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM 0x9241

1962 #endif

1963 #ifndef GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM

1964 #define GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM 0x9243

1965 #endif

1966 #ifdef GL_GLEXT_PROTOTYPES

1967 #define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM)

1968 #if !defined(GLES2_USE_CPP_BINDINGS)

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

1970 #endif

1971 #else

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

1973 #endif

1974 #endif

1975

1976 /* GL_CHROMIUM_command_buffer_query */	1958 /* GL_CHROMIUM_command_buffer_query */

1977 /* Exposes GL_CHROMIUM_command_buffer_query.	1959 /* Exposes GL_CHROMIUM_command_buffer_query.

1978 */	1960 */

1979 #ifndef GL_CHROMIUM_command_buffer_query	1961 #ifndef GL_CHROMIUM_command_buffer_query

1980 #define GL_CHROMIUM_command_buffer_query 1	1962 #define GL_CHROMIUM_command_buffer_query 1

1981 // TODO(gman): Get official numbers for these constants.	1963 // TODO(gman): Get official numbers for these constants.

1982 #define GL_COMMANDS_ISSUED_CHROMIUM 0x84F2	1964 #define GL_COMMANDS_ISSUED_CHROMIUM 0x84F2

1983 #endif	1965 #endif

1984	1966

1985 #ifdef __cplusplus	1967 #ifdef __cplusplus

1986 }	1968 }

1987 #endif	1969 #endif

1988	1970

1989 #endif /* __gl2ext_h_ */	1971 #endif /* __gl2ext_h_ */

OLD	NEW

« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | third_party/khronos/README.chromium » ('j') | no next file with comments »