ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1666 from LukeUsher/fix-reset-bug 

Fix a bug with D3DDevice_Reset that could trigger a black screen
This commit is contained in:
PatrickvL 2019-07-16 22:01:17 +02:00 committed by GitHub
parent e2cceb695a 53ea7f102d
commit f9a3fde976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -2587,15 +2587,22 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_Reset)
// We should leave the rest of the params as is, and let the Xbox code/surface cache take care of it for us
pPresentationParameters->MultiSampleType = XTL::X_D3DMULTISAMPLE_NONE;
// Since Reset will call SetRenderTarget internally with a new backbuffer surface, we can clear our current association
// NOTE: We don't actually free the data, the Xbox side will do this for us when we call the trampoline below.
g_XboxBackBufferSurface = nullptr;
g_XboxDefaultDepthStencilSurface = nullptr;
// Since Reset will call create a new backbuffer surface, we can clear our current association
// NOTE: We don't actually free the Xbox data, the Xbox side will do this for us when we call the trampoline below.
// We must not reset the values to nullptr, since the XDK will re-use the same addresses for the data headers
// (they are members of the Direct3DDevice object). if we overwrite then, the reference to the xbox backbuffer will be lost
// and we'll get a black screen.
FreeHostResource(GetHostResourceKey(g_XboxBackBufferSurface));
FreeHostResource(GetHostResourceKey(g_XboxDefaultDepthStencilSurface));
// Call the Xbox Reset function to do the rest of the work for us
XB_trampoline(HRESULT, WINAPI, D3DDevice_Reset, (X_D3DPRESENT_PARAMETERS*));
HRESULT hRet = XB_D3DDevice_Reset(pPresentationParameters);
// Refresh the current render target and depth stencil, to apply changes made within D3DDevice_Reset
// Some XDKs do this for us, but not all do!
EMUPATCH(D3DDevice_SetRenderTarget)(g_pXboxRenderTarget, g_pXboxDepthStencil);
return hRet;
}