Commit 66e0feec by Jamie Madill Committed by Commit Bot

Remove default template args in ResourceMap.

Only need GLuints now for GLsyncs. Bug: angleproject:3611 Change-Id: Id8b11851d8d5d30e6743433c772b9fa85eb875f5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1783406Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent d0e56cc6
......@@ -59,10 +59,7 @@ class ResourceManagerBase : angle::NonCopyable
size_t mRefCount;
};
template <typename ResourceType,
typename HandleAllocatorType,
typename ImplT,
typename IDType = GLuint>
template <typename ResourceType, typename HandleAllocatorType, typename ImplT, typename IDType>
class TypedResourceManager : public ResourceManagerBase<HandleAllocatorType>
{
public:
......@@ -245,7 +242,7 @@ class SamplerManager
~SamplerManager() override {}
};
class SyncManager : public TypedResourceManager<Sync, HandleAllocator, SyncManager>
class SyncManager : public TypedResourceManager<Sync, HandleAllocator, SyncManager, GLuint>
{
public:
GLuint createSync(rx::GLImplFactory *factory);
......
......@@ -16,7 +16,7 @@
namespace gl
{
template <typename ResourceType, typename IDType = GLuint>
template <typename ResourceType, typename IDType>
class ResourceMap final : angle::NonCopyable
{
public:
......
......@@ -19,7 +19,7 @@ namespace
TEST(ResourceMapTest, AssignAndErase)
{
constexpr size_t kSize = 64;
ResourceMap<size_t> resourceMap;
ResourceMap<size_t, GLuint> resourceMap;
std::vector<size_t> objects(kSize, 1);
for (size_t index = 0; index < kSize; ++index)
{
......@@ -40,7 +40,7 @@ TEST(ResourceMapTest, AssignAndErase)
TEST(ResourceMapTest, AssignAndClear)
{
constexpr size_t kSize = 64;
ResourceMap<size_t> resourceMap;
ResourceMap<size_t, GLuint> resourceMap;
std::vector<size_t> objects(kSize, 1);
for (size_t index = 0; index < kSize; ++index)
{
......@@ -56,7 +56,7 @@ TEST(ResourceMapTest, BigGrowth)
{
constexpr size_t kSize = 8;
ResourceMap<size_t> resourceMap;
ResourceMap<size_t, GLuint> resourceMap;
std::vector<size_t> objects;
for (size_t index = 0; index < kSize; ++index)
......@@ -88,7 +88,7 @@ TEST(ResourceMapTest, QueryUnassigned)
{
constexpr size_t kSize = 8;
ResourceMap<size_t> resourceMap;
ResourceMap<size_t, GLuint> resourceMap;
std::vector<size_t> objects;
for (size_t index = 0; index < kSize; ++index)
......
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