Skip to content

bugfix(dx8wrapper): Prevent crash when getting depth buffer on lost device #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix(dx8wrapper): Prevent crash when getting depth buffer on lost device #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3324,7 +3324,11 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
//
// We'll need the depth buffer later...
//
if (DefaultDepthBuffer == nullptr)
// GO_CHANGE
// Guard against calling GetDepthStencilSurface on a lost/invalid device.
// The D3D9-to-D3D12 translation layer may access freed GPU memory if the
// device is in a lost state, causing an EXCEPTION_ACCESS_VIOLATION_READ crash.
if (DefaultDepthBuffer == nullptr && !IsDeviceLost)
{
// IDirect3DSurface8 *depth_buffer = nullptr;
DX8CALL(GetDepthStencilSurface (&DefaultDepthBuffer));
Expand Down Expand Up @@ -3452,7 +3456,11 @@ void DX8Wrapper::Set_Render_Target
//
// We'll need the depth buffer later...
//
if (DefaultDepthBuffer == nullptr)
// GO_CHANGE
// Guard against calling GetDepthStencilSurface on a lost/invalid device.
// The D3D9-to-D3D12 translation layer may access freed GPU memory if the
// device is in a lost state, causing an EXCEPTION_ACCESS_VIOLATION_READ crash.
if (DefaultDepthBuffer == nullptr && !IsDeviceLost)
{
// IDirect3DSurface8 *depth_buffer = nullptr;
DX8CALL(GetDepthStencilSurface (&DefaultDepthBuffer));
Expand Down
12 changes: 10 additions & 2 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3600,7 +3600,11 @@ DX8Wrapper::Set_Render_Target(IDirect3DSurface8 *render_target, bool use_default
//
// We'll need the depth buffer later...
//
if (DefaultDepthBuffer == nullptr)
// GO_CHANGE
// Guard against calling GetDepthStencilSurface on a lost/invalid device.
// The D3D9-to-D3D12 translation layer may access freed GPU memory if the
// device is in a lost state, causing an EXCEPTION_ACCESS_VIOLATION_READ crash.
if (DefaultDepthBuffer == nullptr && !IsDeviceLost)
{
// IDirect3DSurface8 *depth_buffer = nullptr;
DX8CALL(GetDepthStencilSurface (&DefaultDepthBuffer));
Expand Down Expand Up @@ -3728,7 +3732,11 @@ void DX8Wrapper::Set_Render_Target
//
// We'll need the depth buffer later...
//
if (DefaultDepthBuffer == nullptr)
// GO_CHANGE
// Guard against calling GetDepthStencilSurface on a lost/invalid device.
// The D3D9-to-D3D12 translation layer may access freed GPU memory if the
// device is in a lost state, causing an EXCEPTION_ACCESS_VIOLATION_READ crash.
if (DefaultDepthBuffer == nullptr && !IsDeviceLost)
{
// IDirect3DSurface8 *depth_buffer = nullptr;
DX8CALL(GetDepthStencilSurface (&DefaultDepthBuffer));
Expand Down
Loading