From b7fbd0433fc38ce9921e28387a361da1f6bb9d6f Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Jan 2024 00:53:19 +0100 Subject: [PATCH] little changes to palshader use gl_texture 2 in postprocess like srb2s palshader does it also disable depthtest for screentextures in palshader mode --- src/hardware/r_opengl/r_opengl.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 14bbb4162..28fe99694 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -490,6 +490,10 @@ static PFNglColorPointer pglColorPointer; #define GL_TEXTURE1 0x84C1 #endif +#ifndef GL_TEXTURE2 +#define GL_TEXTURE2 0x84C2 +#endif + boolean SetupGLfunc(void) { #ifndef STATIC_OPENGL @@ -4439,14 +4443,18 @@ EXPORT void HWRAPI(DrawScreenFinalTexture)(int width, int height) clearColour.red = clearColour.green = clearColour.blue = 0; clearColour.alpha = 1; ClearBuffer(true, false, false, &clearColour); - pglBindTexture(GL_TEXTURE_2D, finalScreenTexture); + if (gl_palshader) + { + SetBlend(PF_NoDepthTest); + pglBindTexture(GL_TEXTURE_2D, finalScreenTexture); + } + else + pglBindTexture(GL_TEXTURE_2D, finalScreenTexture); if (gl_palshader) { - Shader_SetUniforms(NULL, NULL, NULL, NULL); // prepare shader, if it is enabled - - pglUseProgram(gl_shaderprograms[8].program); // palette shader - pglActiveTexture(GL_TEXTURE1); + pglUseProgram(gl_shaderprograms[8].program); // palette postprocess shader + pglActiveTexture(GL_TEXTURE2); } pglColor4ubv(white);