From 71847ec0f1a1347a448912ea2528d873576ca22d Mon Sep 17 00:00:00 2001 From: pogokeen Date: Tue, 9 Apr 2019 21:42:52 +0000 Subject: [PATCH] polymost.cpp: fix fragment shader issue where fullbrights in a texture could affect rendering when u_useColorOnly was enabled git-svn-id: https://svn.eduke32.com/eduke32@7552 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/src/polymost.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index 0861af4e3..ec478ff6c 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -898,7 +898,7 @@ void polymost_glinit() float colorIndex = texture2D(s_palswap, u_palswapPos+u_palswapSize*vec2(color.r, shade)).r;\n\ colorIndex = c_basepalOffset + c_basepalScale*colorIndex;\n\ vec4 palettedColor = texture2D(s_palette, vec2(colorIndex, c_zero));\n\ - float fullbright = u_usePalette*palettedColor.a;\n\ + float fullbright = mix(u_usePalette*palettedColor.a, c_zero, u_useColorOnly);\n\ palettedColor.a = c_one-floor(color.r);\n\ color = mix(color, palettedColor, u_usePalette);\n\ \n\ @@ -988,7 +988,7 @@ void polymost_glinit() float colorIndex = texture2D(s_palswap, u_palswapPos+u_palswapSize*vec2(color.r, shade)).r;\n\ colorIndex = c_basepalOffset + c_basepalScale*colorIndex;\n\ vec4 palettedColor = texture2D(s_palette, vec2(colorIndex, c_zero));\n\ - float fullbright = u_usePalette*palettedColor.a;\n\ + float fullbright = mix(u_usePalette*palettedColor.a, c_zero, u_useColorOnly);\n\ palettedColor.a = c_one-floor(color.r);\n\ color = mix(color, palettedColor, u_usePalette);\n\ \n\