Split ResourceStates::ShaderResource into PixelShaderResource and NonPixelShaderResource to support DX12 compute queues that cannot use D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE state in barriers.

Alexey Panteleev · Alexey Panteleev · commit ada8a144d37c · 2026-06-10T15:31:06.000-07:00
diff --git a/include/nvrhi/nvrhi.h b/include/nvrhi/nvrhi.h
@@ -64,7 +64,7 @@ namespace nvrhi
 {
     // Version of the public API provided by NVRHI.
     // Increment this when any changes to the API are made.
-    static constexpr uint32_t c_HeaderVersion = 24;
+    static constexpr uint32_t c_HeaderVersion = 25;
 
     // Verifies that the version of the implementation matches the version of the header.
     // Returns true if they match. Use this when initializing apps using NVRHI as a shared library.
@@ -354,26 +354,28 @@ namespace nvrhi
         VertexBuffer                = 0x00000004,
         IndexBuffer                 = 0x00000008,
         IndirectArgument            = 0x00000010,
-        ShaderResource              = 0x00000020,
-        UnorderedAccess             = 0x00000040,
-        RenderTarget                = 0x00000080,
-        DepthWrite                  = 0x00000100,
-        DepthRead                   = 0x00000200,
-        StreamOut                   = 0x00000400,
-        CopyDest                    = 0x00000800,
-        CopySource                  = 0x00001000,
-        ResolveDest                 = 0x00002000,
-        ResolveSource               = 0x00004000,
-        Present                     = 0x00008000,
-        AccelStructRead             = 0x00010000,
-        AccelStructWrite            = 0x00020000,
-        AccelStructBuildInput       = 0x00040000,
-        AccelStructBuildBlas        = 0x00080000,
-        ShadingRateSurface          = 0x00100000,
-        OpacityMicromapWrite        = 0x00200000,
-        OpacityMicromapBuildInput   = 0x00400000,
-        ConvertCoopVecMatrixInput   = 0x00800000,
-        ConvertCoopVecMatrixOutput  = 0x01000000,
+        PixelShaderResource         = 0x00000020,
+        NonPixelShaderResource      = 0x00000040,
+        ShaderResource              = PixelShaderResource | NonPixelShaderResource,
+        UnorderedAccess             = 0x00000080,
+        RenderTarget                = 0x00000100,
+        DepthWrite                  = 0x00000200,
+        DepthRead                   = 0x00000400,
+        StreamOut                   = 0x00000800,
+        CopyDest                    = 0x00001000,
+        CopySource                  = 0x00002000,
+        ResolveDest                 = 0x00004000,
+        ResolveSource               = 0x00008000,
+        Present                     = 0x00010000,
+        AccelStructRead             = 0x00020000,
+        AccelStructWrite            = 0x00040000,
+        AccelStructBuildInput       = 0x00080000,
+        AccelStructBuildBlas        = 0x00100000,
+        ShadingRateSurface          = 0x00200000,
+        OpacityMicromapWrite        = 0x00400000,
+        OpacityMicromapBuildInput   = 0x00800000,
+        ConvertCoopVecMatrixInput   = 0x01000000,
+        ConvertCoopVecMatrixOutput  = 0x02000000,
     };
 
     NVRHI_ENUM_CLASS_FLAG_OPERATORS(ResourceStates)
diff --git a/src/common/state-tracking.cpp b/src/common/state-tracking.cpp
@@ -451,4 +451,16 @@ namespace nvrhi
 
         return tracking;
     }
+
+    ResourceStates getShaderResourceStateForBindingLayout(IBindingLayout* bindingLayout)
+    {
+        ShaderType const visibility = bindingLayout->getDesc()->visibility;
+        
+        bool const hasPixelShader = (visibility & ShaderType::Pixel) != 0;
+
+        return hasPixelShader
+            ? ResourceStates::ShaderResource
+            : ResourceStates::NonPixelShaderResource;
+    }
+
 } // namespace nvrhi
diff --git a/src/common/state-tracking.h b/src/common/state-tracking.h
@@ -138,4 +138,9 @@ namespace nvrhi
 
     bool verifyPermanentResourceState(ResourceStates permanentState, ResourceStates requiredState, bool isTexture, const std::string& debugName, IMessageCallback* messageCallback);
 
+    // Derives the state for SRV type resources used in binding sets.
+    // We don't want to include the PixelShaderResource bit everywhere because it cannot be used in a compute queue.
+    // So, use the binding layout's visibility mask to determine if a pixel shader might be necessary.
+    ResourceStates getShaderResourceStateForBindingLayout(IBindingLayout* bindingLayout);
+
 } // namespace nvrhi
diff --git a/src/d3d12/d3d12-constants.cpp b/src/d3d12/d3d12-constants.cpp
@@ -251,7 +251,8 @@ namespace nvrhi::d3d12
         if ((stateBits & ResourceStates::VertexBuffer) != 0) result |= D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER;
         if ((stateBits & ResourceStates::IndexBuffer) != 0) result |= D3D12_RESOURCE_STATE_INDEX_BUFFER;
         if ((stateBits & ResourceStates::IndirectArgument) != 0) result |= D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT;
-        if ((stateBits & ResourceStates::ShaderResource) != 0) result |= D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
+        if ((stateBits & ResourceStates::PixelShaderResource) != 0) result |= D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE;
+        if ((stateBits & ResourceStates::NonPixelShaderResource) != 0) result |= D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
         if ((stateBits & ResourceStates::UnorderedAccess) != 0) result |= D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
         if ((stateBits & ResourceStates::RenderTarget) != 0) result |= D3D12_RESOURCE_STATE_RENDER_TARGET;
         if ((stateBits & ResourceStates::DepthWrite) != 0) result |= D3D12_RESOURCE_STATE_DEPTH_WRITE;
diff --git a/src/d3d12/d3d12-state-tracking.cpp b/src/d3d12/d3d12-state-tracking.cpp
@@ -33,6 +33,8 @@ namespace nvrhi::d3d12
             return; // is bindless
 
         BindingSet* bindingSet = checked_cast<BindingSet*>(_bindingSet);
+        
+        ResourceStates const shaderResourceState = getShaderResourceStateForBindingLayout(bindingSet->layout);
 
         for (auto bindingIndex : bindingSet->bindingsThatNeedTransitions)
         {
@@ -41,7 +43,7 @@ namespace nvrhi::d3d12
             switch (binding.type)  // NOLINT(clang-diagnostic-switch-enum)
             {
             case ResourceType::Texture_SRV:
-                requireTextureState(checked_cast<ITexture*>(binding.resourceHandle), binding.subresources, ResourceStates::ShaderResource);
+                requireTextureState(checked_cast<ITexture*>(binding.resourceHandle), binding.subresources, shaderResourceState);
                 break;
 
             case ResourceType::Texture_UAV:
@@ -51,7 +53,7 @@ namespace nvrhi::d3d12
             case ResourceType::TypedBuffer_SRV:
             case ResourceType::StructuredBuffer_SRV:
             case ResourceType::RawBuffer_SRV:
-                requireBufferState(checked_cast<IBuffer*>(binding.resourceHandle), ResourceStates::ShaderResource);
+                requireBufferState(checked_cast<IBuffer*>(binding.resourceHandle), shaderResourceState);
                 break;
 
             case ResourceType::TypedBuffer_UAV:
diff --git a/src/vulkan/vulkan-constants.cpp b/src/vulkan/vulkan-constants.cpp
@@ -231,7 +231,11 @@ namespace nvrhi::vulkan
             vk::PipelineStageFlagBits2::eDrawIndirect,
             vk::AccessFlagBits2::eIndirectCommandRead,
             vk::ImageLayout::eUndefined },
-        { ResourceStates::ShaderResource,
+        { ResourceStates::PixelShaderResource,
+            vk::PipelineStageFlagBits2::eFragmentShader,
+            vk::AccessFlagBits2::eShaderRead,
+            vk::ImageLayout::eShaderReadOnlyOptimal },
+        { ResourceStates::NonPixelShaderResource,
             vk::PipelineStageFlagBits2::eAllCommands,
             vk::AccessFlagBits2::eShaderRead,
             vk::ImageLayout::eShaderReadOnlyOptimal },
diff --git a/src/vulkan/vulkan-state-tracking.cpp b/src/vulkan/vulkan-state-tracking.cpp
@@ -35,6 +35,8 @@ namespace nvrhi::vulkan
 
         BindingSet* bindingSet = checked_cast<BindingSet*>(_bindingSet);
 
+        ResourceStates const shaderResourceState = getShaderResourceStateForBindingLayout(bindingSet->layout);
+
         for (auto bindingIndex : bindingSet->bindingsThatNeedTransitions)
         {
             const BindingSetItem& binding = bindingSet->desc.bindings[bindingIndex];
@@ -50,8 +52,8 @@ namespace nvrhi::vulkan
                     auto* texture = checked_cast<Texture*>(binding.resourceHandle);
                     const FormatInfo& fmtInfo = getFormatInfo(texture->desc.format);
                     const ResourceStates srvState = (fmtInfo.hasDepth || fmtInfo.hasStencil)
-                        ? (ResourceStates::ShaderResource | ResourceStates::DepthRead)
-                        : ResourceStates::ShaderResource;
+                        ? (shaderResourceState | ResourceStates::DepthRead)
+                        : shaderResourceState;
                     requireTextureState(texture, binding.subresources, srvState);
                     break;
                 }
@@ -63,7 +65,7 @@ namespace nvrhi::vulkan
                 case ResourceType::TypedBuffer_SRV:
                 case ResourceType::StructuredBuffer_SRV:
                 case ResourceType::RawBuffer_SRV:
-                    requireBufferState(checked_cast<IBuffer*>(binding.resourceHandle), ResourceStates::ShaderResource);
+                    requireBufferState(checked_cast<IBuffer*>(binding.resourceHandle), shaderResourceState);
                     break;
 
                 case ResourceType::TypedBuffer_UAV:
