Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions trinity/Eve/SpaceObject/EveSpaceObject2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2149,13 +2149,13 @@ void EveSpaceObject2::RefreshDamageLocatorMask( const LocatorStructureList* dama

void EveSpaceObject2::UpdateDamageLocatorFilter()
{
TRINITY_STATS_ZONE( __FUNCTION__ );

if( m_damageFilterState == DamageFilterState::Idle )
{
return;
}

TRINITY_STATS_ZONE( __FUNCTION__ );

if( !m_damageLocatorAutoFilterEnabled && !m_damageLocatorFilterRequested )
{
m_damageLocatorEnabled.clear();
Expand Down
3 changes: 1 addition & 2 deletions trinity/PostProcess/Tr2PostProcessRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "Shader/Parameter/TriTextureParameter.h"
#include "include/TriMath.h"
#include "TriSettingsRegistrar.h"
#include "Utilities/StringUtils.h"

// FidelityFX headers
#define A_CPU
Expand All @@ -26,8 +27,6 @@ TRI_REGISTER_SETTING( "newBloom", g_newBloom );
int32_t g_dynamicExposureQualityRequirement = PostProcess::Quality::MEDIUM;
TRI_REGISTER_SETTING( "dynamicExposureQualityRequirement", g_dynamicExposureQualityRequirement );

#define MEMOIZED_STRING( x ) ( []( const char* str ) { static BlueSharedString s( str ); return s; }( x "" ) )

namespace
{
const uint32_t HISTOGRAM_TILE_SIZE_X = 16;
Expand Down
46 changes: 27 additions & 19 deletions trinity/Tr2VolumetricsRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "Tr2LightManager.h"
#include "Tr2TextureArray.h"
#include "include/TriMath.h"
#include "Utilities/StringUtils.h"
#include "Utilities/Vector4d.h"


Expand Down Expand Up @@ -692,15 +693,15 @@ Tr2GpuResourcePool::Texture Tr2VolumetricsRenderer::RenderFog(
if( shadowType == SHADOWS_RAYTRACED )
{
uint32_t techniqueIndex;
if( !resources.rtCalculateFroxels->GetShaderStateInterface()->GetTechniqueIndex( BlueSharedString( "RtShadow" ), techniqueIndex ) )
if( !resources.rtCalculateFroxels->GetShaderStateInterface()->GetTechniqueIndex( MEMOIZED_STRING( "RtShadow" ), techniqueIndex ) )
{
CCP_LOGERR( "Failed to get technique index for raytraced froxel fog shadows!" );
return {};
}

BlueSharedStringW rayGenName;
BlueSharedStringW missName;
m_pipelineManager.AddLibrary( rayGenName, missName, resources.rtCalculateFroxels, BlueSharedString( "RtShadow" ) );
m_pipelineManager.AddLibrary( rayGenName, missName, resources.rtCalculateFroxels, MEMOIZED_STRING( "RtShadow" ) );

Tr2RtPipelineStateAL pipelineState = m_pipelineManager.GetPipelineState( renderContext );

Expand All @@ -713,20 +714,27 @@ Tr2GpuResourcePool::Texture Tr2VolumetricsRenderer::RenderFog(
Tr2RtLocalMaterialDescriptionAL material;
material.SetConstants( Tr2Renderer::GetPerObjectVSStartRegister(), m_fogConstantBuffer );

TRINITY_STATS_ZONE( "Create shader table" );
m_shaderTableDesc.AddRayGenShader( rayGenName.c_str(), material );
m_shaderTableDesc.AddMissShader( missName.c_str(), material );

Tr2RtShaderTableAL shadowShaderTable;
shadowShaderTable.Create( m_shaderTableDesc, pipelineState, renderContext.GetPrimaryRenderContext() );
{
TRINITY_STATS_ZONE( "Create shader table" );
m_shaderTableDesc.AddRayGenShader( rayGenName.c_str(), material );
m_shaderTableDesc.AddMissShader( missName.c_str(), material );
if( !m_rtShadowShaderTable.IsValid() || FAILED( m_rtShadowShaderTable.Update( m_shaderTableDesc, pipelineState, renderContext.GetPrimaryRenderContext() ) ) )
{
m_rtShadowShaderTable.Create( m_shaderTableDesc, pipelineState, renderContext.GetPrimaryRenderContext() );
}
if( !m_rtShadowShaderTable.IsValid() )
{
return {};
}
}

resources.rtCalculateFroxels->SetOption( BlueSharedString( "GOD_RAY_NOISE" ), BlueSharedString( m_froxelFogSettings.godRayNoiseIntensity.value > 0.0f ? "GOD_RAY_NOISE_ENABLED" : "GOD_RAY_NOISE_DISABLED" ) );
resources.rtCalculateFroxels->SetOption( BlueSharedString( "FOG_NOISE" ), BlueSharedString( m_froxelFogSettings.fogNoiseIntensity.value > 0.0f ? "FOG_NOISE_ENABLED" : "FOG_NOISE_DISABLED" ) );
resources.rtCalculateFroxels->SetOption( MEMOIZED_STRING( "GOD_RAY_NOISE" ), m_froxelFogSettings.godRayNoiseIntensity.value > 0.0f ? MEMOIZED_STRING( "GOD_RAY_NOISE_ENABLED" ) : MEMOIZED_STRING( "GOD_RAY_NOISE_DISABLED" ) );
resources.rtCalculateFroxels->SetOption( MEMOIZED_STRING( "FOG_NOISE" ), m_froxelFogSettings.fogNoiseIntensity.value > 0.0f ? MEMOIZED_STRING( "FOG_NOISE_ENABLED" ) : MEMOIZED_STRING( "FOG_NOISE_DISABLED" ) );

resources.rtCalculateFroxels->SetParameter( BlueSharedString( "Noise3DTexture" ), m_froxel3DNoise );
resources.rtCalculateFroxels->SetParameter( BlueSharedString( "RtFroxelOutputTexture" ), fogFroxels );
resources.rtCalculateFroxels->SetParameter( MEMOIZED_STRING( "Noise3DTexture" ), m_froxel3DNoise );
resources.rtCalculateFroxels->SetParameter( MEMOIZED_STRING( "RtFroxelOutputTexture" ), fogFroxels );

resources.rtCalculateFroxels->SetParameter( BlueSharedString( "RtShadowScene" ), raytracingGeometry );
resources.rtCalculateFroxels->SetParameter( MEMOIZED_STRING( "RtShadowScene" ), raytracingGeometry );
renderContext.SetRtPipelineState( pipelineState, rayGenName.c_str() );
resources.rtCalculateFroxels->ApplyMaterialDataForRtState( techniqueIndex, renderContext );
renderContext.UseAccelerationStructure( raytracingGeometry->GetTLAS() );
Expand All @@ -736,17 +744,17 @@ Tr2GpuResourcePool::Texture Tr2VolumetricsRenderer::RenderFog(
renderContext.UseResources( Tr2UseResourceDestination::COMPUTE, Tr2GpuUsage::SHADER_RESOURCE, raytracingGeometry->GetBindlessResources() );
}

renderContext.DispatchRays( pipelineState, shadowShaderTable, rayGenName.c_str(), width, height, depth );
renderContext.DispatchRays( pipelineState, m_rtShadowShaderTable, rayGenName.c_str(), width, height, depth );
}
else
{
//Otherwise, just use a plain compute shader.
resources.calculateFroxels->SetOption( BlueSharedString( "SHADOWS" ), BlueSharedString( shadowType == SHADOWS_CASCADED ? "SHADOWS_ENABLED" : "SHADOWS_DISABLED" ) );
resources.calculateFroxels->SetOption( BlueSharedString( "GOD_RAY_NOISE" ), BlueSharedString( m_froxelFogSettings.godRayNoiseIntensity.value > 0.0f ? "GOD_RAY_NOISE_ENABLED" : "GOD_RAY_NOISE_DISABLED" ) );
resources.calculateFroxels->SetOption( BlueSharedString( "FOG_NOISE" ), BlueSharedString( m_froxelFogSettings.fogNoiseIntensity.value > 0.0f ? "FOG_NOISE_ENABLED" : "FOG_NOISE_DISABLED" ) );
resources.calculateFroxels->SetOption( MEMOIZED_STRING( "SHADOWS" ), shadowType == SHADOWS_CASCADED ? MEMOIZED_STRING( "SHADOWS_ENABLED" ) : MEMOIZED_STRING( "SHADOWS_DISABLED" ) );
resources.calculateFroxels->SetOption( MEMOIZED_STRING( "GOD_RAY_NOISE" ), m_froxelFogSettings.godRayNoiseIntensity.value > 0.0f ? MEMOIZED_STRING( "GOD_RAY_NOISE_ENABLED" ) : MEMOIZED_STRING( "GOD_RAY_NOISE_DISABLED" ) );
resources.calculateFroxels->SetOption( MEMOIZED_STRING( "FOG_NOISE" ), m_froxelFogSettings.fogNoiseIntensity.value > 0.0f ? MEMOIZED_STRING( "FOG_NOISE_ENABLED" ) : MEMOIZED_STRING( "FOG_NOISE_DISABLED" ) );

resources.calculateFroxels->SetParameter( BlueSharedString( "Noise3DTexture" ), m_froxel3DNoise );
resources.calculateFroxels->SetParameter( BlueSharedString( "RtFroxelOutputTexture" ), fogFroxels );
resources.calculateFroxels->SetParameter( MEMOIZED_STRING( "Noise3DTexture" ), m_froxel3DNoise );
resources.calculateFroxels->SetParameter( MEMOIZED_STRING( "RtFroxelOutputTexture" ), fogFroxels );

Tr2Renderer::RunComputeShader( resources.calculateFroxels, wgX, wgY, wgZ, renderContext );
}
Expand Down
1 change: 1 addition & 0 deletions trinity/Tr2VolumetricsRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ BLUE_CLASS( Tr2VolumetricsRenderer ) :

Tr2RaytracingPipelineStateManager m_pipelineManager;
Tr2RtShaderTableDescriptionAL m_shaderTableDesc;
Tr2RtShaderTableAL m_rtShadowShaderTable;

private:
struct FogViewDependentResources
Expand Down
6 changes: 6 additions & 0 deletions trinity/Utilities/StringUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ inline bool StringReplace( std::string& baseString, const char* oldString, const
return false;
}

// --------------------------------------------------------------------------------
// Description:
// Static BlueSharedString for a string literal, created once at first use
// --------------------------------------------------------------------------------
#define MEMOIZED_STRING( x ) ( []( const char* str ) { static BlueSharedString s( str ); return s; }( x "" ) )




Expand Down
Loading