Changeset 284835 in webkit

Timestamp:

Oct 25, 2021, 2:51:13 PM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r284125. rdar://problem/84630015

Upstream ANGLE: PrimitiveRestart tests fail due to incorrect draw commands
​https://bugs.webkit.org/show_bug.cgi?id=231626
<rdar:/problem/84167241>

Primitive restart draw commands were being encoded
incorrectly. Single element ranges were being disregarded,
and a maximum draw size was not being enforced when the
index buffer was aliased / reused.

Cherry-pick from upstream anglebug.com/6535

Reviewed by Kenneth Russell.

• src/libANGLE/renderer/metal/VertexArrayMtl.mm: (rx::VertexArrayMtl::getDrawIndices):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@284125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612-branch/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/libANGLE/renderer/metal/VertexArrayMtl.mm (modified) (1 diff)

branches/safari-612-branch/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-10-25  Null  <null@apple.com>
+
+        Cherry-pick r284125. rdar://problem/84630015
+
+    Upstream ANGLE: PrimitiveRestart tests fail due to incorrect draw commands
+    https://bugs.webkit.org/show_bug.cgi?id=231626
+    <rdar:/problem/84167241>
+    
+    Primitive restart draw commands were being encoded
+    incorrectly. Single element ranges were being disregarded,
+    and a maximum draw size was not being enforced when the
+    index buffer was aliased / reused.
+    
+    Cherry-pick from upstream anglebug.com/6535
+    
+    Reviewed by Kenneth Russell.
+    
+    * src/libANGLE/renderer/metal/VertexArrayMtl.mm:
+    (rx::VertexArrayMtl::getDrawIndices):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284125 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-13  Kyle Piddington  <kpiddington@apple.com>
+
+            Upstream ANGLE: PrimitiveRestart tests fail due to incorrect draw commands
+            https://bugs.webkit.org/show_bug.cgi?id=231626
+            <rdar:/problem/84167241>
+
+            Primitive restart draw commands were being encoded
+            incorrectly. Single element ranges were being disregarded,
+            and a maximum draw size was not being enforced when the
+            index buffer was aliased / reused.
+
+            Cherry-pick from upstream anglebug.com/6535
+
+            Reviewed by Kenneth Russell.
+
+            * src/libANGLE/renderer/metal/VertexArrayMtl.mm:
+            (rx::VertexArrayMtl::getDrawIndices):
+
 2021-10-25  Null  <null@apple.com>
 

branches/safari-612-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/VertexArrayMtl.mm

@@ -788 +788 @@
         if (range.restartBegin > currentIndexOffset)
         {
-            int64_t nIndicesInSlice = ((int64_t)range.restartBegin - currentIndexOffset) - ((int64_t) range.restartBegin - currentIndexOffset) % nIndicesPerPrimitive;
+            int64_t nIndicesInSlice = MIN(((int64_t)range.restartBegin - currentIndexOffset) -
+                                          ((int64_t)range.restartBegin - currentIndexOffset) % nIndicesPerPrimitive,
+                                      indicesLeft);
             size_t restartSize = (range.restartEnd - range.restartBegin) + 1;
-            if (nIndicesInSlice > nIndicesPerPrimitive)
+            if (nIndicesInSlice >= nIndicesPerPrimitive)
+            {
                 drawCommands.push_back({(uint32_t) nIndicesInSlice, currentIndexOffset * indexTypeBytes});
+            }
             // Account for dropped indices due to incomplete primitives.
             size_t indicesUsed = ( (range.restartBegin + restartSize) - currentIndexOffset);