Skip to content

A
angle
Commit a4ef812c by Jamie Madill Committed by Commit Bot
Options

De-templatize ResourceManagerBase.

Bug: skia:7647 Change-Id: I568cb63118c944c7eca7efcd2445718dc7fda350 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2404745Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 1ab73f0f
Showing with 35 additions and 56 deletions
src/libANGLE/ResourceManager.cpp
......@@ -40,18 +40,16 @@ IDType AllocateEmptyObject(HandleAllocator *handleAllocator,
} // anonymous namespace
template <typename HandleAllocatorType>
ResourceManagerBase<HandleAllocatorType>::ResourceManagerBase() : mRefCount(1)
{}
ResourceManagerBase::ResourceManagerBase() : mRefCount(1) {}
template <typename HandleAllocatorType>
void ResourceManagerBase<HandleAllocatorType>::addRef()
ResourceManagerBase::~ResourceManagerBase() = default;
void ResourceManagerBase::addRef()
{
mRefCount++;
}
template <typename HandleAllocatorType>
void ResourceManagerBase<HandleAllocatorType>::release(const Context *context)
void ResourceManagerBase::release(const Context *context)
{
if (--mRefCount == 0)
{
......@@ -60,15 +58,14 @@ void ResourceManagerBase<HandleAllocatorType>::release(const Context *context)
}
}
template <typename ResourceType, typename HandleAllocatorType, typename ImplT, typename IDType>
TypedResourceManager<ResourceType, HandleAllocatorType, ImplT, IDType>::~TypedResourceManager()
template <typename ResourceType, typename ImplT, typename IDType>
TypedResourceManager<ResourceType, ImplT, IDType>::~TypedResourceManager()
{
ASSERT(mObjectMap.empty());
}
template <typename ResourceType, typename HandleAllocatorType, typename ImplT, typename IDType>
void TypedResourceManager<ResourceType, HandleAllocatorType, ImplT, IDType>::reset(
const Context *context)
template <typename ResourceType, typename ImplT, typename IDType>
void TypedResourceManager<ResourceType, ImplT, IDType>::reset(const Context *context)
{
this->mHandleAllocator.reset();
for (const auto &resource : mObjectMap)
......@@ -81,10 +78,9 @@ void TypedResourceManager<ResourceType, HandleAllocatorType, ImplT, IDType>::res
mObjectMap.clear();
}
template <typename ResourceType, typename HandleAllocatorType, typename ImplT, typename IDType>
void TypedResourceManager<ResourceType, HandleAllocatorType, ImplT, IDType>::deleteObject(
const Context *context,
IDType handle)
template <typename ResourceType, typename ImplT, typename IDType>
void TypedResourceManager<ResourceType, ImplT, IDType>::deleteObject(const Context *context,
IDType handle)
{
ResourceType *resource = nullptr;
if (!mObjectMap.erase(handle, &resource))
......@@ -101,23 +97,13 @@ void TypedResourceManager<ResourceType, HandleAllocatorType, ImplT, IDType>::del
}
}
template class ResourceManagerBase<HandleAllocator>;
template class TypedResourceManager<Buffer, HandleAllocator, BufferManager, BufferID>;
template class TypedResourceManager<Texture, HandleAllocator, TextureManager, TextureID>;
template class TypedResourceManager<Renderbuffer,
HandleAllocator,
RenderbufferManager,
RenderbufferID>;
template class TypedResourceManager<Sampler, HandleAllocator, SamplerManager, SamplerID>;
template class TypedResourceManager<Sync, HandleAllocator, SyncManager, GLuint>;
template class TypedResourceManager<Framebuffer,
HandleAllocator,
FramebufferManager,
FramebufferID>;
template class TypedResourceManager<ProgramPipeline,
HandleAllocator,
ProgramPipelineManager,
ProgramPipelineID>;
template class TypedResourceManager<Buffer, BufferManager, BufferID>;
template class TypedResourceManager<Texture, TextureManager, TextureID>;
template class TypedResourceManager<Renderbuffer, RenderbufferManager, RenderbufferID>;
template class TypedResourceManager<Sampler, SamplerManager, SamplerID>;
template class TypedResourceManager<Sync, SyncManager, GLuint>;
template class TypedResourceManager<Framebuffer, FramebufferManager, FramebufferID>;
template class TypedResourceManager<ProgramPipeline, ProgramPipelineManager, ProgramPipelineID>;
// BufferManager Implementation.
......
src/libANGLE/ResourceManager.h
......@@ -44,7 +44,6 @@ class Shader;
class Sync;
class Texture;
template <typename HandleAllocatorType>
class ResourceManagerBase : angle::NonCopyable
{
public:
......@@ -55,16 +54,16 @@ class ResourceManagerBase : angle::NonCopyable
protected:
virtual void reset(const Context *context) = 0;
virtual ~ResourceManagerBase() {}
virtual ~ResourceManagerBase();
HandleAllocatorType mHandleAllocator;
HandleAllocator mHandleAllocator;
private:
size_t mRefCount;
};
template <typename ResourceType, typename HandleAllocatorType, typename ImplT, typename IDType>
class TypedResourceManager : public ResourceManagerBase<HandleAllocatorType>
template <typename ResourceType, typename ImplT, typename IDType>
class TypedResourceManager : public ResourceManagerBase
{
public:
TypedResourceManager() {}
......@@ -127,7 +126,7 @@ class TypedResourceManager : public ResourceManagerBase<HandleAllocatorType>
}
};
class BufferManager : public TypedResourceManager<Buffer, HandleAllocator, BufferManager, BufferID>
class BufferManager : public TypedResourceManager<Buffer, BufferManager, BufferID>
{
public:
BufferID createBuffer();
......@@ -146,7 +145,7 @@ class BufferManager : public TypedResourceManager<Buffer, HandleAllocator, Buffe
~BufferManager() override {}
};
class ShaderProgramManager : public ResourceManagerBase<HandleAllocator>
class ShaderProgramManager : public ResourceManagerBase
{
public:
ShaderProgramManager();
......@@ -184,8 +183,7 @@ class ShaderProgramManager : public ResourceManagerBase<HandleAllocator>
ResourceMap<Program, ShaderProgramID> mPrograms;
};
class TextureManager
: public TypedResourceManager<Texture, HandleAllocator, TextureManager, TextureID>
class TextureManager : public TypedResourceManager<Texture, TextureManager, TextureID>
{
public:
TextureID createTexture();
......@@ -215,10 +213,8 @@ class TextureManager
~TextureManager() override {}
};
class RenderbufferManager : public TypedResourceManager<Renderbuffer,
HandleAllocator,
RenderbufferManager,
RenderbufferID>
class RenderbufferManager
: public TypedResourceManager<Renderbuffer, RenderbufferManager, RenderbufferID>
{
public:
RenderbufferID createRenderbuffer();
......@@ -236,8 +232,7 @@ class RenderbufferManager : public TypedResourceManager<Renderbuffer,
~RenderbufferManager() override {}
};
class SamplerManager
: public TypedResourceManager<Sampler, HandleAllocator, SamplerManager, SamplerID>
class SamplerManager : public TypedResourceManager<Sampler, SamplerManager, SamplerID>
{
public:
SamplerID createSampler();
......@@ -256,7 +251,7 @@ class SamplerManager
~SamplerManager() override {}
};
class SyncManager : public TypedResourceManager<Sync, HandleAllocator, SyncManager, GLuint>
class SyncManager : public TypedResourceManager<Sync, SyncManager, GLuint>
{
public:
GLuint createSync(rx::GLImplFactory *factory);
......@@ -269,7 +264,7 @@ class SyncManager : public TypedResourceManager<Sync, HandleAllocator, SyncManag
};
class FramebufferManager
: public TypedResourceManager<Framebuffer, HandleAllocator, FramebufferManager, FramebufferID>
: public TypedResourceManager<Framebuffer, FramebufferManager, FramebufferID>
{
public:
FramebufferID createFramebuffer();
......@@ -296,10 +291,8 @@ class FramebufferManager
~FramebufferManager() override {}
};
class ProgramPipelineManager : public TypedResourceManager<ProgramPipeline,
HandleAllocator,
ProgramPipelineManager,
ProgramPipelineID>
class ProgramPipelineManager
: public TypedResourceManager<ProgramPipeline, ProgramPipelineManager, ProgramPipelineID>
{
public:
ProgramPipelineID createProgramPipeline();
......@@ -318,7 +311,7 @@ class ProgramPipelineManager : public TypedResourceManager<ProgramPipeline,
~ProgramPipelineManager() override {}
};
class MemoryObjectManager : public ResourceManagerBase<HandleAllocator>
class MemoryObjectManager : public ResourceManagerBase
{
public:
MemoryObjectManager();
......@@ -336,7 +329,7 @@ class MemoryObjectManager : public ResourceManagerBase<HandleAllocator>
ResourceMap<MemoryObject, MemoryObjectID> mMemoryObjects;
};
class SemaphoreManager : public ResourceManagerBase<HandleAllocator>
class SemaphoreManager : public ResourceManagerBase
{
public:
SemaphoreManager();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment