work in progress

2021-05-09 23:01:24 -07:00
parent 24aa0f8521
commit cb245730a1
5 changed files with 8 additions and 25 deletions
@@ -10,6 +10,8 @@
 *
 */

+// NOTE: This file is a temporary workaround until .shader files can #define macros for their .azsl files
+
 #define QUALITY_LOW_END 1

 #include "StandardPBR_ForwardPass.azsl"
@@ -222,19 +222,6 @@
                    "AssetRef": {
                        "FilePath": "Textures/BRDFTexture.attimage"
                    }
-                },
-                {
-                    "Name": "ScatterDistanceImage",
-                    "SizeSource": {
-                        "Source": {
-                            "Pass": "Parent",
-                            "Attachment": "SwapChainOutput"
-                        }
-                    },
-                    "ImageDescriptor": {
-                        "Format": "R11G11B10_FLOAT",
-                        "SharedQueueMask": "Graphics"
-                    }
                }
            ],
            "Connections": [
@@ -279,13 +266,6 @@
                        "Pass": "This",
                        "Attachment": "BRDFTexture"
                    }
-                },
-                {
-                    "LocalSlot": "ScatterDistanceOutput",
-                    "AttachmentRef": {
-                        "Pass": "This",
-                        "Attachment": "ScatterDistanceImage"
-                    }
                }
            ]
        }
@@ -12,11 +12,6 @@
                    "SlotType": "InputOutput",
                    "ScopeAttachmentUsage": "RenderTarget"
                },
-                {
-                    "Name": "ReflectionInputOutput",
-                    "SlotType": "InputOutput",
-                    "ScopeAttachmentUsage": "RenderTarget"
-                },
                {
                    "Name": "SkyBoxDepth",
                    "SlotType": "InputOutput",
@@ -10,6 +10,8 @@
 *
 */

+// NOTE: This file is a temporary workaround until .shader files can #define macros for their .azsl files
+
 #define SKYBOX_TWO_OUTPUTS

 #include "SkyBox.azsl"
@@ -54,6 +54,7 @@ set(FILES
    Materials/Types/StandardPBR_HandleOpacityMode.lua
    Materials/Types/StandardPBR_LowEndForward.azsl
    Materials/Types/StandardPBR_LowEndForward.shader
+    Materials/Types/StandardPBR_LowEndForward_EDS.shader
    Materials/Types/StandardPBR_ParallaxState.lua
    Materials/Types/StandardPBR_Roughness.lua
    Materials/Types/StandardPBR_ShaderEnable.lua
@@ -194,6 +195,7 @@ set(FILES
    Passes/ShadowParent.pass
    Passes/Skinning.pass
    Passes/SkyBox.pass
+    Passes/SkyBox_TwoOutputs.pass
    Passes/SMAA1xApplyLinearHDRColor.pass
    Passes/SMAA1xApplyPerceptualColor.pass
    Passes/SMAABlendingWeightCalculation.pass
@@ -483,4 +485,6 @@ set(FILES
    Shaders/SkinnedMesh/LinearSkinningPassSRG.azsli
    Shaders/SkyBox/SkyBox.azsl
    Shaders/SkyBox/SkyBox.shader
+    Shaders/SkyBox/SkyBox_TwoOutputs.azsl
+    Shaders/SkyBox/SkyBox_TwoOutputs.shader
 )