diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index c22720b63..f4de6283f 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -191,11 +191,11 @@ static void CV_grshaders_OnChange(void) } } -void CV_useCustomShaders_ONChange(void) +static void CV_useCustomShaders_ONChange(void) { if (rendermode == render_opengl) { - if (cv_grshaders.value) + if (HWR_UseShader()) HWD.pfnInitCustomShaders(); } } @@ -474,12 +474,12 @@ static boolean HWR_UseShader(void) boolean HWR_ShouldUsePaletteRendering(void) { - return (cv_grpaletteshader.value && cv_grshaders.value && gr_shadersavailable); + return (cv_grpaletteshader.value && HWR_UseShader()); } boolean HWR_PalRenderFlashpal(void) { - return (cv_grpaletteshader.value && cv_grshaders.value && gr_shadersavailable && cv_grflashpal.value); + return (cv_grpaletteshader.value && HWR_UseShader() && cv_grflashpal.value); } void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *colormap) diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 3babbb29d..2027e7f6f 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -89,6 +89,10 @@ void HWR_AddCommands(void); void HWR_SetTransform(float fpov, player_t *player); void HWR_ClearClipper(void); +static boolean HWR_UseShader(void); +boolean HWR_ShouldUsePaletteRendering(void); +boolean HWR_PalRenderFlashpal(void); + // My original intention was to split hw_main.c // into files like hw_bsp.c, hw_sprites.c...