diff --git a/src/r_draw_column.cpp b/src/r_draw_column.cpp index 8ec979cde..4102035d1 100644 --- a/src/r_draw_column.cpp +++ b/src/r_draw_column.cpp @@ -44,20 +44,21 @@ static constexpr UINT8 R_GetColumnTranslated(drawcolumndata_t* dc, UINT8 col, co return colormap[col]; } -template +// translucency is handled on flush side now! +/*template static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap) { col = R_GetColumnTranslated(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 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(dc, col, colormap); + //return R_GetColumnTranslucent(dc, col, colormap); + return R_GetColumnTranslated(dc, col, colormap); } /** \brief The R_DrawColumn function diff --git a/src/r_draw_flush.cpp b/src/r_draw_flush.cpp index fcc94a767..53ce2f3f7 100644 --- a/src/r_draw_flush.cpp +++ b/src/r_draw_flush.cpp @@ -14,7 +14,7 @@ /// \note no includes because this is included as part of r_draw.cpp template -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) {