remove R_GetColumnTranslucent
This commit is contained in:
1 parent
c9b6276a02
commit
41b78feef5
2 files changed
+8
-6
No files matched your search
@@ -44,20 +44,21 @@ static constexpr UINT8 R_GetColumnTranslated(drawcolumndata_t* dc, UINT8 col, co
|
||||
return colormap[col];
|
||||
}
|
||||
|
||||
template<DrawColumnType Type>
|
||||
// translucency is handled on flush side now!
|
||||
/*template<DrawColumnType Type>
|
||||
static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap)
|
||||
{
|
||||
col = R_GetColumnTranslated<Type>(dc, col, colormap);
|
||||
|
||||
/*if constexpr (Type & DrawColumnType::DC_TRANSMAP)
|
||||
if constexpr (Type & DrawColumnType::DC_TRANSMAP)
|
||||
{
|
||||
return *(dc->transmap + (col << 8) + (*dest));
|
||||
}
|
||||
else*/
|
||||
else
|
||||
{
|
||||
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)
|
||||
@@ -72,7 +73,8 @@ static constexpr UINT8 R_DrawColumnPixel(drawcolumndata_t* dc, UINT8 * restrict
|
||||
}
|
||||
}
|
||||
|
||||
return R_GetColumnTranslucent<Type>(dc, col, colormap);
|
||||
//return R_GetColumnTranslucent<Type>(dc, col, colormap);
|
||||
return R_GetColumnTranslated<Type>(dc, col, colormap);
|
||||
}
|
||||
|
||||
/** \brief The R_DrawColumn function
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
/// \note no includes because this is included as part of r_draw.cpp
|
||||
|
||||
template<ColumnFlushType Type>
|
||||
static inline UINT8 R_DrawFlushColumnPixel(UINT8 dest, UINT8 source)
|
||||
FUNCINLINE static ATTRINLINE UINT8 R_DrawFlushColumnPixel(UINT8 restrict dest, UINT8 restrict source)
|
||||
{
|
||||
if constexpr (Type & ColumnFlushType::FLUSH_OPAQUE)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user