eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-25 14:09:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Changed SDL_GetWindowPixelFormat() to return SDL_PixelFormat

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/10257
Closes https://github.com/libsdl-org/SDL/pull/10258
This commit is contained in:
Sam Lantinga 2024-07-14 07:19:20 -07:00
parent dd08c279e2
commit bfee544685
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SDL3/SDL_video.h
View file

@ -781,7 +781,7 @@ extern SDL_DECLSPEC void *SDLCALL SDL_GetWindowICCProfile(SDL_Window *window, si
* *
* \since This function is available since SDL 3.0.0. * \since This function is available since SDL 3.0.0.
*/ */
extern SDL_DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window *window); extern SDL_DECLSPEC SDL_PixelFormat SDLCALL SDL_GetWindowPixelFormat(SDL_Window *window);
/** /**
* Get a list of valid windows. * Get a list of valid windows.

2
src/dynapi/SDL_dynapi_procs.h
View file

@ -525,7 +525,7 @@ SDL_DYNAPI_PROC(const SDL_Rect*,SDL_GetWindowMouseRect,(SDL_Window *a),(a),retur
SDL_DYNAPI_PROC(int,SDL_GetWindowOpacity,(SDL_Window *a, float *b),(a,b),return) SDL_DYNAPI_PROC(int,SDL_GetWindowOpacity,(SDL_Window *a, float *b),(a,b),return)
SDL_DYNAPI_PROC(SDL_Window*,SDL_GetWindowParent,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(SDL_Window*,SDL_GetWindowParent,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(float,SDL_GetWindowPixelDensity,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(float,SDL_GetWindowPixelDensity,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(Uint32,SDL_GetWindowPixelFormat,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(SDL_PixelFormat,SDL_GetWindowPixelFormat,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GetWindowPosition,(SDL_Window *a, int *b, int *c),(a,b,c),return) SDL_DYNAPI_PROC(int,SDL_GetWindowPosition,(SDL_Window *a, int *b, int *c),(a,b,c),return)
SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetWindowProperties,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(SDL_PropertiesID,SDL_GetWindowProperties,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GetWindowSize,(SDL_Window *a, int *b, int *c),(a,b,c),return) SDL_DYNAPI_PROC(int,SDL_GetWindowSize,(SDL_Window *a, int *b, int *c),(a,b,c),return)

2
src/render/psp/SDL_render_psp.c
View file

@ -192,7 +192,7 @@ static void psp_on_vblank(u32 sub, PSP_RenderData *data)
} }
} }
static int PixelFormatToPSPFMT(Uint32 format) static int PixelFormatToPSPFMT(SDL_PixelFormat format)
{ {
switch (format) { switch (format) {
case SDL_PIXELFORMAT_BGR565: case SDL_PIXELFORMAT_BGR565:

2
src/video/SDL_video.c
View file

@ -2012,7 +2012,7 @@ void *SDL_GetWindowICCProfile(SDL_Window *window, size_t *size)
return _this->GetWindowICCProfile(_this, window, size); return _this->GetWindowICCProfile(_this, window, size);
} }
Uint32 SDL_GetWindowPixelFormat(SDL_Window *window) SDL_PixelFormat SDL_GetWindowPixelFormat(SDL_Window *window)
{ {
SDL_DisplayID displayID; SDL_DisplayID displayID;
const SDL_DisplayMode *mode; const SDL_DisplayMode *mode;

2
test/testautomation_video.c
View file

@ -731,7 +731,7 @@ static int video_getWindowPixelFormat(void *arg)
{ {
const char *title = "video_getWindowPixelFormat Test Window"; const char *title = "video_getWindowPixelFormat Test Window";
SDL_Window *window; SDL_Window *window;
Uint32 format; SDL_PixelFormat format;
/* Call against new test window */ /* Call against new test window */
window = createVideoSuiteTestWindow(title); window = createVideoSuiteTestWindow(title);