diff --git a/src/Makefile b/src/Makefile index 3422a0cf7..fd3176aa0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -69,6 +69,7 @@ # VALGRIND=1 - Enable Valgrind memory debugging support. # PROFILEMODE=1 - Enable performance profiling (gprof). # USEASAN=1 - Enable building with Address Sanitizer. +# USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer. # NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces. # # General flags for building: @@ -277,6 +278,17 @@ libs+=-fsanitize=address endif endif +ifdef USEUBSAN +# compile with asan +ifdef MINGW +opts+=-fsanitize=undefined -g +libs+=-fsanitize=undefined -g +else +opts+=-fsanitize=undefined +libs+=-fsanitize=undefined +endif +endif + ifeq ($(CC),clang) LDFLAGS+= -fuse-ld=lld endif diff --git a/src/p_saveg.c b/src/p_saveg.c index d158cf91b..d3a162e2d 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -3531,7 +3531,8 @@ static void P_ReloadSaveLevelData(void) ss->floorpic_angle = spawnss->floorpic_angle; ss->ceilingpic_angle = spawnss->ceilingpic_angle; ss->tag = spawnss->tag; - ss->firsttag = ss->nexttag = -1; + ss->firsttag = spawnss->firsttag; + ss->nexttag = spawnss->nexttag; if (ss->ffloors) { @@ -3556,7 +3557,8 @@ static void P_ReloadSaveLevelData(void) li->callcount = 0; li->tag = spawnli->tag; - li->firsttag = li->nexttag = -1; + li->firsttag = spawnli->firsttag; + li->nexttag = spawnli->nexttag; if (li->sidenum[0] != 0xffff) { @@ -3580,8 +3582,6 @@ static void P_ReloadSaveLevelData(void) si->midtexture = spawnsi->midtexture; } } - - P_InitTagLists(); } FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading) diff --git a/src/p_setup.c b/src/p_setup.c index afdda1ded..6d2c7a9a7 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -1994,6 +1994,7 @@ static void P_LoadMapData(const virtres_t* virt) P_LoadLinedefs(virtlinedefs->data); P_LoadSidedefs(virtsidedefs->data); P_LoadThings(virtthings->data); + P_InitTagLists(); // Create xref tables for tags // Copy relevant map data for NetArchive purposes. spawnsectors = Z_Calloc(numsectors * sizeof(*sectors), PU_LEVEL, NULL); diff --git a/src/p_spec.c b/src/p_spec.c index 7b4b45358..cf2ca3e3e 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -5387,7 +5387,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate) // set current weather curWeather = mapheaderinfo[gamemap-1]->weather; - P_InitTagLists(); // Create xref tables for tags P_SearchForDisableLinedefs(); // Disable linedefs are now allowed to disable *any* line P_SpawnScrollers(); // Add generalized scrollers diff --git a/src/r_draw.cpp b/src/r_draw.cpp index ed233e387..39f8918bb 100644 --- a/src/r_draw.cpp +++ b/src/r_draw.cpp @@ -606,13 +606,8 @@ static void R_AllocViewMemory(void) R_AllocVisSpriteMemory(); } -void R_InitViewBuffer(INT32 width, INT32 height) +void R_InitViewBuffer(void) { - if (width > MAXVIDWIDTH) - width = MAXVIDWIDTH; - if (height > MAXVIDHEIGHT) - height = MAXVIDHEIGHT; - R_AllocViewMemory(); viewwindowx = 0; @@ -636,8 +631,10 @@ void R_InitViewBuffer(INT32 width, INT32 height) bufsize++; temp_dc.buf = static_cast(aligned_alloc(16, bufsize)); #else - temp_dc.buf = static_cast(Z_Calloc(bufsize, PU_STATIC, NULL)); + temp_dc.buf = static_cast(Z_Malloc(bufsize, PU_STATIC, NULL)); #endif + + memset(temp_dc.buf, 0, bufsize); } /** \brief The R_VideoErase function diff --git a/src/r_draw.h b/src/r_draw.h index cd1356522..a472b5537 100644 --- a/src/r_draw.h +++ b/src/r_draw.h @@ -31,7 +31,6 @@ FUNCINLINE static ATTRINLINE UINT8 *R_Address(INT32 px, INT32 py) return vid.screens[0] + (py + viewwindowy) * vid.width + (viewwindowx + px); } - typedef struct { float x, y, z; } floatv3_t; @@ -164,6 +163,8 @@ void R_DrawMaskedColumn(drawcolumndata_t* dc, column_t *column); // r_draw.c // ------------------------------------------------ +// Custom player skin translation + #define GTC_CACHE 1 #define GTC_MENUCACHE GTC_CACHE //@TODO Add a separate caching mechanism for menu colormaps distinct from in-level GTC_CACHE. For now this is still preferable to memory leaks... @@ -208,8 +209,7 @@ UINT8 *R_GetBlendTable(int style, INT32 alphalevel); boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel); -// Custom player skin translation -void R_InitViewBuffer(INT32 width, INT32 height); +void R_InitViewBuffer(void); void R_VideoErase(size_t ofs, INT32 count); #define TRANSPARENTPIXEL 247 @@ -231,17 +231,16 @@ void R_Draw2sMultiPatchColumn(drawcolumndata_t* dc); void R_Draw2sMultiPatchTranslucentColumn(drawcolumndata_t* dc); // column drawers which use buffered drawing with flush -void R_DrawColumnFlush(drawcolumndata_t* dc); -void R_DrawTranslucentColumnFlush(drawcolumndata_t* dc); -void R_DrawTranslatedColumnFlush(drawcolumndata_t* dc); -void R_DrawColumnShadowedFlush(drawcolumndata_t* dc); -void R_DrawTranslatedTranslucentColumnFlush(drawcolumndata_t* dc); -void R_Draw2sMultiPatchColumnFlush(drawcolumndata_t* dc); -void R_Draw2sMultiPatchTranslucentColumnFlush(drawcolumndata_t* dc); +void R_DrawColumn_Flush(drawcolumndata_t* dc); +void R_DrawTranslucentColumn_Flush(drawcolumndata_t* dc); +void R_DrawTranslatedColumn_Flush(drawcolumndata_t* dc); +void R_DrawColumnShadowed_Flush(drawcolumndata_t* dc); +void R_DrawTranslatedTranslucentColumn_Flush(drawcolumndata_t* dc); +void R_Draw2sMultiPatchColumn_Flush(drawcolumndata_t* dc); +void R_Draw2sMultiPatchTranslucentColumn_Flush(drawcolumndata_t* dc); void R_DrawFogColumn(drawcolumndata_t* dc); - // span drawers void R_DrawSpan(drawspandata_t* ds); diff --git a/src/r_draw_column.cpp b/src/r_draw_column.cpp index 3ac814e8d..b2ad1c3f4 100644 --- a/src/r_draw_column.cpp +++ b/src/r_draw_column.cpp @@ -358,24 +358,18 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc) R_DrawColumnTemplate(dc); \ } -DEFINE_COLUMN_FUNC(R_DrawColumn, DC_DIRECT|DC_BASIC) -DEFINE_COLUMN_FUNC(R_DrawTranslucentColumn, DC_DIRECT|DC_TRANSMAP) -DEFINE_COLUMN_FUNC(R_DrawTranslatedColumn, DC_DIRECT|DC_COLORMAP) -DEFINE_COLUMN_FUNC(R_DrawColumnShadowed, DC_DIRECT|DC_LIGHTLIST) -DEFINE_COLUMN_FUNC(R_DrawTranslatedTranslucentColumn, DC_DIRECT|DC_COLORMAP|DC_TRANSMAP) -DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchColumn, DC_DIRECT|DC_HOLES) -DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchTranslucentColumn, DC_DIRECT|DC_HOLES|DC_TRANSMAP) +#define DEFINE_COLUMN_COMBO(name, flags) \ + DEFINE_COLUMN_FUNC(name, flags|DC_DIRECT) \ + DEFINE_COLUMN_FUNC(name ## _Flush, flags) -DEFINE_COLUMN_FUNC(R_DrawColumnFlush, DC_BASIC) -DEFINE_COLUMN_FUNC(R_DrawTranslucentColumnFlush, DC_TRANSMAP) -DEFINE_COLUMN_FUNC(R_DrawTranslatedColumnFlush, DC_COLORMAP) -DEFINE_COLUMN_FUNC(R_DrawColumnShadowedFlush, DC_LIGHTLIST) -DEFINE_COLUMN_FUNC(R_DrawTranslatedTranslucentColumnFlush, DC_COLORMAP|DC_TRANSMAP) -DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchColumnFlush, DC_HOLES) -DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchTranslucentColumnFlush, DC_HOLES|DC_TRANSMAP) +DEFINE_COLUMN_COMBO(R_DrawColumn, DC_BASIC) +DEFINE_COLUMN_COMBO(R_DrawTranslucentColumn, DC_TRANSMAP) +DEFINE_COLUMN_COMBO(R_DrawTranslatedColumn, DC_COLORMAP) +DEFINE_COLUMN_COMBO(R_DrawColumnShadowed, DC_LIGHTLIST) +DEFINE_COLUMN_COMBO(R_DrawTranslatedTranslucentColumn, DC_COLORMAP|DC_TRANSMAP) +DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchColumn, DC_HOLES) +DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchTranslucentColumn, DC_HOLES|DC_TRANSMAP) -//skymyass -//DEFINE_COLUMN_FUNC(R_DrawSkyColumn, DC_SKY) /** \brief The R_DrawFogColumn function Fog wall. diff --git a/src/r_draw_flush.cpp b/src/r_draw_flush.cpp index 80da61705..e729243e9 100644 --- a/src/r_draw_flush.cpp +++ b/src/r_draw_flush.cpp @@ -151,23 +151,43 @@ static void R_FlushQuad(void) INT32 count = t_dc->commonbot - t_dc->commontop + 1; const UINT8 *restrict buf = t_dc->buf; + const UINT8 * restrict source = buf + (t_dc->commontop << 3); + UINT8 * restrict dest = R_Address(t_dc->startx, t_dc->commontop); + if constexpr (Type & ColumnFlushType::FLUSH_OPAQUE) { - const INT64 *source = reinterpret_cast(buf + (t_dc->commontop << 3)); - INT64 *dest = reinterpret_cast(R_Address(t_dc->startx, t_dc->commontop)); - const INT32 deststep = stride / 8; - - while (--count >= 0) + // aligned copy + if (((uintptr_t)dest & 7) == 0) { - *dest = *source++; - dest += deststep; + const INT64 *source64 = reinterpret_cast(source); + INT64 *dest64 = reinterpret_cast(dest); + const INT32 deststep = stride / 8; + + while (--count >= 0) + { + *dest64 = *source64++; + dest64 += deststep; + } + } + else + { + while (--count >= 0) + { + dest[0] = source[0]; + dest[1] = source[1]; + dest[2] = source[2]; + dest[3] = source[3]; + dest[4] = source[4]; + dest[5] = source[5]; + dest[6] = source[6]; + dest[7] = source[7]; + source += 8; + dest += stride; + } } } else { - const UINT8 * restrict source = buf + (t_dc->commontop << 3); - UINT8 * restrict dest = R_Address(t_dc->startx, t_dc->commontop); - while (--count >= 0) { dest[0] = R_DrawFlushPixel(t_dc, &dest[0], &source[0]); diff --git a/src/r_main.cpp b/src/r_main.cpp index 37cfed8c5..50185d016 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -1003,7 +1003,7 @@ static void R_InitViewMapping(void) static void R_SetupViewBuffers(void) { R_CalcFov(cv_fov.value); - R_InitViewBuffer(viewwidth, viewheight); + R_InitViewBuffer(); R_InitViewMapping(); } diff --git a/src/r_things.cpp b/src/r_things.cpp index 76cc91254..e7eae525d 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -2801,11 +2801,6 @@ void R_ClipSprites(drawseg_t* dsstart, portal_t* portal) drawseg_t* ds; INT32 i; - if (visspritecount - clippedvissprites <= 0) - { - return; - } - // e6y // Reducing of cache misses in the following R_DrawSprite() // Makes sense for scenes with huge amount of drawsegs. @@ -2815,6 +2810,11 @@ void R_ClipSprites(drawseg_t* dsstart, portal_t* portal) drawsegs_xranges[i].count = 0; } + if (visspritecount - clippedvissprites <= 0) + { + return; + } + if (drawsegs_xrange_size < maxdrawsegs) { // haleyjd: fix reallocation to track 2x size diff --git a/src/screen.c b/src/screen.c index 78cfefd4f..4a38ef97d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -101,13 +101,13 @@ static void SCR_SetDrawFuncs(enum columncontext_e _columncontext) if (_columncontext == COLUMNCONTEXT_FLUSH) { - colfuncs[BASEDRAWFUNC] = R_DrawColumnFlush; - colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumnFlush; - colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumnFlush; - colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowedFlush; - colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumnFlush; - colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumnFlush; - colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumnFlush; + colfuncs[BASEDRAWFUNC] = R_DrawColumn_Flush; + colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn_Flush; + colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn_Flush; + colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed_Flush; + colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn_Flush; + colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn_Flush; + colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn_Flush; } else { diff --git a/src/v_video.c b/src/v_video.c index 0826f508b..0104cf78c 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -3828,11 +3828,15 @@ void V_Init(void) for (i = 0; i < NUMSCREENS; i++) { + if (vid.screens[i]) + { #if defined(__SSE__) - aligned_free(vid.screens[i]); + aligned_free(vid.screens[i]); #else - free(vid.screens[i]); + free(vid.screens[i]); #endif + } + vid.screens[i] = NULL; }