add Column drawer context switching
reasoning explained in screen.c effectively, there are cases where drawing our columns directly to the screen is the better choice
This commit is contained in:
1 parent
b12989f51c
commit
fe54f2fba2
7 files changed
+99
-35
No files matched your search
@@ -489,6 +489,8 @@ void R_FlushTranslationColormapCache(void)
|
||||
// in reality, the few routines that can work for either mode, are
|
||||
// put here
|
||||
|
||||
enum columncontext_e columncontext = COLUMNCONTEXT_DIRECT;
|
||||
|
||||
enum ColumnFlushType
|
||||
{
|
||||
FLUSH_NONE = 0x0000,
|
||||
|
||||
+19
-2
@@ -102,6 +102,16 @@ extern floatv3_t *ds_su, *ds_sv, *ds_sz;
|
||||
|
||||
extern float focallengthf;
|
||||
|
||||
enum columncontext_e
|
||||
{
|
||||
COLUMNCONTEXT_DIRECT = 0,
|
||||
COLUMNCONTEXT_FLUSH,
|
||||
};
|
||||
|
||||
extern enum columncontext_e columncontext;
|
||||
void R_SetColumnContext(enum columncontext_e _columncontext);
|
||||
|
||||
void R_ResetColumnBuffer(void);
|
||||
|
||||
typedef void (coldrawfunc_t)(drawcolumndata_t*);
|
||||
typedef void (spandrawfunc_t)(drawspandata_t*);
|
||||
@@ -250,10 +260,17 @@ void R_DrawTranslatedTranslucentColumn(drawcolumndata_t* dc);
|
||||
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_DrawFogColumn(drawcolumndata_t* dc);
|
||||
|
||||
void R_ResetColumnBuffer(void);
|
||||
void R_DrawSkyColumn(drawcolumndata_t *dc);
|
||||
|
||||
// span drawers
|
||||
void R_DrawSpan(drawspandata_t* ds);
|
||||
|
||||
+33
-17
@@ -30,7 +30,7 @@ enum DrawColumnType
|
||||
DC_TRANSMAP = 0x0002,
|
||||
DC_HOLES = 0x0004,
|
||||
DC_LIGHTLIST = 0x0008,
|
||||
DC_SKY = 0x0010,
|
||||
DC_DIRECT = 0x0010, // draw our columns directly to screen!
|
||||
};
|
||||
|
||||
template<DrawColumnType Type>
|
||||
@@ -45,8 +45,8 @@ static constexpr UINT8 R_GetColumnTranslated(drawcolumndata_t* dc, UINT8 col, co
|
||||
}
|
||||
|
||||
// translucency is handled on flush side now!
|
||||
/*template<DrawColumnType Type>
|
||||
static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap)
|
||||
template<DrawColumnType Type>
|
||||
static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 * restrict dest, UINT8 col, const UINT8 * restrict colormap)
|
||||
{
|
||||
col = R_GetColumnTranslated<Type>(dc, col, colormap);
|
||||
|
||||
@@ -58,7 +58,7 @@ static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 col, c
|
||||
{
|
||||
return col;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
template<DrawColumnType Type>
|
||||
static constexpr UINT8 R_DrawColumnPixel(drawcolumndata_t* dc, UINT8 * restrict dest, UINT32 bit, const UINT8 * restrict source, const UINT8 * restrict colormap)
|
||||
@@ -73,8 +73,14 @@ static constexpr UINT8 R_DrawColumnPixel(drawcolumndata_t* dc, UINT8 * restrict
|
||||
}
|
||||
}
|
||||
|
||||
//return R_GetColumnTranslucent<Type>(dc, col, colormap);
|
||||
return R_GetColumnTranslated<Type>(dc, col, colormap);
|
||||
if constexpr (Type & DrawColumnType::DC_DIRECT)
|
||||
{ // if we dont flush our columns, we need to handle translucency again
|
||||
return R_GetColumnTranslucent<Type>(dc, dest, col, colormap);
|
||||
}
|
||||
else
|
||||
{
|
||||
return R_GetColumnTranslated<Type>(dc, col, colormap);
|
||||
}
|
||||
}
|
||||
|
||||
/** \brief The R_DrawColumn function
|
||||
@@ -212,7 +218,7 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
|
||||
// SoM: MAGIC
|
||||
UINT8 * restrict dest;
|
||||
|
||||
if constexpr (Type & DrawColumnType::DC_SKY)
|
||||
if constexpr (Type & DrawColumnType::DC_DIRECT)
|
||||
dest = R_Address(dc->x, dc->yl);
|
||||
else if constexpr ((Type & (DrawColumnType::DC_COLORMAP | DrawColumnType::DC_TRANSMAP))
|
||||
== (DrawColumnType::DC_COLORMAP | DrawColumnType::DC_TRANSMAP))
|
||||
@@ -226,8 +232,8 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
|
||||
|
||||
restrict INT32 stride = 4; //SoM: Oh, Oh it's MAGIC! You know...
|
||||
|
||||
if constexpr (Type & DrawColumnType::DC_SKY)
|
||||
stride = vid.width; // no MAGIC for the sky here X)
|
||||
if constexpr (Type & DrawColumnType::DC_DIRECT)
|
||||
stride = vid.width;
|
||||
|
||||
count++; // killough 1/99: minor tuning
|
||||
|
||||
@@ -349,14 +355,24 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
|
||||
R_DrawColumnTemplate<opt>(dc); \
|
||||
}
|
||||
|
||||
DEFINE_COLUMN_FUNC(R_DrawColumn, DC_BASIC)
|
||||
DEFINE_COLUMN_FUNC(R_DrawTranslucentColumn, DC_TRANSMAP)
|
||||
DEFINE_COLUMN_FUNC(R_DrawTranslatedColumn, DC_COLORMAP)
|
||||
DEFINE_COLUMN_FUNC(R_DrawColumnShadowed, DC_LIGHTLIST)
|
||||
DEFINE_COLUMN_FUNC(R_DrawTranslatedTranslucentColumn, DC_COLORMAP|DC_TRANSMAP)
|
||||
DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchColumn, DC_HOLES)
|
||||
DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchTranslucentColumn, DC_HOLES|DC_TRANSMAP)
|
||||
DEFINE_COLUMN_FUNC(R_DrawSkyColumn, DC_SKY)
|
||||
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_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)
|
||||
|
||||
//skymyass
|
||||
//DEFINE_COLUMN_FUNC(R_DrawSkyColumn, DC_SKY)
|
||||
|
||||
/** \brief The R_DrawFogColumn function
|
||||
Fog wall.
|
||||
|
||||
@@ -1391,6 +1391,8 @@ void R_RenderPlayerView(player_t *player)
|
||||
R_SetFov(fov);
|
||||
}
|
||||
|
||||
R_SetColumnContext(COLUMNCONTEXT_FLUSH);
|
||||
|
||||
Portal_InitList();
|
||||
|
||||
PS_START_TIMING(ps_skyboxtime);
|
||||
@@ -1407,6 +1409,7 @@ void R_RenderPlayerView(player_t *player)
|
||||
R_RenderViewpoint(&masks[nummasks - 1], false);
|
||||
|
||||
R_ClipSprites(drawsegs, NULL);
|
||||
R_SetColumnContext(COLUMNCONTEXT_DIRECT);
|
||||
R_DrawSkyPlanes(); // draw the fucker again to prevent some artifacts
|
||||
R_DrawPlanes();
|
||||
R_DrawMasked(masks, nummasks);
|
||||
@@ -1442,6 +1445,7 @@ void R_RenderPlayerView(player_t *player)
|
||||
// check for new console commands.
|
||||
NetUpdate();
|
||||
|
||||
R_SetColumnContext(COLUMNCONTEXT_FLUSH);
|
||||
ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0;
|
||||
PS_START_TIMING(ps_bsptime);
|
||||
R_RenderViewpoint(&masks[nummasks - 1], true);
|
||||
@@ -1491,6 +1495,7 @@ void R_RenderPlayerView(player_t *player)
|
||||
}
|
||||
PS_STOP_TIMING(ps_sw_portaltime);
|
||||
|
||||
R_SetColumnContext(COLUMNCONTEXT_DIRECT);
|
||||
PS_START_TIMING(ps_sw_planetime);
|
||||
if (!skybox)
|
||||
R_DrawSkyPlanes();
|
||||
|
||||
+5
-7
@@ -739,7 +739,7 @@ void R_DrawPlanes(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
static void R_DrawSkyPlane(visplane_t *pl, boolean allow_parallel);
|
||||
static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc2)(drawcolumndata_t*), boolean allow_parallel);
|
||||
|
||||
void R_DrawSkyPlanes(void)
|
||||
{
|
||||
@@ -757,7 +757,7 @@ void R_DrawSkyPlanes(void)
|
||||
if (pl->picnum != skyflatnum || pl->ffloor || pl->polyobj)
|
||||
continue;
|
||||
|
||||
R_DrawSkyPlane(pl, cv_parallelsoftware.value);
|
||||
R_DrawSkyPlane(pl, colfunc, cv_parallelsoftware.value);
|
||||
}
|
||||
}
|
||||
#ifdef HAVE_THREADS
|
||||
@@ -767,7 +767,7 @@ void R_DrawSkyPlanes(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
static void R_DrawSkyPlane(visplane_t *pl, boolean allow_parallel)
|
||||
static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc2)(drawcolumndata_t*), boolean allow_parallel)
|
||||
{
|
||||
INT32 x;
|
||||
|
||||
@@ -834,8 +834,7 @@ static void R_DrawSkyPlane(visplane_t *pl, boolean allow_parallel)
|
||||
dc.x = x + i;
|
||||
dc.source = R_GetColumn(texture, -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
|
||||
|
||||
//colfunc2(&dc);
|
||||
R_DrawSkyColumn(&dc);
|
||||
colfunc2(&dc);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -872,8 +871,7 @@ static void R_DrawSkyPlane(visplane_t *pl, boolean allow_parallel)
|
||||
R_GetColumn(texturetranslation[skytexture],
|
||||
-angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
|
||||
|
||||
//colfunc2(&dc);
|
||||
R_DrawSkyColumn(&dc);
|
||||
colfunc2(&dc);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
+34
-9
@@ -84,7 +84,7 @@ UINT8 *scr_borderpatch; // flat used to fill the reduced view borders set at ST_
|
||||
|
||||
// =========================================================================
|
||||
|
||||
static void SCR_SetDrawFuncs(void)
|
||||
static void SCR_SetDrawFuncs(enum columncontext_e _columncontext)
|
||||
{
|
||||
//
|
||||
// setup the right draw routines
|
||||
@@ -103,13 +103,27 @@ static void SCR_SetDrawFuncs(void)
|
||||
spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan;
|
||||
spanfuncs[SPANDRAWFUNC_TILTEDFOG] = R_DrawFogSpan_Tilted;
|
||||
|
||||
colfuncs[BASEDRAWFUNC] = R_DrawColumn;
|
||||
colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn;
|
||||
colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn;
|
||||
colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed;
|
||||
colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn;
|
||||
colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn;
|
||||
colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
|
||||
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;
|
||||
}
|
||||
else
|
||||
{
|
||||
colfuncs[BASEDRAWFUNC] = R_DrawColumn;
|
||||
colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn;
|
||||
colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn;
|
||||
colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed;
|
||||
colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn;
|
||||
colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn;
|
||||
colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
|
||||
}
|
||||
|
||||
colfuncs[COLDRAWFUNC_FOG] = R_DrawFogColumn;
|
||||
|
||||
R_SetColumnFunc(BASEDRAWFUNC);
|
||||
@@ -131,12 +145,23 @@ void SCR_SetMode(void)
|
||||
|
||||
V_SetPalette(0);
|
||||
|
||||
SCR_SetDrawFuncs();
|
||||
SCR_SetDrawFuncs(COLUMNCONTEXT_DIRECT);
|
||||
|
||||
// set the apprpriate drawer for the sky (tall or INT16)
|
||||
setmodeneeded = 0;
|
||||
}
|
||||
|
||||
// used to switch between column buffering and drawing them directly to screen
|
||||
// our sky "plane" drawer cannot handle the buffer system due to multithreading
|
||||
// (that would require alot of extra complexity for smth with massive diminishing results)
|
||||
// Our masked drawing step draws things in a very particular order, which results in alot of flushing to screen
|
||||
// effectively adding massive overhead during buffering, so we draw our masked thing directly to screen instead
|
||||
void R_SetColumnContext(enum columncontext_e _columncontext)
|
||||
{
|
||||
columncontext = _columncontext;
|
||||
SCR_SetDrawFuncs(_columncontext); // set our column drawers
|
||||
}
|
||||
|
||||
void R_SetColumnFunc(size_t id)
|
||||
{
|
||||
I_Assert(id < COLDRAWFUNC_MAX);
|
||||
|
||||
@@ -96,6 +96,7 @@ extern consvar_t cv_vidwait;
|
||||
|
||||
extern consvar_t cv_votebgscaling;
|
||||
|
||||
//void R_SetColumnContext(enum columncontext_e _columncontext); // declared in r_draw!
|
||||
void R_SetColumnFunc(size_t id);
|
||||
void R_SetSpanFunc(size_t id);
|
||||
boolean R_CheckColumnFunc(size_t id);
|
||||
|
||||
Reference in new issue
Block a user