From d95e3c6e0486d07a1434fb3d2eb28e9daf8544a4 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 27 Feb 2025 18:50:50 +0100 Subject: [PATCH] use floor shader for everything when paletterender disabled just like vanilla! not the way to do this properly, but whatever --- src/hardware/hw_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index ab42c4b2c..6c1a003ed 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -881,7 +881,7 @@ static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf) } if (HWR_UseShader()) - shader = SHADER_WALL; + shader = HWR_ShouldUsePaletteRendering() ? SHADER_WALL : SHADER_FLOOR; //FIXME: inplace shader switching is ass HWR_ProcessPolygon(&pSurf, wallVerts, 4, i|PF_Modulated|PF_Decal, shader, false); } @@ -965,7 +965,7 @@ static void HWR_ProjectWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIEL if (HWR_UseShader()) { - shader = SHADER_WALL; + shader = HWR_ShouldUsePaletteRendering() ? SHADER_WALL : SHADER_FLOOR; //FIXME: inplace shader switching is ass blendmode |= PF_ColorMapped; } @@ -3684,7 +3684,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) if (HWR_UseShader()) { - shader = SHADER_SPRITE; + shader = HWR_ShouldUsePaletteRendering() ? SHADER_SPRITE : SHADER_FLOOR; //FIXME: inplace shader switching is ass blend |= PF_ColorMapped; } @@ -3967,7 +3967,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) if (HWR_UseShader()) { - shader = SHADER_SPRITE; + shader = HWR_ShouldUsePaletteRendering() ? SHADER_SPRITE : SHADER_FLOOR; //FIXME: inplace shader switching is ass blend |= PF_ColorMapped; } @@ -4064,7 +4064,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) if (HWR_UseShader()) { - shader = SHADER_SPRITE; + shader = HWR_ShouldUsePaletteRendering() ? SHADER_SPRITE : SHADER_FLOOR; //FIXME: inplace shader switching is ass blend |= PF_ColorMapped; } @@ -5865,7 +5865,7 @@ static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD if (fogwall) shader = SHADER_FOG; else - shader = SHADER_WALL; + shader = HWR_ShouldUsePaletteRendering() ? SHADER_WALL : SHADER_FLOOR; //FIXME: inplace shader switching is ass blendmode |= PF_ColorMapped; }