id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 15:11:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replaced ternary operators in HLSL code. Fixes

Browse source
This commit is contained in:
Robert Beckebans 2023-10-09 15:14:43 +02:00
parent a51833e4ed
commit feffa4a4dd
1 changed files with 3 additions and 3 deletions

6
neo/shaders/builtin/SSAO/ssao_compute.cs.hlsl
View file

@ -104,7 +104,7 @@ static const float g_RandomValues[16] =
// over the diagonals in the octahedral map // over the diagonals in the octahedral map
float2 octWrap( float2 v ) float2 octWrap( float2 v )
{ {
return ( 1.f - abs( v.yx ) ) * ( v.xy >= 0.f ? 1.f : -1.f ); return ( 1.f - abs( v.yx ) ) * select( v.xy >= 0.f, 1.f, -1.f );
} }
/**********************/ /**********************/
@ -116,7 +116,7 @@ float2 ndirToOctSigned( float3 n )
{ {
// Project the sphere onto the octahedron (|x|+|y|+|z| = 1) and then onto the xy-plane // Project the sphere onto the octahedron (|x|+|y|+|z| = 1) and then onto the xy-plane
float2 p = n.xy * ( 1.f / ( abs( n.x ) + abs( n.y ) + abs( n.z ) ) ); float2 p = n.xy * ( 1.f / ( abs( n.x ) + abs( n.y ) + abs( n.z ) ) );
return ( n.z < 0.f ) ? octWrap( p ) : p; return select( n.z < 0.f, octWrap( p ), p );
} }
// Converts a point in the octahedral map to a normalized direction (non-equal area, signed) // Converts a point in the octahedral map to a normalized direction (non-equal area, signed)
@ -127,7 +127,7 @@ float3 octToNdirSigned( float2 p )
// https://twitter.com/Stubbesaurus/status/937994790553227264 // https://twitter.com/Stubbesaurus/status/937994790553227264
float3 n = float3( p.x, p.y, 1.0 - abs( p.x ) - abs( p.y ) ); float3 n = float3( p.x, p.y, 1.0 - abs( p.x ) - abs( p.y ) );
float t = max( 0, -n.z ); float t = max( 0, -n.z );
n.xy += n.xy >= 0.0 ? -t : t; n.xy += select( n.xy >= 0.0, -t, t );
return normalize( n ); return normalize( n );
} }