From 1702cc249d55a070e87f9bb9b51872bcc24a4265 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Sun, 1 Oct 2023 02:14:25 +0200 Subject: [PATCH] why even --- src/hardware/hw_main.c | 13 +++++++------ src/hardware/r_opengl/r_opengl.c | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index df2a4d82c..b5473abc3 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -426,7 +426,7 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col fade_color.rgba = (colormap != NULL) ? (UINT32)colormap->fadergba : GL_DEFAULTFOG; // Crappy backup coloring if you can't do shaders - if (!(cv_grshaders.value && gr_shadersavailable)) + if (!cv_grshaders.value || !gr_shadersavailable) { // be careful, this may get negative for high lightlevel values. float tint_alpha, fade_alpha; @@ -511,7 +511,11 @@ UINT8 HWR_FogBlockAlpha(INT32 light, extracolormap_t *colormap) // Let's see if realcolor.rgba = (colormap != NULL) ? colormap->rgba : GL_DEFAULTMIX; - if (!(cv_grshaders.value && gr_shadersavailable)) + if (cv_grshaders.value && gr_shadersavailable) + { + surfcolor.s.alpha = (255 - light); + } + else { light = light - (255 - light); @@ -526,14 +530,11 @@ UINT8 HWR_FogBlockAlpha(INT32 light, extracolormap_t *colormap) // Let's see if // at 255 brightness, alpha is between 0 and 127, at 0 brightness alpha will always be 255 surfcolor.s.alpha = (alpha*light) / (2*256) + 255-light; } - else - { - surfcolor.s.alpha = (255 - light); - } return surfcolor.s.alpha; } + static FUINT HWR_CalcWallLight(FUINT lightnum, fixed_t v1x, fixed_t v1y, fixed_t v2x, fixed_t v2y) { INT16 finallight = lightnum; diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 67885a1a9..1caebf259 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -983,7 +983,7 @@ EXPORT boolean HWRAPI(LoadShaders) (void) #ifdef GL_SHADERS GLuint gl_vertShader, gl_fragShader; GLint i, result; - + pglUseProgram = NULL; if (!pglUseProgram) return false; gl_customvertexshaders[0] = NULL; @@ -1153,7 +1153,7 @@ EXPORT void HWRAPI(InitCustomShaders) (void) #ifdef GL_SHADERS KillShaders(); - LoadShaders(); + return LoadShaders(); if (gl_use_palette_shader) {