Fixed warnings about preprocessor flags being redefined.

I moved the preprocessor flag settings into the "pre-material" azsli files, which required having per-lighting-model files instead of "CommonPreMaterial" files. So now for every shader template there is a "_A" and "_B" file that get included before and after the material code.

Signed-off-by: santorac <[email protected]>

Materials/Pipelines/PrototypeDeferredPipeline/MaterialPass_PreMaterial.azsli → Materials/Pipelines/PrototypeDeferredPipeline/DeferredMaterialPass_A.azsli

@@ -8,4 +8,5 @@
  
 #define MATERIALPIPELINE_SHADER_HAS_PIXEL_STAGE 1
 
-#include <Atom/RPI/MaterialPipelineCallbacks.azsli>
+//TODO(DeferredPOC): Support clear coat
+#define ENABLE_CLEAR_COAT 0

Materials/Pipelines/PrototypeDeferredPipeline/DeferredMaterialPass.azsli → Materials/Pipelines/PrototypeDeferredPipeline/DeferredMaterialPass_B.azsli

@@ -6,9 +6,6 @@
  *
  */
  
-//TODO(DeferredPOC): Support clear coat
-#define ENABLE_CLEAR_COAT 0
-
 #include <viewsrg.srgi>
 #include <Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli>
 #include <Atom/Features/PBR/DefaultObjectSrg.azsli>

Materials/Pipelines/PrototypeDeferredPipeline/DeferredPipeline.materialpipeline

@@ -2,18 +2,18 @@
     "shaderTemplates": [
         {
             "shader": "./DeferredMaterialPass.shader.template",
-            "preMaterialAzsli": "./MaterialPass_PreMaterial.azsli",
-            "postMaterialAzsli": "Materials/Pipelines/PrototypeDeferredPipeline/DeferredMaterialPass.azsli"
+            "preMaterialAzsli": "./DeferredMaterialPass_A.azsli",
+            "postMaterialAzsli": "./DeferredMaterialPass_B.azsli"
         },
         {
             "shader": "Materials/Pipelines/Common/DepthPass.shader.template",
-            "preMaterialAzsli": "Materials/Pipelines/Common/DepthAndShadow_PreMaterial.azsli",
-            "postMaterialAzsli": "Materials/Pipelines/Common/DepthPass.azsli"
+            "preMaterialAzsli": "Materials/Pipelines/Common/DepthPass_A.azsli",
+            "postMaterialAzsli": "Materials/Pipelines/Common/DepthPass_B.azsli"
         },
         {
             "shader": "Materials/Pipelines/Common/ShadowmapPass.shader.template",
-            "preMaterialAzsli": "Materials/Pipelines/Common/DepthAndShadow_PreMaterial.azsli",
-            "postMaterialAzsli": "Materials/Pipelines/Common/ShadowmapPass.azsli"
+            "preMaterialAzsli": "Materials/Pipelines/Common/DepthPass_A.azsli",
+            "postMaterialAzsli": "Materials/Pipelines/Common/DepthPass_B.azsli"
         }
     ]
 }