commit ee79e2ff368bff54b6b044fa89b5d4ffed9a9c13
author Jiacheng Lu <lujc@google.com> Tue Aug 20 11:28:36 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Thu Aug 22 17:58:16 2019 +0000
tree 45e117ef5ef17b442e1e47f06f4ae2ea77c3e099
parent 05744c23e15d042530c5d8327d65acb0d2c8df7b

Use SamplerID in place of GLuint handles

Update all Sampler handles to type SamplerID, preparing for midframe
capture of sampler.

Bug: angleproject:3804
Change-Id: I9337919f97d61e28718987612d642c569b90246a
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1761780
Commit-Queue: Jiacheng Lu <lujc@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/ResourceManager.cpp

diff --git a/src/libANGLE/ResourceManager.cpp b/src/libANGLE/ResourceManager.cpp
index 4ee7e88..ec8f054 100644
--- a/src/libANGLE/ResourceManager.cpp
+++ b/src/libANGLE/ResourceManager.cpp
@@ -109,7 +109,7 @@
                                     HandleAllocator,
                                     RenderbufferManager,
                                     RenderbufferID>;
-template class TypedResourceManager<Sampler, HandleAllocator, SamplerManager, GLuint>;
+template class TypedResourceManager<Sampler, HandleAllocator, SamplerManager, SamplerID>;
 template class TypedResourceManager<Sync, HandleAllocator, SyncManager, GLuint>;
 template class TypedResourceManager<Framebuffer, HandleAllocator, FramebufferManager, GLuint>;
 template class TypedResourceManager<ProgramPipeline,
@@ -293,7 +293,7 @@
 // SamplerManager Implementation.
 
 // static
-Sampler *SamplerManager::AllocateNewObject(rx::GLImplFactory *factory, GLuint handle)
+Sampler *SamplerManager::AllocateNewObject(rx::GLImplFactory *factory, SamplerID handle)
 {
     Sampler *sampler = new Sampler(factory, handle);
     sampler->addRef();
@@ -306,17 +306,17 @@
     sampler->release(context);
 }
 
-GLuint SamplerManager::createSampler()
+SamplerID SamplerManager::createSampler()
 {
     return AllocateEmptyObject(&mHandleAllocator, &mObjectMap);
 }
 
-Sampler *SamplerManager::getSampler(GLuint handle) const
+Sampler *SamplerManager::getSampler(SamplerID handle) const
 {
     return mObjectMap.query(handle);
 }
 
-bool SamplerManager::isSampler(GLuint sampler) const
+bool SamplerManager::isSampler(SamplerID sampler) const
 {
     return mObjectMap.contains(sampler);
 }