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

Side by Side Diff: gpu/GLES2/gl2extchromium.h

Issue 11693007: Linux: use generated shim headers for system mesa. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move parts to gyp Created 7 years, 11 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 | « build/shim_headers.gypi ('k') | third_party/khronos/khronos.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file contains Chromium-specific GLES2 extensions declarations. 5 // This file contains Chromium-specific GLES2 extensions declarations.
6 6
7 #ifndef GPU_GLES2_GL2EXTCHROMIUM_H_ 7 #ifndef GPU_GLES2_GL2EXTCHROMIUM_H_
8 #define GPU_GLES2_GL2EXTCHROMIUM_H_ 8 #define GPU_GLES2_GL2EXTCHROMIUM_H_
9 9
10 #include <GLES2/gl2.h> 10 #include <GLES2/gl2.h>
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 269
270 /* GL_CHROMIUM_texture_compression_dxt3 */ 270 /* GL_CHROMIUM_texture_compression_dxt3 */
271 #ifndef GL_CHROMIUM_texture_compression_dxt3 271 #ifndef GL_CHROMIUM_texture_compression_dxt3
272 #define GL_CHROMIUM_texture_compression_dxt3 1 272 #define GL_CHROMIUM_texture_compression_dxt3 1
273 273
274 #ifndef GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 274 #ifndef GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
275 #define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 275 #define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
276 #endif 276 #endif
277 #endif /* GL_CHROMIUM_texture_compression_dxt3 */ 277 #endif /* GL_CHROMIUM_texture_compression_dxt3 */
278 278
279 /* GL_ANGLE_instanced_arrays */
greggman 2013/01/10 21:21:02 I don't understand this change. Why are we editing
Paweł Hajdan Jr. 2013/01/10 21:52:03 System headers are buggy and do not contain "#defi
280 #ifndef GL_ANGLE_instanced_arrays
281 #define GL_ANGLE_instanced_arrays 1
282 #ifdef GL_GLEXT_PROTOTYPES
283 GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE(
284 GLenum mode, GLint first, GLsizei count, GLsizei primcount);
285 #endif
286 typedef void (
287 GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDANGLEPROC) (
288 GLenum mode, GLint first, GLsizei count, GLsizei primcount);
289 #ifdef GL_GLEXT_PROTOTYPES
290 GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE(
291 GLenum mode, GLsizei count, GLenum type, const void* indices,
292 GLsizei primcount);
293 #endif
294 typedef void (
295 GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDANGLEPROC) (
296 GLenum mode, GLsizei count, GLenum type, const void* indices,
297 GLsizei primcount);
298 #ifdef GL_GLEXT_PROTOTYPES
299 GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE(
300 GLuint index, GLuint divisor);
301 #endif
302 typedef void (
303 GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (
304 GLuint index, GLuint divisor);
305 #endif /* GL_ANGLE_instanced_arrays */
306
279 /* GL_CHROMIUM_texture_compression_dxt5 */ 307 /* GL_CHROMIUM_texture_compression_dxt5 */
280 #ifndef GL_CHROMIUM_texture_compression_dxt5 308 #ifndef GL_CHROMIUM_texture_compression_dxt5
281 #define GL_CHROMIUM_texture_compression_dxt5 1 309 #define GL_CHROMIUM_texture_compression_dxt5 1
282 310
283 #ifndef GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 311 #ifndef GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
284 #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 312 #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
285 #endif 313 #endif
286 #endif /* GL_CHROMIUM_texture_compression_dxt5 */ 314 #endif /* GL_CHROMIUM_texture_compression_dxt5 */
287 315
288 /* GL_CHROMIUM_async_pixel_transfers */ 316 /* GL_CHROMIUM_async_pixel_transfers */
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 #ifndef GL_CHROMIUM_front_buffer_cached 462 #ifndef GL_CHROMIUM_front_buffer_cached
435 #define GL_CHROMIUM_front_buffer_cached 1 463 #define GL_CHROMIUM_front_buffer_cached 1
436 #endif /* GL_CHROMIUM_front_buffer_cached */ 464 #endif /* GL_CHROMIUM_front_buffer_cached */
437 465
438 #ifdef __cplusplus 466 #ifdef __cplusplus
439 } 467 }
440 #endif 468 #endif
441 469
442 #endif // GPU_GLES2_GL2EXTCHROMIUM_H_ 470 #endif // GPU_GLES2_GL2EXTCHROMIUM_H_
443 471
OLDNEW
« no previous file with comments | « build/shim_headers.gypi ('k') | third_party/khronos/khronos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698