commit 7c7dec01ce348d24e768b33633c7711cd0bd4182
author Jamie Madill <jmadill@chromium.org> Tue Aug 06 17:44:11 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Aug 07 21:21:04 2019 +0000
tree 84b28a89dcf07337416326f0e76f96fd53d03377
parent 93560ef51dc1e79ddeb2d6dcbb8f33eb83ade1b9

Use RenderbufferID in place of GLuint handles.

This will allow frame capture/replay to more easily emulate object
handle manipulation. It also provides a bit of type safety. Also
generalizes ResourceMap to handle non-GLuint IDs.

Bug: angleproject:3611
Change-Id: I174fd260f326e0dbe2aca3f818215c91d82cf48c
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1706559
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/ResourceManager.cpp

diff --git a/src/libANGLE/ResourceManager.cpp b/src/libANGLE/ResourceManager.cpp
index 133cfba..ffc44ba 100644
--- a/src/libANGLE/ResourceManager.cpp
+++ b/src/libANGLE/ResourceManager.cpp
@@ -29,10 +29,11 @@
 namespace
 {
 
-template <typename ResourceType>
-GLuint AllocateEmptyObject(HandleAllocator *handleAllocator, ResourceMap<ResourceType> *objectMap)
+template <typename ResourceType, typename IDType>
+IDType AllocateEmptyObject(HandleAllocator *handleAllocator,
+                           ResourceMap<ResourceType, IDType> *objectMap)
 {
-    GLuint handle = handleAllocator->allocate();
+    IDType handle = FromGL<IDType>(handleAllocator->allocate());
     objectMap->assign(handle, nullptr);
     return handle;
 }
@@ -59,14 +60,15 @@
     }
 }
 
-template <typename ResourceType, typename HandleAllocatorType, typename ImplT>
-TypedResourceManager<ResourceType, HandleAllocatorType, ImplT>::~TypedResourceManager()
+template <typename ResourceType, typename HandleAllocatorType, typename ImplT, typename IDType>
+TypedResourceManager<ResourceType, HandleAllocatorType, ImplT, IDType>::~TypedResourceManager()
 {
     ASSERT(mObjectMap.empty());
 }
 
-template <typename ResourceType, typename HandleAllocatorType, typename ImplT>
-void TypedResourceManager<ResourceType, HandleAllocatorType, ImplT>::reset(const Context *context)
+template <typename ResourceType, typename HandleAllocatorType, typename ImplT, typename IDType>
+void TypedResourceManager<ResourceType, HandleAllocatorType, ImplT, IDType>::reset(
+    const Context *context)
 {
     this->mHandleAllocator.reset();
     for (const auto &resource : mObjectMap)
@@ -79,10 +81,10 @@
     mObjectMap.clear();
 }
 
-template <typename ResourceType, typename HandleAllocatorType, typename ImplT>
-void TypedResourceManager<ResourceType, HandleAllocatorType, ImplT>::deleteObject(
+template <typename ResourceType, typename HandleAllocatorType, typename ImplT, typename IDType>
+void TypedResourceManager<ResourceType, HandleAllocatorType, ImplT, IDType>::deleteObject(
     const Context *context,
-    GLuint handle)
+    IDType handle)
 {
     ResourceType *resource = nullptr;
     if (!mObjectMap.erase(handle, &resource))
@@ -91,7 +93,7 @@
     }
 
     // Requires an explicit this-> because of C++ template rules.
-    this->mHandleAllocator.release(handle);
+    this->mHandleAllocator.release(GetIDValue(handle));
 
     if (resource)
     {
@@ -101,13 +103,19 @@
 
 template class ResourceManagerBase<HandleAllocator>;
 template class ResourceManagerBase<HandleRangeAllocator>;
-template class TypedResourceManager<Buffer, HandleAllocator, BufferManager>;
-template class TypedResourceManager<Texture, HandleAllocator, TextureManager>;
-template class TypedResourceManager<Renderbuffer, HandleAllocator, RenderbufferManager>;
-template class TypedResourceManager<Sampler, HandleAllocator, SamplerManager>;
-template class TypedResourceManager<Sync, HandleAllocator, SyncManager>;
-template class TypedResourceManager<Framebuffer, HandleAllocator, FramebufferManager>;
-template class TypedResourceManager<ProgramPipeline, HandleAllocator, ProgramPipelineManager>;
+template class TypedResourceManager<Buffer, HandleAllocator, BufferManager, GLuint>;
+template class TypedResourceManager<Texture, HandleAllocator, TextureManager, GLuint>;
+template class TypedResourceManager<Renderbuffer,
+                                    HandleAllocator,
+                                    RenderbufferManager,
+                                    RenderbufferID>;
+template class TypedResourceManager<Sampler, HandleAllocator, SamplerManager, GLuint>;
+template class TypedResourceManager<Sync, HandleAllocator, SyncManager, GLuint>;
+template class TypedResourceManager<Framebuffer, HandleAllocator, FramebufferManager, GLuint>;
+template class TypedResourceManager<ProgramPipeline,
+                                    HandleAllocator,
+                                    ProgramPipelineManager,
+                                    GLuint>;
 
 // BufferManager Implementation.
 
@@ -258,7 +266,8 @@
 // RenderbufferManager Implementation.
 
 // static
-Renderbuffer *RenderbufferManager::AllocateNewObject(rx::GLImplFactory *factory, GLuint handle)
+Renderbuffer *RenderbufferManager::AllocateNewObject(rx::GLImplFactory *factory,
+                                                     RenderbufferID handle)
 {
     Renderbuffer *renderbuffer = new Renderbuffer(factory, handle);
     renderbuffer->addRef();
@@ -271,12 +280,12 @@
     renderbuffer->release(context);
 }
 
-GLuint RenderbufferManager::createRenderbuffer()
+RenderbufferID RenderbufferManager::createRenderbuffer()
 {
-    return AllocateEmptyObject(&mHandleAllocator, &mObjectMap);
+    return {AllocateEmptyObject(&mHandleAllocator, &mObjectMap)};
 }
 
-Renderbuffer *RenderbufferManager::getRenderbuffer(GLuint handle) const
+Renderbuffer *RenderbufferManager::getRenderbuffer(RenderbufferID handle) const
 {
     return mObjectMap.query(handle);
 }