Merge pull request #1918 from billhollings/accumulate-render-stages

Accumulate render stages when a resource is used by multiple descriptor bindings.
KhronosGroup · May 23, 2023 · 3d7f996 · 3d7f996
2 parents a832e38 + b863ece
commit 3d7f996
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
@@ -31,6 +31,7 @@ Released 2023/05/23
   large for `MTLCounterSampleBuffer`, and fall back to emulation via CPU timestamps.
 - Ensure shaders that use `PhysicalStorageBufferAddresses` encode the use of the associated `MTLBuffer`.
 - Disable pipeline cache compression prior to macOS 10.15 and iOS/tvOS 13.0.
+- Accumulate render stages when a resource is used by multiple descriptor bindings.
 - Respect the bind point supplied to `vkCmdBindDescriptorSets()` / `vkCmdPushDescriptorSets()`.
 - Check if shader compiled before adding it to a pipeline, to avoid Metal validation error.
 - Identify each unsupported device feature flag that the app attempts to enable.

diff --git a/MoltenVK/MoltenVK/Commands/MVKCommandEncoderState.h b/MoltenVK/MoltenVK/Commands/MVKCommandEncoderState.h
@@ -565,6 +565,8 @@ class MVKGraphicsResourcesCommandEncoderState : public MVKResourcesCommandEncode
 	/** Marks any overridden buffer indexes as dirty. */
 	void markOverriddenBufferIndexesDirty();
 
+	void endMetalRenderPass() override;
+
 	void markDirty() override;
 
 #pragma mark Construction
@@ -577,6 +579,7 @@ class MVKGraphicsResourcesCommandEncoderState : public MVKResourcesCommandEncode
 	void bindMetalArgumentBuffer(MVKShaderStage stage, MVKMTLBufferBinding& buffBind) override;
 
     ResourceBindings<8> _shaderStageResourceBindings[kMVKShaderStageFragment + 1];
+	std::unordered_map<id<MTLResource>, MTLRenderStages> _renderUsageStages;
 };
 
 

diff --git a/MoltenVK/MoltenVK/Commands/MVKCommandEncoderState.mm b/MoltenVK/MoltenVK/Commands/MVKCommandEncoderState.mm
@@ -757,6 +757,11 @@
     }
 }
 
+void MVKGraphicsResourcesCommandEncoderState::endMetalRenderPass() {
+	MVKResourcesCommandEncoderState::endMetalRenderPass();
+	_renderUsageStages.clear();
+}
+
 // Mark everything as dirty
 void MVKGraphicsResourcesCommandEncoderState::markDirty() {
 	MVKResourcesCommandEncoderState::markDirty();
@@ -976,7 +981,12 @@
 		} else {
 			auto* mtlRendEnc = _cmdEncoder->_mtlRenderEncoder;
 			if ([mtlRendEnc respondsToSelector: @selector(useResource:usage:stages:)]) {
-				[mtlRendEnc useResource: mtlResource usage: mtlUsage stages: mtlStages];
+				// Within a renderpass, a resource may be used by multiple descriptor bindings,
+				// each of which may assign a different usage stage. Dynamically accumulate
+				// usage stages across all descriptor bindings using the resource.
+				auto& accumStages = _renderUsageStages[mtlResource];
+				accumStages |= mtlStages;
+				[mtlRendEnc useResource: mtlResource usage: mtlUsage stages: accumStages];
 			} else {
 				[mtlRendEnc useResource: mtlResource usage: mtlUsage];
 			}