Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #12005 from TellowKrinkle/MacOGL
Video: Fix shaders on OpenGL 4.1
  • Loading branch information
JMC47 committed Jun 28, 2023
2 parents 78f4a91 + 6ac20ae commit 86adfa7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Data/Sys/Shaders/default_pre_post_process.glsl
Expand Up @@ -46,7 +46,7 @@ void main()
float4 color = Sample();

// Convert to linear space to do any other kind of operation
color.rgb = pow(color.rgb, game_gamma.xxx);
color.rgb = pow(color.rgb, float3(game_gamma));

if (OptionEnabled(correct_color_space))
{
Expand All @@ -60,7 +60,7 @@ void main()

if (OptionEnabled(hdr_output))
{
const float hdr_paper_white = hdr_paper_white_nits / hdr_sdr_white_nits;
float hdr_paper_white = hdr_paper_white_nits / hdr_sdr_white_nits;
color.rgb *= hdr_paper_white;
}

Expand All @@ -74,12 +74,12 @@ void main()
if (OptionEnabled(sdr_display_gamma_sRGB))
color.rgb = LinearTosRGBGamma(color.rgb);
else
color.rgb = pow(color.rgb, (1.0 / sdr_display_custom_gamma).xxx);
color.rgb = pow(color.rgb, float3(1.0 / sdr_display_custom_gamma));
}
// Restore the original gamma without changes
else
{
color.rgb = pow(color.rgb, (1.0 / game_gamma).xxx);
color.rgb = pow(color.rgb, float3(1.0 / game_gamma));
}

SetOutput(color);
Expand Down

0 comments on commit 86adfa7

Please sign in to comment.