Chris Santora
c158ca178f
This was done while working on "ATOM-15728 Shader Hot Reload Fails in Debug Build", but it turned out these changes did not actually fix the issue (or any other known hot-reload issue). Still, these improvements are appropriate as they correct logical oversights. ShaderVariant was not listening to asset reloads. It needs to know when the ShaderVariantAsset reload happens so it can reinitialize it's members as well as propagate reinitialization messages. I added a member for the ShaderAsset as the class needs this to reinitialize itself. So now the class listens for reloads of both the ShaderVariantAsset and the ShaderAsset. Shader was not listening for ShaderAsset reinitialization events. Updated the API for ShaderReloadNotificationBus's OnShaderVariantReinitialized to include the ShaderVariant which is the most relevant information (the other information wasn't really being used anyway).
83 lines
3.5 KiB
C++
83 lines
3.5 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.
|
|
*
|
|
*/
|
|
#pragma once
|
|
|
|
#include <AzCore/Memory/SystemAllocator.h>
|
|
#include <Atom/RHI/RayTracingPipelineState.h>
|
|
#include <Atom/RHI/RayTracingShaderTable.h>
|
|
#include <Atom/RPI.Public/Pass/RenderPass.h>
|
|
#include <Atom/RPI.Public/Shader/Shader.h>
|
|
#include <Atom/RPI.Public/Shader/ShaderReloadNotificationBus.h>
|
|
|
|
namespace AZ
|
|
{
|
|
namespace Render
|
|
{
|
|
struct RayTracingPassData;
|
|
|
|
//! This pass executes a raytracing shader as specified in the PassData.
|
|
class RayTracingPass
|
|
: public RPI::RenderPass
|
|
, private RPI::ShaderReloadNotificationBus::MultiHandler
|
|
{
|
|
AZ_RPI_PASS(RayTracingPass);
|
|
|
|
public:
|
|
AZ_RTTI(RayTracingPass, "{7A68A36E-956A-4258-93FE-38686042C4D9}", RPI::RenderPass);
|
|
AZ_CLASS_ALLOCATOR(RayTracingPass, SystemAllocator, 0);
|
|
virtual ~RayTracingPass();
|
|
|
|
//! Creates a RayTracingPass
|
|
static RPI::Ptr<RayTracingPass> Create(const RPI::PassDescriptor& descriptor);
|
|
|
|
protected:
|
|
RayTracingPass(const RPI::PassDescriptor& descriptor);
|
|
|
|
// Pass overrides
|
|
void FrameBeginInternal(FramePrepareParams params) override;
|
|
|
|
// Scope producer functions
|
|
void SetupFrameGraphDependencies(RHI::FrameGraphInterface frameGraph) override;
|
|
void CompileResources(const RHI::FrameGraphCompileContext& context) override;
|
|
void BuildCommandListInternal(const RHI::FrameGraphExecuteContext& context) override;
|
|
|
|
// ShaderReloadNotificationBus::Handler overrides
|
|
void OnShaderReinitialized(const RPI::Shader& shader) override;
|
|
void OnShaderAssetReinitialized(const Data::Asset<RPI::ShaderAsset>& shaderAsset) override;
|
|
void OnShaderVariantReinitialized(const RPI::ShaderVariant& shaderVariant) override;
|
|
|
|
// load the raytracing shaders and setup pipeline states
|
|
void Init();
|
|
|
|
// helper for loading a shader from a shader asset reference
|
|
Data::Instance<RPI::Shader> LoadShader(const RPI::AssetReference& shaderAssetReference);
|
|
|
|
// pass data
|
|
RPI::PassDescriptor m_passDescriptor;
|
|
const RayTracingPassData* m_passData = nullptr;
|
|
|
|
// revision number of the ray tracing TLAS when the shader table was built
|
|
uint32_t m_rayTracingRevision = 0;
|
|
|
|
// raytracing shaders, pipeline states, and shader table
|
|
Data::Instance<RPI::Shader> m_rayGenerationShader;
|
|
Data::Instance<RPI::Shader> m_missShader;
|
|
Data::Instance<RPI::Shader> m_closestHitShader;
|
|
RHI::Ptr<RHI::RayTracingPipelineState> m_rayTracingPipelineState;
|
|
RHI::ConstPtr<RHI::PipelineState> m_globalPipelineState;
|
|
RHI::Ptr<RHI::RayTracingShaderTable> m_rayTracingShaderTable;
|
|
bool m_requiresViewSrg = false;
|
|
bool m_requiresRayTracingMaterialSrg = false;
|
|
};
|
|
} // namespace RPI
|
|
} // namespace AZ
|