ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12005 from TellowKrinkle/MacOGL 

Video: Fix shaders on OpenGL 4.1
This commit is contained in:
JMC47 2023-06-28 12:03:04 -04:00 committed by GitHub
parent 78f4a9189d 6ac20aea81
commit 86adfa7e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Sys/Shaders/default_pre_post_process.glsl
View File

@ -46,7 +46,7 @@ void main()
float4 color = Sample(); float4 color = Sample();
// Convert to linear space to do any other kind of operation // 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)) if (OptionEnabled(correct_color_space))
{ {
@ -60,7 +60,7 @@ void main()
if (OptionEnabled(hdr_output)) 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; color.rgb *= hdr_paper_white;
} }
@ -74,12 +74,12 @@ void main()
if (OptionEnabled(sdr_display_gamma_sRGB)) if (OptionEnabled(sdr_display_gamma_sRGB))
color.rgb = LinearTosRGBGamma(color.rgb); color.rgb = LinearTosRGBGamma(color.rgb);
else 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 // Restore the original gamma without changes
else else
{ {
color.rgb = pow(color.rgb, (1.0 / game_gamma).xxx); color.rgb = pow(color.rgb, float3(1.0 / game_gamma));
} }
SetOutput(color); SetOutput(color);