Skip to content

[Part 2] SDL3: display+window: runtime fixes #3577

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
ankith26 wants to merge 1 commit into
base: main
Choose a base branch
from
+115 −16
Open

[Part 2] SDL3: display+window: runtime fixes #3577

Show file tree
Hide file tree
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
108 changes: 92 additions & 16 deletions src_c/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@ _display_state_cleanup(_DisplayState *state)
#endif
}

/* TODO: Check if doing SDL_PIXELFORMAT_XRGB8888 in SDL2 codepath is fine.
* For now do it only on SDL3 codepath to fix SCALED issues */
#if SDL_VERSION_ATLEAST(3, 0, 0)
#define PG_TEXTURE_FMT SDL_PIXELFORMAT_XRGB8888
#else
#define PG_TEXTURE_FMT SDL_PIXELFORMAT_ARGB8888
#endif

// prevent this code block from being linked twice
// (this code block is copied by window.c)
#ifndef BUILD_STATIC
Expand Down Expand Up @@ -464,7 +472,12 @@ pg_GetVideoInfo(pg_VideoInfo *info)
}
else {
#if SDL_VERSION_ATLEAST(3, 0, 0)
if ((mode_ptr = SDL_GetCurrentDisplayMode(0))) {
SDL_DisplayID primary_display = SDL_GetPrimaryDisplay();
if (primary_display == 0) {
PyErr_SetString(pgExc_SDLError, SDL_GetError());
return (pg_VideoInfo *)NULL;
}
if ((mode_ptr = SDL_GetCurrentDisplayMode(primary_display))) {
info->current_w = mode_ptr->w;
info->current_h = mode_ptr->h;
formatenum = mode_ptr->format;
Expand Down Expand Up @@ -942,9 +955,8 @@ pg_ResizeEventWatch(void *userdata, SDL_Event *event)

SDL_DestroyTexture(pg_texture);

pg_texture =
SDL_CreateTexture(pg_renderer, SDL_PIXELFORMAT_ARGB8888,
SDL_TEXTUREACCESS_STREAMING, w, h);
pg_texture = SDL_CreateTexture(pg_renderer, PG_TEXTURE_FMT,
SDL_TEXTUREACCESS_STREAMING, w, h);
}
return 0;
}
Expand Down Expand Up @@ -1166,6 +1178,7 @@ PG_SetWindowFullscreen(SDL_Window *window, bool fullscreen,
}
}

SDL_SyncWindow(window);
ret = true;
end:
SDL_free(modes);
Expand Down Expand Up @@ -1261,6 +1274,16 @@ pg_set_mode(PyObject *self, PyObject *arg, PyObject *kwds)
}
}

#if SDL_VERSION_ATLEAST(3, 0, 0)
/* In SDL2, display == 0 meant primary display, so compat code for it */
if (display == 0) {
display = SDL_GetPrimaryDisplay();
if (display == 0) {
return RAISE(pgExc_SDLError, SDL_GetError());
}
}
#endif

if ((vsync == -1) && ((flags & PGS_OPENGL) == 0)) {
return RAISE(PyExc_ValueError,
"requested adaptive vsync without OpenGL");
Expand Down Expand Up @@ -1751,9 +1774,9 @@ pg_set_mode(PyObject *self, PyObject *arg, PyObject *kwds)
}
#endif

pg_texture = SDL_CreateTexture(
pg_renderer, SDL_PIXELFORMAT_ARGB8888,
SDL_TEXTUREACCESS_STREAMING, w, h);
pg_texture =
SDL_CreateTexture(pg_renderer, PG_TEXTURE_FMT,
SDL_TEXTUREACCESS_STREAMING, w, h);
}
surf = PG_CreateSurface(w, h, SDL_PIXELFORMAT_XRGB8888);
newownedsurf = surf;
Expand Down Expand Up @@ -1875,6 +1898,9 @@ pg_set_mode(PyObject *self, PyObject *arg, PyObject *kwds)
}
}
}
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(win);
#endif

/*return the window's surface (screen)*/
Py_INCREF(surface);
Expand Down Expand Up @@ -1973,6 +1999,9 @@ pg_set_window_position(PyObject *self, PyObject *arg)
if (win) {
/* Will raise errors with SDL 3, deal with it during the porting */
SDL_SetWindowPosition(win, x, y);
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(win);
#endif
}

Py_RETURN_NONE;
Expand All @@ -1999,7 +2028,16 @@ pg_mode_ok(PyObject *self, PyObject *args, PyObject *kwds)
&display_index)) {
return NULL;
}
#if !SDL_VERSION_ATLEAST(3, 0, 0)

#if SDL_VERSION_ATLEAST(3, 0, 0)
/* In SDL2, display == 0 meant primary display, so compat code for it */
if (display_index == 0) {
display_index = SDL_GetPrimaryDisplay();
if (display_index == 0) {
return RAISE(pgExc_SDLError, SDL_GetError());
}
}
#else
/* Display ID is not bounded by number of displays in SDL3 */
if (display_index < 0 || display_index >= SDL_GetNumVideoDisplays()) {
return RAISE(PyExc_ValueError,
Expand All @@ -2026,6 +2064,15 @@ pg_mode_ok(PyObject *self, PyObject *args, PyObject *kwds)
}

#if SDL_VERSION_ATLEAST(3, 0, 0)
/* Compat with SDL2 behaviour */
const SDL_DisplayMode *curmode;
if (!(curmode = SDL_GetCurrentDisplayMode(display_index))) {
return RAISE(pgExc_SDLError, SDL_GetError());
}
if (curmode->w == desired.w && curmode->h == desired.h) {
return PyLong_FromLong(SDL_BITSPERPIXEL(curmode->format));
}

if (!SDL_GetClosestFullscreenDisplayMode(display_index, desired.w,
desired.h, desired.refresh_rate,
1, &closest)) {
Expand Down Expand Up @@ -2065,7 +2112,15 @@ pg_list_modes(PyObject *self, PyObject *args, PyObject *kwds)
return NULL;
}

#if !SDL_VERSION_ATLEAST(3, 0, 0)
#if SDL_VERSION_ATLEAST(3, 0, 0)
/* In SDL2, display == 0 meant primary display, so compat code for it */
if (display_index == 0) {
display_index = SDL_GetPrimaryDisplay();
if (display_index == 0) {
return RAISE(pgExc_SDLError, SDL_GetError());
}
}
#else
/* Display ID is not bounded by number of displays in SDL3 */
if (display_index < 0 || display_index >= SDL_GetNumVideoDisplays()) {
return RAISE(PyExc_ValueError,
Expand All @@ -2077,19 +2132,31 @@ pg_list_modes(PyObject *self, PyObject *args, PyObject *kwds)
#pragma PG_WARN(Ignoring flags)

#if SDL_VERSION_ATLEAST(3, 0, 0)
const SDL_DisplayMode *curmode;
if (!(curmode = SDL_GetCurrentDisplayMode(display_index))) {
return RAISE(pgExc_SDLError, SDL_GetError());
}
if (bpp == 0) {
const SDL_DisplayMode *curmode;
if (!(curmode = SDL_GetCurrentDisplayMode(display_index))) {
return RAISE(pgExc_SDLError, SDL_GetError());
}
bpp = SDL_BITSPERPIXEL(curmode->format);
}

SDL_DisplayMode **modes =
SDL_GetFullscreenDisplayModes(display_index, &nummodes);
if (nummodes < 0) {
if (!modes || nummodes < 0) {
return RAISE(pgExc_SDLError, SDL_GetError());
}

/* SDL3 can return empty list here but SDL2 didn't. In that case, use
* curmode. */
if (nummodes == 0) {
SDL_free(modes);
modes = SDL_malloc(sizeof(SDL_DisplayMode **));
if (!modes) {
return PyErr_NoMemory();
}
modes[0] = (SDL_DisplayMode *)curmode;
nummodes = 1;
}
#else
if (bpp == 0) {
SDL_DisplayMode curmode;
Expand Down Expand Up @@ -2726,6 +2793,9 @@ pg_iconify(PyObject *self, PyObject *_null)
return RAISE(pgExc_SDLError, "No open window");
}
SDL_MinimizeWindow(win);
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(win);
#endif
return PyBool_FromLong(1);
}

Expand Down Expand Up @@ -3219,7 +3289,7 @@ pg_toggle_fullscreen(PyObject *self, PyObject *_null)
SDL_CreateRenderer(win, -1, SDL_RENDERER_SOFTWARE);
#endif
pg_texture =
SDL_CreateTexture(pg_renderer, SDL_PIXELFORMAT_ARGB8888,
SDL_CreateTexture(pg_renderer, PG_TEXTURE_FMT,
SDL_TEXTUREACCESS_STREAMING, w, h);
}
#if SDL_VERSION_ATLEAST(3, 0, 0)
Expand Down Expand Up @@ -3372,7 +3442,7 @@ pg_toggle_fullscreen(PyObject *self, PyObject *_null)
SDL_CreateRenderer(win, -1, SDL_RENDERER_SOFTWARE);
#endif
pg_texture =
SDL_CreateTexture(pg_renderer, SDL_PIXELFORMAT_ARGB8888,
SDL_CreateTexture(pg_renderer, PG_TEXTURE_FMT,
SDL_TEXTUREACCESS_STREAMING, w, h);
}

Expand Down Expand Up @@ -3453,6 +3523,9 @@ pg_toggle_fullscreen(PyObject *self, PyObject *_null)
}
}
}
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(win);
#endif
return PyLong_FromLong(1);
}

Expand Down Expand Up @@ -3531,6 +3604,9 @@ pg_display_resize_event(PyObject *self, PyObject *event)
/* do not do anything that would invalidate a display surface! */
return PyLong_FromLong(-1);
}
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(win);
#endif
Py_RETURN_FALSE;
}

Expand Down
23 changes: 23 additions & 0 deletions src_c/window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ window_set_windowed(pgWindowObject *self, PyObject *_null)
if (!SDL_SetWindowFullscreen(self->_win, 0)) {
return RAISE(pgExc_SDLError, SDL_GetError());
}
SDL_SyncWindow(self->_win);
#else
if (SDL_SetWindowFullscreen(self->_win, 0)) {
return RAISE(pgExc_SDLError, SDL_GetError());
Expand Down Expand Up @@ -345,6 +346,7 @@ pg_window_set_fullscreen(SDL_Window *window, int desktop)
goto end;
}

SDL_SyncWindow(window);
ret = 1;
end:
SDL_free(modes);
Expand Down Expand Up @@ -429,20 +431,29 @@ static PyObject *
window_restore(pgWindowObject *self, PyObject *_null)
{
SDL_RestoreWindow(self->_win);
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(self->_win);
#endif
Py_RETURN_NONE;
}

static PyObject *
window_maximize(pgWindowObject *self, PyObject *_null)
{
SDL_MaximizeWindow(self->_win);
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(self->_win);
#endif
Py_RETURN_NONE;
}

static PyObject *
window_minimize(pgWindowObject *self, PyObject *_null)
{
SDL_MinimizeWindow(self->_win);
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(self->_win);
#endif
Py_RETURN_NONE;
}

Expand Down Expand Up @@ -745,6 +756,9 @@ window_set_size(pgWindowObject *self, PyObject *arg, void *v)
}

SDL_SetWindowSize(self->_win, w, h);
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(self->_win);
#endif
if (self->surf) {
/* Ensure that the underlying surf is immediately updated, instead of
* relying on the event callback */
Expand Down Expand Up @@ -797,6 +811,9 @@ window_set_minimum_size(pgWindowObject *self, PyObject *arg, void *v)
}

SDL_SetWindowMinimumSize(self->_win, w, h);
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(self->_win);
#endif

return 0;
}
Expand Down Expand Up @@ -837,6 +854,9 @@ window_set_maximum_size(pgWindowObject *self, PyObject *arg, void *v)
}

SDL_SetWindowMaximumSize(self->_win, w, h);
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(self->_win);
#endif

return 0;
}
Expand Down Expand Up @@ -868,6 +888,9 @@ window_set_position(pgWindowObject *self, PyObject *arg, void *v)
}

SDL_SetWindowPosition(self->_win, x, y);
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SyncWindow(self->_win);
#endif

return 0;
}
Expand Down
Loading