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: Jonah Ryan-Davis <jonahr@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Remove default template args in ResourceMap.
66e0feec · Jamie Madill · Commit Bot · d0e56cc6 · 66e0feec · 66e0feec
Commit 66e0feec authored Sep 03, 2019 by Jamie Madill Committed by Commit Bot Sep 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 10 deletions

ResourceManager.h src/libANGLE/ResourceManager.h +2 -5

ResourceMap.h src/libANGLE/ResourceMap.h +1 -1

ResourceMap_unittest.cpp src/libANGLE/ResourceMap_unittest.cpp +4 -4

No files found.
--- a/src/libANGLE/ResourceManager.h
+++ b/src/libANGLE/ResourceManager.h
@@ -59,10 +59,7 @@ class ResourceManagerBase : angle::NonCopyable
    size_t mRefCount;
 };
-template <typename ResourceType,
+template <typename ResourceType, typename HandleAllocatorType, typename ImplT, typename IDType>
-          typename HandleAllocatorType,
-          typename ImplT,
-          typename IDType = GLuint>
 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);

--- a/src/libANGLE/ResourceMap.h
+++ b/src/libANGLE/ResourceMap.h
@@ -16,7 +16,7 @@
 namespace gl
 {
-template <typename ResourceType, typename IDType = GLuint>
+template <typename ResourceType, typename IDType>
 class ResourceMap final : angle::NonCopyable
 {
  public:

--- a/src/libANGLE/ResourceMap_unittest.cpp
+++ b/src/libANGLE/ResourceMap_unittest.cpp
@@ -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)