소스 검색

Merge pull request #60 from aws-lumberyard-dev/Atom/moudgils/DxcUpdateFixes

Fix shader build issues related to Dxc update
moudgils 4 년 전
부모
커밋
34094740e0
3개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 0
      Shaders/Instanced.azsl
  2. 2 1
      Shaders/RHI/BindlessPrototype.shader
  3. 5 5
      Shaders/RHI/BindlessPrototypeSrg.azsli

+ 1 - 0
Shaders/Instanced.azsl

@@ -1,3 +1,4 @@
+#include <Atom/Features/SrgSemantics.azsli>
 #include <viewsrg.srgi>
 #include <viewsrg.srgi>
 
 
 struct CubeTransform
 struct CubeTransform

+ 2 - 1
Shaders/RHI/BindlessPrototype.shader

@@ -20,5 +20,6 @@
           "type": "Fragment"
           "type": "Fragment"
         }
         }
       ]
       ]
-    }
+    },
+    "DisabledRHIBackends": ["metal"]
 }
 }

+ 5 - 5
Shaders/RHI/BindlessPrototypeSrg.azsli

@@ -29,6 +29,11 @@ ShaderResourceGroupSemantic FloatBufferSemanticId
     FrequencyId = 7;
     FrequencyId = 7;
 };
 };
 
 
+ShaderResourceGroup FloatBufferSrg : FloatBufferSemanticId
+{
+    StructuredBuffer<FloatBuffer> m_floatBuffer;
+};
+
 ShaderResourceGroup ImageSrg : FrequencyPerScene
 ShaderResourceGroup ImageSrg : FrequencyPerScene
 {
 {
     Sampler m_sampler
     Sampler m_sampler
@@ -43,11 +48,6 @@ ShaderResourceGroup ImageSrg : FrequencyPerScene
     Texture2D m_textureArray[];
     Texture2D m_textureArray[];
 }
 }
 
 
-ShaderResourceGroup FloatBufferSrg : FloatBufferSemanticId
-{
-    StructuredBuffer<FloatBuffer> m_floatBuffer;
-};
-
 // Helper functions to read data from the FloatBuffer. The FloatBuffer is accessed with an offset and an index.
 // Helper functions to read data from the FloatBuffer. The FloatBuffer is accessed with an offset and an index.
 // The offset holds the initial offset within the FloatBuffer, and the index is a sub-index, which increments with each property that is being read.
 // The offset holds the initial offset within the FloatBuffer, and the index is a sub-index, which increments with each property that is being read.
 // The data needs to be read in the same order as it is allocated on the host.
 // The data needs to be read in the same order as it is allocated on the host.