TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove gl side TORQUE_HDR_RGB16 macros. doesn't exist DX side, and seemed to be causing issues

Browse source
This commit is contained in:
AzaezelX 2020-11-01 20:19:49 -06:00
parent 5be1b77791
commit be8988b1a3
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Templates/BaseGame/game/core/rendering/shaders/gl/torque.glsl
View file

@ -166,20 +166,13 @@ vec2 parallaxOffsetDxtnm(sampler2D texMap, vec2 texCoord, vec3 negViewTS, float
return offset; return offset;
} }
/// The maximum value for 16bit per component integer HDR encoding.
const float HDR_RGB16_MAX = 100.0;
/// The maximum value for 10bit per component integer HDR encoding. /// The maximum value for 10bit per component integer HDR encoding.
const float HDR_RGB10_MAX = 4.0; const float HDR_RGB10_MAX = 4.0;
/// Encodes an HDR color for storage into a target. /// Encodes an HDR color for storage into a target.
vec3 hdrEncode( vec3 _sample ) vec3 hdrEncode( vec3 _sample )
{ {
#if defined( TORQUE_HDR_RGB16 ) #if defined( TORQUE_HDR_RGB10 )
return _sample / HDR_RGB16_MAX;
#elif defined( TORQUE_HDR_RGB10 )
return _sample / HDR_RGB10_MAX; return _sample / HDR_RGB10_MAX;
@ -200,11 +193,7 @@ vec4 hdrEncode( vec4 _sample )
/// Decodes an HDR color from a target. /// Decodes an HDR color from a target.
vec3 hdrDecode( vec3 _sample ) vec3 hdrDecode( vec3 _sample )
{ {
#if defined( TORQUE_HDR_RGB16 ) #if defined( TORQUE_HDR_RGB10 )
return _sample * HDR_RGB16_MAX;
#elif defined( TORQUE_HDR_RGB10 )
return _sample * HDR_RGB10_MAX; return _sample * HDR_RGB10_MAX;