OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Fix reserved word in variable names

Browse source 
The use of the reserved name caused initialization failure on Linux.
This commit is contained in:
Norihiro Kamae 2022-05-11 23:15:21 +09:00 committed by Ryan Foster
parent 0f53dc28bb
commit dd43635e78
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libobs/data/color.effect
View file

@ -46,8 +46,8 @@ float3 reinhard(float3 rgb)
float linear_to_st2084_channel(float x)
{
float common = pow(abs(x), 0.1593017578);
return pow((0.8359375 + 18.8515625 * common) / (1. + 18.6875 * common), 78.84375);
float c = pow(abs(x), 0.1593017578);
return pow((0.8359375 + 18.8515625 * c) / (1. + 18.6875 * c), 78.84375);
}
float3 linear_to_st2084(float3 rgb)
@ -57,8 +57,8 @@ float3 linear_to_st2084(float3 rgb)
float st2084_to_linear_channel(float u)
{
float common = pow(abs(u), 1. / 78.84375);
return pow(abs(max(common - 0.8359375, 0.) / (18.8515625 - 18.6875 * common)), 1. / 0.1593017578);
float c = pow(abs(u), 1. / 78.84375);
return pow(abs(max(c - 0.8359375, 0.) / (18.8515625 - 18.6875 * c)), 1. / 0.1593017578);
}
float3 st2084_to_linear(float3 v)