Merge remote-tracking branch 'origin/gi' into large-worlds
# Conflicts: # Source/Engine/Graphics/PostProcessSettings.cpp # Source/Engine/Level/Actors/SkyLight.cpp # Source/Engine/Renderer/GBufferPass.cpp # Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp # Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp # Source/Engine/Renderer/GlobalSignDistanceFieldPass.h # Source/Engine/Renderer/RenderList.h
This commit is contained in:
@@ -500,8 +500,7 @@ void MaterialParameter::Bind(BindMeta& meta) const
|
||||
GlobalSignDistanceFieldPass::BindingData bindingData;
|
||||
if (GlobalSignDistanceFieldPass::Instance()->Get(meta.Buffers, bindingData))
|
||||
Platform::MemoryClear(&bindingData, sizeof(bindingData));
|
||||
for (int32 i = 0; i < 4; i++)
|
||||
meta.Context->BindSR(_registerIndex + i, bindingData.Cascades[i] ? bindingData.Cascades[i]->ViewVolume() : nullptr);
|
||||
bindingData.BindCascades(meta.Context, _registerIndex);
|
||||
*((GlobalSignDistanceFieldPass::ConstantsData*)(meta.Constants.Get() + _offset)) = bindingData.Constants;
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user