zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Move the call to DrawLetterbox() into D3DFB::Flip() so that it is the last thing that happens 

before the scene is presented. Now it properly obscures 2D graphics.

SVN r3183 (trunk)
This commit is contained in:
Randy Heit 2011-04-17 04:04:34 +00:00
parent ef69e2bbf0
commit 619634c1f8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/win32/fb_d3d9.cpp
View File

@ -3,7 +3,7 @@
** Code to let ZDoom use Direct3D 9 as a simple framebuffer ** Code to let ZDoom use Direct3D 9 as a simple framebuffer
** **
**--------------------------------------------------------------------------- **---------------------------------------------------------------------------
** Copyright 1998-2009 Randy Heit ** Copyright 1998-2011 Randy Heit
** All rights reserved. ** All rights reserved.
** **
** Redistribution and use in source and binary forms, with or without ** Redistribution and use in source and binary forms, with or without
@ -34,6 +34,8 @@
** just a means of getting the pixel data to the screen in a more reliable ** just a means of getting the pixel data to the screen in a more reliable
** method on modern hardware by copying the entire frame to a texture, ** method on modern hardware by copying the entire frame to a texture,
** drawing that to the screen, and presenting. ** drawing that to the screen, and presenting.
**
** That said, it does implement hardware-accelerated 2D rendering.
*/ */
// HEADER FILES ------------------------------------------------------------ // HEADER FILES ------------------------------------------------------------
@ -1186,6 +1188,7 @@ void D3DFB::Flip()
{ {
assert(InScene); assert(InScene);
DrawLetterbox();
DoWindowedGamma(); DoWindowedGamma();
D3DDevice->EndScene(); D3DDevice->EndScene();
@ -1315,7 +1318,6 @@ void D3DFB::Draw3DPart(bool copy3d)
FBTexture->UnlockRect (0); FBTexture->UnlockRect (0);
} }
} }
DrawLetterbox();
InScene = true; InScene = true;
D3DDevice->BeginScene(); D3DDevice->BeginScene();
D3DDevice->SetRenderState(D3DRS_ANTIALIASEDLINEENABLE, vid_hwaalines); D3DDevice->SetRenderState(D3DRS_ANTIALIASEDLINEENABLE, vid_hwaalines);
@ -1337,7 +1339,7 @@ void D3DFB::Draw3DPart(bool copy3d)
} }
} }
SetTexture (0, FBTexture); SetTexture(0, FBTexture);
SetPaletteTexture(PaletteTexture, 256, BorderColor); SetPaletteTexture(PaletteTexture, 256, BorderColor);
D3DDevice->SetFVF (D3DFVF_FBVERTEX); D3DDevice->SetFVF (D3DFVF_FBVERTEX);
memset(Constant, 0, sizeof(Constant)); memset(Constant, 0, sizeof(Constant));
@ -2134,7 +2136,7 @@ D3DFB::PackedTexture *D3DFB::PackingTexture::GetBestFit(int w, int h, int &area)
// requested dimensions and adding additional boxes to the empty list if // requested dimensions and adding additional boxes to the empty list if
// needed. // needed.
// //
// The passed box *MUST* be in this packing textures empty list. // The passed box *MUST* be in this packing texture's empty list.
// //
//========================================================================== //==========================================================================