From b14599dde78b2f2d87c8a1f13580eac0413771ba Mon Sep 17 00:00:00 2001 From: Erik Abair Date: Tue, 8 Apr 2025 11:03:00 -0700 Subject: [PATCH] nv2a: Fix assert when setting fog gen mode to fog_x --- hw/xbox/nv2a/pgraph/glsl/vsh-ff.c | 2 +- hw/xbox/nv2a/pgraph/vsh.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/xbox/nv2a/pgraph/glsl/vsh-ff.c b/hw/xbox/nv2a/pgraph/glsl/vsh-ff.c index 445ce73066..19ebf12f3b 100644 --- a/hw/xbox/nv2a/pgraph/glsl/vsh-ff.c +++ b/hw/xbox/nv2a/pgraph/glsl/vsh-ff.c @@ -414,7 +414,7 @@ GLSL_DEFINE(materialEmissionColor, GLSL_LTCTXA(NV_IGRAPH_XF_LTCTXA_CM_COL) ".xyz mstring_append(body, " float fogDistance = fogCoord;\n"); break; default: - assert(false); + assert(!"Invalid foggen mode"); break; } diff --git a/hw/xbox/nv2a/pgraph/vsh.h b/hw/xbox/nv2a/pgraph/vsh.h index 405b6c9aa6..36cac16edf 100644 --- a/hw/xbox/nv2a/pgraph/vsh.h +++ b/hw/xbox/nv2a/pgraph/vsh.h @@ -55,8 +55,6 @@ enum VshFoggen { FOGGEN_RADIAL, FOGGEN_PLANAR, FOGGEN_ABS_PLANAR, - FOGGEN_ERROR4, - FOGGEN_ERROR5, FOGGEN_FOG_X };