mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed shader formatting in applytransparency.frag (#21071)

This commit is contained in:
mrmbernardi 2023-12-09 19:42:41 +01:00 committed by GitHub
parent 5b42da2646
commit 4b0b2a48f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/shaders/applytransparency.frag
View File

@ -7,7 +7,7 @@ uniform usampler2D uTransparentTex;
uniform sampler2D uTransparentDepth; uniform sampler2D uTransparentDepth;
uniform usampler2D uPaletteTex; uniform usampler2D uPaletteTex;
uniform usampler2D uBlendPaletteTex; uniform usampler2D uBlendPaletteTex;
// clang-format off // clang-format on
in vec2 fTextureCoordinate; in vec2 fTextureCoordinate;
@ -15,24 +15,24 @@ out uint oColour;
void main() void main()
{ {
uint opaque = texture(uOpaqueTex, fTextureCoordinate).r; uint opaque = texture(uOpaqueTex, fTextureCoordinate).r;
float opaqueDepth = texture(uOpaqueDepth, fTextureCoordinate).r; float opaqueDepth = texture(uOpaqueDepth, fTextureCoordinate).r;
uint transparent = texture(uTransparentTex, fTextureCoordinate).r; uint transparent = texture(uTransparentTex, fTextureCoordinate).r;
float transparentDepth = texture(uTransparentDepth, fTextureCoordinate).r; float transparentDepth = texture(uTransparentDepth, fTextureCoordinate).r;
if (opaqueDepth <= transparentDepth) if (opaqueDepth <= transparentDepth)
{ {
transparent = 0u; transparent = 0u;
} }
uint blendColour = (transparent & 0xff00u) >> 8; uint blendColour = (transparent & 0xff00u) >> 8;
if(blendColour > 0u) if (blendColour > 0u)
{ {
if((transparent & 0x00ffu) != 0u) if ((transparent & 0x00ffu) != 0u)
{ {
oColour = blendColour; oColour = blendColour;
} }
else else
{ {
oColour = texture(uBlendPaletteTex, vec2(opaque, blendColour) / 256.f).r; oColour = texture(uBlendPaletteTex, vec2(opaque, blendColour) / 256.f).r;
} }