OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed Accel2D variable and a little bit of locking cruft.

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-27 17:13:10 +02:00
commit 62f073ef60
21 changed files with 35 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/swrenderer/scene/r_light.cpp
View file

@ -69,17 +69,10 @@ namespace swrenderer
if (player->fixedcolormap >= 0 && player->fixedcolormap < (int)SpecialColormaps.Size())
{
realfixedcolormap = &SpecialColormaps[player->fixedcolormap];
if (renderTarget == screen->GetCanvas() && (renderTarget->IsBgra() || ((DFrameBuffer *)screen->Accel2D && r_shadercolormaps)))
{
// Render everything fullbright. The copy to video memory will
// apply the special colormap, so it won't be restricted to the
// palette.
fixedcolormap = &realcolormaps;
}
else
{
fixedcolormap = &SpecialSWColormaps[player->fixedcolormap];
}
// Render everything fullbright. The copy to video memory will
// apply the special colormap, so it won't be restricted to the
// palette.
fixedcolormap = &realcolormaps;
}
else if (player->fixedlightlevel >= 0 && player->fixedlightlevel < NUMCOLORMAPS)
{