zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 06:41:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Windowed mode always needs to draw to the temporary surface, even

Browse source 
when not gamma correcting, so that D3DFB::GetCurrentScreen() can read from
  it.


SVN r2007 (trunk)
This commit is contained in:
Randy Heit 2009-11-29 02:33:52 +00:00
parent 4edd51eb09
commit cdb26a9b28
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,4 +1,7 @@
November 28, 2009 November 28, 2009
- Fixed: Windowed mode always needs to draw to the temporary surface, even
when not gamma correcting, so that D3DFB::GetCurrentScreen() can read from
it.
- Use the spawned class's scale as default for ScriptedMarine instead of - Use the spawned class's scale as default for ScriptedMarine instead of
DoomPlayer. DoomPlayer.

2
src/win32/fb_d3d9.cpp
View file

@ -1141,7 +1141,7 @@ void D3DFB::Draw3DPart(bool copy3d)
D3DDevice->SetRenderState(D3DRS_ANTIALIASEDLINEENABLE, vid_hwaalines); D3DDevice->SetRenderState(D3DRS_ANTIALIASEDLINEENABLE, vid_hwaalines);
assert(OldRenderTarget == NULL); assert(OldRenderTarget == NULL);
if (TempRenderTexture != NULL && if (TempRenderTexture != NULL &&
((Windowed && GammaShader && TempRenderTexture != FinalWipeScreen) || GatheringWipeScreen || PixelDoubling)) ((Windowed && TempRenderTexture != FinalWipeScreen) || GatheringWipeScreen || PixelDoubling))
{ {
IDirect3DSurface9 *targetsurf; IDirect3DSurface9 *targetsurf;
if (SUCCEEDED(TempRenderTexture->GetSurfaceLevel(0, &targetsurf))) if (SUCCEEDED(TempRenderTexture->GetSurfaceLevel(0, &targetsurf)))

2
src/win32/fb_d3d9_wipe.cpp
View file

@ -164,7 +164,7 @@ bool D3DFB::WipeStartScreen(int type)
// Create another texture to copy the final wipe screen to so // Create another texture to copy the final wipe screen to so
// we can still gamma correct the wipe. Since this is just for // we can still gamma correct the wipe. Since this is just for
// gamma correction, it's okay to fail (though not desirable.) // gamma correction, it's okay to fail (though not desirable.)
if (PixelDoubling || (Shaders[SHADER_GammaCorrection] != NULL && Windowed)) if (PixelDoubling || Windowed)
{ {
if (SUCCEEDED(TempRenderTexture->GetSurfaceLevel(0, &tsurf))) if (SUCCEEDED(TempRenderTexture->GetSurfaceLevel(0, &tsurf)))
{ {