fixup two phase

sndels · Aug 2, 2024 · b882fd1 · b882fd1
1 parent 3bc153a
commit b882fd1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/render/GBufferRenderer.cpp b/src/render/GBufferRenderer.cpp
@@ -458,15 +458,17 @@ void GBufferRenderer::recordDraw(
             .drawStats = inputsOutputs.inOutDrawStats,
         });
 
+    const ImageState colorAttachmentState =
+        isSecondPhase ? ImageState::ColorAttachmentReadWrite
+                      : ImageState::ColorAttachmentWrite;
+
     transition(
         WHEELS_MOV(scopeAlloc), cb,
         Transitions{
             .images = StaticArray<ImageTransition, 4>{{
-                {inputsOutputs.outAlbedoRoughness,
-                 ImageState::ColorAttachmentWrite},
-                {inputsOutputs.outNormalMetalness,
-                 ImageState::ColorAttachmentWrite},
-                {inputsOutputs.outVelocity, ImageState::ColorAttachmentWrite},
+                {inputsOutputs.outAlbedoRoughness, colorAttachmentState},
+                {inputsOutputs.outNormalMetalness, colorAttachmentState},
+                {inputsOutputs.outVelocity, colorAttachmentState},
                 {inputsOutputs.outDepth, ImageState::DepthAttachmentReadWrite},
             }},
             .buffers = StaticArray<BufferTransition, 3>{{

diff --git a/src/render/MeshletCuller.cpp b/src/render/MeshletCuller.cpp
@@ -488,10 +488,6 @@ MeshletCuller::CullOutput MeshletCuller::recordCullList(
     // confuse debug naming by adding 'SecondPhase' in that case.
     argumentsName.extend("MeshDiscpatchArguments");
 
-    String secondPhaseArgumentsName{scopeAlloc};
-    secondPhaseArgumentsName.extend(debugPrefix);
-    secondPhaseArgumentsName.extend("SecondPhaseInputArguments");
-
     const bool hierarchicalDepthGiven = input.hierarchicalDepth.has_value();
     ImageHandle dummyHierarchicalDepth;
     if (!hierarchicalDepthGiven)