From 64f4e2a10a0e4c5729f39e02dae3b6d589cc695f Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Mon, 30 Dec 2024 02:22:35 -0800 Subject: [PATCH] glsl: unbreak lightmapped surfaces --- engine/gl/gl_shader.c | 4 ++-- engine/gl/gl_vidcommon.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/engine/gl/gl_shader.c b/engine/gl/gl_shader.c index e3523dc09..ee4f6f717 100644 --- a/engine/gl/gl_shader.c +++ b/engine/gl/gl_shader.c @@ -2050,10 +2050,10 @@ static qboolean Shader_LoadPermutations(char *name, program_t *prog, char *scrip nopermutation |= PERMUTATION_SKELETAL; //multiple lightmaps is kinda hacky. if any are set, all must be. -#define ALTLIGHTMAPSAMP 14 +#define ALTLIGHTMAPSAMP 16 if (prog->defaulttextures & ((1u<<(ALTLIGHTMAPSAMP+0)) | (1u<<(ALTLIGHTMAPSAMP+1)) | (1u<<(ALTLIGHTMAPSAMP+2)))) prog->defaulttextures |=((1u<<(ALTLIGHTMAPSAMP+0)) | (1u<<(ALTLIGHTMAPSAMP+1)) | (1u<<(ALTLIGHTMAPSAMP+2))); -#define ALTDELUXMAPSAMP 17 +#define ALTDELUXMAPSAMP 19 if (prog->defaulttextures & ((1u<<(ALTDELUXMAPSAMP+0)) | (1u<<(ALTDELUXMAPSAMP+1)) | (1u<<(ALTDELUXMAPSAMP+2)))) prog->defaulttextures |=((1u<<(ALTDELUXMAPSAMP+0)) | (1u<<(ALTDELUXMAPSAMP+1)) | (1u<<(ALTDELUXMAPSAMP+2))); diff --git a/engine/gl/gl_vidcommon.c b/engine/gl/gl_vidcommon.c index 7a0b53103..2d88e620f 100644 --- a/engine/gl/gl_vidcommon.c +++ b/engine/gl/gl_vidcommon.c @@ -2432,6 +2432,8 @@ static GLuint GLSlang_CreateShader (program_t *prog, const char *name, int ver, "uniform sampler2D s_reflectmask;\n", "uniform sampler2D s_displacement;\n", "uniform sampler2D s_occlusion;\n", + "uniform sampler2D s_transmission;\n", + "uniform sampler2D s_thickness;\n", "uniform sampler2D s_lightmap;\n#define s_lightmap0 s_lightmap\n", "uniform sampler2D s_deluxemap;\n#define s_deluxemap0 s_deluxemap\n",