Skip to content
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

Jump to bottom

Add a SDL12COMPAT_MAX_BPP hint, and use it to restrict Hyperspace Delivery Boy to 16bpp (fixes #317) #321

Merged
merged 2 commits into from
Sep 14, 2023
Merged

Add a SDL12COMPAT_MAX_BPP hint, and use it to restrict Hyperspace Delivery Boy to 16bpp (fixes #317) #321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbb79e6
Add a hint to clamp the reported screen bit depth
sulix Sep 4, 2023
8dc5130
Quirks: Hyperspace Delivery Boy should run in 16bpp mode
sulix Sep 14, 2023
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
60 changes: 47 additions & 13 deletions src/SDL12_compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,10 @@ static QuirkEntryType quirks[] = {
{"fillets", "SDL12COMPAT_ALLOW_SYSWM", "0"},
{"fillets", "SDL12COMPAT_COMPATIBILITY_AUDIOCVT", "1"},

/* Hyperspace Delivery Boy relies on the exact imprecision of the format conversion in some
earlier versions of SDL 1.2. It also recommends 16-bit in the README, so force it. */
{"hdb", "SDL12COMPAT_MAX_BPP", "16"},

/* Mark of the Ninja doesn't work with OpenGL scaling */
{"ninja-bin32", "SDL12COMPAT_OPENGL_SCALING", "0"},
{"ninja-bin64", "SDL12COMPAT_OPENGL_SCALING", "0"},
Expand Down Expand Up @@ -1396,6 +1400,18 @@ SDL12Compat_GetHintFloat(const char *name, float default_value)
return (float) SDL20_atof(val);
}

static int
SDL12Compat_GetHintInt(const char *name, int default_value)
{
const char *val = SDL12Compat_GetHint(name);

if (!val) {
return default_value;
}

return SDL20_atoi(val);
}

static void
SDL12Compat_ApplyQuirks(SDL_bool force_x11)
{
Expand Down Expand Up @@ -2029,6 +2045,21 @@ SDL_JoystickOpened(int device_index)
return SDL20_AtomicGet(&JoystickList[device_index].refcount) ? 1 : 0;
}

static SDL_PixelFormatEnum
BPPToPixelFormat(int bpp)
{
#if !SDL_VERSION_ATLEAST(2,0,14)
#define SDL_PIXELFORMAT_XRGB8888 SDL_PIXELFORMAT_RGB888
#endif
switch (bpp) {
case 8: return SDL_PIXELFORMAT_INDEX8;
case 16: return SDL_PIXELFORMAT_RGB565;
case 24: return SDL_PIXELFORMAT_BGR24;
case 32: return SDL_PIXELFORMAT_XRGB8888;
default: SDL20_SetError("Unsupported bits-per-pixel"); return SDL_PIXELFORMAT_UNKNOWN;
}
}

static SDL_PixelFormat *
PixelFormat12to20(SDL_PixelFormat *format20, SDL_Palette *palette20, const SDL12_PixelFormat *format12)
{
Expand Down Expand Up @@ -2213,6 +2244,7 @@ Init12VidModes(void)
{
const int total = SDL20_GetNumDisplayModes(VideoDisplayIndex);
const char *maxmodestr;
const int max_bpp = SDL12Compat_GetHintInt("SDL12COMPAT_MAX_BPP", 32);
VideoModeList *vmode = NULL;
void *ptr = NULL;
int i, j;
Expand Down Expand Up @@ -2265,6 +2297,11 @@ Init12VidModes(void)
continue; /* can't fit to 16-bits for SDL12_Rect */
}

if (SDL_BITSPERPIXEL(mode.format) > max_bpp) {
/* If we see any mode > max_bpp, reduce its bpp. */
mode.format = BPPToPixelFormat(max_bpp);
}

if (!vmode || (mode.format != vmode->format)) { /* SDL20_GetDisplayMode() sorts on bpp first. We know when to change arrays. */
ptr = (VideoModeList *) SDL20_realloc(VideoModes, sizeof (VideoModeList) * (VideoModesCount+1));
if (!ptr) {
Expand Down Expand Up @@ -2376,6 +2413,7 @@ Init12Video(void)
{
const char *driver = SDL20_GetCurrentVideoDriver();
const char *scale_method_env = SDL12Compat_GetHint("SDL12COMPAT_SCALE_METHOD");
const int max_bpp = SDL12Compat_GetHintInt("SDL12COMPAT_MAX_BPP", 32);
SDL_DisplayMode mode;
int i;

Expand Down Expand Up @@ -2440,7 +2478,11 @@ Init12Video(void)
SDL20_StopTextInput();

if (SDL20_GetDesktopDisplayMode(VideoDisplayIndex, &mode) == 0) {
VideoInfoVfmt20 = SDL20_AllocFormat(mode.format);
if (SDL_BITSPERPIXEL(mode.format) > max_bpp) {
VideoInfoVfmt20 = SDL20_AllocFormat(BPPToPixelFormat(max_bpp));
} else {
VideoInfoVfmt20 = SDL20_AllocFormat(mode.format);
}
VideoInfo12.vfmt = PixelFormat20to12(&VideoInfoVfmt12, &VideoInfoPalette12, VideoInfoVfmt20);
VideoInfo12.current_w = mode.w;
VideoInfo12.current_h = mode.h;
Expand Down Expand Up @@ -5960,6 +6002,7 @@ SetVideoModeImpl(int width, int height, int bpp, Uint32 flags12)
Uint32 appfmt;
const char *vsync_env = SDL12Compat_GetHint("SDL12COMPAT_SYNC_TO_VBLANK");
float window_size_scaling = SDL12Compat_GetHintFloat("SDL12COMPAT_WINDOW_SCALING", 1.0f);
int max_bpp = SDL12Compat_GetHintInt("SDL12COMPAT_MAX_BPP", 32);
SDL_bool use_gl_scaling = SDL_FALSE;
SDL_bool use_highdpi = SDL_TRUE;
SDL_bool fix_bordless_fs_win = SDL_TRUE;
Expand Down Expand Up @@ -6035,28 +6078,19 @@ SetVideoModeImpl(int width, int height, int bpp, Uint32 flags12)
formats, give them 16-bit and we'll convert later. Nothing in SDL 1.2 will
handle > 32 bits, so clamp there, too. AND ALSO, most apps will handle 32-bits
but not 24, so force around that...so basically, you can have 16 or 32 bit. */
bpp = (bpp <= 16) ? 16 : 32;
bpp = (bpp <= 16) ? 16 : max_bpp;
}

if ((bpp != 8) && (bpp != 16) && (bpp != 24) && (bpp != 32)) {
if (flags12 & SDL12_ANYFORMAT) {
bpp = 32;
bpp = max_bpp;
} else {
SDL20_SetError("Unsupported bits-per-pixel");
return NULL;
}
}

#if !SDL_VERSION_ATLEAST(2,0,14)
#define SDL_PIXELFORMAT_XRGB8888 SDL_PIXELFORMAT_RGB888
#endif
switch (bpp) {
case 8: appfmt = SDL_PIXELFORMAT_INDEX8; break;
case 16: appfmt = SDL_PIXELFORMAT_RGB565; break;
case 24: appfmt = SDL_PIXELFORMAT_BGR24; break;
case 32: appfmt = SDL_PIXELFORMAT_XRGB8888; break;
default: SDL20_SetError("Unsupported bits-per-pixel"); return NULL;
}
appfmt = BPPToPixelFormat(bpp);

SDL_assert((VideoSurface12->surface20 != NULL) == (VideoWindow20 != NULL));

Expand Down
Loading