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

Merge pull request #2249 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16002

Browse Source 
Minor improvements to the DiffuseProbeGridRenderPass
This commit is contained in:
dmcdiarmid-ly
2021-07-19 12:06:27 -07:00
committed by GitHub
parent 7cb2f62d4b 918224e2d5
commit 2bf29dca75
2 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.cpp
+38 -17
View File
@@ -6,6 +6,7 @@
*
*/
#include <Atom/RHI/RHISystemInterface.h>
#include <Atom/RPI.Public/Image/AttachmentImagePool.h>
#include <Atom/RPI.Public/Image/ImageSystemInterface.h>
#include <Atom/RPI.Public/RenderPipeline.h>
@@ -44,6 +45,7 @@ namespace AZ
void DiffuseProbeGridRenderPass::FrameBeginInternal(FramePrepareParams params)
{
RHI::Ptr<RHI::Device> device = RHI::RHISystemInterface::Get()->GetDevice();
RPI::Scene* scene = m_pipeline->GetScene();
DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
@@ -67,10 +69,13 @@ namespace AZ
Base::FrameBeginInternal(params);
for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
// process attachment readback for RealTime grids, if raytracing is supported on this device
if (device->GetFeatures().m_rayTracing)
{
// process attachment readback
diffuseProbeGrid->GetTextureReadback().FrameBegin(params);
for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
{
diffuseProbeGrid->GetTextureReadback().FrameBegin(params);
}
}
}
@@ -81,13 +86,7 @@ namespace AZ
for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
{
if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::Baked &&
!diffuseProbeGrid->HasValidBakedTextures())
{
continue;
}
if (!diffuseProbeGrid->GetIsVisible())
if (!ShouldRender(diffuseProbeGrid))
{
continue;
}
@@ -173,13 +172,7 @@ namespace AZ
for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
{
if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::Baked &&
!diffuseProbeGrid->HasValidBakedTextures())
{
continue;
}
if (!diffuseProbeGrid->GetIsVisible())
if (!ShouldRender(diffuseProbeGrid))
{
continue;
}
@@ -193,5 +186,33 @@ namespace AZ
Base::CompileResources(context);
}
bool DiffuseProbeGridRenderPass::ShouldRender(const AZStd::shared_ptr<DiffuseProbeGrid>& diffuseProbeGrid)
{
RHI::Ptr<RHI::Device> device = RHI::RHISystemInterface::Get()->GetDevice();
// check for baked mode with no valid textures
if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::Baked &&
!diffuseProbeGrid->HasValidBakedTextures())
{
return false;
}
// check for RealTime mode without ray tracing
if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::RealTime &&
!device->GetFeatures().m_rayTracing)
{
return false;
}
// check if culled out
if (!diffuseProbeGrid->GetIsVisible())
{
return false;
}
// DiffuseProbeGrid should be rendered
return true;
}
} // namespace Render
} // namespace AZ
Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRenderPass.h
+5
View File
@@ -14,6 +14,8 @@ namespace AZ
{
namespace Render
{
class DiffuseProbeGrid;
//! This pass renders the diffuse global illumination in the area covered by
//! each DiffuseProbeGrid.
class DiffuseProbeGridRenderPass final
@@ -40,6 +42,9 @@ namespace AZ
void SetupFrameGraphDependencies(RHI::FrameGraphInterface frameGraph) override;
void CompileResources(const RHI::FrameGraphCompileContext& context) override;
// helper function to determine if a DiffuseProbeGrid should be rendered based on its state
bool ShouldRender(const AZStd::shared_ptr<DiffuseProbeGrid>& diffuseProbeGrid);
Data::Instance<RPI::Shader> m_shader;
RHI::Ptr<RHI::ShaderResourceGroupLayout> m_srgLayout;
};