Fix a code change needed to update to orign/dev

PixarAnimationStudios · Apr 16, 2024 · 3b95872 · 3b95872
1 parent 328dcb4
commit 3b95872
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/pxr/imaging/hdx/pickTask.cpp b/pxr/imaging/hdx/pickTask.cpp
@@ -144,8 +144,7 @@ HdxPickTask::_InitIfNeeded()
 
         _pickBuffer = hdStResourceRegistry->AllocateSingleBufferArrayRange(
                         _HdxPickTokens->Picking, 
-                        bufferSpecs, 
-                        HdBufferArrayUsageHint());
+                        bufferSpecs, HdBufferArrayUsageHintBitsStorage);
     }
 
     if (_pickableAovBuffers.empty()) {
@@ -637,8 +636,8 @@ HdxPickTask::Prepare(HdTaskContext* ctx,
     if (renderPassShader) {
         if (_pickBuffer) {
             renderPassShader->AddBufferBinding(
-                HdBindingRequest(
-                    HdBinding::SSBO,
+                HdStBindingRequest(
+                    HdStBinding::SSBO,
                     _HdxPickTokens->PickBufferBinding, 
                     _pickBuffer, 
                     /*interleaved*/ false,

diff --git a/pxr/imaging/hdx/shaders/renderPass.glslfx b/pxr/imaging/hdx/shaders/renderPass.glslfx
@@ -198,21 +198,21 @@ compareOrSet(
 
         // Potentially available slot, store the values and return true if successful.
         int expected = -9;
-        primIdValue = ATOMIC_COMPARE_SWAP(PickBuffer[primIdOffset], expected, primId);
+        primIdValue = ATOMIC_COMP_SWAP(PickBuffer[primIdOffset], expected, primId);
 
         // Exit if the slot was unavailable.
         if (primIdValue != -9 && primIdValue != primId)
             return false;
 
         expected = -9;
-        instanceIdValue = ATOMIC_COMPARE_SWAP(PickBuffer[instanceIdOffset], expected, instanceId);
+        instanceIdValue = ATOMIC_COMP_SWAP(PickBuffer[instanceIdOffset], expected, instanceId);
 
         // Exit if the slot was unavailable.
         if (instanceIdValue != -9 && instanceIdValue != instanceId)
             return false;
 
         expected = -9;
-        partIdValue = ATOMIC_COMPARE_SWAP(PickBuffer[partIdOffset], expected, partId);
+        partIdValue = ATOMIC_COMP_SWAP(PickBuffer[partIdOffset], expected, partId);
 
         // Exit if the slot was unavailable.
         if (partIdValue != -9 && partIdValue != partId)
@@ -284,7 +284,7 @@ void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
         {
             // see if we need to add a new entry
             if (entryNumber == ATOMIC_LOAD(PickBuffer[sizeOffset])) {
-                ATOMIC_COMPARE_SWAP(PickBuffer[sizeOffset], entryNumber, entryNumber + 1);
+                ATOMIC_COMP_SWAP(PickBuffer[sizeOffset], entryNumber, entryNumber + 1);
             }
 
             // if either the item equals to the current entry or we managed to