[hdSt] Add argument to specify buffer usage for standalone buffer res…

…ources. This allows us to correctly specify that the drawIndirectResult should be a storage buffer when creating it. (Internal change: 2297310)
autodesk-forks · Oct 2, 2023 · 7f84c75 · 7f84c75
1 parent 1e488ba
commit 7f84c75
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/pxr/imaging/hdSt/indirectDrawBatch.cpp b/pxr/imaging/hdSt/indirectDrawBatch.cpp
@@ -1541,7 +1541,7 @@ HdSt_IndirectDrawBatch::_BeginGPUCountVisibleInstances(
 
         _resultBuffer =
             resourceRegistry->RegisterBufferResource(
-                _tokens->drawIndirectResult, tupleType);
+                _tokens->drawIndirectResult, tupleType, HgiBufferUsageStorage);
     }
 
     // Reset visible item count

diff --git a/pxr/imaging/hdSt/pipelineDrawBatch.cpp b/pxr/imaging/hdSt/pipelineDrawBatch.cpp
@@ -597,7 +597,8 @@ _AllocateTessFactorsBuffer(
 
     return resourceRegistry->RegisterBufferResource(
         HdTokens->tessFactors,
-        HdTupleType{HdTypeHalfFloat, numElements*numTessFactorsPerElement});
+        HdTupleType{HdTypeHalfFloat, numElements*numTessFactorsPerElement},
+        HgiBufferUsageUniform);
 }
 
 } // annonymous namespace
@@ -1883,7 +1884,7 @@ HdSt_PipelineDrawBatch::_BeginGPUCountVisibleInstances(
 
         _resultBuffer =
             resourceRegistry->RegisterBufferResource(
-                _tokens->drawIndirectResult, tupleType);
+                _tokens->drawIndirectResult, tupleType, HgiBufferUsageStorage);
     }
 
     // Reset visible item count

diff --git a/pxr/imaging/hdSt/resourceRegistry.cpp b/pxr/imaging/hdSt/resourceRegistry.cpp
@@ -535,7 +535,8 @@ HdStResourceRegistry::RegisterDispatchBuffer(
 HdStBufferResourceSharedPtr
 HdStResourceRegistry::RegisterBufferResource(
     TfToken const &role, 
-    HdTupleType tupleType)
+    HdTupleType tupleType,
+    HgiBufferUsage bufferUsage)
 {
     HdStBufferResourceSharedPtr const result =
         std::make_shared<HdStBufferResource>(
@@ -544,8 +545,8 @@ HdStResourceRegistry::RegisterBufferResource(
     size_t byteSize = HdDataSizeOfTupleType(tupleType);
 
     HgiBufferDesc bufDesc;
-    bufDesc.usage= HgiBufferUsageUniform;
-    bufDesc.byteSize= byteSize;
+    bufDesc.usage = bufferUsage;
+    bufDesc.byteSize = byteSize;
     HgiBufferHandle buffer = _hgi->CreateBuffer(bufDesc);
 
     result->SetAllocation(buffer, byteSize);

diff --git a/pxr/imaging/hdSt/resourceRegistry.h b/pxr/imaging/hdSt/resourceRegistry.h
@@ -334,7 +334,8 @@ class HdStResourceRegistry final : public HdResourceRegistry
     HDST_API
     HdStBufferResourceSharedPtr RegisterBufferResource(
         TfToken const &role, 
-        HdTupleType tupleType);
+        HdTupleType tupleType,
+        HgiBufferUsage bufferUsage);
 
     /// Remove any entries associated with expired dispatch buffers.
     HDST_API