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>
179 lines
9.9 KiB
C++
179 lines
9.9 KiB
C++
/*
|
|
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
|
* its licensors.
|
|
*
|
|
* For complete copyright and license terms please see the LICENSE at the root of this
|
|
* distribution (the "License"). All use of this software is governed by the License,
|
|
* or, if provided, by the license below or the license accompanying this file. Do not
|
|
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
*
|
|
*/
|
|
|
|
#include <AzslShaderBuilderSystemComponent.h>
|
|
|
|
#include <AssetBuilderSDK/AssetBuilderSDK.h>
|
|
#include <AssetBuilderSDK/AssetBuilderBusses.h>
|
|
|
|
#include <Atom/RHI.Edit/ShaderPlatformInterface.h>
|
|
#include <Atom/RHI.Edit/Utils.h>
|
|
|
|
#include <Atom/RPI.Reflect/Asset/AssetHandler.h>
|
|
#include <Atom/RPI.Reflect/Shader/ShaderAsset.h>
|
|
#include <Atom/RPI.Edit/Shader/ShaderSourceData.h>
|
|
#include <Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h>
|
|
|
|
#include <AzToolsFramework/ToolsComponents/ToolsAssetCatalogBus.h>
|
|
|
|
#include <AzCore/Serialization/EditContext.h>
|
|
#include <AzCore/Serialization/SerializeContext.h>
|
|
|
|
#include <CommonFiles/Preprocessor.h>
|
|
#include <CommonFiles/GlobalBuildOptions.h>
|
|
#include <Editor/AtomShaderCapabilitiesConfigFile.h>
|
|
|
|
namespace AZ
|
|
{
|
|
namespace ShaderBuilder
|
|
{
|
|
void AzslShaderBuilderSystemComponent::Reflect(ReflectContext* context)
|
|
{
|
|
if (SerializeContext* serialize = azrtti_cast<SerializeContext*>(context))
|
|
{
|
|
serialize->Class<AzslShaderBuilderSystemComponent, Component>()
|
|
->Version(0)
|
|
->Attribute(Edit::Attributes::SystemComponentTags, AZStd::vector<Crc32>({ AssetBuilderSDK::ComponentTags::AssetBuilder }))
|
|
;
|
|
}
|
|
|
|
PreprocessorOptions::Reflect(context);
|
|
RHI::ShaderCompilerProfiling::Reflect(context);
|
|
AtomShaderConfig::CapabilitiesConfigFile::Reflect(context);
|
|
GlobalBuildOptions::Reflect(context);
|
|
RHI::ShaderCompilerArguments::Reflect(context);
|
|
}
|
|
|
|
void AzslShaderBuilderSystemComponent::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
|
|
{
|
|
provided.push_back(AZ_CRC("AzslShaderBuilderService", 0x09315a40));
|
|
}
|
|
|
|
void AzslShaderBuilderSystemComponent::GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible)
|
|
{
|
|
incompatible.push_back(AZ_CRC("AzslShaderBuilderService", 0x09315a40));
|
|
}
|
|
|
|
void AzslShaderBuilderSystemComponent::GetRequiredServices(ComponentDescriptor::DependencyArrayType& required)
|
|
{
|
|
(void)required;
|
|
}
|
|
|
|
void AzslShaderBuilderSystemComponent::GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent)
|
|
{
|
|
dependent.push_back(AZ_CRC("AssetCatalogService", 0xc68ffc57));
|
|
}
|
|
|
|
void AzslShaderBuilderSystemComponent::Init()
|
|
{
|
|
}
|
|
|
|
void AzslShaderBuilderSystemComponent::Activate()
|
|
{
|
|
RHI::ShaderPlatformInterfaceRegisterBus::Handler::BusConnect();
|
|
ShaderPlatformInterfaceRequestBus::Handler::BusConnect();
|
|
|
|
// Register Shader Asset Builder
|
|
AssetBuilderSDK::AssetBuilderDesc shaderAssetBuilderDescriptor;
|
|
shaderAssetBuilderDescriptor.m_name = "Shader Asset Builder";
|
|
shaderAssetBuilderDescriptor.m_version = 101; // ATOM-15472
|
|
// .shader file changes trigger rebuilds
|
|
shaderAssetBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern( AZStd::string::format("*.%s", RPI::ShaderSourceData::Extension), AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
|
|
shaderAssetBuilderDescriptor.m_busId = azrtti_typeid<ShaderAssetBuilder>();
|
|
shaderAssetBuilderDescriptor.m_createJobFunction = AZStd::bind(&ShaderAssetBuilder::CreateJobs, &m_shaderAssetBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
|
|
shaderAssetBuilderDescriptor.m_processJobFunction = AZStd::bind(&ShaderAssetBuilder::ProcessJob, &m_shaderAssetBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
|
|
|
|
m_shaderAssetBuilder.BusConnect(shaderAssetBuilderDescriptor.m_busId);
|
|
AssetBuilderSDK::AssetBuilderBus::Broadcast(&AssetBuilderSDK::AssetBuilderBus::Handler::RegisterBuilderInformation, shaderAssetBuilderDescriptor);
|
|
|
|
// Register Shader Variant Asset Builder
|
|
AssetBuilderSDK::AssetBuilderDesc shaderVariantAssetBuilderDescriptor;
|
|
shaderVariantAssetBuilderDescriptor.m_name = "Shader Variant Asset Builder";
|
|
// Both "Shader Variant Asset Builder" and "Shader Asset Builder" produce ShaderVariantAsset products. If you update
|
|
// ShaderVariantAsset you will need to update BOTH version numbers, not just "Shader Variant Asset Builder".
|
|
shaderVariantAssetBuilderDescriptor.m_version = 22; // ATOM-15472
|
|
shaderVariantAssetBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern(AZStd::string::format("*.%s", RPI::ShaderVariantListSourceData::Extension), AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
|
|
shaderVariantAssetBuilderDescriptor.m_busId = azrtti_typeid<ShaderVariantAssetBuilder>();
|
|
shaderVariantAssetBuilderDescriptor.m_createJobFunction = AZStd::bind(&ShaderVariantAssetBuilder::CreateJobs, &m_shaderVariantAssetBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
|
|
shaderVariantAssetBuilderDescriptor.m_processJobFunction = AZStd::bind(&ShaderVariantAssetBuilder::ProcessJob, &m_shaderVariantAssetBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
|
|
|
|
m_shaderVariantAssetBuilder.BusConnect(shaderVariantAssetBuilderDescriptor.m_busId);
|
|
AssetBuilderSDK::AssetBuilderBus::Broadcast(&AssetBuilderSDK::AssetBuilderBus::Handler::RegisterBuilderInformation, shaderVariantAssetBuilderDescriptor);
|
|
|
|
// Register Precompiled Shader Builder
|
|
AssetBuilderSDK::AssetBuilderDesc precompiledShaderBuilderDescriptor;
|
|
precompiledShaderBuilderDescriptor.m_name = "Precompiled Shader Builder";
|
|
precompiledShaderBuilderDescriptor.m_version = 9; // ATOM-15472
|
|
precompiledShaderBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern(AZStd::string::format("*.%s", AZ::PrecompiledShaderBuilder::Extension), AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
|
|
precompiledShaderBuilderDescriptor.m_busId = azrtti_typeid<PrecompiledShaderBuilder>();
|
|
precompiledShaderBuilderDescriptor.m_createJobFunction = AZStd::bind(&PrecompiledShaderBuilder::CreateJobs, &m_precompiledShaderBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
|
|
precompiledShaderBuilderDescriptor.m_processJobFunction = AZStd::bind(&PrecompiledShaderBuilder::ProcessJob, &m_precompiledShaderBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2);
|
|
|
|
m_precompiledShaderBuilder.BusConnect(precompiledShaderBuilderDescriptor.m_busId);
|
|
AssetBuilderSDK::AssetBuilderBus::Broadcast(&AssetBuilderSDK::AssetBuilderBus::Handler::RegisterBuilderInformation, precompiledShaderBuilderDescriptor);
|
|
}
|
|
|
|
void AzslShaderBuilderSystemComponent::Deactivate()
|
|
{
|
|
m_shaderAssetBuilder.BusDisconnect();
|
|
m_shaderVariantAssetBuilder.BusDisconnect();
|
|
m_precompiledShaderBuilder.BusDisconnect();
|
|
|
|
RHI::ShaderPlatformInterfaceRegisterBus::Handler::BusDisconnect();
|
|
ShaderPlatformInterfaceRequestBus::Handler::BusDisconnect();
|
|
}
|
|
|
|
void AzslShaderBuilderSystemComponent::RegisterShaderPlatformHandler(RHI::ShaderPlatformInterface* shaderPlatformInterface)
|
|
{
|
|
m_shaderPlatformInterfaces[shaderPlatformInterface->GetAPIType()] = shaderPlatformInterface;
|
|
}
|
|
|
|
void AzslShaderBuilderSystemComponent::UnregisterShaderPlatformHandler(RHI::ShaderPlatformInterface* shaderPlatformInterface)
|
|
{
|
|
m_shaderPlatformInterfaces.erase(shaderPlatformInterface->GetAPIType());
|
|
}
|
|
|
|
AZStd::vector<RHI::ShaderPlatformInterface*> AzslShaderBuilderSystemComponent::GetShaderPlatformInterface(const AssetBuilderSDK::PlatformInfo& platformInfo)
|
|
{
|
|
//Used to validate that each ShaderPlatformInterface returns a unique index.
|
|
AZStd::unordered_map<uint32_t, Name> apiUniqueIndexToName;
|
|
|
|
|
|
AZStd::vector<RHI::ShaderPlatformInterface*> results;
|
|
results.reserve(platformInfo.m_tags.size());
|
|
for (const AZStd::string& tag : platformInfo.m_tags)
|
|
{
|
|
// Use the platform tags to find the proper ShaderPlatformInterface
|
|
auto findIt = m_shaderPlatformInterfaces.find(RHI::APIType(tag.c_str()));
|
|
if (findIt != m_shaderPlatformInterfaces.end())
|
|
{
|
|
RHI::ShaderPlatformInterface* rhiApi = findIt->second;
|
|
const uint32_t uniqueIndex = rhiApi->GetAPIUniqueIndex();
|
|
auto uniqueIt = apiUniqueIndexToName.find(uniqueIndex);
|
|
if (uniqueIt != apiUniqueIndexToName.end())
|
|
{
|
|
AZ_Assert(false, "The ShaderPlatformInterface with name [%s] is providing a unique api index [%u] which was already provided by the ShaderPlatformInterface [%s]",
|
|
rhiApi->GetAPIName().GetCStr(), uniqueIndex, uniqueIt->second.GetCStr());
|
|
continue;
|
|
}
|
|
AZ_Assert(uniqueIndex <= RHI::Limits::APIType::PerPlatformApiUniqueIndexMax, "The api index [%u] from ShaderPlatformInterface [%s] is invalid", uniqueIndex, rhiApi->GetAPIName().GetCStr());
|
|
apiUniqueIndexToName[uniqueIndex] = rhiApi->GetAPIName();
|
|
|
|
results.push_back(rhiApi);
|
|
}
|
|
}
|
|
return results;
|
|
}
|
|
|
|
} // namespace ShaderBuilder
|
|
} // namespace AZ
|