From 12a1755edf1587fd8ee095aaa5d8978af01f37cc Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Fri, 4 Nov 2016 01:39:53 +0100 Subject: [PATCH] Move texture info to R_DrawMaskedColumn and add bounds checking --- src/r_segs.cpp | 8 +------ src/r_things.cpp | 60 ++++++++++++++++++++++++++---------------------- src/r_things.h | 2 +- src/v_draw.cpp | 42 +++------------------------------ 4 files changed, 37 insertions(+), 75 deletions(-) diff --git a/src/r_segs.cpp b/src/r_segs.cpp index a8267a663..e1925f66a 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -197,13 +197,7 @@ static void BlastMaskedColumn (FTexture *tex, bool useRt) // when forming multipatched textures (see r_data.c). // draw the texture - const FTexture::Span *spans; - const BYTE *pixels; - if (r_swtruecolor && !drawer_needs_pal_input) - pixels = (const BYTE *)tex->GetColumnBgra(maskedtexturecol[dc_x] >> FRACBITS, &spans); - else - pixels = tex->GetColumn(maskedtexturecol[dc_x] >> FRACBITS, &spans); - R_DrawMaskedColumn(pixels, spans, useRt); + R_DrawMaskedColumn(tex, maskedtexturecol[dc_x], useRt); rw_light += rw_lightstep; spryscale += rw_scalestep; } diff --git a/src/r_things.cpp b/src/r_things.cpp index bde2bfc66..a04676492 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -251,9 +251,27 @@ double sprtopscreen; bool sprflipvert; -void R_DrawMaskedColumn (const BYTE *column, const FTexture::Span *span, bool useRt) +void R_DrawMaskedColumn (FTexture *tex, fixed_t col, bool useRt, bool unmasked) { + const FTexture::Span *span; + const BYTE *column; + if (r_swtruecolor && !drawer_needs_pal_input) + column = (const BYTE *)tex->GetColumnBgra(col >> FRACBITS, &span); + else + column = tex->GetColumn(col >> FRACBITS, &span); + + FTexture::Span unmaskedSpan[2]; + if (unmasked) + { + span = unmaskedSpan; + unmaskedSpan[0].TopOffset = 0; + unmaskedSpan[0].Length = tex->GetHeight(); + unmaskedSpan[1].TopOffset = 0; + unmaskedSpan[1].Length = 0; + } + int pixelsize = r_swtruecolor ? 4 : 1; + while (span->Length != 0) { const int length = span->Length; @@ -283,6 +301,15 @@ void R_DrawMaskedColumn (const BYTE *column, const FTexture::Span *span, bool us dc_source = column; dc_dest = (ylookup[dc_yl] + dc_x) * pixelsize + dc_destorg; dc_count = dc_yh - dc_yl + 1; + + fixed_t maxfrac = ((top + length) << FRACBITS) - 1; + dc_texturefrac = MAX(dc_texturefrac, 0); + dc_texturefrac = MIN(dc_texturefrac, maxfrac); + if (dc_iscale > 0) + dc_count = MIN(dc_count, (maxfrac - dc_texturefrac + dc_iscale - 1) / dc_iscale); + else if (dc_iscale < 0) + dc_count = MIN(dc_count, (dc_texturefrac - dc_iscale) / (-dc_iscale)); + if (useRt) hcolfunc_pre(); else @@ -364,8 +391,6 @@ static inline bool R_ClipSpriteColumnWithPortals(vissprite_t* spr) // void R_DrawVisSprite (vissprite_t *vis) { - const BYTE *pixels; - const FTexture::Span *spans; fixed_t frac; FTexture *tex; int x2, stop4; @@ -432,13 +457,8 @@ void R_DrawVisSprite (vissprite_t *vis) { while ((dc_x < stop4) && (dc_x & 3)) { - if (r_swtruecolor && !drawer_needs_pal_input) - pixels = (const BYTE *)tex->GetColumnBgra (frac >> FRACBITS, &spans); - else - pixels = tex->GetColumn (frac >> FRACBITS, &spans); - if (ispsprite || !R_ClipSpriteColumnWithPortals(vis)) - R_DrawMaskedColumn (pixels, spans, false); + R_DrawMaskedColumn (tex, frac, false); dc_x++; frac += xiscale; } @@ -448,13 +468,8 @@ void R_DrawVisSprite (vissprite_t *vis) rt_initcols(nullptr); for (int zz = 4; zz; --zz) { - if (r_swtruecolor && !drawer_needs_pal_input) - pixels = (const BYTE *)tex->GetColumnBgra (frac >> FRACBITS, &spans); - else - pixels = tex->GetColumn (frac >> FRACBITS, &spans); - if (ispsprite || !R_ClipSpriteColumnWithPortals(vis)) - R_DrawMaskedColumn (pixels, spans, true); + R_DrawMaskedColumn (tex, frac, true); dc_x++; frac += xiscale; } @@ -463,13 +478,8 @@ void R_DrawVisSprite (vissprite_t *vis) while (dc_x < x2) { - if (r_swtruecolor && !drawer_needs_pal_input) - pixels = (const BYTE *)tex->GetColumnBgra (frac >> FRACBITS, &spans); - else - pixels = tex->GetColumn (frac >> FRACBITS, &spans); - if (ispsprite || !R_ClipSpriteColumnWithPortals(vis)) - R_DrawMaskedColumn (pixels, spans, false); + R_DrawMaskedColumn (tex, frac, false); dc_x++; frac += xiscale; } @@ -623,14 +633,8 @@ void R_WallSpriteColumn (bool useRt) else sprtopscreen = CenterY - dc_texturemid * spryscale; - const BYTE *column; - const FTexture::Span *spans; - if (r_swtruecolor && !drawer_needs_pal_input) - column = (const BYTE *)WallSpriteTile->GetColumnBgra (lwall[dc_x] >> FRACBITS, &spans); - else - column = WallSpriteTile->GetColumn (lwall[dc_x] >> FRACBITS, &spans); dc_texturefrac = 0; - R_DrawMaskedColumn(column, spans, useRt); + R_DrawMaskedColumn(WallSpriteTile, lwall[dc_x], useRt); rw_light += rw_lightstep; } diff --git a/src/r_things.h b/src/r_things.h index e8ffbf5ca..e35489892 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -126,7 +126,7 @@ extern double pspriteyscale; extern FTexture *WallSpriteTile; -void R_DrawMaskedColumn (const BYTE *column, const FTexture::Span *spans, bool useRt); +void R_DrawMaskedColumn (FTexture *texture, fixed_t column, bool useRt, bool unmasked = false); void R_WallSpriteColumn (bool useRt); void R_CacheSprite (spritedef_t *sprite); diff --git a/src/v_draw.cpp b/src/v_draw.cpp index ddcbb381c..2397fc48c 100644 --- a/src/v_draw.cpp +++ b/src/v_draw.cpp @@ -133,8 +133,6 @@ void DCanvas::DrawTexture (FTexture *img, double x, double y, int tags_first, .. void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms) { #ifndef NO_SWRENDER - FTexture::Span unmaskedSpan[2]; - const FTexture::Span **spanptr, *spans; static short bottomclipper[MAXWIDTH], topclipper[MAXWIDTH]; const BYTE *translation = NULL; @@ -144,15 +142,6 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms) R_InitColumnDrawers(); } - if (parms.masked) - { - spanptr = &spans; - } - else - { - spanptr = NULL; - } - if (APART(parms.colorOverlay) != 0) { // The software renderer cannot invert the source without inverting the overlay @@ -217,18 +206,8 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms) if (mode != DontDraw) { - const BYTE *pixels; int stop4; - if (spanptr == NULL) - { // Create a single span for forced unmasked images - spans = unmaskedSpan; - unmaskedSpan[0].TopOffset = 0; - unmaskedSpan[0].Length = img->GetHeight(); - unmaskedSpan[1].TopOffset = 0; - unmaskedSpan[1].Length = 0; - } - double centeryback = CenterY; CenterY = 0; @@ -320,12 +299,7 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms) { while ((dc_x < stop4) && (dc_x & 3)) { - if (r_swtruecolor && !drawer_needs_pal_input) - pixels = (const BYTE *)img->GetColumnBgra(frac >> FRACBITS, spanptr); - else - pixels = img->GetColumn(frac >> FRACBITS, spanptr); - - R_DrawMaskedColumn(pixels, spans, false); + R_DrawMaskedColumn(img, frac, false, !parms.masked); dc_x++; frac += xiscale_i; } @@ -335,12 +309,7 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms) rt_initcols(nullptr); for (int zz = 4; zz; --zz) { - if (r_swtruecolor && !drawer_needs_pal_input) - pixels = (const BYTE *)img->GetColumnBgra(frac >> FRACBITS, spanptr); - else - pixels = img->GetColumn(frac >> FRACBITS, spanptr); - - R_DrawMaskedColumn(pixels, spans, true); + R_DrawMaskedColumn(img, frac, true, !parms.masked); dc_x++; frac += xiscale_i; } @@ -349,12 +318,7 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms) while (dc_x < x2_i) { - if (r_swtruecolor && !drawer_needs_pal_input) - pixels = (const BYTE *)img->GetColumnBgra(frac >> FRACBITS, spanptr); - else - pixels = img->GetColumn(frac >> FRACBITS, spanptr); - - R_DrawMaskedColumn(pixels, spans, false); + R_DrawMaskedColumn(img, frac, false, !parms.masked); dc_x++; frac += xiscale_i; }