OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into swmodels

Browse source
This commit is contained in:
Magnus Norddahl 2018-04-14 21:20:05 +02:00
commit c3bd93a85c
25 changed files with 542 additions and 389 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/swrenderer/scene/r_scene.cpp
View file

@ -111,11 +111,12 @@ namespace swrenderer
}
else
{
uint32_t bgracolor = GPalette.BaseColors[clearcolor].d;
PalEntry bgracolor = GPalette.BaseColors[clearcolor];
bgracolor.a = 255;
int size = viewport->RenderTarget->GetPitch() * viewport->RenderTarget->GetHeight();
uint32_t *dest = (uint32_t *)viewport->RenderTarget->GetPixels();
for (int i = 0; i < size; i++)
dest[i] = bgracolor;
dest[i] = bgracolor.d;
}
}
@ -343,6 +344,7 @@ namespace swrenderer
auto viewport = MainThread()->Viewport.get();
const bool savedviewactive = viewactive;
auto savedtarget = viewport->RenderTarget;
viewwidth = width;
viewport->RenderTarget = canvas;
@ -361,7 +363,7 @@ namespace swrenderer
DrawerThreads::WaitForWorkers();
DrawerWaitCycles.Unclock();
viewport->RenderTarget = nullptr;
viewport->RenderTarget = savedtarget;
viewport->RenderingToCanvas = false;
viewactive = savedviewactive;
}