diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 6c1a003ed..ab42c4b2c 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 = HWR_ShouldUsePaletteRendering() ? SHADER_WALL : SHADER_FLOOR; //FIXME: inplace shader switching is ass + shader = SHADER_WALL; 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 = HWR_ShouldUsePaletteRendering() ? SHADER_WALL : SHADER_FLOOR; //FIXME: inplace shader switching is ass + shader = SHADER_WALL; blendmode |= PF_ColorMapped; } @@ -3684,7 +3684,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) if (HWR_UseShader()) { - shader = HWR_ShouldUsePaletteRendering() ? SHADER_SPRITE : SHADER_FLOOR; //FIXME: inplace shader switching is ass + shader = SHADER_SPRITE; blend |= PF_ColorMapped; } @@ -3967,7 +3967,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) if (HWR_UseShader()) { - shader = HWR_ShouldUsePaletteRendering() ? SHADER_SPRITE : SHADER_FLOOR; //FIXME: inplace shader switching is ass + shader = SHADER_SPRITE; blend |= PF_ColorMapped; } @@ -4064,7 +4064,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) if (HWR_UseShader()) { - shader = HWR_ShouldUsePaletteRendering() ? SHADER_SPRITE : SHADER_FLOOR; //FIXME: inplace shader switching is ass + shader = SHADER_SPRITE; blend |= PF_ColorMapped; } @@ -5865,7 +5865,7 @@ static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD if (fogwall) shader = SHADER_FOG; else - shader = HWR_ShouldUsePaletteRendering() ? SHADER_WALL : SHADER_FLOOR; //FIXME: inplace shader switching is ass + shader = SHADER_WALL; blendmode |= PF_ColorMapped; } diff --git a/src/hardware/hw_shaders.h b/src/hardware/hw_shaders.h index abc1fcc27..d1fa4be4e 100644 --- a/src/hardware/hw_shaders.h +++ b/src/hardware/hw_shaders.h @@ -220,21 +220,28 @@ // hand tuned adjustments for light level calculation #define GLSL_FLOOR_FUDGES \ - "#version 120\n" \ "#define STARTMAP_FUDGE 1.06\n" \ "#define SCALE_FUDGE 1.15\n" #define GLSL_WALL_FUDGES \ - "#version 120\n" \ "#define STARTMAP_FUDGE 1.05\n" \ "#define SCALE_FUDGE 2.2\n" #define GLSL_FLOOR_FRAGMENT_SHADER \ + "#version 120\n" \ GLSL_FLOOR_FUDGES \ GLSL_SOFTWARE_FRAGMENT_SHADER +// this is very backwards +// but we wanna have the game look like vanilla does +// oh well #define GLSL_WALL_FRAGMENT_SHADER \ + "#version 120\n" \ + "#ifdef SRB2_PALETTE_RENDERING\n" \ GLSL_WALL_FUDGES \ + "#else\n" \ + GLSL_FLOOR_FUDGES \ + "#endif\n" \ GLSL_SOFTWARE_FRAGMENT_SHADER //