izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove HeterogeneousVolumes setup cost when no volumes are to be rendered.

Browse Source 
- Split VolumetricMeshBatches into Volumetric Fog and Heterogeneous variants
- Do not perform invoke setup if a view has no heterogeneous volumes

#rb stu.mckenna
#jira UE-176477
#preflight 63e3dca114326f9a40c29e03

[CL 24082326 by patrick kelly in ue5-main branch]
This commit is contained in:
patrick kelly
2023-02-08 16:12:59 -05:00
parent f0909dc988
commit ace62b8c21
5 changed files with 69 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/Renderer/Private/HeterogeneousVolumes/HeterogeneousVolumes.cpp
+28 -21
View File
@@ -177,10 +177,11 @@ bool ShouldRenderHeterogeneousVolumes(
}
bool ShouldRenderHeterogeneousVolumesForView(
const FSceneView& View
const FViewInfo& View
)
{
return IsHeterogeneousVolumesEnabled()
&& !View.HeterogeneousVolumesMeshBatches.IsEmpty()
&& View.Family
&& !View.bIsReflectionCapture;
}
@@ -207,13 +208,21 @@ bool DoesMaterialShaderSupportHeterogeneousVolumes(const FMaterial& Material)
&& Material.IsUsedWithNiagaraMeshParticles();
}
bool ShouldRenderPrimitiveWithHeterogeneousVolumes(
const FPrimitiveSceneProxy* PrimitiveSceneProxy,
const FMaterial& Material
bool ShouldRenderMeshBatchWithHeterogeneousVolumes(
const FMeshBatch* Mesh,
const FPrimitiveSceneProxy* Proxy,
ERHIFeatureLevel::Type FeatureLevel
)
{
check(PrimitiveSceneProxy);
return PrimitiveSceneProxy->IsHeterogeneousVolume() && DoesMaterialShaderSupportHeterogeneousVolumes(Material);
check(Mesh);
check(Proxy);
check(Mesh->MaterialRenderProxy);
const FMaterialRenderProxy* MaterialRenderProxy = Mesh->MaterialRenderProxy;
const FMaterial& Material = MaterialRenderProxy->GetMaterialWithFallback(FeatureLevel, MaterialRenderProxy);
return IsHeterogeneousVolumesEnabled()
&& Proxy->IsHeterogeneousVolume()
&& DoesMaterialShaderSupportHeterogeneousVolumes(Material);
}
namespace HeterogeneousVolumes
@@ -359,26 +368,24 @@ void FDeferredShadingSceneRenderer::RenderHeterogeneousVolumes(
{
FViewInfo& View = Views[ViewIndex];
// Per-view??
FRDGTextureDesc Desc = SceneTextures.Color.Target->Desc;
Desc.Format = PF_FloatRGBA;
Desc.Flags &= ~(TexCreate_FastVRAM);
FRDGTextureRef HeterogeneousVolumeRadiance = GraphBuilder.CreateTexture(Desc, TEXT("HeterogeneousVolumes"));
AddClearUAVPass(GraphBuilder, GraphBuilder.CreateUAV(HeterogeneousVolumeRadiance), FLinearColor::Transparent);
if (ShouldRenderHeterogeneousVolumesForView(View))
{
for (int32 MeshBatchIndex = 0; MeshBatchIndex < View.VolumetricMeshBatches.Num(); ++MeshBatchIndex)
FRDGTextureDesc Desc = SceneTextures.Color.Target->Desc;
Desc.Format = PF_FloatRGBA;
Desc.Flags &= ~(TexCreate_FastVRAM);
FRDGTextureRef HeterogeneousVolumeRadiance = GraphBuilder.CreateTexture(Desc, TEXT("HeterogeneousVolumes"));
AddClearUAVPass(GraphBuilder, GraphBuilder.CreateUAV(HeterogeneousVolumeRadiance), FLinearColor::Transparent);
for (int32 MeshBatchIndex = 0; MeshBatchIndex < View.HeterogeneousVolumesMeshBatches.Num(); ++MeshBatchIndex)
{
const FMeshBatch* Mesh = View.VolumetricMeshBatches[MeshBatchIndex].Mesh;
const FMaterialRenderProxy* MaterialRenderProxy = Mesh->MaterialRenderProxy;
const FMaterial& Material = MaterialRenderProxy->GetMaterialWithFallback(View.GetFeatureLevel(), MaterialRenderProxy);
const FPrimitiveSceneProxy* PrimitiveSceneProxy = View.VolumetricMeshBatches[MeshBatchIndex].Proxy;
if (!ShouldRenderPrimitiveWithHeterogeneousVolumes(PrimitiveSceneProxy, Material))
const FMeshBatch* Mesh = View.HeterogeneousVolumesMeshBatches[MeshBatchIndex].Mesh;
const FPrimitiveSceneProxy* PrimitiveSceneProxy = View.HeterogeneousVolumesMeshBatches[MeshBatchIndex].Proxy;
if (!ShouldRenderMeshBatchWithHeterogeneousVolumes(Mesh, PrimitiveSceneProxy, View.GetFeatureLevel()))
{
continue;
}
const FMaterialRenderProxy* MaterialRenderProxy = Mesh->MaterialRenderProxy;
const FPrimitiveSceneInfo* PrimitiveSceneInfo = PrimitiveSceneProxy->GetPrimitiveSceneInfo();
const int32 PrimitiveId = PrimitiveSceneInfo->GetIndex();
const FBoxSphereBounds LocalBoxSphereBounds = PrimitiveSceneProxy->GetLocalBounds();
@@ -445,9 +452,9 @@ void FDeferredShadingSceneRenderer::RenderHeterogeneousVolumes(
);
}
}
}
View.HeterogeneousVolumeRadiance = HeterogeneousVolumeRadiance;
View.HeterogeneousVolumeRadiance = HeterogeneousVolumeRadiance;
}
}
}
Engine/Source/Runtime/Renderer/Private/HeterogeneousVolumes/HeterogeneousVolumes.h
+5 -4
View File
@@ -25,12 +25,13 @@ struct FSceneTextures;
//
bool ShouldRenderHeterogeneousVolumes(const FScene* Scene);
bool ShouldRenderHeterogeneousVolumesForView(const FSceneView& View);
bool ShouldRenderHeterogeneousVolumesForView(const FViewInfo& View);
bool DoesPlatformSupportHeterogeneousVolumes(EShaderPlatform Platform);
bool DoesMaterialShaderSupportHeterogeneousVolumes(const FMaterialShaderParameters& Parameters);
bool ShouldRenderPrimitiveWithHeterogeneousVolumes(
const FPrimitiveSceneProxy* PrimitiveSceneProxy,
const FMaterial& Material
bool ShouldRenderMeshBatchWithHeterogeneousVolumes(
const FMeshBatch* Mesh,
const FPrimitiveSceneProxy* Proxy,
ERHIFeatureLevel::Type FeatureLevel
);
//
Engine/Source/Runtime/Renderer/Private/SceneRendering.h
+3
View File
@@ -1342,6 +1342,9 @@ public:
/** Mesh batches with a volumetric material. */
TArray<FVolumetricMeshBatch, SceneRenderingAllocator> VolumetricMeshBatches;
/** Mesh batches for heterogeneous volumes rendering. */
TArray<FVolumetricMeshBatch, SceneRenderingAllocator> HeterogeneousVolumesMeshBatches;
/** Mesh batches with a sky material. */
TArray<FSkyMeshBatch, SceneRenderingAllocator> SkyMeshBatches;
Engine/Source/Runtime/Renderer/Private/SceneVisibility.cpp
+31 -8
View File
@@ -49,6 +49,7 @@
#include "InstanceCulling/InstanceCullingManager.h"
#include "PostProcess/TemporalAA.h"
#include "RayTracing/RayTracingInstanceCulling.h"
#include "HeterogeneousVolumes/HeterogeneousVolumes.h"
#include "RendererModule.h"
#include "SceneViewExtension.h"
#include "RenderCore.h"
@@ -2301,6 +2302,7 @@ struct FRelevancePacket : public FSceneRenderingAllocatorObject<FRelevancePacket
TArray<FMeshDecalBatch> MeshDecalBatches;
TArray<FVolumetricMeshBatch> VolumetricMeshBatches;
TArray<FVolumetricMeshBatch> HeterogeneousVolumesMeshBatches;
TArray<FSkyMeshBatch> SkyMeshBatches;
TArray<FSortedTrianglesMeshBatch> SortedTrianglesMeshBatches;
FDrawCommandRelevancePacket DrawCommandPacket;
@@ -2898,10 +2900,20 @@ struct FRelevancePacket : public FSceneRenderingAllocatorObject<FRelevancePacket
if (ViewRelevance.bHasVolumeMaterialDomain)
{
VolumetricMeshBatches.AddUninitialized(1);
FVolumetricMeshBatch& BatchAndProxy = VolumetricMeshBatches.Last();
BatchAndProxy.Mesh = &StaticMesh;
BatchAndProxy.Proxy = PrimitiveSceneInfo->Proxy;
if (ShouldRenderMeshBatchWithHeterogeneousVolumes(&StaticMesh, PrimitiveSceneInfo->Proxy, View.FeatureLevel))
{
HeterogeneousVolumesMeshBatches.AddUninitialized(1);
FVolumetricMeshBatch& BatchAndProxy = HeterogeneousVolumesMeshBatches.Last();
BatchAndProxy.Mesh = &StaticMesh;
BatchAndProxy.Proxy = PrimitiveSceneInfo->Proxy;
}
else
{
VolumetricMeshBatches.AddUninitialized(1);
FVolumetricMeshBatch& BatchAndProxy = VolumetricMeshBatches.Last();
BatchAndProxy.Mesh = &StaticMesh;
BatchAndProxy.Proxy = PrimitiveSceneInfo->Proxy;
}
}
if (ViewRelevance.bUsesSkyMaterial)
@@ -3012,6 +3024,7 @@ struct FRelevancePacket : public FSceneRenderingAllocatorObject<FRelevancePacket
WriteView.MeshDecalBatches.Append(MeshDecalBatches);
WriteView.VolumetricMeshBatches.Append(VolumetricMeshBatches);
WriteView.HeterogeneousVolumesMeshBatches.Append(HeterogeneousVolumesMeshBatches);
WriteView.SkyMeshBatches.Append(SkyMeshBatches);
WriteView.SortedTrianglesMeshBatches.Append(SortedTrianglesMeshBatches);
@@ -3399,10 +3412,20 @@ void ComputeDynamicMeshRelevance(EShadingPath ShadingPath, bool bAddLightmapDens
if (ViewRelevance.bHasVolumeMaterialDomain)
{
View.VolumetricMeshBatches.AddUninitialized(1);
FVolumetricMeshBatch& BatchAndProxy = View.VolumetricMeshBatches.Last();
BatchAndProxy.Mesh = MeshBatch.Mesh;
BatchAndProxy.Proxy = MeshBatch.PrimitiveSceneProxy;
if (ShouldRenderMeshBatchWithHeterogeneousVolumes(MeshBatch.Mesh, MeshBatch.PrimitiveSceneProxy, View.FeatureLevel))
{
View.HeterogeneousVolumesMeshBatches.AddUninitialized(1);
FVolumetricMeshBatch& BatchAndProxy = View.HeterogeneousVolumesMeshBatches.Last();
BatchAndProxy.Mesh = MeshBatch.Mesh;
BatchAndProxy.Proxy = MeshBatch.PrimitiveSceneProxy;
}
else
{
View.VolumetricMeshBatches.AddUninitialized(1);
FVolumetricMeshBatch& BatchAndProxy = View.VolumetricMeshBatches.Last();
BatchAndProxy.Mesh = MeshBatch.Mesh;
BatchAndProxy.Proxy = MeshBatch.PrimitiveSceneProxy;
}
}
if (ViewRelevance.bUsesSkyMaterial)
Engine/Source/Runtime/Renderer/Private/VolumetricFogVoxelization.cpp
+2 -5
View File
@@ -672,13 +672,10 @@ void FDeferredShadingSceneRenderer::VoxelizeFogVolumePrimitives(
for (int32 MeshBatchIndex = 0; MeshBatchIndex < View.VolumetricMeshBatches.Num(); ++MeshBatchIndex)
{
const FMeshBatch* Mesh = View.VolumetricMeshBatches[MeshBatchIndex].Mesh;
const FMaterialRenderProxy* MaterialRenderProxy = Mesh->MaterialRenderProxy;
const FMaterial& Material = MaterialRenderProxy->GetMaterialWithFallback(View.GetFeatureLevel(), MaterialRenderProxy);
// Skip volumes flagged as rendered with HeterogenousVolumes
const FMeshBatch* Mesh = View.VolumetricMeshBatches[MeshBatchIndex].Mesh;
const FPrimitiveSceneProxy* PrimitiveSceneProxy = View.VolumetricMeshBatches[MeshBatchIndex].Proxy;
if (bShouldRenderHeterogeneousVolumes && ShouldRenderPrimitiveWithHeterogeneousVolumes(PrimitiveSceneProxy, Material))
if (ShouldRenderMeshBatchWithHeterogeneousVolumes(Mesh, PrimitiveSceneProxy, View.GetFeatureLevel()))
{
continue;
}