writability improvements

PixarAnimationStudios · Sep 23, 2022 · 9a8dd1d · 9a8dd1d
1 parent cde066d
commit 9a8dd1d
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 5 deletions.
diff --git a/pxr/imaging/hdSt/domeLightComputations.cpp b/pxr/imaging/hdSt/domeLightComputations.cpp
@@ -240,13 +240,14 @@ HdSt_DomeLightComputationGPU::Execute(
     texBind0.stageUsage = HgiShaderStageCompute;
     texBind0.textures.push_back(srcTextureName);
     texBind0.samplers.push_back(srcSamplerName);
-    texBind0.readOnly = true;
+    texBind0.writable = false;
     texBind0.resourceType = HgiBindResourceTypeCombinedSamplerImage;
     resourceDesc.textures.push_back(std::move(texBind0));
 
     HgiTextureBindDesc texBind1;
     texBind1.bindingIndex = 1;
     texBind1.stageUsage = HgiShaderStageCompute;
+    texBind1.writable = true;
     texBind1.textures.push_back(dstTextureView->GetViewTexture());
     texBind1.samplers.push_back(srcSamplerName);
     texBind1.resourceType = HgiBindResourceTypeStorageImage;

diff --git a/pxr/imaging/hdSt/resourceBinder.cpp b/pxr/imaging/hdSt/resourceBinder.cpp
@@ -1123,6 +1123,7 @@ HdSt_ResourceBinder::GetTextureBindingDesc(
     texelDesc.samplers = { texelSampler };
     texelDesc.resourceType = HgiBindResourceTypeSampledImage;
     texelDesc.bindingIndex = binding.GetTextureUnit();
+    texelDesc.writable = false;
     bindingsDesc->textures.push_back(std::move(texelDesc));
 }
 
@@ -1146,6 +1147,7 @@ HdSt_ResourceBinder::GetTextureWithLayoutBindingDesc(
     layoutDesc.samplers = { };
     layoutDesc.resourceType = HgiBindResourceTypeSampledImage;
     layoutDesc.bindingIndex = layoutBinding.GetTextureUnit();
+    layoutDesc.writable = false;
     bindingsDesc->textures.push_back(std::move(layoutDesc));
 }
 

diff --git a/pxr/imaging/hdSt/unitTestHelper.cpp b/pxr/imaging/hdSt/unitTestHelper.cpp
@@ -604,6 +604,7 @@ HdSt_TextureTestDriver::_CreateTextureBindings(
         HgiTextureBindDesc texBindDesc;
         texBindDesc.bindingIndex = 0;
         texBindDesc.stageUsage = HgiShaderStageFragment;
+        texBindDesc.writable = true;
         texBindDesc.textures.push_back(textureHandle);
         if (samplerHandle) {
             texBindDesc.samplers.push_back(samplerHandle);

diff --git a/pxr/imaging/hdx/colorCorrectionTask.cpp b/pxr/imaging/hdx/colorCorrectionTask.cpp
@@ -348,15 +348,16 @@ HdxColorCorrectionTask::_CreateResourceBindings(
     HgiTextureBindDesc texBind0;
     texBind0.bindingIndex = 0;
     texBind0.stageUsage = HgiShaderStageFragment;
+    texBind0.writable = false;
     texBind0.textures.push_back(aovTexture);
     texBind0.samplers.push_back(_sampler);
-    texBind0.readOnly = true;
     resourceDesc.textures.push_back(std::move(texBind0));
 
     if (useOCIO && _texture3dLUT) {
         HgiTextureBindDesc texBind1;
         texBind1.bindingIndex = 1;
         texBind1.stageUsage = HgiShaderStageFragment;
+        texBind1.writable = false;
         texBind1.textures.push_back(_texture3dLUT);
         texBind1.samplers.push_back(_sampler);
         resourceDesc.textures.push_back(std::move(texBind1));

diff --git a/pxr/imaging/hdx/fullscreenShader.cpp b/pxr/imaging/hdx/fullscreenShader.cpp
@@ -360,6 +360,7 @@ HdxFullscreenShader::_CreateResourceBindings(TextureMap const& textures)
         HgiTextureBindDesc texBind;
         texBind.bindingIndex = bindSlots++;
         texBind.stageUsage = HgiShaderStageFragment;
+        texBind.writable = false;
         texBind.textures.push_back(texHandle);
         texBind.samplers.push_back(_sampler);
         resourceDesc.textures.push_back(std::move(texBind));

diff --git a/pxr/imaging/hdx/visualizeAovTask.cpp b/pxr/imaging/hdx/visualizeAovTask.cpp
@@ -298,6 +298,7 @@ HdxVisualizeAovTask::_CreateResourceBindings(
     HgiTextureBindDesc texBind0;
     texBind0.bindingIndex = 0;
     texBind0.stageUsage = HgiShaderStageFragment;
+    texBind0.writable = false;
     texBind0.textures.push_back(inputAovTexture);
     texBind0.samplers.push_back(_sampler);
     resourceDesc.textures.push_back(std::move(texBind0));

diff --git a/pxr/imaging/hgi/resourceBindings.cpp b/pxr/imaging/hgi/resourceBindings.cpp
@@ -78,7 +78,8 @@ bool operator==(
            lhs.resourceType == rhs.resourceType &&
            lhs.bindingIndex == rhs.bindingIndex &&
            lhs.stageUsage == rhs.stageUsage &&
-           lhs.samplers == rhs.samplers;
+           lhs.samplers == rhs.samplers &&
+           lhs.writable == rhs.writable;
 }
 
 bool operator!=(

diff --git a/pxr/imaging/hgi/resourceBindings.h b/pxr/imaging/hgi/resourceBindings.h
@@ -130,7 +130,7 @@ struct HgiTextureBindDesc
     HgiBindResourceType resourceType;
     uint32_t bindingIndex;
     HgiShaderStage stageUsage;
-    bool readOnly;
+    bool writable;
 };
 using HgiTextureBindDescVector = std::vector<HgiTextureBindDesc>;
 

diff --git a/pxr/imaging/hgiMetal/resourceBindings.mm b/pxr/imaging/hgiMetal/resourceBindings.mm
@@ -116,7 +116,7 @@
             else {
                 usageFlags = MTLResourceUsageRead;
             }
-            if (!texDesc.readOnly) {
+            if (texDesc.writable) {
                 usageFlags = usageFlags | MTLResourceUsageWrite;
             }
             [renderEncoder useResource:metalTexture