mirrors/SDL
0
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2024-11-23 19:03:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

SDL_GetFullscreenDisplayModes() follows the SDL_GetStringRule

Browse Source
This commit is contained in:
Sam Lantinga 2024-07-18 17:02:47 -07:00
parent 9758e102bc
commit 9de8cb888a
8 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/README-migration.md
View File

@ -2015,14 +2015,13 @@ Rather than iterating over display modes using an index, there is a new function
{ {
SDL_DisplayID display = SDL_GetPrimaryDisplay(); SDL_DisplayID display = SDL_GetPrimaryDisplay();
int num_modes = 0; int num_modes = 0;
SDL_DisplayMode **modes = SDL_GetFullscreenDisplayModes(display, &num_modes); const SDL_DisplayMode * const *modes = SDL_GetFullscreenDisplayModes(display, &num_modes);
if (modes) { if (modes) {
for (i = 0; i < num_modes; ++i) { for (i = 0; i < num_modes; ++i) {
SDL_DisplayMode *mode = modes[i]; SDL_DisplayMode *mode = modes[i];
SDL_Log("Display %" SDL_PRIu32 " mode %d: %dx%d@%gx %gHz\n", SDL_Log("Display %" SDL_PRIu32 " mode %d: %dx%d@%gx %gHz\n",
display, i, mode->w, mode->h, mode->pixel_density, mode->refresh_rate); display, i, mode->w, mode->h, mode->pixel_density, mode->refresh_rate);
} }
SDL_free(modes);
} }
} }
``` ```

9
include/SDL3/SDL_video.h
View File

@ -555,17 +555,18 @@ extern SDL_DECLSPEC float SDLCALL SDL_GetDisplayContentScale(SDL_DisplayID displ
* - refresh rate -> highest to lowest * - refresh rate -> highest to lowest
* - pixel density -> lowest to highest * - pixel density -> lowest to highest
* *
* The returned array follows the SDL_GetStringRule, and will be automatically freed later.
*
* \param displayID the instance ID of the display to query. * \param displayID the instance ID of the display to query.
* \param count a pointer filled in with the number of display modes returned. * \param count a pointer filled in with the number of display modes returned, may be NULL.
* \returns a NULL terminated array of display mode pointers which should be * \returns a NULL terminated array of display mode pointers or NULL on failure; call SDL_GetError() for
* freed with SDL_free(), or NULL on failure; call SDL_GetError() for
* more information. * more information.
* *
* \since This function is available since SDL 3.0.0. * \since This function is available since SDL 3.0.0.
* *
* \sa SDL_GetDisplays * \sa SDL_GetDisplays
*/ */
extern SDL_DECLSPEC const SDL_DisplayMode ** SDLCALL SDL_GetFullscreenDisplayModes(SDL_DisplayID displayID, int *count); extern SDL_DECLSPEC const SDL_DisplayMode * const * SDLCALL SDL_GetFullscreenDisplayModes(SDL_DisplayID displayID, int *count);
/** /**
* Get the closest match to the requested display mode. * Get the closest match to the requested display mode.

2
src/dynapi/SDL_dynapi_procs.h
View File

@ -269,7 +269,7 @@ SDL_DYNAPI_PROC(const SDL_DisplayID*,SDL_GetDisplays,(int *a),(a),return)
SDL_DYNAPI_PROC(const char*,SDL_GetError,(void),(),return) SDL_DYNAPI_PROC(const char*,SDL_GetError,(void),(),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_GetEventFilter,(SDL_EventFilter *a, void **b),(a,b),return) SDL_DYNAPI_PROC(SDL_bool,SDL_GetEventFilter,(SDL_EventFilter *a, void **b),(a,b),return)
SDL_DYNAPI_PROC(float,SDL_GetFloatProperty,(SDL_PropertiesID a, const char *b, float c),(a,b,c),return) SDL_DYNAPI_PROC(float,SDL_GetFloatProperty,(SDL_PropertiesID a, const char *b, float c),(a,b,c),return)
SDL_DYNAPI_PROC(const SDL_DisplayMode**,SDL_GetFullscreenDisplayModes,(SDL_DisplayID a, int *b),(a,b),return) SDL_DYNAPI_PROC(const SDL_DisplayMode* const*,SDL_GetFullscreenDisplayModes,(SDL_DisplayID a, int *b),(a,b),return)
SDL_DYNAPI_PROC(int,SDL_GetGDKDefaultUser,(XUserHandle *a),(a),return) SDL_DYNAPI_PROC(int,SDL_GetGDKDefaultUser,(XUserHandle *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GetGDKTaskQueue,(XTaskQueueHandle *a),(a),return) SDL_DYNAPI_PROC(int,SDL_GetGDKTaskQueue,(XTaskQueueHandle *a),(a),return)
SDL_DYNAPI_PROC(const char*,SDL_GetGamepadAppleSFSymbolsNameForAxis,(SDL_Gamepad *a, SDL_GamepadAxis b),(a,b),return) SDL_DYNAPI_PROC(const char*,SDL_GetGamepadAppleSFSymbolsNameForAxis,(SDL_Gamepad *a, SDL_GamepadAxis b),(a,b),return)

3
src/test/SDL_test_common.c
View File

@ -1194,7 +1194,7 @@ SDL_bool SDLTest_CommonInit(SDLTest_CommonState *state)
if (state->verbose & VERBOSE_MODES) { if (state->verbose & VERBOSE_MODES) {
const SDL_DisplayID *displays; const SDL_DisplayID *displays;
SDL_Rect bounds, usablebounds; SDL_Rect bounds, usablebounds;
const SDL_DisplayMode **modes; const SDL_DisplayMode * const *modes;
const SDL_DisplayMode *mode; const SDL_DisplayMode *mode;
int bpp; int bpp;
Uint32 Rmask, Gmask, Bmask, Amask; Uint32 Rmask, Gmask, Bmask, Amask;
@ -1258,7 +1258,6 @@ SDL_bool SDLTest_CommonInit(SDLTest_CommonState *state)
} }
} }
} }
SDL_free((void *)modes);
#if defined(SDL_VIDEO_DRIVER_WINDOWS) && !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES) #if defined(SDL_VIDEO_DRIVER_WINDOWS) && !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
/* Print the D3D9 adapter index */ /* Print the D3D9 adapter index */

31
src/video/SDL_video.c
View File

@ -1111,7 +1111,7 @@ void SDL_SetDisplayHDRProperties(SDL_VideoDisplay *display, const SDL_HDROutputP
static const SDL_DisplayMode *SDL_GetFullscreenModeMatch(const SDL_DisplayMode *mode) static const SDL_DisplayMode *SDL_GetFullscreenModeMatch(const SDL_DisplayMode *mode)
{ {
const SDL_DisplayMode **modes; const SDL_DisplayMode * const *modes;
SDL_DisplayMode fullscreen_mode; SDL_DisplayMode fullscreen_mode;
if (mode->w <= 0 || mode->h <= 0) { if (mode->w <= 0 || mode->h <= 0) {
@ -1150,8 +1150,6 @@ static const SDL_DisplayMode *SDL_GetFullscreenModeMatch(const SDL_DisplayMode *
} }
} }
} }
SDL_free((void *)modes);
} }
return mode; return mode;
} }
@ -1222,10 +1220,11 @@ void SDL_ResetFullscreenDisplayModes(SDL_VideoDisplay *display)
display->current_mode = &display->desktop_mode; display->current_mode = &display->desktop_mode;
} }
const SDL_DisplayMode **SDL_GetFullscreenDisplayModes(SDL_DisplayID displayID, int *count) const SDL_DisplayMode * const *SDL_GetFullscreenDisplayModes(SDL_DisplayID displayID, int *count)
{ {
int i; int i;
const SDL_DisplayMode **modes; int num_modes;
const SDL_DisplayMode **retval;
SDL_VideoDisplay *display = SDL_GetVideoDisplay(displayID); SDL_VideoDisplay *display = SDL_GetVideoDisplay(displayID);
if (count) { if (count) {
@ -1238,27 +1237,30 @@ const SDL_DisplayMode **SDL_GetFullscreenDisplayModes(SDL_DisplayID displayID, i
_this->GetDisplayModes(_this, display); _this->GetDisplayModes(_this, display);
} }
modes = (const SDL_DisplayMode **)SDL_malloc((display->num_fullscreen_modes + 1) * sizeof(*modes)); num_modes = display->num_fullscreen_modes;
if (modes) { retval = (const SDL_DisplayMode **)SDL_malloc((num_modes + 1) * sizeof(*retval) + num_modes * sizeof(**retval));
if (count) { if (retval) {
*count = display->num_fullscreen_modes; SDL_DisplayMode *modes = (SDL_DisplayMode *)((Uint8 *)retval + ((num_modes + 1) * sizeof(*retval)));
SDL_memcpy(modes, display->fullscreen_modes, num_modes * sizeof(*modes));
for (i = 0; i < num_modes; ++i) {
retval[i] = modes++;
} }
retval[i] = NULL;
for (i = 0; i < display->num_fullscreen_modes; ++i) { if (count) {
modes[i] = &display->fullscreen_modes[i]; *count = num_modes;
} }
modes[i] = NULL;
} else { } else {
if (count) { if (count) {
*count = 0; *count = 0;
} }
} }
return modes; return SDL_FreeLater(retval);
} }
const SDL_DisplayMode *SDL_GetClosestFullscreenDisplayMode(SDL_DisplayID displayID, int w, int h, float refresh_rate, SDL_bool include_high_density_modes) const SDL_DisplayMode *SDL_GetClosestFullscreenDisplayMode(SDL_DisplayID displayID, int w, int h, float refresh_rate, SDL_bool include_high_density_modes)
{ {
const SDL_DisplayMode **modes; const SDL_DisplayMode * const *modes;
const SDL_DisplayMode *mode, *closest = NULL; const SDL_DisplayMode *mode, *closest = NULL;
float aspect_ratio; float aspect_ratio;
int i; int i;
@ -1311,7 +1313,6 @@ const SDL_DisplayMode *SDL_GetClosestFullscreenDisplayMode(SDL_DisplayID display
closest = mode; closest = mode;
} }
SDL_free((void *)modes);
} }
return closest; return closest;
} }

6
test/testautomation_video.c
View File

@ -306,7 +306,7 @@ static int video_getWindowFlags(void *arg)
static int video_getFullscreenDisplayModes(void *arg) static int video_getFullscreenDisplayModes(void *arg)
{ {
const SDL_DisplayID *displays; const SDL_DisplayID *displays;
const SDL_DisplayMode **modes; const SDL_DisplayMode * const *modes;
int count; int count;
int i; int i;
@ -321,7 +321,6 @@ static int video_getFullscreenDisplayModes(void *arg)
SDLTest_AssertPass("Call to SDL_GetFullscreenDisplayModes(%" SDL_PRIu32 ")", displays[i]); SDLTest_AssertPass("Call to SDL_GetFullscreenDisplayModes(%" SDL_PRIu32 ")", displays[i]);
SDLTest_AssertCheck(modes != NULL, "Validate returned value from function; expected != NULL; got: %p", modes); SDLTest_AssertCheck(modes != NULL, "Validate returned value from function; expected != NULL; got: %p", modes);
SDLTest_AssertCheck(count >= 0, "Validate number of modes; expected: >= 0; got: %d", count); SDLTest_AssertCheck(count >= 0, "Validate number of modes; expected: >= 0; got: %d", count);
SDL_free((void *)modes);
} }
} }
@ -334,7 +333,7 @@ static int video_getFullscreenDisplayModes(void *arg)
static int video_getClosestDisplayModeCurrentResolution(void *arg) static int video_getClosestDisplayModeCurrentResolution(void *arg)
{ {
const SDL_DisplayID *displays; const SDL_DisplayID *displays;
const SDL_DisplayMode **modes; const SDL_DisplayMode * const *modes;
SDL_DisplayMode current; SDL_DisplayMode current;
const SDL_DisplayMode *closest; const SDL_DisplayMode *closest;
int i, num_modes; int i, num_modes;
@ -370,7 +369,6 @@ static int video_getClosestDisplayModeCurrentResolution(void *arg)
current.h, closest->h); current.h, closest->h);
} }
} }
SDL_free((void *)modes);
} }
} }

3
test/testdisplayinfo.c
View File

@ -34,7 +34,7 @@ print_mode(const char *prefix, const SDL_DisplayMode *mode)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
const SDL_DisplayID *displays; const SDL_DisplayID *displays;
const SDL_DisplayMode **modes; const SDL_DisplayMode * const *modes;
const SDL_DisplayMode *mode; const SDL_DisplayMode *mode;
int num_displays, i; int num_displays, i;
SDLTest_CommonState *state; SDLTest_CommonState *state;
@ -94,7 +94,6 @@ int main(int argc, char *argv[])
(void)SDL_snprintf(prefix, sizeof(prefix), " MODE %d", m); (void)SDL_snprintf(prefix, sizeof(prefix), " MODE %d", m);
print_mode(prefix, modes[m]); print_mode(prefix, modes[m]);
} }
SDL_free((void*)modes);
SDL_Log("\n"); SDL_Log("\n");
} }

3
test/testwm.c
View File

@ -53,7 +53,7 @@ static const SDL_DisplayMode *highlighted_mode = NULL;
static void static void
draw_modes_menu(SDL_Window *window, SDL_Renderer *renderer, SDL_FRect viewport) draw_modes_menu(SDL_Window *window, SDL_Renderer *renderer, SDL_FRect viewport)
{ {
const SDL_DisplayMode **modes; const SDL_DisplayMode * const *modes;
char text[1024]; char text[1024];
const int lineHeight = 10; const int lineHeight = 10;
int i, j; int i, j;
@ -143,7 +143,6 @@ draw_modes_menu(SDL_Window *window, SDL_Renderer *renderer, SDL_FRect viewport)
column_chars = 0; column_chars = 0;
} }
} }
SDL_free((void *)modes);
} }
} }
} }