summaryrefslogtreecommitdiffstats
path: root/mojo/gpu
diff options
context:
space:
mode:
authordyen <dyen@chromium.org>2015-10-07 11:58:31 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-07 18:59:10 +0000
commit5c38a030b88f43b57f404dc60d777572b33ea3c4 (patch)
treedcbefdf15124d6a1a11245bd1c901515cc11e795 /mojo/gpu
parentb474ca01fcc5376eb538f71e524351e52319d396 (diff)
downloadchromium_src-5c38a030b88f43b57f404dc60d777572b33ea3c4.zip
chromium_src-5c38a030b88f43b57f404dc60d777572b33ea3c4.tar.gz
chromium_src-5c38a030b88f43b57f404dc60d777572b33ea3c4.tar.bz2
Implemented new fence syncs which replaces the old sync points.
The new GL_CHROMIUM_sync_point proposal has been implemented now. The old functions are all different enough that no names were overloaded, so all of the old functionality still exists. This way, we can incrementally move over call sites of the old functions to use the new ones. R=jam@chromium.org, piman@chromium.org BUG=514815 Review URL: https://codereview.chromium.org/1331843005 Cr-Commit-Position: refs/heads/master@{#352901}
Diffstat (limited to 'mojo/gpu')
-rw-r--r--mojo/gpu/mojo_gles2_impl_autogen.cc13
-rw-r--r--mojo/gpu/mojo_gles2_impl_autogen.h3
2 files changed, 16 insertions, 0 deletions
diff --git a/mojo/gpu/mojo_gles2_impl_autogen.cc b/mojo/gpu/mojo_gles2_impl_autogen.cc
index 5237b66..f256ba0 100644
--- a/mojo/gpu/mojo_gles2_impl_autogen.cc
+++ b/mojo/gpu/mojo_gles2_impl_autogen.cc
@@ -1657,6 +1657,19 @@ void MojoGLES2Impl::WaitSyncPointCHROMIUM(GLuint sync_point) {
MojoGLES2MakeCurrent(context_);
glWaitSyncPointCHROMIUM(sync_point);
}
+GLuint64 MojoGLES2Impl::InsertFenceSyncCHROMIUM() {
+ MojoGLES2MakeCurrent(context_);
+ return glInsertFenceSyncCHROMIUM();
+}
+void MojoGLES2Impl::GenSyncTokenCHROMIUM(GLuint64 fence_sync,
+ GLbyte* sync_token) {
+ MojoGLES2MakeCurrent(context_);
+ glGenSyncTokenCHROMIUM(fence_sync, sync_token);
+}
+void MojoGLES2Impl::WaitSyncTokenCHROMIUM(const GLbyte* sync_token) {
+ MojoGLES2MakeCurrent(context_);
+ glWaitSyncTokenCHROMIUM(sync_token);
+}
void MojoGLES2Impl::DrawBuffersEXT(GLsizei count, const GLenum* bufs) {
MojoGLES2MakeCurrent(context_);
glDrawBuffersEXT(count, bufs);
diff --git a/mojo/gpu/mojo_gles2_impl_autogen.h b/mojo/gpu/mojo_gles2_impl_autogen.h
index 872c4f7..6d9d0a8 100644
--- a/mojo/gpu/mojo_gles2_impl_autogen.h
+++ b/mojo/gpu/mojo_gles2_impl_autogen.h
@@ -765,6 +765,9 @@ class MojoGLES2Impl : public gpu::gles2::GLES2Interface {
void LoseContextCHROMIUM(GLenum current, GLenum other) override;
GLuint InsertSyncPointCHROMIUM() override;
void WaitSyncPointCHROMIUM(GLuint sync_point) override;
+ GLuint64 InsertFenceSyncCHROMIUM() override;
+ void GenSyncTokenCHROMIUM(GLuint64 fence_sync, GLbyte* sync_token) override;
+ void WaitSyncTokenCHROMIUM(const GLbyte* sync_token) override;
void DrawBuffersEXT(GLsizei count, const GLenum* bufs) override;
void DiscardBackbufferCHROMIUM() override;
void ScheduleOverlayPlaneCHROMIUM(GLint plane_z_order,