Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Side by Side Diff: third_party/mesa/include/GL/glext.h

Issue 16818021: Changed typedefs for GLintptr and GLsizeiptr (and ARB variants) to work around conflicts with Skia'… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 7 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #ifndef __glext_h_ 1 #ifndef __glext_h_
2 #define __glext_h_ 2 #define __glext_h_
3 3
4 #ifdef __cplusplus 4 #ifdef __cplusplus
5 extern "C" { 5 extern "C" {
6 #endif 6 #endif
7 7
8 /* 8 /*
9 ** Copyright (c) 2007-2012 The Khronos Group Inc. 9 ** Copyright (c) 2007-2012 The Khronos Group Inc.
10 ** 10 **
(...skipping 6131 matching lines...) Expand 10 before | Expand all | Expand 10 after
6142 /*************************************************************/ 6142 /*************************************************************/
6143 6143
6144 #include <stddef.h> 6144 #include <stddef.h>
6145 #ifndef GL_VERSION_2_0 6145 #ifndef GL_VERSION_2_0
6146 /* GL type for program/shader text */ 6146 /* GL type for program/shader text */
6147 typedef char GLchar; 6147 typedef char GLchar;
6148 #endif 6148 #endif
6149 6149
6150 #ifndef GL_VERSION_1_5 6150 #ifndef GL_VERSION_1_5
6151 /* GL types for handling large vertex buffer objects */ 6151 /* GL types for handling large vertex buffer objects */
6152 typedef ptrdiff_t GLintptr; 6152 typedef signed long int GLintptr;
6153 typedef ptrdiff_t GLsizeiptr; 6153 typedef signed long int GLsizeiptr;
6154 #endif 6154 #endif
6155 6155
6156 #ifndef GL_ARB_vertex_buffer_object 6156 #ifndef GL_ARB_vertex_buffer_object
6157 /* GL types for handling large vertex buffer objects */ 6157 /* GL types for handling large vertex buffer objects */
6158 typedef ptrdiff_t GLintptrARB; 6158 typedef signed long int GLintptrARB;
6159 typedef ptrdiff_t GLsizeiptrARB; 6159 typedef signed long int GLsizeiptrARB;
6160 #endif 6160 #endif
6161 6161
6162 #ifndef GL_ARB_shader_objects 6162 #ifndef GL_ARB_shader_objects
6163 /* GL types for program/shader text and shader object handles */ 6163 /* GL types for program/shader text and shader object handles */
6164 typedef char GLcharARB; 6164 typedef char GLcharARB;
6165 typedef unsigned int GLhandleARB; 6165 typedef unsigned int GLhandleARB;
6166 #endif 6166 #endif
6167 6167
6168 /* GL type for "half" precision (s10e5) float data in host memory */ 6168 /* GL type for "half" precision (s10e5) float data in host memory */
6169 #ifndef GL_ARB_half_float_pixel 6169 #ifndef GL_ARB_half_float_pixel
(...skipping 6561 matching lines...) Expand 10 before | Expand all | Expand 10 after
12731 typedef void (APIENTRYP PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum int ernalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbit field flags); 12731 typedef void (APIENTRYP PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum int ernalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbit field flags);
12732 typedef void (APIENTRYP PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenu m target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, G Lsizei layers, GLbitfield flags); 12732 typedef void (APIENTRYP PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenu m target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, G Lsizei layers, GLbitfield flags);
12733 #endif 12733 #endif
12734 12734
12735 12735
12736 #ifdef __cplusplus 12736 #ifdef __cplusplus
12737 } 12737 }
12738 #endif 12738 #endif
12739 12739
12740 #endif 12740 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698