From 738b9ceb084017c0169fcbbfe110cc759c046c6c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 21 Dec 2019 21:07:00 +0100 Subject: [PATCH] - fixed incompletely changed shader. It was still using a variable from the first revision that no longer exists. --- src/rendering/gl/shaders/gl_shader.cpp | 6 ------ wadsrc/static/shaders/glsl/main.fp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/rendering/gl/shaders/gl_shader.cpp b/src/rendering/gl/shaders/gl_shader.cpp index 904abae05..fc8d78720 100644 --- a/src/rendering/gl/shaders/gl_shader.cpp +++ b/src/rendering/gl/shaders/gl_shader.cpp @@ -250,12 +250,6 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char * i_data += "uniform float uDesaturationFactor;\n"; i_data += "uniform float uInterpolationFactor;\n"; - i_data += "uniform float uObjectDesaturationFactor;\n"; - i_data += "uniform float uObjectColorizeFactor;\n"; - i_data += "uniform int uObjectBlendMode;\n"; - i_data += "uniform int uObjectInvertColor;\n"; - - // Glowing walls stuff i_data += "uniform vec4 uGlowTopPlane;\n"; i_data += "uniform vec4 uGlowTopColor;\n"; diff --git a/wadsrc/static/shaders/glsl/main.fp b/wadsrc/static/shaders/glsl/main.fp index cf47708c8..095c16a35 100644 --- a/wadsrc/static/shaders/glsl/main.fp +++ b/wadsrc/static/shaders/glsl/main.fp @@ -110,7 +110,7 @@ const int Tex_Blend_Hardlight = 4; texel.rgb = clamp(texel.rgb, 0.0, 1.0); // Step 5: Apply a blend. This may just be a translucent overlay or one of the blend modes present in current Build engines. - if (uObjectBlendMode != 0) + if ((blendflags & 7) != 0) { vec3 tcol = texel.rgb * 255.0; // * 255.0 to make it easier to reuse the integer math. vec4 tint = uTextureBlendColor * 255.0;