Skip to content

[GEN][ZH] Add additional logging for calls to DX8Wrapper::Reset_Device #883

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

Merged
merged 1 commit into from
May 19, 2025
Merged

[GEN][ZH] Add additional logging for calls to DX8Wrapper::Reset_Device #883

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
6 changes: 6 additions & 0 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 @@ -1028,7 +1028,10 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
bool ret;

if (reset_device)
{
WWDEBUG_SAY(("DX8Wrapper::Set_Render_Device is resetting the device.\n"));
ret = Reset_Device(restore_assets); //reset device without restoring data - we're likely switching out of the app.
}
else
ret = Create_Device();

Expand Down Expand Up @@ -1100,6 +1103,7 @@ void DX8Wrapper::Set_Swap_Interval(int swap)
default: _PresentParameters.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_ONE ; break;
}

WWDEBUG_SAY(("DX8Wrapper::Set_Swap_Interval is resetting the device.\n"));
Reset_Device();
}

Expand Down Expand Up @@ -1169,6 +1173,7 @@ bool DX8Wrapper::Set_Device_Resolution(int width,int height,int bits,int windowe
Resize_And_Position_Window();
}
#pragma message("TODO: support changing windowed status and changing the bit depth")
WWDEBUG_SAY(("DX8Wrapper::Set_Device_Resolution is resetting the device.\n"));
return Reset_Device();
} else {
return false;
Expand Down Expand Up @@ -1604,6 +1609,7 @@ void DX8Wrapper::End_Scene(bool flip_frames)
if (hr==D3DERR_DEVICELOST) {
hr=_Get_D3D_Device8()->TestCooperativeLevel();
if (hr==D3DERR_DEVICENOTRESET) {
WWDEBUG_SAY(("DX8Wrapper::End_Scene is resetting the device.\n"));
Reset_Device();
}
else {
Expand Down
3 changes: 2 additions & 1 deletion Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,8 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
// Check if the device needs to be reset
if( D3DERR_DEVICENOTRESET == hr )
{
DX8Wrapper::Reset_Device();
WWDEBUG_SAY(("WW3D::Begin_Render is resetting the device.\n"));
DX8Wrapper::Reset_Device();
}

return WW3D_ERROR_GENERIC;
Expand Down
6 changes: 6 additions & 0 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 @@ -1118,7 +1118,10 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
bool ret;

if (reset_device)
{
WWDEBUG_SAY(("DX8Wrapper::Set_Render_Device is resetting the device.\n"));
ret = Reset_Device(restore_assets); //reset device without restoring data - we're likely switching out of the app.
}
else
ret = Create_Device();

Expand Down Expand Up @@ -1190,6 +1193,7 @@ void DX8Wrapper::Set_Swap_Interval(int swap)
default: _PresentParameters.FullScreen_PresentationInterval = D3DPRESENT_INTERVAL_ONE ; break;
}

WWDEBUG_SAY(("DX8Wrapper::Set_Swap_Interval is resetting the device.\n"));
Reset_Device();
}

Expand Down Expand Up @@ -1259,6 +1263,7 @@ bool DX8Wrapper::Set_Device_Resolution(int width,int height,int bits,int windowe
Resize_And_Position_Window();
}
#pragma message("TODO: support changing windowed status and changing the bit depth")
WWDEBUG_SAY(("DX8Wrapper::Set_Device_Resolution is resetting the device.\n"));
return Reset_Device();
} else {
return false;
Expand Down Expand Up @@ -1749,6 +1754,7 @@ void DX8Wrapper::End_Scene(bool flip_frames)
if (hr==D3DERR_DEVICELOST) {
hr=_Get_D3D_Device8()->TestCooperativeLevel();
if (hr==D3DERR_DEVICENOTRESET) {
WWDEBUG_SAY(("DX8Wrapper::End_Scene is resetting the device.\n"));
Reset_Device();
}
else {
Expand Down
3 changes: 2 additions & 1 deletion GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,8 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
// Check if the device needs to be reset
if( D3DERR_DEVICENOTRESET == hr )
{
DX8Wrapper::Reset_Device();
WWDEBUG_SAY(("WW3D::Begin_Render is resetting the device.\n"));
DX8Wrapper::Reset_Device();
}

return WW3D_ERROR_GENERIC;
Expand Down
Loading