From 08fd81802d518e0fbb1eb537ceefcea5d0661465 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 25 Dec 2016 08:01:21 +0100 Subject: [PATCH] Remove useRt --- src/r_segs.cpp | 8 ++++---- src/r_things.cpp | 14 +++++++------- src/r_things.h | 4 ++-- src/v_draw.cpp | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/r_segs.cpp b/src/r_segs.cpp index a2d02c3f9..eff303acb 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -153,7 +153,7 @@ inline bool IsFogBoundary (sector_t *front, sector_t *back) float *MaskedSWall; float MaskedScaleY; -static void BlastMaskedColumn (FTexture *tex, bool useRt) +static void BlastMaskedColumn (FTexture *tex) { // calculate lighting if (fixedcolormap == NULL && fixedlightlev < 0) @@ -176,7 +176,7 @@ static void BlastMaskedColumn (FTexture *tex, bool useRt) // when forming multipatched textures (see r_data.c). // draw the texture - R_DrawMaskedColumn(tex, maskedtexturecol[dc_x], useRt); + R_DrawMaskedColumn(tex, maskedtexturecol[dc_x]); rw_light += rw_lightstep; spryscale += rw_scalestep; } @@ -415,7 +415,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2) { for (dc_x = x1; dc_x < x2; ++dc_x) { - BlastMaskedColumn (tex, false); + BlastMaskedColumn (tex); } } } @@ -2309,7 +2309,7 @@ static void R_RenderDecal (side_t *wall, DBaseDecal *decal, drawseg_t *clipper, { // calculate lighting R_SetColorMapLight(usecolormap, rw_light, wallshade); } - R_WallSpriteColumn (false); + R_WallSpriteColumn (); dc_x++; } } diff --git a/src/r_things.cpp b/src/r_things.cpp index 7b945a44c..0e1fbef56 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -258,7 +258,7 @@ double sprtopscreen; bool sprflipvert; -void R_DrawMaskedColumnBgra(FTexture *tex, fixed_t col, bool useRt, bool unmasked) +void R_DrawMaskedColumnBgra(FTexture *tex, fixed_t col, bool unmasked) { fixed_t saved_iscale = dc_iscale; // Save this because we need to modify it for mipmaps @@ -374,12 +374,12 @@ void R_DrawMaskedColumnBgra(FTexture *tex, fixed_t col, bool useRt, bool unmaske dc_iscale = saved_iscale; } -void R_DrawMaskedColumn (FTexture *tex, fixed_t col, bool useRt, bool unmasked) +void R_DrawMaskedColumn (FTexture *tex, fixed_t col, bool unmasked) { // Handle the linear filtered version in a different function to reduce chances of merge conflicts from zdoom. - if (r_swtruecolor && !drawer_needs_pal_input && !useRt) // To do: add support to R_DrawColumnHoriz_rgba + if (r_swtruecolor && !drawer_needs_pal_input) // To do: add support to R_DrawColumnHoriz_rgba { - R_DrawMaskedColumnBgra(tex, col, useRt, unmasked); + R_DrawMaskedColumnBgra(tex, col, unmasked); return; } @@ -669,14 +669,14 @@ void R_DrawWallSprite(vissprite_t *spr) R_SetColorMapLight(usecolormap, rw_light, shade); } if (!R_ClipSpriteColumnWithPortals(spr)) - R_WallSpriteColumn(false); + R_WallSpriteColumn(); dc_x++; } } R_FinishSetPatchStyle(); } -void R_WallSpriteColumn (bool useRt) +void R_WallSpriteColumn () { float iscale = swall[dc_x] * MaskedScaleY; dc_iscale = FLOAT2FIXED(iscale); @@ -687,7 +687,7 @@ void R_WallSpriteColumn (bool useRt) sprtopscreen = CenterY - dc_texturemid * spryscale; dc_texturefrac = 0; - R_DrawMaskedColumn(WallSpriteTile, lwall[dc_x], useRt); + R_DrawMaskedColumn(WallSpriteTile, lwall[dc_x]); rw_light += rw_lightstep; } diff --git a/src/r_things.h b/src/r_things.h index 657be32c5..ac8345c70 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -129,8 +129,8 @@ extern double pspriteyscale; extern FTexture *WallSpriteTile; -void R_DrawMaskedColumn (FTexture *texture, fixed_t column, bool useRt, bool unmasked = false); -void R_WallSpriteColumn (bool useRt); +void R_DrawMaskedColumn (FTexture *texture, fixed_t column, bool unmasked = false); +void R_WallSpriteColumn (); void R_CacheSprite (spritedef_t *sprite); void R_SortVisSprites (int (*compare)(const void *, const void *), size_t first); diff --git a/src/v_draw.cpp b/src/v_draw.cpp index df5dd5cf0..1b23d5566 100644 --- a/src/v_draw.cpp +++ b/src/v_draw.cpp @@ -281,7 +281,7 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms) while (dc_x < x2_i) { - R_DrawMaskedColumn(img, frac, false, !parms.masked); + R_DrawMaskedColumn(img, frac, !parms.masked); dc_x++; frac += xiscale_i; }