Merge pull request #531 from aws-lumberyard-dev/Atom/santorac/ShaderImprovementsForDeferredSupport

Made changes to o3de shader code to better support eventual developme…

Materials/DynamicMaterialTest/EmissiveMaterial.azsl

@@ -15,6 +15,7 @@
 #include <Atom/Features/ColorManagement/TransformColor.azsli>
 #include <Atom/Features/SrgSemantics.azsli>
 #include <Atom/Features/PBR/Lighting/StandardLighting.azsli>
+#include <Atom/Features/PBR/Lights/IblForward.azsli>
 #include <Atom/Features/PBR/Decals.azsli>
 
 ShaderResourceGroup MaterialSrg : SRG_PerMaterial
@@ -125,7 +126,7 @@ ForwardPassOutput MainPS(VSOutput IN)
     ApplyDirectLighting(surface, lightingData, IN.m_position);
 
     // Apply Image Based Lighting (IBL)
-    ApplyIBL(surface, lightingData);
+    ApplyIblForward(surface, lightingData);
 
     // Finalize Lighting
     lightingData.FinalizeLighting();

Materials/Types/MinimalMultilayerPBR_ForwardPass.azsl

@@ -15,6 +15,7 @@
 #include <Atom/Features/SrgSemantics.azsli>
 #include <Atom/Features/ColorManagement/TransformColor.azsli>
 #include <Atom/Features/PBR/Lighting/StandardLighting.azsli>
+#include <Atom/Features/PBR/Lights/IblForward.azsli>
 #include <Atom/Features/PBR/Decals.azsli>
 
 #include <Atom/Feature/Common/Assets/Shaders/Materials/MaterialInputs/BaseColorInput.azsli>
@@ -143,7 +144,7 @@ ForwardPassOutput MinimalMultilayerPBR_MainPassPS(VSOutput IN)
     ApplyDirectLighting(surface, lightingData, IN.m_position);
 
     // Apply Image Based Lighting (IBL)
-    ApplyIBL(surface, lightingData);
+    ApplyIblForward(surface, lightingData);
 
     // Finalize Lighting
     lightingData.FinalizeLighting();

Scripts/MaterialScreenshotTests.bv.lua

@@ -200,7 +200,7 @@ g_testMaterialsFolder = 'materials/minimalpbr/'
 g_testCaseFolder = 'MinimalPBR'
 Print('Saving screenshots to ' .. NormalizePath(g_screenshotOutputFolder .. g_testCaseFolder))
 
-GenerateMaterialScreenshot('Level B', 'MinimalPbr_Default')
+GenerateMaterialScreenshot('Level C', 'MinimalPbr_Default')
 GenerateMaterialScreenshot('Level F', 'MinimalPbr_BlueMetal')
 GenerateMaterialScreenshot('Level D', 'MinimalPbr_RedDielectric')