birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5196 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16056

Browse Source 
ReflectionProbe cubemap visual quality improvements
monroegm-disable-blank-issue-2
dmcdiarmid-ly 4 years ago committed by GitHub
parent 22b21acc97 b744734719
commit 1d106c0c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 339 additions and 9 deletions
Show Stats Download Patch File Download Diff File

16
Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapForwardMSAA.pass
Unescape Escape View File

@ -91,10 +91,10 @@
"LoadStoreAction": { "LoadStoreAction": {
"ClearValue": { "ClearValue": {
"Value": [ "Value": [
0.4000000059604645, 0.0,
0.4000000059604645, 0.0,
0.4000000059604645, 0.0,
{} 0.0
] ]
}, },
"LoadAction": "Clear" "LoadAction": "Clear"
@ -107,10 +107,10 @@
"LoadStoreAction": { "LoadStoreAction": {
"ClearValue": { "ClearValue": {
"Value": [ "Value": [
0.4000000059604645, 0.0,
0.4000000059604645, 0.0,
0.4000000059604645, 0.0,
{} 0.0
] ]
}, },
"LoadAction": "Clear" "LoadAction": "Clear"

158
Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapForwardSubsurfaceMSAA.pass
Unescape Escape View File

@ -0,0 +1,158 @@
{
"Type": "JsonSerialization",
"Version": 1,
"ClassName": "PassAsset",
"ClassData": {
"PassTemplate": {
"Name": "EnvironmentCubeMapForwardSubsurfaceMSAAPassTemplate",
"PassClass": "RasterPass",
"Slots": [
// Inputs...
{
"Name": "BRDFTextureInput",
"ShaderInputName": "m_brdfMap",
"SlotType": "Input",
"ScopeAttachmentUsage": "Shader"
},
{
"Name": "DirectionalLightShadowmap",
"ShaderInputName": "m_directionalLightShadowmap",
"SlotType": "Input",
"ScopeAttachmentUsage": "Shader",
"ImageViewDesc": {
"IsArray": 1
}
},
{
"Name": "ExponentialShadowmapDirectional",
"ShaderInputName": "m_directionalLightExponentialShadowmap",
"SlotType": "Input",
"ScopeAttachmentUsage": "Shader",
"ImageViewDesc": {
"IsArray": 1
}
},
{
"Name": "ProjectedShadowmap",
"ShaderInputName": "m_projectedShadowmaps",
"SlotType": "Input",
"ScopeAttachmentUsage": "Shader",
"ImageViewDesc": {
"IsArray": 1
}
},
{
"Name": "ExponentialShadowmapProjected",
"ShaderInputName": "m_projectedExponentialShadowmap",
"SlotType": "Input",
"ScopeAttachmentUsage": "Shader",
"ImageViewDesc": {
"IsArray": 1
}
},
{
"Name": "TileLightData",
"SlotType": "Input",
"ShaderInputName": "m_tileLightData",
"ScopeAttachmentUsage": "Shader"
},
{
"Name": "LightListRemapped",
"SlotType": "Input",
"ShaderInputName": "m_lightListRemapped",
"ScopeAttachmentUsage": "Shader"
},
// Input/Outputs...
{
"Name": "DepthStencilInputOutput",
"SlotType": "InputOutput",
"ScopeAttachmentUsage": "DepthStencil"
},
{
"Name": "DiffuseOutput",
"SlotType": "InputOutput",
"ScopeAttachmentUsage": "RenderTarget"
},
{
"Name": "SpecularOutput",
"SlotType": "InputOutput",
"ScopeAttachmentUsage": "RenderTarget"
},
{
"Name": "AlbedoOutput",
"SlotType": "InputOutput",
"ScopeAttachmentUsage": "RenderTarget"
},
{
"Name": "SpecularF0Output",
"SlotType": "InputOutput",
"ScopeAttachmentUsage": "RenderTarget"
},
{
"Name": "NormalOutput",
"SlotType": "InputOutput",
"ScopeAttachmentUsage": "RenderTarget"
},
// Outputs...
{
"Name": "ScatterDistanceOutput",
"SlotType": "Output",
"ScopeAttachmentUsage": "RenderTarget",
"LoadStoreAction": {
"ClearValue": {
"Value": [
0.0,
0.0,
0.0,
0.0
]
},
"LoadAction": "Clear"
}
}
],
"ImageAttachments": [
{
"Name": "BRDFTexture",
"Lifetime": "Imported",
"AssetRef": {
"FilePath": "Textures/BRDFTexture.attimage"
}
},
{
"Name": "ScatterDistanceImage",
"SizeSource": {
"Source": {
"Pass": "Parent",
"Attachment": "Output"
}
},
"MultisampleSource": {
"Pass": "This",
"Attachment": "DepthStencilInputOutput"
},
"ImageDescriptor": {
"Format": "R11G11B10_FLOAT",
"SharedQueueMask": "Graphics"
}
}
],
"Connections": [
{
"LocalSlot": "BRDFTextureInput",
"AttachmentRef": {
"Pass": "This",
"Attachment": "BRDFTexture"
}
},
{
"LocalSlot": "ScatterDistanceOutput",
"AttachmentRef": {
"Pass": "This",
"Attachment": "ScatterDistanceImage"
}
}
]
}
}
}

170
Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapPipeline.pass
Unescape Escape View File

@ -211,6 +211,105 @@
} }
} }
}, },
{
"Name": "ForwardSubsurfaceMSAAPass",
"TemplateName": "EnvironmentCubeMapForwardSubsurfaceMSAAPassTemplate",
"Connections": [
{
"LocalSlot": "DirectionalLightShadowmap",
"AttachmentRef": {
"Pass": "CascadedShadowmapsPass",
"Attachment": "Shadowmap"
}
},
{
"LocalSlot": "ExponentialShadowmapDirectional",
"AttachmentRef": {
"Pass": "EsmShadowmapsPassDirectional",
"Attachment": "EsmShadowmaps"
}
},
{
"LocalSlot": "ProjectedShadowmap",
"AttachmentRef": {
"Pass": "ProjectedShadowmapsPass",
"Attachment": "Shadowmap"
}
},
{
"LocalSlot": "ExponentialShadowmapProjected",
"AttachmentRef": {
"Pass": "EsmShadowmapsPassProjected",
"Attachment": "EsmShadowmaps"
}
},
{
"LocalSlot": "TileLightData",
"AttachmentRef": {
"Pass": "LightCullingPass",
"Attachment": "TileLightData"
}
},
{
"LocalSlot": "LightListRemapped",
"AttachmentRef": {
"Pass": "LightCullingPass",
"Attachment": "LightListRemapped"
}
},
// Input/Outputs...
{
"LocalSlot": "DepthStencilInputOutput",
"AttachmentRef": {
"Pass": "DepthPrePass",
"Attachment": "DepthMSAA"
}
},
{
"LocalSlot": "DiffuseOutput",
"AttachmentRef": {
"Pass": "ForwardMSAAPass",
"Attachment": "DiffuseOutput"
}
},
{
"LocalSlot": "SpecularOutput",
"AttachmentRef": {
"Pass": "ForwardMSAAPass",
"Attachment": "SpecularOutput"
}
},
{
"LocalSlot": "AlbedoOutput",
"AttachmentRef": {
"Pass": "ForwardMSAAPass",
"Attachment": "AlbedoOutput"
}
},
{
"LocalSlot": "SpecularF0Output",
"AttachmentRef": {
"Pass": "ForwardMSAAPass",
"Attachment": "SpecularF0Output"
}
},
{
"LocalSlot": "NormalOutput",
"AttachmentRef": {
"Pass": "ForwardMSAAPass",
"Attachment": "NormalOutput"
}
}
],
"PassData": {
"$type": "RasterPassData",
"DrawListTag": "forwardWithSubsurfaceOutput",
"PipelineViewTag": "MainCamera",
"PassSrgShaderAsset": {
"FilePath": "Shaders/ForwardPassSrg.shader"
}
}
},
{ {
"Name": "SkyBoxPass", "Name": "SkyBoxPass",
"TemplateName": "EnvironmentCubeMapSkyBoxPassTemplate", "TemplateName": "EnvironmentCubeMapSkyBoxPassTemplate",
@ -325,6 +424,75 @@
} }
] ]
}, },
{
"Name": "MSAAResolveScatterDistancePass",
"TemplateName": "MSAAResolveColorTemplate",
"Connections": [
{
"LocalSlot": "Input",
"AttachmentRef": {
"Pass": "ForwardSubsurfaceMSAAPass",
"Attachment": "ScatterDistanceOutput"
}
}
]
},
{
"Name": "SubsurfaceScatteringPass",
"TemplateName": "SubsurfaceScatteringPassTemplate",
"Enabled": true,
"Connections": [
{
"LocalSlot": "InputDiffuse",
"AttachmentRef": {
"Pass": "MSAAResolveDiffusePass",
"Attachment": "Output"
}
},
{
"LocalSlot": "InputLinearDepth",
"AttachmentRef": {
"Pass": "DepthPrePass",
"Attachment": "DepthLinear"
}
},
{
"LocalSlot": "InputScatterDistance",
"AttachmentRef": {
"Pass": "MSAAResolveScatterDistancePass",
"Attachment": "Output"
}
}
],
"PassData": {
"$type": "ComputePassData",
"ShaderAsset": {
"FilePath": "Shaders/PostProcessing/ScreenSpaceSubsurfaceScatteringCS.shader"
},
"Make Fullscreen Pass": true,
"PipelineViewTag": "MainCamera"
}
},
{
"Name": "Ssao",
"TemplateName": "SsaoParentTemplate",
"Connections": [
{
"LocalSlot": "LinearDepth",
"AttachmentRef": {
"Pass": "DepthPrePass",
"Attachment": "DepthLinear"
}
},
{
"LocalSlot": "Modulate",
"AttachmentRef": {
"Pass": "SubsurfaceScatteringPass",
"Attachment": "Output"
}
}
]
},
{ {
"Name": "DiffuseSpecularMergePass", "Name": "DiffuseSpecularMergePass",
"TemplateName": "DiffuseSpecularMergeTemplate", "TemplateName": "DiffuseSpecularMergeTemplate",
@ -332,7 +500,7 @@
{ {
"LocalSlot": "InputDiffuse", "LocalSlot": "InputDiffuse",
"AttachmentRef": { "AttachmentRef": {
"Pass": "MSAAResolveDiffusePass", "Pass": "Ssao",
"Attachment": "Output" "Attachment": "Output"
} }
}, },

4
Gems/Atom/Feature/Common/Assets/Passes/PassTemplates.azasset
Unescape Escape View File

@ -252,6 +252,10 @@
"Name": "EnvironmentCubeMapForwardMSAAPassTemplate", "Name": "EnvironmentCubeMapForwardMSAAPassTemplate",
"Path": "Passes/EnvironmentCubeMapForwardMSAA.pass" "Path": "Passes/EnvironmentCubeMapForwardMSAA.pass"
}, },
{
"Name": "EnvironmentCubeMapForwardSubsurfaceMSAAPassTemplate",
"Path": "Passes/EnvironmentCubeMapForwardSubsurfaceMSAA.pass"
},
{ {
"Name": "EnvironmentCubeMapDepthMSAAPassTemplate", "Name": "EnvironmentCubeMapDepthMSAAPassTemplate",
"Path": "Passes/EnvironmentCubeMapDepthMSAA.pass" "Path": "Passes/EnvironmentCubeMapDepthMSAA.pass"

Write Preview
Loading…
Cancel
Save