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

Merge pull request #3035 from aws-lumberyard-dev/Atom/antonmic/PassBuilder

Browse Source 
Changing pass builder to declare job dependencies on referenced .shader files and consequently removing the critical flag from the shader builder.
This commit is contained in:
antonmic
2021-08-13 11:50:51 -07:00
committed by GitHub
parent 9571a15769 706333466e
commit 7d4022fbdf
22 changed files with 213 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder.cpp
+1 -2
View File
@@ -139,8 +139,7 @@ namespace AZ
AssetBuilderSDK::JobDescriptor jobDescriptor;
jobDescriptor.m_priority = 2;
// [GFX TODO][ATOM-2830] Set 'm_critical' back to 'false' once proper fix for Atom startup issues are in
jobDescriptor.m_critical = true;
jobDescriptor.m_critical = false;
jobDescriptor.m_jobKey = ShaderAssetBuilderJobKey;
jobDescriptor.SetPlatformIdentifier(platformInfo.m_identifier.c_str());
jobDescriptor.m_jobParameters.emplace(ShaderAssetBuildTimestampParam, AZStd::to_string(shaderAssetBuildTimestamp));
Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp
+1 -1
View File
@@ -322,7 +322,7 @@ namespace AZ
{
const char* auxGeomWorldShaderFilePath = "Shaders/auxgeom/auxgeomworld.azshader";
m_shader = RPI::LoadShader(auxGeomWorldShaderFilePath);
m_shader = RPI::LoadCriticalShader(auxGeomWorldShaderFilePath);
if (!m_shader)
{
AZ_Error("DynamicPrimitiveProcessor", false, "Failed to get shader");
Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp
+2 -2
View File
@@ -1385,9 +1385,9 @@ namespace AZ
const char* litObjectShaderFilePath = "Shaders/auxgeom/auxgeomobjectlit.azshader";
// constant color shader
m_unlitShader = RPI::LoadShader(unlitObjectShaderFilePath);
m_unlitShader = RPI::LoadCriticalShader(unlitObjectShaderFilePath);
// direction light shader
m_litShader = RPI::LoadShader(litObjectShaderFilePath);
m_litShader = RPI::LoadCriticalShader(litObjectShaderFilePath);
if (m_unlitShader.get() == nullptr || m_litShader == nullptr)
{
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ namespace AZ
// load shader
// Note: the shader may not be available on all platforms
AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistance.azshader";
m_shader = RPI::LoadShader(shaderFilePath);
m_shader = RPI::LoadCriticalShader(shaderFilePath);
if (m_shader == nullptr)
{
return;
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ namespace AZ
// load shader
// Note: the shader may not be available on all platforms
AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiance.azshader";
m_shader = RPI::LoadShader(shaderFilePath);
m_shader = RPI::LoadCriticalShader(shaderFilePath);
if (m_shader == nullptr)
{
return;
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdatePass.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ namespace AZ
{
// load shader
// Note: the shader may not be available on all platforms
shader = RPI::LoadShader(shaderFilePath);
shader = RPI::LoadCriticalShader(shaderFilePath);
if (shader == nullptr)
{
return;
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ namespace AZ
// load shader
// Note: the shader may not be available on all platforms
AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridClassification.azshader";
m_shader = RPI::LoadShader(shaderFilePath);
m_shader = RPI::LoadCriticalShader(shaderFilePath);
if (m_shader == nullptr)
{
return;
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ namespace AZ
// load shader
// Note: the shader may not be available on all platforms
Data::Instance<RPI::Shader> shader = RPI::LoadShader("Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRender.azshader");
Data::Instance<RPI::Shader> shader = RPI::LoadCriticalShader("Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRender.azshader");
if (shader)
{
m_probeGridRenderData.m_drawListTag = shader->GetDrawListTag();
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.cpp
+3 -3
View File
@@ -52,7 +52,7 @@ namespace AZ
// load the ray tracing shader
// Note: the shader may not be available on all platforms
AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRayTracing.azshader";
m_rayTracingShader = RPI::LoadShader(shaderFilePath);
m_rayTracingShader = RPI::LoadCriticalShader(shaderFilePath);
if (m_rayTracingShader == nullptr)
{
return;
@@ -64,7 +64,7 @@ namespace AZ
// closest hit shader
AZStd::string closestHitShaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingClosestHit.azshader";
m_closestHitShader = RPI::LoadShader(closestHitShaderFilePath);
m_closestHitShader = RPI::LoadCriticalShader(closestHitShaderFilePath);
auto closestHitShaderVariant = m_closestHitShader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId);
RHI::PipelineStateDescriptorForRayTracing closestHitShaderDescriptor;
@@ -72,7 +72,7 @@ namespace AZ
// miss shader
AZStd::string missShaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingMiss.azshader";
m_missShader = RPI::LoadShader(missShaderFilePath);
m_missShader = RPI::LoadCriticalShader(missShaderFilePath);
auto missShaderVariant = m_missShader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId);
RHI::PipelineStateDescriptorForRayTracing missShaderDescriptor;
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRelocationPass.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ namespace AZ
// load shader
// Note: the shader may not be available on all platforms
AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRelocation.azshader";
m_shader = RPI::LoadShader(shaderFilePath);
m_shader = RPI::LoadCriticalShader(shaderFilePath);
if (m_shader == nullptr)
{
return;
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ namespace AZ
// create the shader resource group
// Note: the shader may not be available on all platforms
AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRender.azshader";
m_shader = RPI::LoadShader(shaderFilePath);
m_shader = RPI::LoadCriticalShader(shaderFilePath);
if (m_shader == nullptr)
{
return;
Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp
+1 -1
View File
@@ -446,7 +446,7 @@ namespace AZ
}
{
m_shader = RPI::LoadShader(ImguiShaderFilePath);
m_shader = RPI::LoadCriticalShader(ImguiShaderFilePath);
m_pipelineState = aznew RPI::PipelineStateForDraw;
m_pipelineState->Init(m_shader);
Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
+1 -1
View File
@@ -487,7 +487,7 @@ namespace AZ
RHI::DrawListTag& drawListTag)
{
// load shader
shader = RPI::LoadShader(filePath);
shader = RPI::LoadCriticalShader(filePath);
AZ_Error("ReflectionProbeFeatureProcessor", shader, "Failed to find asset for shader [%s]", filePath);
// store drawlist tag
Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ namespace AZ
// load shaders
AZStd::string verticalBlurShaderFilePath = "Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azshader";
Data::Instance<AZ::RPI::Shader> verticalBlurShader = RPI::LoadShader(verticalBlurShaderFilePath);
Data::Instance<AZ::RPI::Shader> verticalBlurShader = RPI::LoadCriticalShader(verticalBlurShaderFilePath);
if (verticalBlurShader == nullptr)
{
AZ_Error("PassSystem", false, "[ReflectionScreenSpaceBlurPass '%s']: Failed to load shader '%s'!", GetPathName().GetCStr(), verticalBlurShaderFilePath.c_str());
@@ -60,7 +60,7 @@ namespace AZ
}
AZStd::string horizontalBlurShaderFilePath = "Shaders/Reflections/ReflectionScreenSpaceBlurHorizontal.azshader";
Data::Instance<AZ::RPI::Shader> horizontalBlurShader = RPI::LoadShader(horizontalBlurShaderFilePath);
Data::Instance<AZ::RPI::Shader> horizontalBlurShader = RPI::LoadCriticalShader(horizontalBlurShaderFilePath);
if (horizontalBlurShader == nullptr)
{
AZ_Error("PassSystem", false, "[ReflectionScreenSpaceBlurPass '%s']: Failed to load shader '%s'!", GetPathName().GetCStr(), horizontalBlurShaderFilePath.c_str());
Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h
+3 -1
View File
@@ -22,19 +22,21 @@ namespace AZ
class Shader;
//! Get the asset ID for a given shader file path
Data::AssetId GetShaderAssetId(const AZStd::string& shaderFilePath);
Data::AssetId GetShaderAssetId(const AZStd::string& shaderFilePath, bool isCritical = false);
//! Finds a shader asset for the given shader asset ID. Optional shaderFilePath param for debugging.
Data::Asset<ShaderAsset> FindShaderAsset(Data::AssetId shaderAssetId, const AZStd::string& shaderFilePath = "");
//! Finds a shader asset for the given shader file path
Data::Asset<ShaderAsset> FindShaderAsset(const AZStd::string& shaderFilePath);
Data::Asset<ShaderAsset> FindCriticalShaderAsset(const AZStd::string& shaderFilePath);
//! Loads a shader for the given shader asset ID. Optional shaderFilePath param for debugging.
Data::Instance<Shader> LoadShader(Data::AssetId shaderAssetId, const AZStd::string& shaderFilePath = "");
//! Loads a shader for the given shader file path
Data::Instance<Shader> LoadShader(const AZStd::string& shaderFilePath);
Data::Instance<Shader> LoadCriticalShader(const AZStd::string& shaderFilePath);
//! Loads a streaming image asset for the given file path
Data::Instance<RPI::StreamingImage> LoadStreamingTexture(AZStd::string_view path);
Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.cpp
+162 -61
View File
@@ -37,7 +37,7 @@ namespace AZ
{
AssetBuilderSDK::AssetBuilderDesc builder;
builder.m_name = PassBuilderJobKey;
builder.m_version = 12; // ATOM-15472
builder.m_version = 13; // antonmic: making .pass files declare dependency on shaders they reference
builder.m_busId = azrtti_typeid<PassBuilder>();
builder.m_createJobFunction = AZStd::bind(&PassBuilder::CreateJobs, this, AZStd::placeholders::_1, AZStd::placeholders::_2);
builder.m_processJobFunction = AZStd::bind(&PassBuilder::ProcessJob, this, AZStd::placeholders::_1, AZStd::placeholders::_2);
@@ -65,36 +65,52 @@ namespace AZ
m_isShuttingDown = true;
}
void PassBuilder::CreateJobs(const AssetBuilderSDK::CreateJobsRequest& request, AssetBuilderSDK::CreateJobsResponse& response) const
// --- Code related to dependency shader asset handling ---
// Helper class to pass parameters to the AddDependency and FindReferencedAssets functions below
struct FindPassReferenceAssetParams
{
if (m_isShuttingDown)
void* passAssetObject = nullptr;
Uuid passAssetUuid;
SerializeContext* serializeContext = nullptr;
AZStd::string_view passAssetSourceFile; // File path of the pass asset
AZStd::string_view dependencySourceFile; // File pass of the asset the pass asset depends on
const char* jobKey = nullptr; // Job key for adding job dependency
};
// Helper function to get a file reference and create a corresponding job dependency
bool AddDependency(FindPassReferenceAssetParams& params, AssetBuilderSDK::JobDescriptor* job)
{
AZStd::string_view& file = params.dependencySourceFile;
AZ::Data::AssetInfo sourceInfo;
AZStd::string watchFolder;
bool fileFound = false;
AzToolsFramework::AssetSystemRequestBus::BroadcastResult(fileFound, &AzToolsFramework::AssetSystem::AssetSystemRequest::GetSourceInfoBySourcePath, file.data(), sourceInfo, watchFolder);
if (fileFound)
{
response.m_result = AssetBuilderSDK::CreateJobsResultCode::ShuttingDown;
return;
AssetBuilderSDK::JobDependency jobDependency;
jobDependency.m_jobKey = params.jobKey;
jobDependency.m_type = AssetBuilderSDK::JobDependencyType::Order;
jobDependency.m_sourceFile.m_sourceFileDependencyPath = file;
job->m_jobDependencyList.push_back(jobDependency);
AZ_TracePrintf(PassBuilderName, "Creating job dependency on file [%s] \n", file.data());
return true;
}
for (const AssetBuilderSDK::PlatformInfo& platformInfo : request.m_enabledPlatforms)
else
{
AssetBuilderSDK::JobDescriptor job;
job.m_jobKey = PassBuilderJobKey;
job.SetPlatformIdentifier(platformInfo.m_identifier.c_str());
// Passes are a critical part of the rendering system
job.m_critical = true;
response.m_createJobOutputs.push_back(job);
AZ_Error(PassBuilderName, false, "Could not find referenced file [%s]", file.data());
return false;
}
response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success;
}
// Helper function to find all assetId's and object references
bool PassBuilder::FindPassReferencedAssets(void* objectPtr, Uuid passAssetUuid, SerializeContext* context, AZStd::unordered_set<Data::AssetId> &referencedAssetList) const
bool FindReferencedAssets(FindPassReferenceAssetParams& params, AssetBuilderSDK::JobDescriptor* job)
{
SerializeContext::ErrorHandler errorLogger;
errorLogger.Reset();
bool foundProblems = false;
bool success = true;
// This callback will check whether the given element is an asset reference. If so, it will add it to the list of asset references
auto beginCallback = [&](void* ptr, const SerializeContext::ClassData* classData, [[maybe_unused]] const SerializeContext::ClassElement* classElement)
@@ -103,30 +119,33 @@ namespace AZ
if (classData->m_typeId == azrtti_typeid<AssetReference>())
{
AssetReference* assetReference = reinterpret_cast<AssetReference*>(ptr);
// If the asset id isn't already provided, get it using the source file path
if (!assetReference->m_assetId.IsValid() && !assetReference->m_filePath.empty())
{
AZStd::string path = assetReference->m_filePath;
const AZStd::string& path = assetReference->m_filePath;
uint32_t subId = 0;
auto assetIdOutcome = AssetUtils::MakeAssetId(path, subId);
if (job != nullptr) // Create Job Phase
{
params.dependencySourceFile = path;
bool dependencyAddedSuccessfully = AddDependency(params, job);
success = dependencyAddedSuccessfully && success;
}
else // Process Job Phase
{
auto assetIdOutcome = AssetUtils::MakeAssetId(path, subId);
if (assetIdOutcome)
{
assetReference->m_assetId = assetIdOutcome.GetValue();
if (assetIdOutcome)
{
assetReference->m_assetId = assetIdOutcome.GetValue();
}
else
{
AZ_Error(PassBuilderName, false, "Could not get AssetId for [%s]", assetReference->m_filePath.c_str());
success = false;
}
}
else
{
AZ_Error(PassBuilderName, false, "Could not get AssetId for [%s]", assetReference->m_filePath.c_str());
foundProblems = true;
}
}
// If the asset ID is valid, add it as a dependency
if (assetReference->m_assetId.IsValid())
{
referencedAssetList.insert(assetReference->m_assetId);
}
}
return true;
@@ -136,26 +155,100 @@ namespace AZ
SerializeContext::EnumerateInstanceCallContext callContext(
AZStd::move(beginCallback),
nullptr,
context,
params.serializeContext,
SerializeContext::ENUM_ACCESS_FOR_READ,
&errorLogger
);
// Recursively iterate over all elements in the object to find asset references with the above callback
context->EnumerateInstance(
params.serializeContext->EnumerateInstance(
&callContext
, objectPtr
, passAssetUuid
, params.passAssetObject
, params.passAssetUuid
, nullptr
, nullptr
);
return !foundProblems;
return success;
}
// --- Code related to dependency shader asset handling ---
void PassBuilder::CreateJobs(const AssetBuilderSDK::CreateJobsRequest& request, AssetBuilderSDK::CreateJobsResponse& response) const
{
// --- Handle shutdown case ---
if (m_isShuttingDown)
{
response.m_result = AssetBuilderSDK::CreateJobsResultCode::ShuttingDown;
return;
}
// --- Get serialization context ---
SerializeContext* serializeContext = nullptr;
ComponentApplicationBus::BroadcastResult(serializeContext, &ComponentApplicationBus::Events::GetSerializeContext);
if (!serializeContext)
{
AZ_Assert(false, "No serialize context");
return;
}
// --- Load PassAsset ---
AZStd::string fullPath;
AzFramework::StringFunc::Path::ConstructFull(request.m_watchFolder.c_str(), request.m_sourceFile.c_str(), fullPath, true);
PassAsset passAsset;
AZ::Outcome<void, AZStd::string> loadResult = JsonSerializationUtils::LoadObjectFromFile(passAsset, fullPath);
if (!loadResult.IsSuccess())
{
AZ_Error(PassBuilderName, false, "Failed to load pass asset [%s]", request.m_sourceFile.c_str());
AZ_Error(PassBuilderName, false, "Loading issues: %s", loadResult.GetError().data());
return;
}
AssetBuilderSDK::JobDescriptor job;
job.m_jobKey = PassBuilderJobKey;
job.m_critical = true; // Passes are a critical part of the rendering system
// --- Find all dependencies ---
AZStd::unordered_set<Data::AssetId> dependentList;
Uuid passAssetUuid = AzTypeInfo<PassAsset>::Uuid();
FindPassReferenceAssetParams params;
params.passAssetObject = &passAsset;
params.passAssetSourceFile = request.m_sourceFile;
params.passAssetUuid = passAssetUuid;
params.serializeContext = serializeContext;
params.jobKey = "Shader Asset";
if (!FindReferencedAssets(params, &job))
{
return;
}
// --- Create a job per platform ---
for (const AssetBuilderSDK::PlatformInfo& platformInfo : request.m_enabledPlatforms)
{
for (auto& jobDependency : job.m_jobDependencyList)
{
jobDependency.m_platformIdentifier = platformInfo.m_identifier.c_str();
}
job.SetPlatformIdentifier(platformInfo.m_identifier.c_str());
response.m_createJobOutputs.push_back(job);
}
response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success;
}
void PassBuilder::ProcessJob(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response) const
{
// Handle job cancellation and shutdown cases
// --- Handle job cancellation and shutdown cases ---
AssetBuilderSDK::JobCancelListener jobCancelListener(request.m_jobId);
if (jobCancelListener.IsCancelled() || m_isShuttingDown)
{
@@ -163,16 +256,18 @@ namespace AZ
return;
}
// Get serialization context
SerializeContext* context = nullptr;
ComponentApplicationBus::BroadcastResult(context, &ComponentApplicationBus::Events::GetSerializeContext);
if (!context)
// --- Get serialization context ---
SerializeContext* serializeContext = nullptr;
ComponentApplicationBus::BroadcastResult(serializeContext, &ComponentApplicationBus::Events::GetSerializeContext);
if (!serializeContext)
{
AZ_Assert(false, "No serialize context");
return;
}
// Load PassAsset
// --- Load PassAsset ---
PassAsset passAsset;
AZ::Outcome<void, AZStd::string> loadResult = JsonSerializationUtils::LoadObjectFromFile(passAsset, request.m_fullPath);
@@ -183,36 +278,42 @@ namespace AZ
return;
}
// Find all Asset IDs we depend on
AZStd::unordered_set<Data::AssetId> dependentList;
// --- Find all dependencies ---
Uuid passAssetUuid = AzTypeInfo<PassAsset>::Uuid();
if (!FindPassReferencedAssets(&passAsset, passAssetUuid, context, dependentList))
FindPassReferenceAssetParams params;
params.passAssetObject = &passAsset;
params.passAssetSourceFile = request.m_sourceFile;
params.passAssetUuid = passAssetUuid;
params.serializeContext = serializeContext;
params.jobKey = "Shader Asset";
if (!FindReferencedAssets(params, nullptr))
{
return;
}
// Get destination file name and path
// --- Get destination file name and path ---
AZStd::string destFileName;
AZStd::string destPath;
AzFramework::StringFunc::Path::GetFullFileName(request.m_fullPath.c_str(), destFileName);
AzFramework::StringFunc::Path::ConstructFull(request.m_tempDirPath.c_str(), destFileName.c_str(), destPath, true);
// Save the asset to binary format for production
bool result = Utils::SaveObjectToFile(destPath, DataStream::ST_BINARY, &passAsset, passAssetUuid, context);
// --- Save the asset to binary format for production ---
bool result = Utils::SaveObjectToFile(destPath, DataStream::ST_BINARY, &passAsset, passAssetUuid, serializeContext);
if (result == false)
{
AZ_Error(PassBuilderName, false, "Failed to save asset to %s", destPath.c_str());
return;
}
// Success. Save output product(s) to response
AssetBuilderSDK::JobProduct jobProduct(destPath, PassAsset::RTTI_Type(), 0);
for (auto& assetId : dependentList)
{
jobProduct.m_dependencies.emplace_back(AssetBuilderSDK::ProductDependency(assetId, 0));
}
// --- Save output product(s) to response ---
jobProduct.m_dependenciesHandled = true; // We've output the dependencies immediately above so it's OK to tell the AP we've handled dependencies
AssetBuilderSDK::JobProduct jobProduct(destPath, PassAsset::RTTI_Type(), 0);
jobProduct.m_dependenciesHandled = true;
response.m_outputProducts.push_back(jobProduct);
response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
}
Gems/Atom/RPI/Code/Source/RPI.Builders/Pass/PassBuilder.h
-1
View File
@@ -37,7 +37,6 @@ namespace AZ
void RegisterBuilder();
private:
bool FindPassReferencedAssets(void* objectPtr, Uuid passAssetUuid, SerializeContext* context, AZStd::unordered_set<Data::AssetId> &referencedAssetList) const;
bool m_isShuttingDown = false;
};
Gems/Atom/RPI/Code/Source/RPI.Public/Pass/AttachmentReadback.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ namespace AZ
// Load shader and srg
const char* ShaderPath = "shader/decomposemsimage.azshader";
m_decomposeShader = LoadShader(ShaderPath);
m_decomposeShader = LoadCriticalShader(ShaderPath);
if (m_decomposeShader == nullptr)
{
Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp
+27 -1
View File
@@ -8,6 +8,7 @@
#include <Atom/RHI/RHISystemInterface.h>
#include <Atom/RPI.Reflect/Asset/AssetUtils.h>
#include <Atom/RPI.Reflect/Shader/ShaderAsset.h>
#include <Atom/RPI.Public/RPIUtils.h>
@@ -20,7 +21,7 @@ namespace AZ
namespace RPI
{
Data::AssetId GetShaderAssetId(const AZStd::string& shaderFilePath)
Data::AssetId GetShaderAssetId(const AZStd::string& shaderFilePath, bool isCritical)
{
Data::AssetId shaderAssetId;
@@ -34,6 +35,19 @@ namespace AZ
if (!shaderAssetId.IsValid())
{
if (isCritical)
{
Data::Asset<RPI::ShaderAsset> shaderAsset = RPI::AssetUtils::LoadCriticalAsset<RPI::ShaderAsset>(shaderFilePath);
if (shaderAsset.IsReady())
{
return shaderAsset.GetId();
}
else
{
AZ_Error("RPI Utils", false, "Could not load critical shader [%s]", shaderFilePath.c_str());
}
}
AZ_Error("RPI Utils", false, "Failed to get asset id for shader [%s]", shaderFilePath.c_str());
}
@@ -83,11 +97,23 @@ namespace AZ
return FindShaderAsset(GetShaderAssetId(shaderFilePath), shaderFilePath);
}
Data::Asset<ShaderAsset> FindCriticalShaderAsset(const AZStd::string& shaderFilePath)
{
const bool isCritical = true;
return FindShaderAsset(GetShaderAssetId(shaderFilePath, isCritical), shaderFilePath);
}
Data::Instance<Shader> LoadShader(const AZStd::string& shaderFilePath)
{
return LoadShader(GetShaderAssetId(shaderFilePath), shaderFilePath);
}
Data::Instance<Shader> LoadCriticalShader(const AZStd::string& shaderFilePath)
{
const bool isCritical = true;
return LoadShader(GetShaderAssetId(shaderFilePath, isCritical), shaderFilePath);
}
AZ::Data::Instance<RPI::StreamingImage> LoadStreamingTexture(AZStd::string_view path)
{
AzFramework::AssetSystem::AssetStatus status = AzFramework::AssetSystem::AssetStatus_Unknown;
Gems/Atom/RPI/Code/Tests.Builders/PassBuilderTest.cpp
-3
View File
@@ -112,9 +112,6 @@ namespace UnitTest
EXPECT_TRUE(response.m_resultCode == AssetBuilderSDK::ProcessJobResult_Success);
EXPECT_TRUE(response.m_outputProducts.size() == 1);
// Verify the dependency was registered
EXPECT_TRUE(response.m_outputProducts[0].m_dependencies.size() == 1);
// Verify input and output names are the same
Data::Asset<Data::AssetData> readAsset = LoadAssetFromFile(response.m_outputProducts[0].m_productFileName.c_str());
RPI::PassAsset* readPassAsset = static_cast<RPI::PassAsset*>(readAsset.GetData());
Gems/LyShine/Code/Source/Draw2d.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ void CDraw2d::OnBootstrapSceneReady([[maybe_unused]] AZ::RPI::Scene* bootstrapSc
// Load the shader to be used for 2d drawing
const char* shaderFilepath = "Shaders/SimpleTextured.azshader";
AZ::Data::Instance<AZ::RPI::Shader> shader = AZ::RPI::LoadShader(shaderFilepath);
AZ::Data::Instance<AZ::RPI::Shader> shader = AZ::RPI::LoadCriticalShader(shaderFilepath);
// Set scene to be associated with the dynamic draw context
AZ::RPI::ScenePtr scene;
Gems/LyShine/Code/Source/UiRenderer.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ void UiRenderer::OnBootstrapSceneReady([[maybe_unused]] AZ::RPI::Scene* bootstra
// Load the UI shader
const char* uiShaderFilepath = "Shaders/LyShineUI.azshader";
AZ::Data::Instance<AZ::RPI::Shader> uiShader = AZ::RPI::LoadShader(uiShaderFilepath);
AZ::Data::Instance<AZ::RPI::Shader> uiShader = AZ::RPI::LoadCriticalShader(uiShaderFilepath);
// Create scene to be used by the dynamic draw context
if (m_viewportContext)