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

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

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Folded sync_point into sync_tokens Created 5 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 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 /* GL_CHROMIUM_sync_point */ 674 /* GL_CHROMIUM_sync_point */
675 #ifndef GL_CHROMIUM_sync_point 675 #ifndef GL_CHROMIUM_sync_point
676 #define GL_CHROMIUM_sync_point 1 676 #define GL_CHROMIUM_sync_point 1
677 677
678 #ifndef GL_SYNC_TOKEN_SIZE_CHROMIUM 678 #ifndef GL_SYNC_TOKEN_SIZE_CHROMIUM
679 #define GL_SYNC_TOKEN_SIZE_CHROMIUM 24 679 #define GL_SYNC_TOKEN_SIZE_CHROMIUM 24
680 #endif 680 #endif
681 681
682 #ifdef GL_GLEXT_PROTOTYPES 682 #ifdef GL_GLEXT_PROTOTYPES
683 GL_APICALL GLuint GL_APIENTRY glInsertSyncPointCHROMIUM(); 683 GL_APICALL GLuint GL_APIENTRY glInsertSyncPointCHROMIUM();
684 GL_APICALL void GL_APIENTRY glWaitSyncPointCHROMIUM(GLuint sync_point);
685 GL_APICALL GLuint64 GL_APIENTRY glInsertFenceSyncCHROMIUM(); 684 GL_APICALL GLuint64 GL_APIENTRY glInsertFenceSyncCHROMIUM();
686 GL_APICALL void GL_APIENTRY glGenSyncTokenCHROMIUM(GLuint64 fence_sync, 685 GL_APICALL void GL_APIENTRY glGenSyncTokenCHROMIUM(GLuint64 fence_sync,
687 GLbyte* sync_token); 686 GLbyte* sync_token);
688 GL_APICALL void GL_APIENTRY glWaitSyncTokenCHROMIUM(const GLbyte* sync_token); 687 GL_APICALL void GL_APIENTRY glWaitSyncTokenCHROMIUM(const GLbyte* sync_token);
689 #endif 688 #endif
690 typedef GLuint (GL_APIENTRYP PFNGLINSERTSYNCPOINTCHROMIUMPROC) (); 689 typedef GLuint (GL_APIENTRYP PFNGLINSERTSYNCPOINTCHROMIUMPROC) ();
691 typedef void (GL_APIENTRYP PFNGLWAITSYNCPOINTCHROMIUMPROC) (GLuint sync_point);
692 typedef GLuint64 (GL_APIENTRYP PFNGLINSERTFENCESYNCCHROMIUMPROC) (); 690 typedef GLuint64 (GL_APIENTRYP PFNGLINSERTFENCESYNCCHROMIUMPROC) ();
693 typedef void (GL_APIENTRYP PFNGLGENSYNCTOKENCHROMIUMPROC) (GLuint64 fence_sync, 691 typedef void (GL_APIENTRYP PFNGLGENSYNCTOKENCHROMIUMPROC) (GLuint64 fence_sync,
694 GLbyte* sync_token); 692 GLbyte* sync_token);
695 typedef void (GL_APIENTRYP PFNGLWAITSYNCTOKENCHROMIUM) ( 693 typedef void (GL_APIENTRYP PFNGLWAITSYNCTOKENCHROMIUM) (
696 const GLbyte* sync_tokens); 694 const GLbyte* sync_tokens);
697 #endif /* GL_CHROMIUM_sync_point */ 695 #endif /* GL_CHROMIUM_sync_point */
698 696
699 #ifndef GL_CHROMIUM_color_buffer_float_rgba 697 #ifndef GL_CHROMIUM_color_buffer_float_rgba
700 #define GL_CHROMIUM_color_buffer_float_rgba 1 698 #define GL_CHROMIUM_color_buffer_float_rgba 1
701 #ifndef GL_RGBA32F 699 #ifndef GL_RGBA32F
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 #define GL_PATH_STENCIL_VALUE_MASK_CHROMIUM 0x90B9 976 #define GL_PATH_STENCIL_VALUE_MASK_CHROMIUM 0x90B9
979 #endif 977 #endif
980 978
981 #endif /* GL_CHROMIUM_path_rendering */ 979 #endif /* GL_CHROMIUM_path_rendering */
982 980
983 #ifdef __cplusplus 981 #ifdef __cplusplus
984 } 982 }
985 #endif 983 #endif
986 984
987 #endif // GPU_GLES2_GL2EXTCHROMIUM_H_ 985 #endif // GPU_GLES2_GL2EXTCHROMIUM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698