Skip to content

Commit 4df5354

Browse files
committed
Revert loggings
1 parent e0ff30a commit 4df5354

File tree

4 files changed

+2
-16
lines changed

4 files changed

+2
-16
lines changed

Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,10 +1028,7 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
10281028
bool ret;
10291029

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

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

1106-
WWDEBUG_SAY(("DX8Wrapper::Set_Swap_Interval is resetting the device.\n"));
11071103
Reset_Device();
11081104
}
11091105

@@ -1173,7 +1169,6 @@ bool DX8Wrapper::Set_Device_Resolution(int width,int height,int bits,int windowe
11731169
Resize_And_Position_Window();
11741170
}
11751171
#pragma message("TODO: support changing windowed status and changing the bit depth")
1176-
WWDEBUG_SAY(("DX8Wrapper::Set_Device_Resolution is resetting the device.\n"));
11771172
return Reset_Device();
11781173
} else {
11791174
return false;
@@ -1609,7 +1604,6 @@ void DX8Wrapper::End_Scene(bool flip_frames)
16091604
if (hr==D3DERR_DEVICELOST) {
16101605
hr=_Get_D3D_Device8()->TestCooperativeLevel();
16111606
if (hr==D3DERR_DEVICENOTRESET) {
1612-
WWDEBUG_SAY(("DX8Wrapper::End_Scene is resetting the device.\n"));
16131607
Reset_Device();
16141608
}
16151609
else {

Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,8 +817,7 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
817817
// Check if the device needs to be reset
818818
if( D3DERR_DEVICENOTRESET == hr )
819819
{
820-
WWDEBUG_SAY(("WW3D::Begin_Render is resetting the device.\n"));
821-
DX8Wrapper::Reset_Device();
820+
DX8Wrapper::Reset_Device();
822821
}
823822

824823
return WW3D_ERROR_GENERIC;

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,10 +1118,7 @@ bool DX8Wrapper::Set_Render_Device(int dev, int width, int height, int bits, int
11181118
bool ret;
11191119

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

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

1196-
WWDEBUG_SAY(("DX8Wrapper::Set_Swap_Interval is resetting the device.\n"));
11971193
Reset_Device();
11981194
}
11991195

@@ -1263,7 +1259,6 @@ bool DX8Wrapper::Set_Device_Resolution(int width,int height,int bits,int windowe
12631259
Resize_And_Position_Window();
12641260
}
12651261
#pragma message("TODO: support changing windowed status and changing the bit depth")
1266-
WWDEBUG_SAY(("DX8Wrapper::Set_Device_Resolution is resetting the device.\n"));
12671262
return Reset_Device();
12681263
} else {
12691264
return false;
@@ -1754,7 +1749,6 @@ void DX8Wrapper::End_Scene(bool flip_frames)
17541749
if (hr==D3DERR_DEVICELOST) {
17551750
hr=_Get_D3D_Device8()->TestCooperativeLevel();
17561751
if (hr==D3DERR_DEVICENOTRESET) {
1757-
WWDEBUG_SAY(("DX8Wrapper::End_Scene is resetting the device.\n"));
17581752
Reset_Device();
17591753
}
17601754
else {

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,8 +810,7 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f
810810
// Check if the device needs to be reset
811811
if( D3DERR_DEVICENOTRESET == hr )
812812
{
813-
WWDEBUG_SAY(("WW3D::Begin_Render is resetting the device.\n"));
814-
DX8Wrapper::Reset_Device();
813+
DX8Wrapper::Reset_Device();
815814
}
816815

817816
return WW3D_ERROR_GENERIC;

0 commit comments

Comments
 (0)