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

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

Issue 715983004: gpu: Change the hex code of conflicted _CHROMIUM macro (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run build_gles2_cmd_buffer.py Created 6 years, 1 month 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
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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 #ifndef GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 360 #ifndef GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
361 #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 361 #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
362 #endif 362 #endif
363 #endif /* GL_CHROMIUM_texture_compression_dxt5 */ 363 #endif /* GL_CHROMIUM_texture_compression_dxt5 */
364 364
365 /* GL_CHROMIUM_async_pixel_transfers */ 365 /* GL_CHROMIUM_async_pixel_transfers */
366 #ifndef GL_CHROMIUM_async_pixel_transfers 366 #ifndef GL_CHROMIUM_async_pixel_transfers
367 #define GL_CHROMIUM_async_pixel_transfers 1 367 #define GL_CHROMIUM_async_pixel_transfers 1
368 368
369 #ifndef GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM 369 #ifndef GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM
370 #define GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM 0x84F5 370 #define GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM 0x84F8
no sievers 2014/11/17 20:11:26 This actually collides with MAX_RECTANGLE_TEXTURE_
371 #endif 371 #endif
372 #ifndef GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM 372 #ifndef GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM
373 #define GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM 0x84F6 373 #define GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM 0x84F9
374 #endif 374 #endif
375 #endif /* GL_CHROMIUM_async_pixel_transfers */ 375 #endif /* GL_CHROMIUM_async_pixel_transfers */
376 376
377 #ifndef GL_BIND_GENERATES_RESOURCE_CHROMIUM 377 #ifndef GL_BIND_GENERATES_RESOURCE_CHROMIUM
378 #define GL_BIND_GENERATES_RESOURCE_CHROMIUM 0x9244 378 #define GL_BIND_GENERATES_RESOURCE_CHROMIUM 0x9244
379 #endif 379 #endif
380 380
381 /* GL_CHROMIUM_copy_texture */ 381 /* GL_CHROMIUM_copy_texture */
382 #ifndef GL_CHROMIUM_copy_texture 382 #ifndef GL_CHROMIUM_copy_texture
383 #define GL_CHROMIUM_copy_texture 1 383 #define GL_CHROMIUM_copy_texture 1
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 typedef void(GL_APIENTRYP PFNGLMATRIXLOADIDENTITYCHROMIUMPROC)( 763 typedef void(GL_APIENTRYP PFNGLMATRIXLOADIDENTITYCHROMIUMPROC)(
764 GLenum matrixMode); 764 GLenum matrixMode);
765 765
766 #endif /* GL_CHROMIUM_path_rendering */ 766 #endif /* GL_CHROMIUM_path_rendering */
767 767
768 #ifdef __cplusplus 768 #ifdef __cplusplus
769 } 769 }
770 #endif 770 #endif
771 771
772 #endif // GPU_GLES2_GL2EXTCHROMIUM_H_ 772 #endif // GPU_GLES2_GL2EXTCHROMIUM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698