2
0
Эх сурвалжийг харах

All compilation flags required for shader (#355)

compilation should be user configurable

Signed-off-by: galibzon <[email protected]>
galibzon 3 жил өмнө
parent
commit
64499f0e2e

+ 1 - 1
Gem/Code/Source/AssetLoadTestComponent.cpp

@@ -58,7 +58,7 @@ namespace AtomSampleViewer
         {
             "materials/defaultpbr.azmaterial",
             "materials/presets/pbr/metal_aluminum_polished.azmaterial",
-            "materials/basic_gray.azmaterial"
+            "materials/basic_grey.azmaterial"
         };
         m_materialBrowser.SetDefaultPinnedAssets(defaultMaterialAllowlist);
 

+ 0 - 4
Materials/DynamicMaterialTest/EmissiveMaterial.shader

@@ -38,9 +38,5 @@
         ] 
     },
 
-    "CompilerHints" : { 
-        "DisableOptimizations" : false
-    },
-
     "DrawList" : "forward"
 }

+ 0 - 4
Materials/Types/MinimalMultilayerPBR_ForwardPass.shader

@@ -23,10 +23,6 @@
         }
     },
 
-    "CompilerHints" : { 
-        "DisableOptimizations" : false
-    },
-
     "ProgramSettings":
     {
       "EntryPoints":

+ 2 - 3
Shaders/RHI/AsyncComputeShadow.shader

@@ -5,9 +5,8 @@
         "Depth" : { "Enable" : true, "CompareFunc" : "LessEqual" }
     },
 
-    "CompilerHints":
-    {
-        "DxcGenerateDebugInfo" : "True" 
+    "AddBuildArguments": {
+        "debug": true
     },
 
     "ProgramSettings":

+ 1 - 1
Shaders/RHI/MatrixAlignmentTest.shader

@@ -26,7 +26,7 @@
     [
       {
         "Name" : "float2",
-        "PlusArguments" : "-DNUM_FLOATS_AFTER_MATRIX=2"
+        "Definitions": ["NUM_FLOATS_AFTER_MATRIX=2"]
       }
     ]
     

+ 2 - 3
Shaders/RHI/RayTracingClosestHitGradient.shader

@@ -2,9 +2,8 @@
     "Source" : "RayTracingClosestHitGradient.azsl",
     "DrawList" : "RayTracing",
 
-    "CompilerHints":
-    {
-        "DxcAdditionalFreeArguments" : "-fspv-target-env=vulkan1.2"
+    "AddBuildArguments": {
+        "dxc": ["-fspv-target-env=vulkan1.2"]
     },
 
     "ProgramSettings":

+ 2 - 3
Shaders/RHI/RayTracingClosestHitSolid.shader

@@ -2,9 +2,8 @@
     "Source" : "RayTracingClosestHitSolid.azsl",
     "DrawList" : "RayTracing",
 
-    "CompilerHints":
-    {
-        "DxcAdditionalFreeArguments" : "-fspv-target-env=vulkan1.2"
+    "AddBuildArguments": {
+        "dxc": ["-fspv-target-env=vulkan1.2"]
     },
 
     "ProgramSettings":

+ 2 - 3
Shaders/RHI/RayTracingDispatch.shader

@@ -2,9 +2,8 @@
     "Source" : "RayTracingDispatch.azsl",
     "DrawList" : "RayTracing",
 
-    "CompilerHints":
-    {
-        "DxcAdditionalFreeArguments" : "-fspv-target-env=vulkan1.2"
+    "AddBuildArguments": {
+        "dxc": ["-fspv-target-env=vulkan1.2"]
     },
 
     "ProgramSettings":

+ 2 - 3
Shaders/RHI/RayTracingMiss.shader

@@ -2,9 +2,8 @@
     "Source" : "RayTracingMiss.azsl",
     "DrawList" : "RayTracing",
 
-    "CompilerHints":
-    {
-        "DxcAdditionalFreeArguments" : "-fspv-target-env=vulkan1.2"
+    "AddBuildArguments": {
+        "dxc": ["-fspv-target-env=vulkan1.2"]
     },
 
     "ProgramSettings":

+ 2 - 3
Shaders/RayTracing/RTAOClosestHit.shader

@@ -2,9 +2,8 @@
     "Source" : "RTAOClosestHit.azsl",
     "DrawList" : "RayTracing",
 
-    "CompilerHints":
-    {
-        "DxcAdditionalFreeArguments" : "-fspv-target-env=vulkan1.2"
+    "AddBuildArguments": {
+        "dxc": ["-fspv-target-env=vulkan1.2"]
     },
 
     "ProgramSettings":

+ 3 - 4
Shaders/RayTracing/RTAOGeneration.shader

@@ -2,10 +2,9 @@
     "Source" : "RTAOGeneration.azsl",
     "DrawList" : "RayTracing",
 
-    "CompilerHints":
-    {
-        "DxcAdditionalFreeArguments" : "-fspv-target-env=vulkan1.2"
-    }, 
+    "AddBuildArguments": {
+        "dxc": ["-fspv-target-env=vulkan1.2"]
+    },
 
     "ProgramSettings":
     {

+ 2 - 3
Shaders/RayTracing/RTAOMiss.shader

@@ -2,9 +2,8 @@
     "Source" : "RTAOMiss.azsl",
     "DrawList" : "RayTracing",
 
-    "CompilerHints":
-    {
-        "DxcAdditionalFreeArguments" : "-fspv-target-env=vulkan1.2"
+    "AddBuildArguments": {
+        "dxc": ["-fspv-target-env=vulkan1.2"]
     },
 
     "ProgramSettings":