diff options
author | dyen <dyen@chromium.org> | 2015-11-03 12:03:04 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-03 20:04:03 +0000 |
commit | cc16ed4d1e600f3d478bd00d8d315894a74d68bb (patch) | |
tree | bd2ca9893e7ce38921b7a664486d55931db35aeb /gpu/GLES2 | |
parent | 55df5b2e04bc9ab96196b38a05a8dfb5f9701ca4 (diff) | |
download | chromium_src-cc16ed4d1e600f3d478bd00d8d315894a74d68bb.zip chromium_src-cc16ed4d1e600f3d478bd00d8d315894a74d68bb.tar.gz chromium_src-cc16ed4d1e600f3d478bd00d8d315894a74d68bb.tar.bz2 |
Modified old wait sync point functions to also accept new sync tokens.
In order to help with refactoring old sync points into new sync points,
glWaitSyncPointCHROMIUM() has been changed to accept both the old and
new sync points.
This CL only refactors all the ways we pass around sync points so in
theory shouldn't change any behavior. Once this lands we can then
incrementally change the sync point insertions to the new sync points.
R=piman@chromium.org
BUG=514815
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1427543002
Cr-Commit-Position: refs/heads/master@{#357595}
Diffstat (limited to 'gpu/GLES2')
-rw-r--r-- | gpu/GLES2/gl2extchromium.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h index 9e15249..7939bc7 100644 --- a/gpu/GLES2/gl2extchromium.h +++ b/gpu/GLES2/gl2extchromium.h @@ -681,14 +681,12 @@ typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUMPROC) ( #ifdef GL_GLEXT_PROTOTYPES GL_APICALL GLuint GL_APIENTRY glInsertSyncPointCHROMIUM(); -GL_APICALL void GL_APIENTRY glWaitSyncPointCHROMIUM(GLuint sync_point); GL_APICALL GLuint64 GL_APIENTRY glInsertFenceSyncCHROMIUM(); GL_APICALL void GL_APIENTRY glGenSyncTokenCHROMIUM(GLuint64 fence_sync, GLbyte* sync_token); GL_APICALL void GL_APIENTRY glWaitSyncTokenCHROMIUM(const GLbyte* sync_token); #endif typedef GLuint (GL_APIENTRYP PFNGLINSERTSYNCPOINTCHROMIUMPROC) (); -typedef void (GL_APIENTRYP PFNGLWAITSYNCPOINTCHROMIUMPROC) (GLuint sync_point); typedef GLuint64 (GL_APIENTRYP PFNGLINSERTFENCESYNCCHROMIUMPROC) (); typedef void (GL_APIENTRYP PFNGLGENSYNCTOKENCHROMIUMPROC) (GLuint64 fence_sync, GLbyte* sync_token); |