cleanup after rebase

Author: kohakukun

pxr/imaging/hdSt/codeGen.cpp

@@ -1065,7 +1065,7 @@ _ResourceGenerator::_GenerateHgiTextureResources(
     using TextureType = HioGlslfxResourceLayout::TextureType;
 
     for (auto const & texture : textureElements) {
-        HgiShaderTextureType const textureType = _textureTypeMap[texture.textureType];
+        HgiShaderTextureType const hgiTextureType = _textureTypeMap[texture.textureType];
         HdFormat const hdTextureFormat =
             HdStHioConversions::GetHdFormat(texture.format);
         if (texture.arraySize > 0) {
@@ -1076,15 +1076,15 @@ _ResourceGenerator::_GenerateHgiTextureResources(
                 texture.bindingIndex,
                 texture.dim,
                 HdStHgiConversions::GetHgiFormat(hdTextureFormat),
-                textureType);
+                hgiTextureType);
         } else {
             HgiShaderFunctionAddTexture(
                 funcDesc,
                 texture.name,
                 texture.bindingIndex,
                 texture.dim,
                 HdStHgiConversions::GetHgiFormat(hdTextureFormat),
-                textureType);
+                hgiTextureType);
         }
     }
 }
@@ -2012,7 +2012,6 @@ HdSt_CodeGen::Compile(HdStResourceRegistry*const registry)
         capabilities->IsSet(HgiDeviceCapabilitiesBitsShaderDoublePrecision);
     const bool minusOneToOneDepth =
         capabilities->IsSet(HgiDeviceCapabilitiesBitsDepthRangeMinusOnetoOne);
-    TfToken const apiName = registry->GetHgi()->GetAPIName();
 
     bool const useHgiResourceGeneration =
         IsEnabledHgiResourceGeneration(registry->GetHgi());
@@ -6523,9 +6522,7 @@ HdSt_CodeGen::_GenerateShaderParameters(bool bindlessTextureEnabled)
 
             _AddTextureElement(&_resTextures,
                                it->second.name, 2,
-                               binding.GetTextureUnit(),
-                               HioFormatFloat32Vec4,
-                               TextureType::TEXTURE);
+                               binding.GetTextureUnit());
 
             _EmitTextureAccessors(
                 accessors, it->second, swizzle, fallbackSwizzle,

pxr/imaging/hdSt/drawBatch.cpp

@@ -461,8 +461,7 @@ HdSt_DrawBatch::_DrawingProgram::CompileShader(
                                     instanceDraw,
                                     customBindings,
                                     resourceRegistry->GetHgi()->
-                                        GetCapabilities(),
-                                    resourceRegistry->GetHgi()->GetAPIName());
+                                        GetCapabilities());
 
     HdSt_CodeGen codeGen(_geometricShader, shaders,
                          drawItem->GetMaterialTag(), std::move(metaData));

pxr/imaging/hdSt/renderPassState.cpp

@@ -335,7 +335,7 @@ HdStRenderPassState::Prepare(
             HdShaderTokens->viewport,
             HdTupleType{HdTypeFloatVec4, 1});
 
-        if (_clippingEnabled) {
+        if (clipDistanceSupport) {
             // Avoid shader permutations when using 0-4 clip planes by always
             // allocating storage for 4 clip planes.
             static constexpr size_t s_minNumClipPlanes = 4;
@@ -482,16 +482,18 @@ HdStRenderPassState::Prepare(
                 _ComputeDataWindow(
                     _framing, _viewport))));
 
-    if (clipPlanes.size() > 0) {
-        sources.push_back(
-            std::make_shared<HdVtBufferSource>(
-                HdShaderTokens->clipPlanes,
-                VtValue(clipPlanes),
-                clipPlanes.size()));
+    if (clipDistanceSupport) {
         sources.push_back(
         std::make_shared<HdVtBufferSource>(
             HdShaderTokens->numClipPlanes,
             VtValue(uint32_t(clipPlanes.size()))));
+        if (clipPlanes.size() > 0) {
+            sources.push_back(
+                std::make_shared<HdVtBufferSource>(
+                    HdShaderTokens->clipPlanes,
+                    VtValue(clipPlanes),
+                    clipPlanes.size()));
+        }
     }
 
     hdStResourceRegistry->AddSources(_renderPassStateBar, std::move(sources));
@@ -863,12 +865,6 @@ HdStRenderPassState::GetShaderHash() const
     );
 }
 
-size_t
-HdStRenderPassState::GetRenderPassStateBarVersion() const
-{
-    return _renderPassStateBar->GetVersion();
-}
-
 static
 HdRenderBuffer *
 _GetRenderBuffer(const HdRenderPassAovBinding& aov,

pxr/imaging/hdSt/renderPassState.h

@@ -122,9 +122,6 @@ class HdStRenderPassState : public HdRenderPassState
     HDST_API
     size_t GetShaderHash() const;
 
-    HDST_API
-    size_t GetRenderPassStateBarVersion() const;
-
     /// Camera setter API
     ///
     /// Set matrices, viewport and clipping planes explicitly that are used

pxr/imaging/hdSt/resourceBinder.cpp

@@ -179,8 +179,7 @@ HdSt_ResourceBinder::ResolveBindings(
     HdSt_ResourceBinder::MetaData::DrawingCoordBufferBinding const &dcBinding,
     bool instanceDraw,
     HdStBindingRequestVector const &customBindings,
-    HgiCapabilities const *capabilities,
-    TfToken const &apiName)
+    HgiCapabilities const *capabilities)
 {
     HD_TRACE_FUNCTION();
     HF_MALLOC_TAG_FUNCTION();
@@ -192,7 +191,7 @@ HdSt_ResourceBinder::ResolveBindings(
     const bool bindlessTexturesEnabled = 
         capabilities->IsSet(HgiDeviceCapabilitiesBitsBindlessTextures);
     const bool isMetal =
-            apiName == HgiTokens->Metal;
+        capabilities->IsSet(HgiDeviceCapabilitiesBitsMetalTessellation);
 
     HdStBinding::Type arrayBufferBindingType = HdStBinding::SSBO;
     if (bindlessBuffersEnabled) {

pxr/imaging/hdSt/resourceBinder.h

@@ -342,8 +342,7 @@ class HdSt_ResourceBinder {
                          MetaData::DrawingCoordBufferBinding const &dcBinding,
                          bool instanceDraw,
                          HdStBindingRequestVector const &customBindings,
-                         HgiCapabilities const *capabilities,
-                         TfToken const &apiName);
+                         HgiCapabilities const *capabilities);
 
     /// Assign all binding points used in computation.
     /// Returns metadata to be used for codegen.

pxr/imaging/hdSt/testenv/testHdStCodeGen.cpp

@@ -272,8 +272,7 @@ CodeGenTest(HdStResourceRegistrySharedPtr const &registry,
                            metaData.get(),
                            dcBinding,
                            /*instanced=*/true, empty,
-                           registry->GetHgi()->GetCapabilities(),
-                           registry->GetHgi()->GetAPIName());
+                           registry->GetHgi()->GetCapabilities());
 
     HdSt_CodeGen codeGen(geometricShader, shaders,
                          drawItem.GetMaterialTag(), std::move(metaData));

pxr/imaging/hdSt/testenv/testHdStQualifiers.cpp

@@ -294,8 +294,7 @@ My_TestGLDrawing::DrawTest()
         drawingCoordBufferBinding,
         false,
         customBindings,
-        registry->GetHgi()->GetCapabilities(),
-        registry->GetHgi()->GetAPIName());
+        registry->GetHgi()->GetCapabilities());
 
     // Initialize codegen.
     HdSt_CodeGen codeGen(geometricShader, shaders,

pxr/imaging/hgi/enums.h

@@ -811,6 +811,10 @@ enum HgiShaderTextureType
     HgiShaderTextureTypeArrayTexture,
     HgiShaderTextureTypeCubemapTexture
 };
+
+/// \enum HgiComputeDispatch
+///
+/// Specifies the dispatch method for compute encoders.
 ///
 /// <ul>
 /// <li>HgiComputeDispatchSerial: