From ea0c624d56e8c681bfdda5dd97ffa47df5b3ad42 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 19 Oct 2025 21:02:04 +0200 Subject: [PATCH] macrofy column function definitions --- src/r_draw.h | 15 +++++++-------- src/r_draw_column.cpp | 26 ++++++++++---------------- src/screen.c | 14 +++++++------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/src/r_draw.h b/src/r_draw.h index 175781e4c..83ec33d56 100644 --- a/src/r_draw.h +++ b/src/r_draw.h @@ -230,17 +230,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/screen.c b/src/screen.c index b7b1a99ad..fbf547ce6 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 {