OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed most checks on vid_hw2d/test2d. This now gets checked only once per

Browse source 
frame to avoid the remote possibility that it could change during the middle
  of drawing the frame and cause strange things to happen.
- Renamed test2d to vid_hw2d.


SVN r744 (trunk)
This commit is contained in:
Randy Heit 2008-02-14 04:58:45 +00:00
commit a9e2d96483
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/win32/fb_d3d9.cpp
View file

@ -208,7 +208,7 @@ extern cycle_t BlitCycles;
// PUBLIC DATA DEFINITIONS -------------------------------------------------
CUSTOM_CVAR(Bool, test2d, true, CVAR_NOINITCALL)
CUSTOM_CVAR(Bool, vid_hw2d, true, CVAR_NOINITCALL)
{
BorderNeedRefresh = SB_state = screen->GetPageCount();
}
@ -747,7 +747,8 @@ bool D3DFB::Lock (bool buffered)
{
return false;
}
assert (!In2D);
Accel2D = vid_hw2d;
Buffer = MemBuffer;
return false;
}
@ -944,7 +945,7 @@ void D3DFB::Draw3DPart(bool copy3d)
if (copy3d)
{
FBVERTEX verts[4];
CalcFullscreenCoords(verts, test2d, false, FlashColor0, FlashColor1);
CalcFullscreenCoords(verts, Accel2D, false, FlashColor0, FlashColor1);
D3DDevice->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, verts, sizeof(FBVERTEX));
}
}
@ -1114,7 +1115,7 @@ void D3DFB::GetScreenshotBuffer(const BYTE *&buffer, int &pitch, ESSType &color_
{
D3DLOCKED_RECT lrect;
if (!test2d)
if (!Accel2D)
{
Super::GetScreenshotBuffer(buffer, pitch, color_type);
return;
@ -2071,7 +2072,7 @@ bool D3DPal::Update()
bool D3DFB::Begin2D(bool copy3d)
{
if (!test2d)
if (!Accel2D)
{
return false;
}