From 18ede6664a0a1d492447f23719f99eda9cd701f5 Mon Sep 17 00:00:00 2001 From: breki Date: Mon, 16 Nov 2026 14:21:34 +0000 Subject: [PATCH] custom stencil was missing and caused outline effect not to work in frontier anymore, re adding --- trinity/Eve/EveSpaceSceneRenderDriver.cpp | 14 +++++++++----- trinity/Eve/EveSpaceSceneRenderDriver.h | 5 ++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/trinity/Eve/EveSpaceSceneRenderDriver.cpp b/trinity/Eve/EveSpaceSceneRenderDriver.cpp index 3b63ef4ac..aede1a249 100644 --- a/trinity/Eve/EveSpaceSceneRenderDriver.cpp +++ b/trinity/Eve/EveSpaceSceneRenderDriver.cpp @@ -336,6 +336,7 @@ EveSpaceSceneRenderDriver::Features EveSpaceSceneRenderDriver::Features::Main() features.velocityMap = true; features.background = true; features.overlay = true; + features.customStencil = true; return features; } @@ -350,6 +351,7 @@ EveSpaceSceneRenderDriver::Features EveSpaceSceneRenderDriver::Features::Reflect features.velocityMap = false; features.background = false; features.overlay = false; + features.customStencil = false; return features; } @@ -587,6 +589,8 @@ void EveSpaceSceneRenderDriver::Execute( const Span& destina renderContext.m_esm.SetRenderTarget( 0, *destinations.data ); renderContext.m_esm.SetDepthStencilBuffer( {} ); + GlobalStore().RegisterVariable( "SpaceSceneCustomStencil", targets.customStencil ); + ON_BLOCK_EXIT( [&] { GlobalStore().RegisterVariable( "SpaceSceneCustomStencil", Tr2TextureAL{} ); } ); { TimeSection postProcessSection( m_timers.postProcess, "PostProcess", rootTimer, renderContext ); @@ -730,13 +734,13 @@ EveSpaceSceneRenderDriver::ViewTargets EveSpaceSceneRenderDriver::RenderView( co distortionMap = {}; Tr2GpuResourcePool::Texture normalMap = GetNormalMapIfNeeded( renderSize, outputs, view.features ); - Tr2GpuResourcePool::Texture customStencil = GetCustomStencilMapIfNeeded( renderSize, outputs ); + targets.customStencil = GetCustomStencilMapIfNeeded( renderSize, outputs, view.features ); { TimeSection depthPassSection( timers.depthPass, "DepthPass", rootTimer, renderContext ); - m_scene->RenderDepthPass( depthBuffer, normalMap, customStencil, view.scene, renderContext, m_depthPassTechnique ); + m_scene->RenderDepthPass( depthBuffer, normalMap, targets.customStencil, view.scene, renderContext, m_depthPassTechnique ); } GlobalStore().RegisterVariable( "SpaceSceneNormalMap", normalMap ); - GlobalStore().RegisterVariable( "SpaceSceneCustomStencil", customStencil ); + GlobalStore().RegisterVariable( "SpaceSceneCustomStencil", targets.customStencil ); ON_BLOCK_EXIT( [&] { GlobalStore().RegisterVariable( "SpaceSceneCustomStencil", Tr2TextureAL{} ); } ); EveSpaceScene::ShadowResources shadowResources; @@ -987,10 +991,10 @@ Tr2GpuResourcePool::Texture EveSpaceSceneRenderDriver::GetNormalMapIfNeeded( con return {}; } -Tr2GpuResourcePool::Texture EveSpaceSceneRenderDriver::GetCustomStencilMapIfNeeded( const TextureSize2D& size, const Span& outputs ) +Tr2GpuResourcePool::Texture EveSpaceSceneRenderDriver::GetCustomStencilMapIfNeeded( const TextureSize2D& size, const Span& outputs, const Features& featureSet ) { auto namedOutput = FindNamedOutput( outputs, "CustomStencilMap" ); - if( m_customStencilFormat != ImageIO::PIXEL_FORMAT_UNKNOWN || namedOutput ) + if( ( featureSet.customStencil && m_customStencilFormat != ImageIO::PIXEL_FORMAT_UNKNOWN ) || namedOutput ) { auto texture = m_gpuResourcePool.GetTempTexture( "customStencil", size, m_customStencilFormat, Tr2GpuUsage::RENDER_TARGET | Tr2GpuUsage::SHADER_RESOURCE ); if( namedOutput ) diff --git a/trinity/Eve/EveSpaceSceneRenderDriver.h b/trinity/Eve/EveSpaceSceneRenderDriver.h index 76a58f2b0..431bd2b24 100644 --- a/trinity/Eve/EveSpaceSceneRenderDriver.h +++ b/trinity/Eve/EveSpaceSceneRenderDriver.h @@ -104,6 +104,8 @@ BLUE_CLASS( EveSpaceSceneRenderDriver ) : bool background = false; // special overlay rendering (f.ex texture overlay) bool overlay = false; + // custom stencil target written in the depth pre-pass + bool customStencil = false; static Features Main(); static Features ReflectionFace(); @@ -137,6 +139,7 @@ BLUE_CLASS( EveSpaceSceneRenderDriver ) : Tr2GpuResourcePool::Texture depth; Tr2GpuResourcePool::Texture velocity; Tr2GpuResourcePool::Texture opaqueColor; + Tr2GpuResourcePool::Texture customStencil; }; // The faces the reflection probe renders in a frame, built before the lights are gathered @@ -166,7 +169,7 @@ BLUE_CLASS( EveSpaceSceneRenderDriver ) : Tr2GpuResourcePool::Texture GetDistortionMapIfNeeded( const TextureSize2D& size, bool distortion ); Tr2GpuResourcePool::Texture GetVelocityMapIfNeeded( const TextureSize2D& size, const Span& outputs, const Features& featureSet ); Tr2GpuResourcePool::Texture GetNormalMapIfNeeded( const TextureSize2D& size, const Span& outputs, const Features& featureSet ); - Tr2GpuResourcePool::Texture GetCustomStencilMapIfNeeded( const TextureSize2D& size, const Span& outputs ); + Tr2GpuResourcePool::Texture GetCustomStencilMapIfNeeded( const TextureSize2D& size, const Span& outputs, const Features& featureSet ); Tr2GpuResourcePool::Texture GetOpaqueColorMapIfNeeded( const TextureSize2D& size, const Span& outputs, const Features& featureSet ); void UpdateGpuParticleSystem( Tr2RenderContext& renderContext );