Use hash table for index conversion compute pipeline cache instead of tree map

Change-Id: I83cfdfb1918d3bc36f34ac81953da812cc48f26c

Author: kakashidinho

src/libANGLE/renderer/metal/mtl_render_utils.h

@@ -16,6 +16,37 @@
 #include "libANGLE/renderer/metal/mtl_command_buffer.h"
 #include "libANGLE/renderer/metal/mtl_state_cache.h"
 
+namespace rx
+{
+namespace mtl
+{
+struct IndexConversionPipelineCacheKey
+{
+    gl::DrawElementsType srcType;
+    bool srcBufferOffsetAligned;
+
+    bool operator==(const IndexConversionPipelineCacheKey &other) const;
+
+    size_t hash() const;
+};
+
+}  // namespace mtl
+}  // namespace rx
+
+namespace std
+{
+
+template <>
+struct hash<rx::mtl::IndexConversionPipelineCacheKey>
+{
+    size_t operator()(const rx::mtl::IndexConversionPipelineCacheKey &key) const
+    {
+        return key.hash();
+    }
+};
+
+}  // namespace std
+
 namespace rx
 {
 
@@ -218,17 +249,9 @@ class RenderUtils : public Context, angle::NonCopyable
     RenderPipelineCache mStencilBlitRenderPipelineCache;
     RenderPipelineCache mDepthStencilBlitRenderPipelineCache;
 
-    struct IndexConvesionPipelineCacheKey
-    {
-        gl::DrawElementsType srcType;
-        bool srcBufferOffsetAligned;
-
-        bool operator==(const IndexConvesionPipelineCacheKey &other) const;
-        bool operator<(const IndexConvesionPipelineCacheKey &other) const;
-    };
-    std::map<IndexConvesionPipelineCacheKey, AutoObjCPtr<id<MTLComputePipelineState>>>
+    std::unordered_map<IndexConversionPipelineCacheKey, AutoObjCPtr<id<MTLComputePipelineState>>>
         mIndexConversionPipelineCaches;
-    std::map<IndexConvesionPipelineCacheKey, AutoObjCPtr<id<MTLComputePipelineState>>>
+    std::unordered_map<IndexConversionPipelineCacheKey, AutoObjCPtr<id<MTLComputePipelineState>>>
         mTriFanFromElemArrayGeneratorPipelineCaches;
     AutoObjCPtr<id<MTLComputePipelineState>> mTriFanFromArraysGeneratorPipeline;
 };

src/libANGLE/renderer/metal/mtl_render_utils.mm

@@ -101,23 +101,16 @@ void GetFirstLastIndicesFromClientElements(GLsizei count,
 
 }  // namespace
 
-bool RenderUtils::IndexConvesionPipelineCacheKey::operator==(
-    const IndexConvesionPipelineCacheKey &other) const
+bool IndexConversionPipelineCacheKey::operator==(const IndexConversionPipelineCacheKey &other) const
 {
     return srcType == other.srcType && srcBufferOffsetAligned == other.srcBufferOffsetAligned;
 }
-bool RenderUtils::IndexConvesionPipelineCacheKey::operator<(
-    const IndexConvesionPipelineCacheKey &other) const
+size_t IndexConversionPipelineCacheKey::hash() const
 {
-    if (!srcBufferOffsetAligned && other.srcBufferOffsetAligned)
-    {
-        return true;
-    }
-    if (srcBufferOffsetAligned && !other.srcBufferOffsetAligned)
-    {
-        return false;
-    }
-    return static_cast<int>(srcType) < static_cast<int>(other.srcType);
+    size_t h = srcBufferOffsetAligned ? 1 : 0;
+    h        = (h << static_cast<size_t>(gl::DrawElementsType::EnumCount));
+    h        = h | static_cast<size_t>(srcType);
+    return h;
 }
 
 RenderUtils::RenderUtils(DisplayMtl *display) : Context(display) {}
@@ -752,7 +745,7 @@ void GetFirstLastIndicesFromClientElements(GLsizei count,
     size_t elementSize        = gl::GetDrawElementsTypeSize(srcType);
     bool aligned              = (srcOffset % elementSize) == 0;
 
-    IndexConvesionPipelineCacheKey key = {srcType, aligned};
+    IndexConversionPipelineCacheKey key = {srcType, aligned};
 
     auto &cache = mIndexConversionPipelineCaches[key];
 
@@ -816,7 +809,7 @@ void GetFirstLastIndicesFromClientElements(GLsizei count,
     size_t elementSize        = gl::GetDrawElementsTypeSize(srcType);
     bool aligned              = (srcOffset % elementSize) == 0;
 
-    IndexConvesionPipelineCacheKey key = {srcType, aligned};
+    IndexConversionPipelineCacheKey key = {srcType, aligned};
 
     auto &cache = mTriFanFromElemArrayGeneratorPipelineCaches[key];
 

src/tests/gl_tests/IndexBufferOffsetTest.cpp

@@ -173,6 +173,49 @@ TEST_P(IndexBufferOffsetTest, DrawAtDifferentOffsets)
     EXPECT_GL_NO_ERROR();
 }
 
+// Uses index buffer offset and 2 drawElement calls one of the other, one has aligned
+// offset and one doesn't
+TEST_P(IndexBufferOffsetTest, DrawAtDifferentOffsetAlignments)
+{
+    GLubyte indexData8[]   = {0, 1, 0, 1, 2, 3};
+    GLushort indexData16[] = {0, 1, 2, 1, 2, 3};
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    size_t indexDataWidth16 = 6 * sizeof(GLushort);
+
+    GLuint buffer[2];
+    glGenBuffers(2, buffer);
+
+    glUseProgram(mProgram);
+    glUniform4f(mColorUniformLocation, 1.0f, 0.0f, 0.0f, 1.0f);
+
+    glBindBuffer(GL_ARRAY_BUFFER, mVertexBuffer);
+    glVertexAttribPointer(mPositionAttributeLocation, 2, GL_FLOAT, GL_FALSE, 0, 0);
+    glEnableVertexAttribArray(mPositionAttributeLocation);
+
+    // 8 bit index with aligned offset
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer[0]);
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indexData8), indexData8, GL_DYNAMIC_DRAW);
+
+    glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_BYTE, reinterpret_cast<void *>(2));
+
+    // 16 bits index buffer, which unaligned offset
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer[1]);
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexDataWidth16, indexData16, GL_DYNAMIC_DRAW);
+
+    glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_SHORT,
+                   reinterpret_cast<void *>(indexDataWidth16 / 2));
+
+    // Check the upper left triangle
+    EXPECT_PIXEL_COLOR_EQ(0, getWindowHeight() / 4, GLColor::red);
+
+    // Check the down right triangle
+    EXPECT_PIXEL_COLOR_EQ(getWindowWidth() - 1, getWindowHeight() - 1, GLColor::red);
+
+    EXPECT_GL_NO_ERROR();
+}
+
 // Uses index buffer offset and 2 drawElement calls one of the other with different counts,
 // makes sure the second drawElement call will have its data available.
 TEST_P(IndexBufferOffsetTest, DrawWithDifferentCountsSameOffset)