Changeset 278335 in webkit

Timestamp:

Jun 1, 2021, 6:01:06 PM (5 years ago)

Author:

Kyle Piddington

Message:

[Metal ANGLE] transformFeedback samples on webglsamples.org do not render correctly
​https://bugs.webkit.org/show_bug.cgi?id=226285
<rdar://78524773>

Reviewed by Dean Jackson.

Metal ANGLE does not render these samples correctly, for a number of reasons.
For transform_feedback_interleaved and seperated, We need to start a new renderEncoder to get the results from the transform feedback.
for transform_feedback-seperated_2, we need to invalidate the current render pass descriptor in order to switch to the rasterizer-enabled version of the shader.
Testing: Ran all transform feedback tests from deqp suite to ensure no regressions are present.

• src/libANGLE/renderer/metal/ContextMtl.h:
• src/libANGLE/renderer/metal/ContextMtl.mm:

(rx::ContextMtl::drawTriFanArraysWithBaseVertex):
(rx::ContextMtl::drawArraysImpl):
(rx::ContextMtl::drawTriFanElements):
(rx::ContextMtl::prepareForTransformFeedbackPassTwo):
(rx::ContextMtl::drawLineLoopElements):
(rx::ContextMtl::drawElementsImpl):
(rx::ContextMtl::onEndTransformFeedback):

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

(rx::TransformFeedbackMtl::end):

Location:

trunk/Source/ThirdParty/ANGLE

Files:

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

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-06-01  Kyle Piddington  <kpiddington@apple.com>
+
+        [Metal ANGLE] transformFeedback samples on webglsamples.org do not render correctly
+        https://bugs.webkit.org/show_bug.cgi?id=226285
+        <rdar://78524773>
+
+        Reviewed by Dean Jackson.
+
+        Metal ANGLE does not render these samples correctly, for a number of reasons. 
+        For transform_feedback_interleaved and seperated, We need to start a new renderEncoder to get the results from the transform feedback. 
+        for transform_feedback-seperated_2, we need to invalidate the current render pass descriptor in order to switch to the rasterizer-enabled version of the shader.
+        Testing: Ran all transform feedback tests from deqp suite to ensure no regressions are present.
+
+        * src/libANGLE/renderer/metal/ContextMtl.h:
+        * src/libANGLE/renderer/metal/ContextMtl.mm:
+        (rx::ContextMtl::drawTriFanArraysWithBaseVertex):
+        (rx::ContextMtl::drawArraysImpl):
+        (rx::ContextMtl::drawTriFanElements):
+        (rx::ContextMtl::prepareForTransformFeedbackPassTwo):
+        (rx::ContextMtl::drawLineLoopElements):
+        (rx::ContextMtl::drawElementsImpl):
+        (rx::ContextMtl::onEndTransformFeedback):
+        * src/libANGLE/renderer/metal/TransformFeedbackMtl.mm:
+        (rx::TransformFeedbackMtl::end):
+
 2021-06-01  Kimmo Kinnunen  <kkinnunen@apple.com>
 

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

@@ -96 +96 @@
     // So, in order to let GPU use the most recent modified content, one must call this method
     // right before the draw call to retrieved the most up-to-date mtl::Buffer.
-    mtl::BufferRef getCurrentBuffer() { return mIsWeak ? mBufferWeakRef.lock() : mBuffer; }
+    mtl::BufferRef getCurrentBuffer() const { return mIsWeak ? mBufferWeakRef.lock() : mBuffer; }
 
   protected:

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

@@ -281 +281 @@
     void invalidateDriverUniforms();
     void invalidateRenderPipeline();
-
+    void prepareForTransformFeedbackPassTwo();
     // Call this to notify ContextMtl whenever FramebufferMtl's state changed
     void onDrawFrameBufferChangedState(const gl::Context *context,

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

@@ -267 +267 @@
                                                       MTLIndexTypeUInt32, mTriFanArraysIndexBuffer,
                                                       0, instances, first);
+        prepareForTransformFeedbackPassTwo();
     }
 
@@ -306 +307 @@
         execDrawIndexedInstanced(MTLPrimitiveTypeTriangle, genIndicesCount, MTLIndexTypeUInt32,
                                  genIdxBuffer, genIdxBufferOffset, instances);
+        prepareForTransformFeedbackPassTwo();
     }
     ANGLE_TRY(setupDraw(context, gl::PrimitiveMode::TriangleFan, first, count, instances,
@@ -375 +377 @@
         execDrawIndexedInstanced(MTLPrimitiveTypeLineStrip, genIndicesCount, MTLIndexTypeUInt32,
                                  genIdxBuffer, genIdxBufferOffset, instances);
+        prepareForTransformFeedbackPassTwo();
     }
     ANGLE_TRY(setupDraw(context, gl::PrimitiveMode::LineLoop, first, count, instances,
@@ -424 +427 @@
             execDrawInstanced(mtlType, first, count, instanceCount);
         }
+        prepareForTransformFeedbackPassTwo();
     }
     ANGLE_TRY(setupDraw(context, mode, first, count, instances, gl::DrawElementsType::InvalidEnum,
@@ -501 +505 @@
             execDrawIndexedInstanced(MTLPrimitiveTypeTriangle, genIndicesCount, MTLIndexTypeUInt32,
                                      genIdxBuffer, genIdxBufferOffset, instances);
+            prepareForTransformFeedbackPassTwo();
         }
 
@@ -530 +535 @@
 }
 
+void ContextMtl::prepareForTransformFeedbackPassTwo()
+{
+    //If we don't have rasterization enabled, we can re-run the same vertex shader. Otherwise,
+    //We need to invalidate the render pipeline state.
+    if(!mState.isRasterizerDiscardEnabled())
+    {
+        invalidateRenderPipeline();
+    }
+}
 angle::Result ContextMtl::drawLineLoopElements(const gl::Context *context,
                                                GLsizei count,
@@ -566 +580 @@
             execDrawIndexedInstanced(MTLPrimitiveTypeLineStrip, genIndicesCount, MTLIndexTypeUInt32,
                                      genIdxBuffer, genIdxBufferOffset, instances);
+            prepareForTransformFeedbackPassTwo();
         }
 
@@ -661 +676 @@
             }
         }
+        prepareForTransformFeedbackPassTwo();
     }
 
@@ -1394 +1410 @@
     {
         onTransformFeedbackStateChanged();
+    }
+    if (getDisplay()->getFeatures().hasExplicitMemBarrier.enabled)
+    {
+        for(auto & bufferRef : mCurrentTransformFeedbackBuffers)
+        {
+            const mtl::BufferRef & constBufferRef = bufferRef->getCurrentBuffer();
+            mRenderEncoder.memoryBarrierWithResource(constBufferRef, mtl::kRenderStageVertex, mtl::kRenderStageVertex);
+        }
+    }
+    else
+    {
+        //End the command encoder, so any Transform Feedback changes are available to subsequent draw calls.
+        endEncoding(false);
     }
 }