Changeset 275476 in webkit

Timestamp:

Apr 5, 2021 7:16:53 PM (3 years ago)

Author:

commit-queue@webkit.org

Message:

[METAL ANGLE] Stencil only formats being used as the depth attachment.
​https://bugs.webkit.org/show_bug.cgi?id=224183

Patch by John Cunningham <​johncunnigham@apple.com> on 2021-04-05
Reviewed by Jon Lee.

• src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp:
• src/compiler/translator/TranslatorMetalDirect/RewriteOutArgs.cpp:

(sh::Rewriter::argAlreadyProcessed):

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

(rx::ContextMtl::setupDraw):

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

(rx::mtl::RenderCommandEncoder::reset):
(rx::mtl::RenderCommandEncoder::setRenderPipelineState):
(rx::mtl::RenderCommandEncoder::draw):
(rx::mtl::RenderCommandEncoder::drawInstanced):
(rx::mtl::RenderCommandEncoder::drawIndexed):
(rx::mtl::RenderCommandEncoder::drawIndexedInstanced):
(rx::mtl::RenderCommandEncoder::drawIndexedInstancedBaseVertex):

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

(rx::mtl::InitializeDepthStencilTextureContentsGPU):

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp (modified) (1 diff)
• src/compiler/translator/TranslatorMetalDirect/RewriteOutArgs.cpp (modified) (2 diffs)
• src/libANGLE/renderer/metal/ContextMtl.mm (modified) (2 diffs)
• src/libANGLE/renderer/metal/mtl_command_buffer.h (modified) (1 diff)
• src/libANGLE/renderer/metal/mtl_command_buffer.mm (modified) (7 diffs)
• src/libANGLE/renderer/metal/mtl_utils.mm (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-04-05  John Cunningham  <johncunnigham@apple.com>
+
+        [METAL ANGLE] Stencil only formats being used as the depth attachment.
+        https://bugs.webkit.org/show_bug.cgi?id=224183
+
+        Reviewed by Jon Lee.
+
+        * src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp:
+        * src/compiler/translator/TranslatorMetalDirect/RewriteOutArgs.cpp:
+        (sh::Rewriter::argAlreadyProcessed):
+        * src/libANGLE/renderer/metal/ContextMtl.mm:
+        (rx::ContextMtl::setupDraw):
+        * src/libANGLE/renderer/metal/mtl_command_buffer.h:
+        * src/libANGLE/renderer/metal/mtl_command_buffer.mm:
+        (rx::mtl::RenderCommandEncoder::reset):
+        (rx::mtl::RenderCommandEncoder::setRenderPipelineState):
+        (rx::mtl::RenderCommandEncoder::draw):
+        (rx::mtl::RenderCommandEncoder::drawInstanced):
+        (rx::mtl::RenderCommandEncoder::drawIndexed):
+        (rx::mtl::RenderCommandEncoder::drawIndexedInstanced):
+        (rx::mtl::RenderCommandEncoder::drawIndexedInstancedBaseVertex):
+        * src/libANGLE/renderer/metal/mtl_utils.mm:
+        (rx::mtl::InitializeDepthStencilTextureContentsGPU):
+
 2021-03-30  Kyle Piddington  <kpiddington@apple.com>
 

trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp

@@ -1243 +1243 @@
     ~ANGLE_Out() { mDest = mTemp; }
     ANGLE_Out(thread T &dest)
-        : mDest(dest)
+        : mTemp(dest), mDest(dest)
     {}
     operator thread T &() { return mTemp; }

trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/RewriteOutArgs.cpp

@@ -91 +91 @@
         : TIntermRebuild(compiler, false, true), mSymbolEnv(symbolEnv)
     {}
+
+    static bool argAlreadyProcessed(TIntermTyped *arg)
+    {
+        if (arg->getAsAggregate())
+        {
+            const TFunction *func = arg->getAsAggregate()->getFunction();
+            if (func && func->symbolType() == SymbolType::AngleInternal && func->name() == "swizzle_ref")
+            {
+                return true;
+            }
+        }
+        return false;
+    }
 
     PostResult visitAggregatePost(TIntermAggregate &aggregateNode) override
@@ -162 +175 @@
                 TIntermTyped *arg = args[i]->getAsTyped();
                 ASSERT(arg);
-                const TVariable *var       = GetVariable(*arg);
-                const TQualifier paramQual = getParamQualifier(i);
-
-                if (hasIndeterminateVar || mVarBuffer.multiplicity(var) > 1)
+                if (!argAlreadyProcessed(arg))
                 {
-                    switch (paramQual)
+                    const TVariable *var       = GetVariable(*arg);
+                    const TQualifier paramQual = getParamQualifier(i);
+
+                    if (hasIndeterminateVar || mVarBuffer.multiplicity(var) > 1)
                     {
-                        case TQualifier::EvqOut:
-                            args[i] = &mSymbolEnv.callFunctionOverload(Name("out"), arg->getType(),
-                                                                       *new TIntermSequence{arg});
-                            break;
-
-                        case TQualifier::EvqInOut:
-                            args[i] = &mSymbolEnv.callFunctionOverload(
-                                Name("inout"), arg->getType(), *new TIntermSequence{arg});
-                            break;
-
-                        default:
-                            break;
+                        switch (paramQual)
+                        {
+                            case TQualifier::EvqOut:
+                                args[i] = &mSymbolEnv.callFunctionOverload(Name("out"), arg->getType(),
+                                                                           *new TIntermSequence{arg});
+                                break;
+
+                            case TQualifier::EvqInOut:
+                                args[i] = &mSymbolEnv.callFunctionOverload(
+                                    Name("inout"), arg->getType(), *new TIntermSequence{arg});
+                                break;
+
+                            default:
+                                break;
+                        }
                     }
                 }

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

@@ -131 +131 @@
 
         indexBufferPool->releaseInFlightBuffers(mContextMtl);
-
         ANGLE_TRY(indexBufferPool->allocate(mContextMtl, 2 * sizeof(uint32_t), nullptr,
                                             &mLineLoopIndexBuffer, nullptr, nullptr));
@@ -2214 +2213 @@
     }
 
-    ANGLE_TRY(mProgram->setupDraw(context, &mRenderEncoder, mRenderPipelineDesc, changedPipeline,
-                                  textureChanged, uniformBuffersDirty, transformFeedbackDraw));
+    ANGLE_TRY(mProgram->setupDraw(context, &mRenderEncoder, mRenderPipelineDesc,
+                                  changedPipeline, textureChanged,
+                                  uniformBuffersDirty, transformFeedbackDraw));
+
+    // Setting up the draw required us to call a command buffer flush, re-run setupDraw with state invaliated to restart the command buffer from the current draw with previously set state
+    if (!mCmdBuffer.valid())
+    {
+        invalidateState(context);
+        ANGLE_TRY(setupDraw(context, mode, firstVertex, vertexOrIndexCount, instances, indexTypeOrNone, indices, transformFeedbackDraw));
+    }
 
     return angle::Result::Continue;

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

@@ -523 +523 @@
 
     RenderCommandEncoderStates mStateCache = {};
+
+    bool mPipelineStateSet = false;
 };
 

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

@@ -1032 +1032 @@
     CommandEncoder::reset();
     mRecording = false;
+    mPipelineStateSet = false;
     mCommands.clear();
 }
@@ -1296 +1297 @@
 RenderCommandEncoder &RenderCommandEncoder::setRenderPipelineState(id<MTLRenderPipelineState> state)
 {
+    mPipelineStateSet = true;
     if (mStateCache.renderPipeline == state)
     {
@@ -1604 +1606 @@
                                                  uint32_t vertexCount)
 {
+    ASSERT(mPipelineStateSet && "Render Pipeline State was never set and we've issued a draw command.");
     mHasDrawCalls = true;
     mCommands.push(CmdType::Draw).push(primitiveType).push(vertexStart).push(vertexCount);
@@ -1615 +1618 @@
                                                           uint32_t instances)
 {
+    ASSERT(mPipelineStateSet && "Render Pipeline State was never set and we've issued a draw command.");
     mHasDrawCalls = true;
     mCommands.push(CmdType::DrawInstanced)
@@ -1631 +1635 @@
                                                         size_t bufferOffset)
 {
+    ASSERT(mPipelineStateSet && "Render Pipeline State was never set and we've issued a draw command.");
     if (!indexBuffer)
     {
@@ -1656 +1661 @@
                                                                  uint32_t instances)
 {
+    ASSERT(mPipelineStateSet && "Render Pipeline State was never set and we've issued a draw command.");
     if (!indexBuffer)
     {
@@ -1684 +1690 @@
     uint32_t baseVertex)
 {
+    ASSERT(mPipelineStateSet && "Render Pipeline State was never set and we've issued a draw command.");
     if (!indexBuffer)
     {

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

@@ -313 +313 @@
     rtMTL.set(texture, level, layer, textureObjFormat);
     mtl::RenderPassDesc rpDesc;
-    rtMTL.toRenderPassAttachmentDesc(&rpDesc.depthAttachment);
+    // For formats such as MTLPixelFormatStencil8/GL_STENCIL_INDEX8 we only want to set the stencil attachment.
+    if (angleFormat.stencilBits && !angleFormat.depthBits)
+    {
+        rtMTL.toRenderPassAttachmentDesc(&rpDesc.stencilAttachment);
+    }
+    else
+    {
+        rtMTL.toRenderPassAttachmentDesc(&rpDesc.depthAttachment);
+    }
     rpDesc.sampleCount = texture->samples();
     if (angleFormat.depthBits)