commit 70b5bb00e87d1f99c014590329c4cbc5886b56e6
author Jamie Madill <jmadill@chromium.org> Mon Aug 28 13:32:37 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Aug 28 18:54:08 2017 +0000
tree e473f48a3cb9cf98e0ffc9e6b0f8fad51015a0a9
parent 3ef140a9741e6f8410c7e3f464963f05730d17f3

Rename gl::FenceSync to gl::Sync.

The spec refers to Sync objects, FenceSyncs being a subtype. The
motivation for this fix is to clear up the FenceSync_ entry point for
auto-generation.

BUG=angleproject:1309

Change-Id: I94c440476d701628575e7a3eea68b6dd110f41c3
Reviewed-on: https://chromium-review.googlesource.com/636516
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index d42ab2f..b84ba00 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -473,7 +473,7 @@
     mState.mTextures->release(this);
     mState.mRenderbuffers->release(this);
     mState.mSamplers->release(this);
-    mState.mFenceSyncs->release(this);
+    mState.mSyncs->release(this);
     mState.mPaths->release(this);
     mState.mFramebuffers->release(this);
 
@@ -676,7 +676,7 @@
     // wait commands finish. However, since the name becomes invalid, we cannot query the fence,
     // and since our API is currently designed for being called from a single thread, we can delete
     // the fence immediately.
-    mState.mFenceSyncs->deleteObject(this, static_cast<GLuint>(reinterpret_cast<uintptr_t>(sync)));
+    mState.mSyncs->deleteObject(this, static_cast<GLuint>(reinterpret_cast<uintptr_t>(sync)));
 }
 
 void Context::deletePaths(GLuint first, GLsizei range)
@@ -804,10 +804,9 @@
     return mState.mRenderbuffers->getRenderbuffer(handle);
 }
 
-FenceSync *Context::getFenceSync(GLsync handle) const
+Sync *Context::getSync(GLsync handle) const
 {
-    return mState.mFenceSyncs->getFenceSync(
-        static_cast<GLuint>(reinterpret_cast<uintptr_t>(handle)));
+    return mState.mSyncs->getSync(static_cast<GLuint>(reinterpret_cast<uintptr_t>(handle)));
 }
 
 VertexArray *Context::getVertexArray(GLuint handle) const
@@ -857,7 +856,7 @@
 
 LabeledObject *Context::getLabeledObjectFromPtr(const void *ptr) const
 {
-    return getFenceSync(reinterpret_cast<GLsync>(const_cast<void *>(ptr)));
+    return getSync(reinterpret_cast<GLsync>(const_cast<void *>(ptr)));
 }
 
 void Context::objectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar *label)
@@ -4149,7 +4148,7 @@
 
 void Context::getSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    const FenceSync *syncObject = getFenceSync(sync);
+    const Sync *syncObject = getSync(sync);
     handleError(QuerySynciv(syncObject, pname, bufSize, length, values));
 }
 
@@ -5154,29 +5153,29 @@
 
 GLsync Context::fenceSync(GLenum condition, GLbitfield flags)
 {
-    GLuint handle    = mState.mFenceSyncs->createFenceSync(mImplementation.get());
-    GLsync fenceSync = reinterpret_cast<GLsync>(static_cast<uintptr_t>(handle));
+    GLuint handle     = mState.mSyncs->createSync(mImplementation.get());
+    GLsync syncHandle = reinterpret_cast<GLsync>(static_cast<uintptr_t>(handle));
 
-    FenceSync *fenceSyncObject = getFenceSync(fenceSync);
-    Error error                = fenceSyncObject->set(condition, flags);
+    Sync *syncObject = getSync(syncHandle);
+    Error error      = syncObject->set(condition, flags);
     if (error.isError())
     {
-        deleteSync(fenceSync);
+        deleteSync(syncHandle);
         handleError(error);
         return nullptr;
     }
 
-    return fenceSync;
+    return syncHandle;
 }
 
 GLboolean Context::isSync(GLsync sync)
 {
-    return (getFenceSync(sync) != nullptr);
+    return (getSync(sync) != nullptr);
 }
 
 GLenum Context::clientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    FenceSync *syncObject = getFenceSync(sync);
+    Sync *syncObject = getSync(sync);
 
     GLenum result = GL_WAIT_FAILED;
     handleError(syncObject->clientWait(flags, timeout, &result));
@@ -5185,7 +5184,7 @@
 
 void Context::waitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    FenceSync *syncObject = getFenceSync(sync);
+    Sync *syncObject = getSync(sync);
     handleError(syncObject->serverWait(flags, timeout));
 }