Skip to content

Accept a 24 bpp desktop when a 32 bpp mode is requested #11

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
f1nalspace wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Accept a 24 bpp desktop when a 32 bpp mode is requested #11

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
11 changes: 10 additions & 1 deletion wined3d/directx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4517,7 +4517,8 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d,
}
else if (current_mode.dmPelsWidth == new_mode.dmPelsWidth
&& current_mode.dmPelsHeight == new_mode.dmPelsHeight
&& current_mode.dmBitsPerPel == new_mode.dmBitsPerPel
&& (current_mode.dmBitsPerPel == new_mode.dmBitsPerPel
|| pixelformat_for_depth(current_mode.dmBitsPerPel) == new_format_id)
&& (current_mode.dmDisplayFrequency == new_mode.dmDisplayFrequency
|| !(new_mode.dmFields & DM_DISPLAYFREQUENCY))
&& (DUMMYACCESS1(current_mode, u2, dmDisplayFlags) == DUMMYACCESS1(new_mode, u2, dmDisplayFlags)
Expand All @@ -4537,6 +4538,14 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d,
new_mode.dmDisplayFrequency = 0;
ret = ChangeDisplaySettingsExA95(adapter->DeviceName, &new_mode, NULL, CDS_FULLSCREEN, NULL);
}
if (ret != DISP_CHANGE_SUCCESSFUL && new_mode.dmBitsPerPel == 32
&& pixelformat_for_depth(24) == new_format_id)
{
WARN("No 32 bpp mode, retrying at 24 bpp.\n");
new_mode.dmBitsPerPel = 24;
ret = ChangeDisplaySettingsExA95(adapter->DeviceName, &new_mode, NULL, CDS_FULLSCREEN, NULL);
}

if (ret != DISP_CHANGE_SUCCESSFUL)
return WINED3DERR_NOTAVAILABLE;
}
Expand Down