From bb70f4ff0f287c1891471d2ed765b78f8634c8c1 Mon Sep 17 00:00:00 2001 From: SarahW Date: Sat, 15 Aug 2020 14:38:31 +0100 Subject: [PATCH] Re-enable fog on Banshee. --- src/vid_voodoo_codegen_x86.h | 3 --- src/vid_voodoo_render.c | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/vid_voodoo_codegen_x86.h b/src/vid_voodoo_codegen_x86.h index 3fe0335..5867d85 100644 --- a/src/vid_voodoo_codegen_x86.h +++ b/src/vid_voodoo_codegen_x86.h @@ -2208,8 +2208,6 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo // addbyte(0x7e); // addbyte(0x87); // addlong(offsetof(voodoo_state_t, out)); - if (voodoo->type != VOODOO_BANSHEE) /*HACK*/ - { if (params->fogMode & FOG_ENABLE) { if (params->fogMode & FOG_CONSTANT) @@ -2412,7 +2410,6 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo src_g = CLAMP(src_g); src_b = CLAMP(src_b);*/ } - } if ((params->alphaMode & 1) && (alpha_func != AFUNC_NEVER) && (alpha_func != AFUNC_ALWAYS)) { diff --git a/src/vid_voodoo_render.c b/src/vid_voodoo_render.c index 8de9489..b2b3e89 100644 --- a/src/vid_voodoo_render.c +++ b/src/vid_voodoo_render.c @@ -1273,11 +1273,8 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood if (cca_invert_output) src_a ^= 0xff; - if (voodoo->type != VOODOO_BANSHEE) /*HACK*/ - { - if (params->fogMode & FOG_ENABLE) - APPLY_FOG(src_r, src_g, src_b, state->z, state->ia, state->w); - } + if (params->fogMode & FOG_ENABLE) + APPLY_FOG(src_r, src_g, src_b, state->z, state->ia, state->w); if (params->alphaMode & 1) ALPHA_TEST(src_a);