Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff

This commit is contained in:
Alug committed 2023-12-20 17:53:09 +01:00
commit 8676769a8f
2 files changed
+2 -13

No files matched your search

+1 -3
View File
@@ -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);
}
+1 -10
View File
@@ -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,
};