From 39489fc6f11508b0cc953b9ab8d4e2db9a0bbdf5 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 6 Jan 2024 08:07:11 +0100 Subject: [PATCH] =?UTF-8?q?use=20srb2=C2=B4s=20sky=20shader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit also its finally a defined shader now + move default fragment shader to the top --- src/hardware/r_opengl/r_opengl.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index f2510a389..451237160 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -687,6 +687,17 @@ static float shader_leveltime = 0; // Fragment shader macros // ======================== +// +// GLSL generic fragment shader +// + +#define GLSL_DEFAULT_FRAGMENT_SHADER \ + "uniform sampler2D tex;\n" \ + "uniform vec4 poly_color;\n" \ + "void main(void) {\n" \ + "gl_FragColor = texture2D(tex, gl_TexCoord[0].st) * poly_color;\n" \ + "}\0" + // // GLSL Software fragment shader // @@ -919,14 +930,14 @@ static float shader_leveltime = 0; "}\0" // -// GLSL generic fragment shader -// - -#define GLSL_DEFAULT_FRAGMENT_SHADER \ +// Sky fragment shader +// Modulates poly_color with gl_Color +// +#define GLSL_SKY_FRAGMENT_SHADER \ "uniform sampler2D tex;\n" \ "uniform vec4 poly_color;\n" \ "void main(void) {\n" \ - "gl_FragColor = texture2D(tex, gl_TexCoord[0].st) * poly_color;\n" \ + "gl_FragColor = texture2D(tex, gl_TexCoord[0].st) * gl_Color * poly_color;\n" \ "}\0" static const char *fragment_shaders[] = { @@ -952,10 +963,7 @@ static const char *fragment_shaders[] = { GLSL_FOG_FRAGMENT_SHADER, // Sky fragment shader - "uniform sampler2D tex;\n" - "void main(void) {\n" - "gl_FragColor = texture2D(tex, gl_TexCoord[0].st);\n" - "}\0", + GLSL_SKY_FRAGMENT_SHADER, // Palette fragment shader GLSL_PALETTE_FRAGMENT_SHADER,