isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-20 14:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Proper EnumDisplayModes implementation (#88)

Browse Source
This commit is contained in:
Anders Jenbo 2025-05-15 02:52:52 +02:00 committed by GitHub
parent c6107bdb5b
commit b304232bde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miniwin/miniwin/include/miniwin_ddraw.h
View File

@ -9,6 +9,8 @@
#define DISCL_BACKGROUND 0x00000002 #define DISCL_BACKGROUND 0x00000002
#define PC_NOCOLLAPSE 0x04 #define PC_NOCOLLAPSE 0x04
#define DDCAPS2_CERTIFIED 0x00000001
// DirectDraw Surface Description flags // DirectDraw Surface Description flags
#define DDSD_CAPS 0x00000001 #define DDSD_CAPS 0x00000001
#define DDSD_HEIGHT 0x00000002 #define DDSD_HEIGHT 0x00000002

54
miniwin/miniwin/src/miniwin_ddraw.cpp
View File

@ -171,22 +171,48 @@ HRESULT DirectDrawImpl::EnumDisplayModes(
LPDDENUMMODESCALLBACK lpEnumModesCallback LPDDENUMMODESCALLBACK lpEnumModesCallback
) )
{ {
DDSURFACEDESC ddsd = {}; if (!lpEnumModesCallback) {
ddsd.dwSize = sizeof(DDSURFACEDESC); return DDERR_INVALIDPARAMS;
ddsd.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; }
ddsd.dwWidth = 640;
ddsd.dwHeight = 480;
ddsd.lPitch = 0;
ddsd.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); SDL_DisplayID displayID = SDL_GetPrimaryDisplay();
ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB | D3DDD_DEVICEZBUFFERBITDEPTH; if (!displayID) {
ddsd.ddpfPixelFormat.dwRGBBitCount = 16; // Game only accpets 8 or 16
if (!lpEnumModesCallback(&ddsd, lpContext)) {
return DDERR_GENERIC; return DDERR_GENERIC;
} }
return S_OK; int count_modes;
SDL_DisplayMode** modes = SDL_GetFullscreenDisplayModes(displayID, &count_modes);
if (!modes) {
return DDERR_GENERIC;
}
HRESULT status = S_OK;
for (int i = 0; i < count_modes; i++) {
const SDL_PixelFormatDetails* format = SDL_GetPixelFormatDetails(modes[i]->format);
if (!format) {
continue;
}
DDSURFACEDESC ddsd = {};
ddsd.dwSize = sizeof(DDSURFACEDESC);
ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT;
ddsd.dwWidth = modes[i]->w;
ddsd.dwHeight = modes[i]->h;
ddsd.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT);
ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB;
ddsd.ddpfPixelFormat.dwRGBBitCount =
(format->bits_per_pixel == 8) ? 8 : 16; // Game only accepts 8 or 16 bit mode
ddsd.ddpfPixelFormat.dwRBitMask = format->Rmask;
ddsd.ddpfPixelFormat.dwGBitMask = format->Gmask;
ddsd.ddpfPixelFormat.dwBBitMask = format->Bmask;
if (!lpEnumModesCallback(&ddsd, lpContext)) {
status = DDERR_GENERIC;
}
}
SDL_free(modes);
return status;
} }
HRESULT DirectDrawImpl::GetCaps(LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) HRESULT DirectDrawImpl::GetCaps(LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps)
@ -194,13 +220,13 @@ HRESULT DirectDrawImpl::GetCaps(LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps)
if (lpDDDriverCaps) { if (lpDDDriverCaps) {
memset(lpDDDriverCaps, 0, sizeof(DDCAPS)); memset(lpDDDriverCaps, 0, sizeof(DDCAPS));
lpDDDriverCaps->dwSize = sizeof(DDCAPS); lpDDDriverCaps->dwSize = sizeof(DDCAPS);
lpDDDriverCaps->dwCaps = 0; lpDDDriverCaps->dwCaps2 = DDCAPS2_CERTIFIED; // Required to enable lighting
} }
if (lpDDHELCaps) { if (lpDDHELCaps) {
memset(lpDDHELCaps, 0, sizeof(DDCAPS)); memset(lpDDHELCaps, 0, sizeof(DDCAPS));
lpDDHELCaps->dwSize = sizeof(DDCAPS); lpDDHELCaps->dwSize = sizeof(DDCAPS);
lpDDHELCaps->dwCaps = 0; lpDDHELCaps->dwCaps2 = DDCAPS2_CERTIFIED; // Required to enable lighting
} }
return S_OK; return S_OK;