From 1552b1808fe06189732d592584ac5075adaf74fc Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 21 Aug 2026 16:51:04 +0200 Subject: [PATCH 1/4] "about" --- src/doomdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doomdef.h b/src/doomdef.h index afbe61b21..e4dd2ba65 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -604,7 +604,7 @@ extern const char *compdate, *comptime, *comprevision, *compbranch; // undefine to enable fixes and features that are not vanilla compatible #define COMPAT_VANILLA -// if we build with 32 player (or more or less!) support we dont need to care vanilla compat +// if we build with 32 player (or more or less!) support we dont need to care about vanilla compat #if MAXPLAYERS != 16 #undef COMPAT_VANILLA #endif From de74c9251f721cd838a33536281396018541c9c7 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 23 Aug 2026 16:40:22 +0200 Subject: [PATCH 2/4] make HWR_AddPolyObjectPlanes a little less ugly --- src/hardware/hw_main.cpp | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index cc3c55e2f..ad5137eaa 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -2662,11 +2662,13 @@ static void HWR_AddPolyObjectPlanes(void) polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector - if (polyobjsector->floorheight <= gl_frontsector->ceilingheight - && polyobjsector->floorheight >= gl_frontsector->floorheight - && (viewz < polyobjsector->floorheight)) + if (polyobjsector->floorheight <= gl_frontsector->ceilingheight && + polyobjsector->floorheight >= gl_frontsector->floorheight && + (viewz < polyobjsector->floorheight)) { light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true); + const INT16 llevel = (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel); + extracolormap_t *colmap = (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap); if (po_ptrs[i]->translucency > 0) { @@ -2674,22 +2676,24 @@ static void HWR_AddPolyObjectPlanes(void) FBITFIELD blendmode; blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf); HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight, - (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap)); + llevel, Surf.PolyColor.s.alpha, polyobjsector, blendmode, colmap); } else { HWR_GetFlat(levelflats[polyobjsector->floorpic].lumpnum, R_NoEncore(polyobjsector, false)); HWR_RenderPolyObjectPlane(po_ptrs[i], false, polyobjsector->floorheight, PF_Occlude, - (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->floorpic].lumpnum, - polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap)); + llevel, levelflats[polyobjsector->floorpic].lumpnum, + polyobjsector, 255, colmap); } } - if (polyobjsector->ceilingheight >= gl_frontsector->floorheight - && polyobjsector->ceilingheight <= gl_frontsector->ceilingheight - && (viewz > polyobjsector->ceilingheight)) + if (polyobjsector->ceilingheight >= gl_frontsector->floorheight && + polyobjsector->ceilingheight <= gl_frontsector->ceilingheight && + (viewz > polyobjsector->ceilingheight)) { light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true); + const INT16 llevel = (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel); + extracolormap_t *colmap = (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap); if (po_ptrs[i]->translucency > 0) { @@ -2697,14 +2701,14 @@ static void HWR_AddPolyObjectPlanes(void) FBITFIELD blendmode; blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf); HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight, - (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap)); + llevel, Surf.PolyColor.s.alpha, polyobjsector, blendmode, colmap); } else { HWR_GetFlat(levelflats[polyobjsector->ceilingpic].lumpnum, R_NoEncore(polyobjsector, true)); HWR_RenderPolyObjectPlane(po_ptrs[i], true, polyobjsector->ceilingheight, PF_Occlude, - (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->ceilingpic].lumpnum, - polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap)); + llevel, levelflats[polyobjsector->ceilingpic].lumpnum, + polyobjsector, 255, colmap); } } } @@ -3717,7 +3721,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) Surf.PolyColor.s.alpha = alpha; - HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); // sprite shader + HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); top = bot; endtop = endbot; @@ -3744,7 +3748,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) Surf.PolyColor.s.alpha = alpha; - HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); // sprite shader + HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); } // -----------------+ From 5644036d25a60e37785214b60c1b8e898a9cffd7 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 24 Aug 2026 10:30:28 +0200 Subject: [PATCH 3/4] macrofy Z_CheckHeap errors stuff was slightly ugly and unwieldy. making it a macro also makes adding new errors less messy --- src/z_zone.cpp | 102 +++++++++---------------------------------------- 1 file changed, 17 insertions(+), 85 deletions(-) diff --git a/src/z_zone.cpp b/src/z_zone.cpp index f688dd831..ccf3f9bd0 100644 --- a/src/z_zone.cpp +++ b/src/z_zone.cpp @@ -513,6 +513,16 @@ void Z_CheckHeap(INT32 tag) (void)tag; #endif +#ifdef ZDEBUG +#define HeapError(msg) \ + I_Error("Z_CheckHeap : %s:%d, block %u (owned by %s:%d) %s", \ + file, line, blocknumon, block->ownerfile, block->ownerline, msg) +#else +#define HeapError(msg) \ + I_Error("Z_CheckHeap : block %u (owned by %s:%d) %s", \ + blocknumon, block->ownerfile, block->ownerline, msg) +#endif + for (block = head.next; block != &head; block = block->next) { blocknumon++; @@ -524,105 +534,27 @@ void Z_CheckHeap(INT32 tag) #ifdef VALGRIND_MEMPOOL_EXISTS if (!VALGRIND_MEMPOOL_EXISTS(block)) { - I_Error("Z_CheckHeap :" -#ifdef ZDEBUG - " %s %d" -#endif - " block %u" -#ifdef ZDEBUG - " (owned by %s:%d)" -#endif - " should not exist" -#ifdef ZDEBUG - , file, line -#endif - , blocknumon -#ifdef ZDEBUG - , block->ownerfile, block->ownerline -#endif - ); + HeapError(" should not exist"); } #endif if (block->user != NULL && *(block->user) != given) { - I_Error("Z_CheckHeap :" -#ifdef ZDEBUG - " %s %d" -#endif - " block %u" -#ifdef ZDEBUG - " (owned by %s:%d)" -#endif - " doesn't have a proper user" -#ifdef ZDEBUG - , file, line -#endif - , blocknumon -#ifdef ZDEBUG - , block->ownerfile, block->ownerline -#endif - ); + HeapError(" doesn't have a proper user"); } + if (block->next->prev != block) { - I_Error("Z_CheckHeap :" -#ifdef ZDEBUG - " %s %d" -#endif - " block %u" -#ifdef ZDEBUG - " (owned by %s:%d)" -#endif - " lacks proper backlink" -#ifdef ZDEBUG - , file, line -#endif - , blocknumon -#ifdef ZDEBUG - , block->ownerfile, block->ownerline -#endif - ); + HeapError(" lacks proper backlink"); } + if (block->prev->next != block) { - I_Error("Z_CheckHeap :" -#ifdef ZDEBUG - " %s %d" -#endif - " block %u" -#ifdef ZDEBUG - " (owned by %s:%d)" -#endif - " lacks proper forward link" -#ifdef ZDEBUG - , file, line -#endif - , blocknumon -#ifdef ZDEBUG - , block->ownerfile, block->ownerline -#endif - ); + HeapError(" lacks proper forward link"); } #ifdef PARANOIA if (block->id != ZONEID) { - I_Error("Z_CheckHeap :" -#ifdef ZDEBUG - " %s %d" -#endif - " block %u" -#ifdef ZDEBUG - " (owned by %s:%d)" -#endif - " have the wrong ID" -#ifdef ZDEBUG - , file, line -#endif - , blocknumon -#ifdef ZDEBUG - , block->ownerfile, block->ownerline -#endif - ); + HeapError(" has the wrong ID"); } #endif } From 882716e9117278dc191b3ead62fd97441fc18503 Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Sun, 9 Feb 2025 23:05:11 +0100 Subject: [PATCH 4/4] Make Valgrind builds usable when not running with Valgrind + cleanup --- src/z_zone.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/z_zone.cpp b/src/z_zone.cpp index ccf3f9bd0..3a78c7079 100644 --- a/src/z_zone.cpp +++ b/src/z_zone.cpp @@ -44,7 +44,6 @@ #ifdef HAVE_VALGRIND #include "valgrind.h" static boolean Z_calloc = false; -#include "memcheck.h" #endif #define ZONEID 0xa441d13d @@ -180,7 +179,7 @@ void Z_Free(void *ptr) if (block->user != NULL) *block->user = NULL; -#ifdef VALGRIND_DESTROY_MEMPOOL +#ifdef HAVE_VALGRIND VALGRIND_DESTROY_MEMPOOL(block); #endif block->prev->next = block->next; @@ -246,10 +245,6 @@ void *Z_Malloc(size_t size, INT32 tag, void *user) ptr = MEMORY(block); I_Assert((intptr_t)ptr % alignof (max_align_t) == 0); -#ifdef HAVE_VALGRIND - Z_calloc = false; -#endif - block->next = head.next; block->prev = &head; head.next = block; @@ -263,8 +258,9 @@ void *Z_Malloc(size_t size, INT32 tag, void *user) #endif block->size = size; -#ifdef VALGRIND_CREATE_MEMPOOL +#ifdef HAVE_VALGRIND VALGRIND_CREATE_MEMPOOL(block, size, Z_calloc); + Z_calloc = false; #endif #ifdef PARANOIA @@ -301,7 +297,8 @@ void *Z_Calloc2(size_t size, INT32 tag, void *user, const char *file, INT32 line void *Z_Calloc(size_t size, INT32 tag, void *user) #endif { -#ifdef VALGRIND_MEMPOOL_ALLOC + +#ifdef HAVE_VALGRIND Z_calloc = true; #endif #ifdef ZDEBUG @@ -531,8 +528,8 @@ void Z_CheckHeap(INT32 tag) CONS_Debug(DBG_MEMORY, "block %u owned by %s:%d\n", blocknumon, block->ownerfile, block->ownerline); #endif -#ifdef VALGRIND_MEMPOOL_EXISTS - if (!VALGRIND_MEMPOOL_EXISTS(block)) +#ifdef HAVE_VALGRIND + if (RUNNING_ON_VALGRIND && !VALGRIND_MEMPOOL_EXISTS(block)) { HeapError(" should not exist"); }