From 09fc5b73d7868cb66ff9b4cd56e33ad17356dbab Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 11 Feb 2024 22:57:18 +0100 Subject: [PATCH] glgsg: Fix regressions with fog shader inputs in GLSL --- panda/src/glstuff/glShaderContext_src.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx index dbf735abc0..7b1fff3273 100644 --- a/panda/src/glstuff/glShaderContext_src.cxx +++ b/panda/src/glstuff/glShaderContext_src.cxx @@ -1231,7 +1231,7 @@ reflect_uniform(int i, char *name_buffer, GLsizei name_buflen) { bind._part[0] = Shader::SMO_attr_fogcolor; if (param_type == GL_FLOAT_VEC3) { - bind._piece = Shader::SMP_vec4; + bind._piece = Shader::SMP_vec3; } else if (param_type == GL_FLOAT_VEC4) { bind._piece = Shader::SMP_vec4; } else { @@ -1256,7 +1256,7 @@ reflect_uniform(int i, char *name_buffer, GLsizei name_buflen) { if (param_type == GL_FLOAT) { bind._piece = Shader::SMP_float; - bind._offset = 13; + bind._offset = 1; } else { GLCAT.error() << "p3d_Fog.start should be float\n"; @@ -1268,7 +1268,7 @@ reflect_uniform(int i, char *name_buffer, GLsizei name_buflen) { if (param_type == GL_FLOAT) { bind._piece = Shader::SMP_float; - bind._offset = 14; + bind._offset = 2; } else { GLCAT.error() << "p3d_Fog.end should be float\n"; @@ -1280,7 +1280,7 @@ reflect_uniform(int i, char *name_buffer, GLsizei name_buflen) { if (param_type == GL_FLOAT) { bind._piece = Shader::SMP_float; - bind._offset = 15; + bind._offset = 3; } else { GLCAT.error() << "p3d_Fog.scale should be float\n";