diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 0c576b051..f0fab7fe5 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -892,7 +892,7 @@ void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isc if (PolyFlags & PF_Fog) HWD.pfnSetShader(6); // fog shader else if (PolyFlags & PF_Ripple) - HWD.pfnSetShader(HWR_ShouldUsePaletteRendering() ? 12 : 5); // water shader + HWD.pfnSetShader(HWR_ShouldUsePaletteRendering() ? 11 : 5); // water shader else HWD.pfnSetShader(HWR_ShouldUsePaletteRendering() ? 9 : 1); // floor shader @@ -6838,8 +6838,6 @@ void HWR_MakeScreenFinalTexture(void) void HWR_DrawScreenFinalTexture(int width, int height) { - if (HWR_ShouldUsePaletteRendering()) - HWD.pfnSetShader(11); //post processing HWD.pfnDrawScreenFinalTexture(width, height); } diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 21b58f795..80dfb9171 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -807,11 +807,6 @@ static float shader_leveltime = 0; GLSL_SOFTWARE_PAL_MAIN \ "\0" -#define GLSL_SOFTWARE_PAL_FRAGMENT_SHADER_POSTPROCESS \ - GLSL_SOFTWARE_PAL_UNIFORMS \ - GLSL_SOFTWARE_PAL_MAIN \ - "\0" - // // Water surface shader // @@ -950,7 +945,7 @@ static const char *fragment_shaders[] = { "void main(void) {\n" "gl_FragColor = texture2D(tex, gl_TexCoord[0].st);\n" "}\0", - + // Palette fragment shader GLSL_PALETTE_FRAGMENT_SHADER, @@ -960,9 +955,6 @@ static const char *fragment_shaders[] = { // Palette wall fudge shader GLSL_SOFTWARE_PAL_FRAGMENT_SHADER_WALLS, - // Palette postprocess shader - GLSL_SOFTWARE_PAL_FRAGMENT_SHADER_POSTPROCESS, - // Palette water shader GLSL_PALETTE_WATER_FRAGMENT_SHADER, @@ -1016,7 +1008,6 @@ static const char *vertex_shaders[] = { GLSL_DEFAULT_VERTEX_SHADER, GLSL_DEFAULT_VERTEX_SHADER, GLSL_DEFAULT_VERTEX_SHADER, - GLSL_DEFAULT_VERTEX_SHADER, NULL, };