Consolidate TypedResourceManager::isXGenerated.

src/libANGLE/ContextState.cpp

@@ -724,22 +724,22 @@ Shader *ValidationContext::getShader(GLuint handle) const
 
 bool ValidationContext::isTextureGenerated(GLuint texture) const
 {
-    return mState.mTextures->isTextureGenerated(texture);
+    return mState.mTextures->isHandleGenerated(texture);
 }
 
 bool ValidationContext::isBufferGenerated(GLuint buffer) const
 {
-    return mState.mBuffers->isBufferGenerated(buffer);
+    return mState.mBuffers->isHandleGenerated(buffer);
 }
 
 bool ValidationContext::isRenderbufferGenerated(GLuint renderbuffer) const
 {
-    return mState.mRenderbuffers->isRenderbufferGenerated(renderbuffer);
+    return mState.mRenderbuffers->isHandleGenerated(renderbuffer);
 }
 
 bool ValidationContext::isFramebufferGenerated(GLuint framebuffer) const
 {
-    return mState.mFramebuffers->isFramebufferGenerated(framebuffer);
+    return mState.mFramebuffers->isHandleGenerated(framebuffer);
 }
 
 bool ValidationContext::usingDisplayTextureShareGroup() const

src/libANGLE/ResourceManager.cpp

@@ -182,11 +182,6 @@ Buffer *BufferManager::getBuffer(GLuint handle) const
     return GetObject(mObjectMap, handle);
 }
 
-bool BufferManager::isBufferGenerated(GLuint buffer) const
-{
-    return buffer == 0 || mObjectMap.find(buffer) != mObjectMap.end();
-}
-
 // ShaderProgramManager Implementation.
 
 ShaderProgramManager::~ShaderProgramManager()
@@ -297,11 +292,6 @@ Texture *TextureManager::getTexture(GLuint handle) const
     return GetObject(mObjectMap, handle);
 }
 
-bool TextureManager::isTextureGenerated(GLuint texture) const
-{
-    return texture == 0 || mObjectMap.find(texture) != mObjectMap.end();
-}
-
 void TextureManager::invalidateTextureComplenessCache()
 {
     for (auto &texture : mObjectMap)
@@ -339,11 +329,6 @@ Renderbuffer *RenderbufferManager::getRenderbuffer(GLuint handle)
     return GetObject(mObjectMap, handle);
 }
 
-bool RenderbufferManager::isRenderbufferGenerated(GLuint renderbuffer) const
-{
-    return renderbuffer == 0 || mObjectMap.find(renderbuffer) != mObjectMap.end();
-}
-
 // SamplerManager Implementation.
 
 // static
@@ -501,12 +486,6 @@ void FramebufferManager::setDefaultFramebuffer(Framebuffer *framebuffer)
     mObjectMap[0] = framebuffer;
 }
 
-bool FramebufferManager::isFramebufferGenerated(GLuint framebuffer)
-{
-    ASSERT(mObjectMap.find(0) != mObjectMap.end());
-    return mObjectMap.find(framebuffer) != mObjectMap.end();
-}
-
 void FramebufferManager::invalidateFramebufferComplenessCache()
 {
     for (auto &framebuffer : mObjectMap)

src/libANGLE/ResourceManager.h

@@ -63,6 +63,11 @@ class TypedResourceManager : public ResourceManagerBase<HandleAllocatorType>
     TypedResourceManager() {}
 
     void deleteObject(const Context *context, GLuint handle);
+    bool isHandleGenerated(GLuint handle) const
+    {
+        // Zero is always assumed to have been generated implicitly.
+        return handle == 0 || mObjectMap.find(handle) != mObjectMap.end();
+    }
 
   protected:
     ~TypedResourceManager() override;
@@ -102,7 +107,6 @@ class BufferManager : public TypedResourceManager<Buffer, HandleAllocator, Buffe
   public:
     GLuint createBuffer();
     Buffer *getBuffer(GLuint handle) const;
-    bool isBufferGenerated(GLuint buffer) const;
 
     Buffer *checkBufferAllocation(rx::GLImplFactory *factory, GLuint handle)
     {
@@ -148,7 +152,6 @@ class TextureManager : public TypedResourceManager<Texture, HandleAllocator, Tex
   public:
     GLuint createTexture();
     Texture *getTexture(GLuint handle) const;
-    bool isTextureGenerated(GLuint texture) const;
 
     void invalidateTextureComplenessCache();
 
@@ -170,7 +173,6 @@ class RenderbufferManager
   public:
     GLuint createRenderbuffer();
     Renderbuffer *getRenderbuffer(GLuint handle);
-    bool isRenderbufferGenerated(GLuint renderbuffer) const;
 
     Renderbuffer *checkRenderbufferAllocation(rx::GLImplFactory *factory, GLuint handle)
     {
@@ -238,7 +240,6 @@ class FramebufferManager
     GLuint createFramebuffer();
     Framebuffer *getFramebuffer(GLuint handle) const;
     void setDefaultFramebuffer(Framebuffer *framebuffer);
-    bool isFramebufferGenerated(GLuint framebuffer);
 
     void invalidateFramebufferComplenessCache();