Skip to content

bugfix(dx8): Use the display format for the fullscreen back buffer when a device reset does not last #3656

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
coconutbird wants to merge 2 commits into
base: main
Choose a base branch
from
+56 −2
Open

bugfix(dx8): Use the display format for the fullscreen back buffer when a device reset does not last #3656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94a12ec
bugfix(dx8): Use the display format for the fullscreen back buffer wh…
coconutbird Nov 5, 2026
da9500c
bugfix(dx8): Keep the back buffer format when no depth buffer format …
coconutbird Nov 6, 2026
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
55 changes: 53 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ int DX8Wrapper::TextureBitDepth = DEFAULT_TEXTURE_BIT_DEPTH;
bool DX8Wrapper::IsWindowed = false;
D3DFORMAT DX8Wrapper::DisplayFormat = D3DFMT_UNKNOWN;
D3DMULTISAMPLE_TYPE DX8Wrapper::MultiSampleAntiAliasing = DEFAULT_MSAA;
bool DX8Wrapper::FullscreenBackBufferUsesDisplayFormat = false;
unsigned DX8Wrapper::FullscreenResetsWithoutPresent = 0;

// shader system additions KJM v
DWORD DX8Wrapper::Vertex_Shader = 0;
Expand Down Expand Up @@ -631,9 +633,24 @@ bool DX8Wrapper::Reset_Device(bool reload_assets)

HRESULT hr=_Get_D3D_Device8()->TestCooperativeLevel();
if (hr != D3DERR_DEVICELOST )
{ DX8CALL_HRES(Reset(&_PresentParameters),hr)
{
// TheSuperHackers @bugfix coconutbird 05/11/2026 A fullscreen back buffer with destination alpha does not

@bobtista bobtista Nov 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: The analysis is already in the PR description, can we make this comment more brief? eg "A fullscreen back buffer that differs from the display format makes every Reset() change the display mode. Use the display format if the previous Reset() never presented a frame."

// match the display format, so every Reset() sets the display mode again. On systems where a display mode
// change loses the device, the device is lost again by its own Reset() before it presents a single frame,
// and the game resets forever while the screen keeps switching modes. When the previous Reset() did not
// last until a frame was presented, use the display format for the back buffer, so that Reset() can
// restore the device without changing the display mode.
if (!IsWindowed && FullscreenResetsWithoutPresent != 0 && _PresentParameters.BackBufferFormat != DisplayFormat)
{
Use_Display_Format_For_Fullscreen_Back_Buffer();
}

DX8CALL_HRES(Reset(&_PresentParameters),hr)
if (hr != D3D_OK)
return false; //reset failed.

if (!IsWindowed)

@bobtista bobtista Nov 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: add braces to this "if"

++FullscreenResetsWithoutPresent;
}
else
return false; //device is lost and can't be reset.
Expand Down Expand Up @@ -1485,7 +1502,9 @@ bool DX8Wrapper::Find_Color_And_Z_Mode(int resx,int resy,int bitdepth,D3DFORMAT
*set_backbuffer=*set_colorbuffer = format_table[format_index];
}

if (bitdepth==32 && *set_colorbuffer == D3DFMT_X8R8G8B8 && D3DInterface->CheckDeviceType(0,D3DDEVTYPE_HAL,*set_colorbuffer,D3DFMT_A8R8G8B8, TRUE) == D3D_OK)
// TheSuperHackers @bugfix coconutbird 05/11/2026 Keep the display format once Reset_Device found that a back buffer
// with destination alpha cannot be kept in fullscreen.
if (bitdepth==32 && *set_colorbuffer == D3DFMT_X8R8G8B8 && !FullscreenBackBufferUsesDisplayFormat && D3DInterface->CheckDeviceType(0,D3DDEVTYPE_HAL,*set_colorbuffer,D3DFMT_A8R8G8B8, TRUE) == D3D_OK)

@bobtista bobtista Nov 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this condition be reached after the switch? If not, I think this hunk and its comment can go, and the description could say something like the format survives a resolution change because Set_Device_Resolution keeps it.

{
//promote 32-bit modes to include destination alpha when supported
*set_backbuffer = D3DFMT_A8R8G8B8;
Expand Down Expand Up @@ -1624,6 +1643,36 @@ bool DX8Wrapper::Test_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORM
return true;
}

void DX8Wrapper::Use_Display_Format_For_Fullscreen_Back_Buffer()
{
D3DFORMAT zmode;
if (!Find_Z_Mode(DisplayFormat, DisplayFormat, &zmode))
{
WWDEBUG_SAY(("DX8Wrapper::Reset_Device did not last until a frame was presented, but no depth buffer format matches the display format. Keeping the fullscreen back buffer format."));
return;
}

WWDEBUG_SAY(("DX8Wrapper::Reset_Device did not last until a frame was presented. Using the display format for the fullscreen back buffer."));
FullscreenBackBufferUsesDisplayFormat = true;
_PresentParameters.BackBufferFormat = DisplayFormat;
_PresentParameters.AutoDepthStencilFormat = zmode;

if (_PresentParameters.MultiSampleType != D3DMULTISAMPLE_NONE)
{
const HRESULT hrBack = D3DInterface->CheckDeviceMultiSampleType(CurRenderDevice, D3DDEVTYPE_HAL,
_PresentParameters.BackBufferFormat, FALSE, _PresentParameters.MultiSampleType);
const HRESULT hrDepth = D3DInterface->CheckDeviceMultiSampleType(CurRenderDevice, D3DDEVTYPE_HAL,
_PresentParameters.AutoDepthStencilFormat, FALSE, _PresentParameters.MultiSampleType);

if (FAILED(hrBack) || FAILED(hrDepth))
{
WWDEBUG_SAY(("Requested MSAA Mode Not Supported"));
MultiSampleAntiAliasing = D3DMULTISAMPLE_NONE;
_PresentParameters.MultiSampleType = D3DMULTISAMPLE_NONE;
}
}
}


void DX8Wrapper::Reset_Statistics()
{
Expand Down Expand Up @@ -1692,6 +1741,7 @@ void DX8Wrapper::End_Scene(bool flip_frames)
#endif
IsDeviceLost=false;
FrameCount++;
FullscreenResetsWithoutPresent = 0;
}
else {
IsDeviceLost=true;
Expand Down Expand Up @@ -1760,6 +1810,7 @@ void DX8Wrapper::Flip_To_Primary()
if (SUCCEEDED(hr)) {
IsDeviceLost=false;
FrameCount++;
FullscreenResetsWithoutPresent = 0;
WWDEBUG_SAY(("Flip to primary succeeded %ld", FrameCount));
}
else {
Expand Down
3 changes: 3 additions & 0 deletions Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@ class DX8Wrapper
static bool Find_Color_Mode(D3DFORMAT colorbuffer, int resx, int resy, UINT *mode);
static bool Find_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORMAT *zmode);
static bool Test_Z_Mode(D3DFORMAT colorbuffer,D3DFORMAT backbuffer, D3DFORMAT zmode);
static void Use_Display_Format_For_Fullscreen_Back_Buffer();
static void Compute_Caps(WW3DFormat display_format);

/*
Expand Down Expand Up @@ -651,6 +652,8 @@ class DX8Wrapper
static bool IsWindowed;
static D3DFORMAT DisplayFormat;
static D3DMULTISAMPLE_TYPE MultiSampleAntiAliasing;
static bool FullscreenBackBufferUsesDisplayFormat;
static unsigned FullscreenResetsWithoutPresent;


// shader system updates KJM v
Expand Down
Loading