From 4b0b2a48f676342edd148cddba60fbe9b9a260d1 Mon Sep 17 00:00:00 2001 From: mrmbernardi Date: Sat, 9 Dec 2023 19:42:41 +0100 Subject: [PATCH] Fixed shader formatting in applytransparency.frag (#21071) --- data/shaders/applytransparency.frag | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/shaders/applytransparency.frag b/data/shaders/applytransparency.frag index 3cd00671d0..e2440e913c 100644 --- a/data/shaders/applytransparency.frag +++ b/data/shaders/applytransparency.frag @@ -7,7 +7,7 @@ uniform usampler2D uTransparentTex; uniform sampler2D uTransparentDepth; uniform usampler2D uPaletteTex; uniform usampler2D uBlendPaletteTex; -// clang-format off +// clang-format on in vec2 fTextureCoordinate; @@ -15,24 +15,24 @@ out uint oColour; void main() { - uint opaque = texture(uOpaqueTex, fTextureCoordinate).r; + uint opaque = texture(uOpaqueTex, 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; if (opaqueDepth <= transparentDepth) { transparent = 0u; } - + uint blendColour = (transparent & 0xff00u) >> 8; - if(blendColour > 0u) + if (blendColour > 0u) { - if((transparent & 0x00ffu) != 0u) + if ((transparent & 0x00ffu) != 0u) { oColour = blendColour; } - else + else { oColour = texture(uBlendPaletteTex, vec2(opaque, blendColour) / 256.f).r; }