mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-26 12:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed SDL_HasWindowSurface to SDL_WindowHasSurface

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/9034
This commit is contained in:
Sam Lantinga
2024-02-09 16:46:58 -08:00
parent 1ec0e22bcd
commit f95b7ee4da
9 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build-scripts/SDL_migration.cocci
View File

@@ -2904,3 +2904,8 @@ expression e1, e2, e3, e4;
- SDL_threadID - SDL_threadID
+ SDL_ThreadID + SDL_ThreadID
(...) (...)
@@
@@
- SDL_HasWindowSurface
+ SDL_WindowHasSurface
(...)

1
docs/README-migration.md
View File

@@ -1626,6 +1626,7 @@ The following functions have been renamed:
* SDL_GetRectDisplayIndex() => SDL_GetDisplayForRect() * SDL_GetRectDisplayIndex() => SDL_GetDisplayForRect()
* SDL_GetWindowDisplayIndex() => SDL_GetDisplayForWindow() * SDL_GetWindowDisplayIndex() => SDL_GetDisplayForWindow()
* SDL_GetWindowDisplayMode() => SDL_GetWindowFullscreenMode() * SDL_GetWindowDisplayMode() => SDL_GetWindowFullscreenMode()
* SDL_HasWindowSurface() => SDL_WindowHasSurface()
* SDL_IsScreenSaverEnabled() => SDL_ScreenSaverEnabled() * SDL_IsScreenSaverEnabled() => SDL_ScreenSaverEnabled()
* SDL_SetWindowDisplayMode() => SDL_SetWindowFullscreenMode() * SDL_SetWindowDisplayMode() => SDL_SetWindowFullscreenMode()

2
include/SDL3/SDL_oldnames.h
View File

@@ -499,6 +499,7 @@
#define SDL_GetRectDisplayIndex SDL_GetDisplayForRect #define SDL_GetRectDisplayIndex SDL_GetDisplayForRect
#define SDL_GetWindowDisplayIndex SDL_GetDisplayForWindow #define SDL_GetWindowDisplayIndex SDL_GetDisplayForWindow
#define SDL_GetWindowDisplayMode SDL_GetWindowFullscreenMode #define SDL_GetWindowDisplayMode SDL_GetWindowFullscreenMode
#define SDL_HasWindowSurface SDL_WindowHasSurface
#define SDL_IsScreenSaverEnabled SDL_ScreenSaverEnabled #define SDL_IsScreenSaverEnabled SDL_ScreenSaverEnabled
#define SDL_SetWindowDisplayMode SDL_SetWindowFullscreenMode #define SDL_SetWindowDisplayMode SDL_SetWindowFullscreenMode
#define SDL_WINDOW_ALLOW_HIGHDPI SDL_WINDOW_HIGH_PIXEL_DENSITY #define SDL_WINDOW_ALLOW_HIGHDPI SDL_WINDOW_HIGH_PIXEL_DENSITY
@@ -967,6 +968,7 @@
#define SDL_GetRectDisplayIndex SDL_GetRectDisplayIndex_renamed_SDL_GetDisplayForRect #define SDL_GetRectDisplayIndex SDL_GetRectDisplayIndex_renamed_SDL_GetDisplayForRect
#define SDL_GetWindowDisplayIndex SDL_GetWindowDisplayIndex_renamed_SDL_GetDisplayForWindow #define SDL_GetWindowDisplayIndex SDL_GetWindowDisplayIndex_renamed_SDL_GetDisplayForWindow
#define SDL_GetWindowDisplayMode SDL_GetWindowDisplayMode_renamed_SDL_GetWindowFullscreenMode #define SDL_GetWindowDisplayMode SDL_GetWindowDisplayMode_renamed_SDL_GetWindowFullscreenMode
#define SDL_HasWindowSurface SDL_HasWindowSurface_renamed_SDL_WindowHasSurface
#define SDL_IsScreenSaverEnabled SDL_IsScreenSaverEnabled_renamed_SDL_ScreenSaverEnabled #define SDL_IsScreenSaverEnabled SDL_IsScreenSaverEnabled_renamed_SDL_ScreenSaverEnabled
#define SDL_SetWindowDisplayMode SDL_SetWindowDisplayMode_renamed_SDL_SetWindowFullscreenMode #define SDL_SetWindowDisplayMode SDL_SetWindowDisplayMode_renamed_SDL_SetWindowFullscreenMode
#define SDL_WINDOW_ALLOW_HIGHDPI SDL_WINDOW_ALLOW_HIGHDPI_renamed_SDL_WINDOW_HIGH_PIXEL_DENSITY #define SDL_WINDOW_ALLOW_HIGHDPI SDL_WINDOW_ALLOW_HIGHDPI_renamed_SDL_WINDOW_HIGH_PIXEL_DENSITY

6
include/SDL3/SDL_video.h
View File

@@ -1699,7 +1699,7 @@ extern DECLSPEC int SDLCALL SDL_SyncWindow(SDL_Window *window);
* *
* \sa SDL_GetWindowSurface * \sa SDL_GetWindowSurface
*/ */
extern DECLSPEC SDL_bool SDLCALL SDL_HasWindowSurface(SDL_Window *window); extern DECLSPEC SDL_bool SDLCALL SDL_WindowHasSurface(SDL_Window *window);
/** /**
* Get the SDL surface associated with the window. * Get the SDL surface associated with the window.
@@ -1722,7 +1722,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasWindowSurface(SDL_Window *window);
* \since This function is available since SDL 3.0.0. * \since This function is available since SDL 3.0.0.
* *
* \sa SDL_DestroyWindowSurface * \sa SDL_DestroyWindowSurface
* \sa SDL_HasWindowSurface * \sa SDL_WindowHasSurface
* \sa SDL_UpdateWindowSurface * \sa SDL_UpdateWindowSurface
* \sa SDL_UpdateWindowSurfaceRects * \sa SDL_UpdateWindowSurfaceRects
*/ */
@@ -1784,7 +1784,7 @@ extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window *window, con
* \since This function is available since SDL 3.0.0. * \since This function is available since SDL 3.0.0.
* *
* \sa SDL_GetWindowSurface * \sa SDL_GetWindowSurface
* \sa SDL_HasWindowSurface * \sa SDL_WindowHasSurface
*/ */
extern DECLSPEC int SDLCALL SDL_DestroyWindowSurface(SDL_Window *window); extern DECLSPEC int SDLCALL SDL_DestroyWindowSurface(SDL_Window *window);

2
src/dynapi/SDL_dynapi.sym
View File

@@ -393,7 +393,7 @@ SDL3_0.0.0 {
SDL_HasSSE42; SDL_HasSSE42;
SDL_HasSSE; SDL_HasSSE;
SDL_HasScreenKeyboardSupport; SDL_HasScreenKeyboardSupport;
SDL_HasWindowSurface; SDL_WindowHasSurface;
SDL_HideCursor; SDL_HideCursor;
SDL_HideWindow; SDL_HideWindow;
SDL_Init; SDL_Init;

2
src/dynapi/SDL_dynapi_overrides.h
View File

@@ -417,7 +417,7 @@
#define SDL_HasSSE41 SDL_HasSSE41_REAL #define SDL_HasSSE41 SDL_HasSSE41_REAL
#define SDL_HasSSE42 SDL_HasSSE42_REAL #define SDL_HasSSE42 SDL_HasSSE42_REAL
#define SDL_HasScreenKeyboardSupport SDL_HasScreenKeyboardSupport_REAL #define SDL_HasScreenKeyboardSupport SDL_HasScreenKeyboardSupport_REAL
#define SDL_HasWindowSurface SDL_HasWindowSurface_REAL #define SDL_WindowHasSurface SDL_WindowHasSurface_REAL
#define SDL_HideCursor SDL_HideCursor_REAL #define SDL_HideCursor SDL_HideCursor_REAL
#define SDL_HideWindow SDL_HideWindow_REAL #define SDL_HideWindow SDL_HideWindow_REAL
#define SDL_Init SDL_Init_REAL #define SDL_Init SDL_Init_REAL

2
src/dynapi/SDL_dynapi_procs.h
View File

@@ -476,7 +476,7 @@ SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE3,(void),(),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE41,(void),(),return) SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE41,(void),(),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE42,(void),(),return) SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE42,(void),(),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_HasScreenKeyboardSupport,(void),(),return) SDL_DYNAPI_PROC(SDL_bool,SDL_HasScreenKeyboardSupport,(void),(),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_HasWindowSurface,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(SDL_bool,SDL_WindowHasSurface,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_HideCursor,(void),(),return) SDL_DYNAPI_PROC(int,SDL_HideCursor,(void),(),return)
SDL_DYNAPI_PROC(int,SDL_HideWindow,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(int,SDL_HideWindow,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_Init,(Uint32 a),(a),return) SDL_DYNAPI_PROC(int,SDL_Init,(Uint32 a),(a),return)

2
src/render/SDL_render.c
View File

@@ -899,7 +899,7 @@ SDL_Renderer *SDL_CreateRendererWithProperties(SDL_PropertiesID props)
goto error; goto error;
} }
if (SDL_HasWindowSurface(window)) { if (SDL_WindowHasSurface(window)) {
SDL_SetError("Surface already associated with window"); SDL_SetError("Surface already associated with window");
goto error; goto error;
} }

2
src/video/SDL_video.c
View File

@@ -3119,7 +3119,7 @@ static SDL_Surface *SDL_CreateWindowFramebuffer(SDL_Window *window)
return SDL_CreateSurfaceFrom(pixels, w, h, pitch, format); return SDL_CreateSurfaceFrom(pixels, w, h, pitch, format);
} }
SDL_bool SDL_HasWindowSurface(SDL_Window *window) SDL_bool SDL_WindowHasSurface(SDL_Window *window)
{ {
CHECK_WINDOW_MAGIC(window, SDL_FALSE); CHECK_WINDOW_MAGIC(window, SDL_FALSE);