Changeset 281550 in webkit

Timestamp:

Aug 25, 2021, 12:42:34 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

ANGLE Metal index buffer restart range cache is could be maintained more consistently
​https://bugs.webkit.org/show_bug.cgi?id=227451

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2021-08-25
Reviewed by Kenneth Russell.

• src/libANGLE/renderer/metal/BufferMtl.h:

(rx::BufferMtl::RestartRangeCache::RestartRangeCache):
Add optional<RestartRangeCache> which contains the ranges and
the index type used to build the ranges.

• src/libANGLE/renderer/metal/BufferMtl.mm:

(rx::BufferMtl::markConversionBuffersDirty):
(rx::BufferMtl::clearConversionBuffers):
Invalidate the range cache when clearing conversion buffers.
Otherwise the cache would be left in inconsistent state vs.
the contents of the index buffer in cases of code like:
BufferMtl::setDataImpl() ...

if (...) {

markConversionBufferDirty();

} else {

clearConversionBuffers();

}

(rx::BufferMtl::getRestartIndices):

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/libANGLE/renderer/metal/BufferMtl.h (modified) (2 diffs)
• src/libANGLE/renderer/metal/BufferMtl.mm (modified) (3 diffs)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-08-25  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        ANGLE Metal index buffer restart range cache is could be maintained more consistently
+        https://bugs.webkit.org/show_bug.cgi?id=227451
+
+        Reviewed by Kenneth Russell.
+
+        * src/libANGLE/renderer/metal/BufferMtl.h:
+        (rx::BufferMtl::RestartRangeCache::RestartRangeCache):
+        Add optional<RestartRangeCache> which contains the ranges and
+        the index type used to build the ranges.
+
+        * src/libANGLE/renderer/metal/BufferMtl.mm:
+        (rx::BufferMtl::markConversionBuffersDirty):
+        (rx::BufferMtl::clearConversionBuffers):
+        Invalidate the range cache when clearing conversion buffers.
+        Otherwise the cache would be left in inconsistent state vs.
+        the contents of the index buffer in cases of code like:
+        BufferMtl::setDataImpl() ...
+           if (...) {
+               markConversionBufferDirty();
+           } else {
+               clearConversionBuffers();
+           }
+        (rx::BufferMtl::getRestartIndices):
+
 2021-08-24  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/BufferMtl.h

@@ -13 +13 @@
 #import <Metal/Metal.h>
 
+#include <optional>
 #include <utility>
 
@@ -211 +212 @@
     
     std::vector<UniformConversionBufferMtl> mUniformConversionBuffers;
-    
-    bool mRestartIndicesDirty;
-    std::vector<IndexRange> mRestartIndices;
-    
+
+    struct RestartRangeCache
+    {
+        RestartRangeCache(std::vector<IndexRange>&& ranges_,  gl::DrawElementsType indexType_)
+            : ranges(ranges_), indexType(indexType_)
+        {}
+        const std::vector<IndexRange> ranges;
+        const gl::DrawElementsType indexType;
+    };
+    std::optional<RestartRangeCache> mRestartRangeCache;
 };
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/BufferMtl.mm

@@ -402 +402 @@
         buffer.convertedOffset = 0;
     }
-    mRestartIndicesDirty = true;
+    mRestartRangeCache = std::nullopt;
 }
 
@@ -410 +410 @@
     mIndexConversionBuffers.clear();
     mUniformConversionBuffers.clear();
+    mRestartRangeCache = std::nullopt;
 }
 
@@ -438 +439 @@
 const std::vector<IndexRange> & BufferMtl::getRestartIndices(ContextMtl * ctx, gl::DrawElementsType indexType)
 {
-    if(mRestartIndicesDirty)
-    {
-        std::vector<IndexRange>().swap(mRestartIndices);
+    if (!mRestartRangeCache || mRestartRangeCache->indexType != indexType)
+    {
+        mRestartRangeCache = std::nullopt;
+        std::vector<IndexRange> ranges;
         switch(indexType)
         {
             case gl::DrawElementsType::UnsignedByte:
-                mRestartIndices = calculateRestartRanges<uint8_t>(ctx, getCurrentBuffer());
+                ranges = calculateRestartRanges<uint8_t>(ctx, getCurrentBuffer());
                 break;
             case gl::DrawElementsType::UnsignedShort:
-                mRestartIndices = calculateRestartRanges<uint16_t>(ctx, getCurrentBuffer());
+                ranges = calculateRestartRanges<uint16_t>(ctx, getCurrentBuffer());
                 break;
             case gl::DrawElementsType::UnsignedInt:
-                mRestartIndices = calculateRestartRanges<uint32_t>(ctx, getCurrentBuffer());
+                ranges = calculateRestartRanges<uint32_t>(ctx, getCurrentBuffer());
                 break;
             default:
                 ASSERT(false);
         }
-        mRestartIndicesDirty = false;
-    }
-    return mRestartIndices;
+        mRestartRangeCache.emplace(std::move(ranges), indexType);
+    }
+    return mRestartRangeCache->ranges;
 }
 angle::Result BufferMtl::setDataImpl(const gl::Context *context,