galibzon
cc615a8f32
* [ATOM-15472] Shader Build Pipeline: Remove Deprecated Files And Functions That Predate The Shader Supervariants These are the essential impactful changes as a result of deprecating the ShaderResourceGroupAsset. * Addressed feedback by @moudgils. Better comments in header files. * More updates related with deprecation of ShaderResourceGroupAsset * Deleted the temporary version 2 classes. * Updated version of the shader asset builders. * Updated version of all the shader related classes impacted by the Supervariant concept and deprecation of ShaderResourceGroupAsset * Changes to *.pass and DGI, Reflections and RayTracing. * changes to material related assets * changes to core lights * Changes to auxgeom/dynamic draw. * changes to decals, lyshine, imguipass * changes to RPI Pass classes * Shader for SceneSrg, ViewSrg and ForwardPass Srgs. * changes to mesh, skinned mesh, Morphtarget. * Fixes to RayTracingPass.cpp & now allow empty srg in shaders. * Updated Atom_RPI.Tests * Simplified InstanceDatabase by removing AddHandler ------------------------------------------------------------------------------------ * Updated DiffuseGI precompiled shaders. Added RayTracingSceneSrg and RayTracingMaterialSrg shader asset. Updated ShaderAssetCreator::Clone to handle the supervariant when processing root variants. Co-authored-by: Doug McDiarmid <dmcdiar@amazon.com> ------------------------------------------------------------------------------------ * Changed semantics for some PassSrg to SRG_PerPass_WithFallback. AuxGeom/FixedShapeProcessor.cpp requires SRG_PerDraw on ObjectSrg. Removed names of SceneSrg and ViewSrg from RPISystemDescriptor.cpp * Moved ShaderLib/Atom/Features/DummyEntryFunctions.azsli To Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/DummyEntryFunctions.azsli Removed redundant checking for finalization in ShaderResourceGroupLayout.cpp * Fixed race condition bug for Shader::FindOrCreate. InstanceDatabase<>::CreateInstance() needs to be atomic for instance creation and initialization. Added optional InstanceHandler::CreateFunctionWithParams to accomodate to the needs of Instances that need more than an asset reference to be able to be created an initialzed. Removed ShaderResourceGroup::FindOrCreate() only ::Create is available now. * Renamed scene_and_view_srgs.* as SceneAndViewSrgs.* Changed GetAzslFileOfOrigin for GetUniqueId * Fixed unit tests. * Reverted the serialization name of m_uniqueId back to "m_azslFileOfOrigin" so precompiled shaders don't fail in layout comparison. * Fixed AtomCore.Tests Removed non-applicable test. InstanceDatabase.AddHandler() is not available anymore. * The Null rhi is re-enabled for shader compilation. Signed-off-by: garrieta <garrieta@amazon.com>
135 lines
4.9 KiB
Plaintext
135 lines
4.9 KiB
Plaintext
{
|
|
"Type": "JsonSerialization",
|
|
"Version": 1,
|
|
"ClassName": "PassAsset",
|
|
"ClassData": {
|
|
"PassTemplate": {
|
|
"Name": "TransparentParentTemplate",
|
|
"PassClass": "ParentPass",
|
|
"Slots": [
|
|
// Inputs...
|
|
{
|
|
"Name": "DirectionalShadowmap",
|
|
"SlotType": "Input"
|
|
},
|
|
{
|
|
"Name": "DirectionalESM",
|
|
"SlotType": "Input"
|
|
},
|
|
{
|
|
"Name": "ProjectedShadowmap",
|
|
"SlotType": "Input"
|
|
},
|
|
{
|
|
"Name": "ProjectedESM",
|
|
"SlotType": "Input"
|
|
},
|
|
{
|
|
"Name": "TileLightData",
|
|
"SlotType": "Input"
|
|
},
|
|
{
|
|
"Name": "LightListRemapped",
|
|
"SlotType": "Input"
|
|
},
|
|
{
|
|
"Name": "InputLinearDepth",
|
|
"SlotType": "Input"
|
|
},
|
|
// Input/Outputs...
|
|
{
|
|
"Name": "DepthStencil",
|
|
"SlotType": "InputOutput"
|
|
},
|
|
{
|
|
"Name": "InputOutput",
|
|
"SlotType": "InputOutput"
|
|
}
|
|
],
|
|
"PassRequests": [
|
|
{
|
|
"Name": "TransparentPass",
|
|
"TemplateName": "TransparentPassTemplate",
|
|
"Enabled": true,
|
|
"Connections": [
|
|
// Inputs...
|
|
{
|
|
"LocalSlot": "DirectionalLightShadowmap",
|
|
"AttachmentRef": {
|
|
"Pass": "Parent",
|
|
"Attachment": "DirectionalShadowmap"
|
|
}
|
|
},
|
|
{
|
|
"LocalSlot": "ExponentialShadowmapDirectional",
|
|
"AttachmentRef": {
|
|
"Pass": "Parent",
|
|
"Attachment": "DirectionalESM"
|
|
}
|
|
},
|
|
{
|
|
"LocalSlot": "ProjectedShadowmap",
|
|
"AttachmentRef": {
|
|
"Pass": "Parent",
|
|
"Attachment": "ProjectedShadowmap"
|
|
}
|
|
},
|
|
{
|
|
"LocalSlot": "ExponentialShadowmapProjected",
|
|
"AttachmentRef": {
|
|
"Pass": "Parent",
|
|
"Attachment": "ProjectedESM"
|
|
}
|
|
},
|
|
{
|
|
"LocalSlot": "TileLightData",
|
|
"AttachmentRef": {
|
|
"Pass": "Parent",
|
|
"Attachment": "TileLightData"
|
|
}
|
|
},
|
|
{
|
|
"LocalSlot": "LightListRemapped",
|
|
"AttachmentRef": {
|
|
"Pass": "Parent",
|
|
"Attachment": "LightListRemapped"
|
|
}
|
|
},
|
|
{
|
|
"LocalSlot": "InputLinearDepth",
|
|
"AttachmentRef": {
|
|
"Pass": "Parent",
|
|
"Attachment": "InputLinearDepth"
|
|
}
|
|
},
|
|
// Input/Outputs...
|
|
{
|
|
"LocalSlot": "DepthStencil",
|
|
"AttachmentRef": {
|
|
"Pass": "Parent",
|
|
"Attachment": "DepthStencil"
|
|
}
|
|
},
|
|
{
|
|
"LocalSlot": "InputOutput",
|
|
"AttachmentRef": {
|
|
"Pass": "Parent",
|
|
"Attachment": "InputOutput"
|
|
}
|
|
}
|
|
],
|
|
"PassData": {
|
|
"$type": "RasterPassData",
|
|
"DrawListTag": "transparent",
|
|
"DrawListSortType": "KeyThenReverseDepth",
|
|
"PipelineViewTag": "MainCamera",
|
|
"PassSrgShaderAsset": {
|
|
"FilePath": "Shaders/ForwardPassSrg.shader"
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|