[ATOM-15472] Shader Build Pipeline: Remove Deprecated Files And Funct… (#1079)
* [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>
This commit is contained in:
@@ -16,17 +16,19 @@
|
||||
#include <AzCore/Serialization/SerializeContext.h>
|
||||
#include <AzCore/std/algorithm.h>
|
||||
|
||||
#include <Atom/RPI.Reflect/Shader/ShaderCommonTypes.h>
|
||||
#include <Atom/RHI.Reflect/ShaderStageFunction.h>
|
||||
#include <Atom/RHI.Reflect/Limits.h>
|
||||
|
||||
namespace AZ
|
||||
{
|
||||
namespace RPI
|
||||
{
|
||||
uint32_t ShaderVariantAsset::MakeAssetProductSubId(
|
||||
uint32_t rhiApiUniqueIndex, ShaderVariantStableId variantStableId, uint32_t subProductType)
|
||||
uint32_t rhiApiUniqueIndex, uint32_t supervariantIndex, ShaderVariantStableId variantStableId, uint32_t subProductType)
|
||||
{
|
||||
static constexpr uint32_t SubProductTypeBitPosition = 17;
|
||||
static constexpr uint32_t SubProductTypeNumBits = RhiIndexBitPosition - SubProductTypeBitPosition;
|
||||
static constexpr uint32_t SubProductTypeNumBits = SupervariantIndexBitPosition - SubProductTypeBitPosition;
|
||||
static constexpr uint32_t SubProductTypeMaxValue = (1 << SubProductTypeNumBits) - 1;
|
||||
|
||||
static constexpr uint32_t StableIdBitPosition = 0;
|
||||
@@ -37,11 +39,12 @@ namespace AZ
|
||||
|
||||
// The 2 Most significant bits encode the the RHI::API unique index.
|
||||
AZ_Assert(rhiApiUniqueIndex <= RhiIndexMaxValue, "Invalid rhiApiUniqueIndex [%u]", rhiApiUniqueIndex);
|
||||
AZ_Assert(supervariantIndex <= SupervariantIndexMaxValue, "Invalid supervariantIndex [%u]", supervariantIndex);
|
||||
AZ_Assert(subProductType <= SubProductTypeMaxValue, "Invalid subProductType [%u]", subProductType);
|
||||
AZ_Assert(variantStableId.GetIndex() <= StableIdMaxValue, "Invalid variantStableId [%u]", variantStableId.GetIndex());
|
||||
|
||||
const uint32_t assetProductSubId = (rhiApiUniqueIndex << RhiIndexBitPosition) |
|
||||
(subProductType << SubProductTypeBitPosition) |
|
||||
(supervariantIndex << SupervariantIndexBitPosition) | (subProductType << SubProductTypeBitPosition) |
|
||||
(variantStableId.GetIndex() << StableIdBitPosition);
|
||||
return assetProductSubId;
|
||||
}
|
||||
@@ -51,22 +54,19 @@ namespace AZ
|
||||
if (auto* serializeContext = azrtti_cast<SerializeContext*>(context))
|
||||
{
|
||||
serializeContext->Class<ShaderVariantAsset, AZ::Data::AssetData>()
|
||||
->Version(3)
|
||||
->Version(1)
|
||||
->Field("StableId", &ShaderVariantAsset::m_stableId)
|
||||
->Field("ShaderVariantId", &ShaderVariantAsset::m_shaderVariantId)
|
||||
->Field("IsFullyBaked", &ShaderVariantAsset::m_isFullyBaked)
|
||||
->Field("InputContract", &ShaderVariantAsset::m_inputContract)
|
||||
->Field("OutputContract", &ShaderVariantAsset::m_outputContract)
|
||||
->Field("RenderStates", &ShaderVariantAsset::m_renderStates)
|
||||
->Field("FunctionsByStage", &ShaderVariantAsset::m_functionsByStage)
|
||||
->Field("shaderAssetBuildTimestamp", &ShaderVariantAsset::m_shaderAssetBuildTimestamp)
|
||||
->Field("BuildTimestamp", &ShaderVariantAsset::m_buildTimestamp)
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
AZStd::sys_time_t ShaderVariantAsset::GetShaderAssetBuildTimestamp() const
|
||||
AZStd::sys_time_t ShaderVariantAsset::GetBuildTimestamp() const
|
||||
{
|
||||
return m_shaderAssetBuildTimestamp;
|
||||
return m_buildTimestamp;
|
||||
}
|
||||
|
||||
const RHI::ShaderStageFunction* ShaderVariantAsset::GetShaderStageFunction(RHI::ShaderStage shaderStage) const
|
||||
@@ -74,21 +74,6 @@ namespace AZ
|
||||
return m_functionsByStage[static_cast<size_t>(shaderStage)].get();
|
||||
}
|
||||
|
||||
const ShaderInputContract& ShaderVariantAsset::GetInputContract() const
|
||||
{
|
||||
return m_inputContract;
|
||||
}
|
||||
|
||||
const ShaderOutputContract& ShaderVariantAsset::GetOutputContract() const
|
||||
{
|
||||
return m_outputContract;
|
||||
}
|
||||
|
||||
const RHI::RenderStates& ShaderVariantAsset::GetRenderStates() const
|
||||
{
|
||||
return m_renderStates;
|
||||
}
|
||||
|
||||
bool ShaderVariantAsset::IsFullyBaked() const
|
||||
{
|
||||
return m_isFullyBaked;
|
||||
|
||||
Reference in New Issue
Block a user