commit 33dc84394ba08700d700a3da692e8de18433a031
author Jamie Madill <jmadill@transgaming.com> Fri Jul 26 11:55:05 2013 -0400
committer Jamie Madill <jmadill@transgaming.com> Fri Jul 26 12:51:30 2013 -0400
tree a575eeed3cd8764501c259ca3932fb75cd7815ba
parent fb9a7409515cb0a8f9926974511ff486361909d7

Rename the old Fence class and associated methods to show an NV suffix, for differentiation with ES3 fences sync objects.

ES3 fences are shared across contexts, while NV fences are not.

TRAC #23446

Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Authored-by: Jamie Madill

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 04777e0..a48af12 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -49,7 +49,7 @@
 {
     ASSERT(robustAccess == false);   // Unimplemented
 
-    mFenceHandleAllocator.setBaseHandle(0);
+    mFenceNVHandleAllocator.setBaseHandle(0);
 
     setClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
@@ -229,9 +229,9 @@
         deleteFramebuffer(mFramebufferMap.begin()->first);
     }
 
-    while (!mFenceMap.empty())
+    while (!mFenceNVMap.empty())
     {
-        deleteFence(mFenceMap.begin()->first);
+        deleteFenceNV(mFenceNVMap.begin()->first);
     }
 
     while (!mQueryMap.empty())
@@ -816,11 +816,11 @@
     return handle;
 }
 
-GLuint Context::createFence()
+GLuint Context::createFenceNV()
 {
-    GLuint handle = mFenceHandleAllocator.allocate();
+    GLuint handle = mFenceNVHandleAllocator.allocate();
 
-    mFenceMap[handle] = new Fence(mRenderer);
+    mFenceNVMap[handle] = new FenceNV(mRenderer);
 
     return handle;
 }
@@ -913,15 +913,15 @@
     }
 }
 
-void Context::deleteFence(GLuint fence)
+void Context::deleteFenceNV(GLuint fence)
 {
-    FenceMap::iterator fenceObject = mFenceMap.find(fence);
+    FenceNVMap::iterator fenceObject = mFenceNVMap.find(fence);
 
-    if (fenceObject != mFenceMap.end())
+    if (fenceObject != mFenceNVMap.end())
     {
-        mFenceHandleAllocator.release(fenceObject->first);
+        mFenceNVHandleAllocator.release(fenceObject->first);
         delete fenceObject->second;
-        mFenceMap.erase(fenceObject);
+        mFenceNVMap.erase(fenceObject);
     }
 }
 
@@ -1350,11 +1350,11 @@
     }
 }
 
-Fence *Context::getFence(unsigned int handle)
+FenceNV *Context::getFenceNV(unsigned int handle)
 {
-    FenceMap::iterator fence = mFenceMap.find(handle);
+    FenceNVMap::iterator fence = mFenceNVMap.find(handle);
 
-    if (fence == mFenceMap.end())
+    if (fence == mFenceNVMap.end())
     {
         return NULL;
     }