OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Remove r_swtruecolor variable as it is redundant

Browse source
This commit is contained in:
Magnus Norddahl 2017-02-01 21:42:08 +01:00
commit 93166fa150
18 changed files with 49 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/swrenderer/line/r_walldraw.cpp
View file

@ -49,7 +49,7 @@ namespace swrenderer
xoffset += FLOAT2FIXED(xmagnitude * 0.5);
if (!viewport->r_swtruecolor)
if (!viewport->RenderTarget->IsBgra())
{
height = texture->GetHeight();
@ -88,7 +88,7 @@ namespace swrenderer
col = width + (col % width);
}
if (viewport->r_swtruecolor)
if (viewport->RenderTarget->IsBgra())
source = (const uint8_t *)texture->GetColumnBgra(col, nullptr);
else
source = texture->GetColumn(col, nullptr);
@ -240,7 +240,7 @@ namespace swrenderer
drawerargs.dc_num_lights = 0;
}
if (RenderViewport::Instance()->r_swtruecolor)
if (RenderViewport::Instance()->RenderTarget->IsBgra())
{
int count = y2 - y1;
@ -324,7 +324,7 @@ namespace swrenderer
texturemid = 0;
}
drawerargs.dc_wall_fracbits = RenderViewport::Instance()->r_swtruecolor ? FRACBITS : fracbits;
drawerargs.dc_wall_fracbits = RenderViewport::Instance()->RenderTarget->IsBgra() ? FRACBITS : fracbits;
CameraLight *cameraLight = CameraLight::Instance();
bool fixed = (cameraLight->fixedcolormap != NULL || cameraLight->fixedlightlev >= 0);