GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix shadows rendering in reflection probes

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-24 13:43:53 +02:00
parent e9144ff834
commit b2e228c090
4 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Graphics/RenderBuffers.cpp
View File

@@ -126,10 +126,10 @@ void RenderBuffers::SetUseAlpha(bool value)
_useAlpha = value;
}
const RenderBuffers::CustomBuffer* RenderBuffers::FindCustomBuffer(const StringView& name) const
const RenderBuffers::CustomBuffer* RenderBuffers::FindCustomBuffer(const StringView& name, bool withLinked) const
{
if (LinkedCustomBuffers)
return LinkedCustomBuffers->FindCustomBuffer(name);
if (LinkedCustomBuffers && withLinked)
return LinkedCustomBuffers->FindCustomBuffer(name, withLinked);
for (const CustomBuffer* e : CustomBuffers)
{
if (e->Name == name)

14
Source/Engine/Graphics/RenderBuffers.h
View File

@@ -167,20 +167,20 @@ public:
/// </summary>
API_PROPERTY() void SetUseAlpha(bool value);
const CustomBuffer* FindCustomBuffer(const StringView& name) const;
const CustomBuffer* FindCustomBuffer(const StringView& name, bool withLinked = true) const;
template<class T>
const T* FindCustomBuffer(const StringView& name) const
const T* FindCustomBuffer(const StringView& name, bool withLinked = true) const
{
return (const T*)FindCustomBuffer(name);
return (const T*)FindCustomBuffer(name, withLinked);
}
template<class T>
T* GetCustomBuffer(const StringView& name)
T* GetCustomBuffer(const StringView& name, bool withLinked = true)
{
if (LinkedCustomBuffers)
return LinkedCustomBuffers->GetCustomBuffer<T>(name);
CustomBuffer* result = (CustomBuffer*)FindCustomBuffer(name);
if (LinkedCustomBuffers && withLinked)
return LinkedCustomBuffers->GetCustomBuffer<T>(name, withLinked);
CustomBuffer* result = (CustomBuffer*)FindCustomBuffer(name, withLinked);
if (!result)
{
result = New<T>();

1
Source/Engine/Renderer/ProbesRenderer.cpp
View File

@@ -492,6 +492,7 @@ void ProbesRenderer::OnRender(RenderTask* task, GPUContext* context)
// Render frame
Renderer::Render(_task);
context->ClearState();
_task->CameraCut();
// Copy frame to cube face
{

27
Source/Engine/Renderer/ShadowsPass.cpp
View File

@@ -1043,8 +1043,6 @@ void ShadowsPass::SetupShadows(RenderContext& renderContext, RenderContextBatch&
// Early out and skip shadows setup if no lights is actively casting shadows
// RenderBuffers will automatically free any old ShadowsCustomBuffer after a few frames if we don't update LastFrameUsed
if (_shadowMapFormat == PixelFormat::Unknown || checkIfSkipPass() || EnumHasNoneFlags(renderContext.View.Flags, ViewFlags::Shadows))
return;
Array<RenderLightData*, RendererAllocation> shadowedLights;
for (auto& light : renderContext.List->DirectionalLights)
{
@@ -1061,12 +1059,25 @@ void ShadowsPass::SetupShadows(RenderContext& renderContext, RenderContextBatch&
if (light.CanRenderShadow(renderContext.View))
shadowedLights.Add(&light);
}
if (shadowedLights.IsEmpty())
const auto currentFrame = Engine::FrameCount;
if (_shadowMapFormat == PixelFormat::Unknown ||
EnumHasNoneFlags(renderContext.View.Flags, ViewFlags::Shadows) ||
checkIfSkipPass() ||
shadowedLights.IsEmpty())
{
// Invalidate any existing custom buffer that could have been used by the same task (eg. when rendering 6 sides of env probe)
if (auto* old = (ShadowsCustomBuffer*)renderContext.Buffers->FindCustomBuffer<ShadowsCustomBuffer>(TEXT("Shadows"), false))
{
if (old->LastFrameUsed == currentFrame)
old->LastFrameUsed = 0;
}
return;
}
// Initialize shadow atlas
auto& shadows = *renderContext.Buffers->GetCustomBuffer<ShadowsCustomBuffer>(TEXT("Shadows"));
const auto currentFrame = Engine::FrameCount;
auto& shadows = *renderContext.Buffers->GetCustomBuffer<ShadowsCustomBuffer>(TEXT("Shadows"), false);
if (shadows.LastFrameUsed == currentFrame)
shadows.Reset();
shadows.LastFrameUsed = currentFrame;
shadows.MaxShadowsQuality = Math::Clamp(Math::Min<int32>((int32)Graphics::ShadowsQuality, (int32)renderContext.View.MaxShadowsQuality), 0, (int32)Quality::MAX - 1);
shadows.EnableStaticShadows = !renderContext.View.IsOfflinePass && !renderContext.View.IsSingleFrame;
@@ -1337,7 +1348,7 @@ RETRY_ATLAS_SETUP:
void ShadowsPass::RenderShadowMaps(RenderContextBatch& renderContextBatch)
{
const RenderContext& renderContext = renderContextBatch.GetMainContext();
const ShadowsCustomBuffer* shadowsPtr = renderContext.Buffers->FindCustomBuffer<ShadowsCustomBuffer>(TEXT("Shadows"));
const ShadowsCustomBuffer* shadowsPtr = renderContext.Buffers->FindCustomBuffer<ShadowsCustomBuffer>(TEXT("Shadows"), false);
if (shadowsPtr == nullptr || shadowsPtr->Lights.IsEmpty() || shadowsPtr->LastFrameUsed != Engine::FrameCount)
return;
PROFILE_GPU_CPU("ShadowMaps");
@@ -1488,7 +1499,7 @@ void ShadowsPass::RenderShadowMask(RenderContextBatch& renderContextBatch, Rende
PROFILE_GPU_CPU("Shadow");
GPUContext* context = GPUDevice::Instance->GetMainContext();
RenderContext& renderContext = renderContextBatch.GetMainContext();
const ShadowsCustomBuffer& shadows = *renderContext.Buffers->FindCustomBuffer<ShadowsCustomBuffer>(TEXT("Shadows"));
const ShadowsCustomBuffer& shadows = *renderContext.Buffers->FindCustomBuffer<ShadowsCustomBuffer>(TEXT("Shadows"), false);
ASSERT(shadows.LastFrameUsed == Engine::FrameCount);
auto& view = renderContext.View;
auto shader = _shader->GetShader();
@@ -1559,7 +1570,7 @@ void ShadowsPass::RenderShadowMask(RenderContextBatch& renderContextBatch, Rende
void ShadowsPass::GetShadowAtlas(const RenderBuffers* renderBuffers, GPUTexture*& shadowMapAtlas, GPUBufferView*& shadowsBuffer)
{
const ShadowsCustomBuffer* shadowsPtr = renderBuffers->FindCustomBuffer<ShadowsCustomBuffer>(TEXT("Shadows"));
const ShadowsCustomBuffer* shadowsPtr = renderBuffers->FindCustomBuffer<ShadowsCustomBuffer>(TEXT("Shadows"), false);
if (shadowsPtr && shadowsPtr->ShadowMapAtlas && shadowsPtr->LastFrameUsed == Engine::FrameCount)
{
shadowMapAtlas = shadowsPtr->ShadowMapAtlas;