From e87d336d7a73d7cce89531fbd552f085ad2bfe16 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 5 Feb 2023 23:33:10 +0300
Subject: [PATCH] sync with SDL3 latest headers.
---
src/sdl2_compat.c | 41 +++++++++++++++++------
src/sdl3_include_wrapper.h | 68 +++++++++++++++++++-------------------
src/sdl3_syms.h | 10 +++---
3 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index 6d96db8..2c51e26 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -1580,6 +1580,24 @@ SDL_WarpMouseGlobal(int x, int y)
return SDL3_WarpMouseGlobal((float)x, (float)y);
}
+DECLSPEC void SDLCALL
+SDL_RenderGetViewport(SDL_Renderer *renderer, SDL_Rect *rect)
+{
+ SDL3_GetRenderViewport(renderer, rect);
+}
+
+DECLSPEC void SDLCALL
+SDL_RenderGetClipRect(SDL_Renderer *renderer, SDL_Rect *rect)
+{
+ SDL3_GetRenderClipRect(renderer, rect);
+}
+
+DECLSPEC void SDLCALL
+SDL_RenderGetScale(SDL_Renderer *renderer, float *scaleX, float *scaleY)
+{
+ SDL3_GetRenderScale(renderer, scaleX, scaleY);
+}
+
DECLSPEC void SDLCALL
SDL_RenderWindowToLogical(SDL_Renderer *renderer,
int windowX, int windowY,
@@ -3001,10 +3019,10 @@ SDL_CreateRenderer(SDL_Window *window, int index, Uint32 flags)
return SDL3_CreateRenderer(window, name, flags);
}
-DECLSPEC SDL_bool SDLCALL
+DECLSPEC SDL_bool SDLCALL
SDL_RenderTargetSupported(SDL_Renderer *renderer)
{
- int ret;
+ int ret;
SDL_RendererInfo info;
ret = SDL_GetRendererInfo(renderer, &info);
if (ret == 0) {
@@ -3015,22 +3033,23 @@ SDL_RenderTargetSupported(SDL_Renderer *renderer)
return SDL_FALSE;
}
-DECLSPEC int SDLCALL
+DECLSPEC int SDLCALL
SDL_RenderSetLogicalSize(SDL_Renderer *renderer, int w, int h)
{
if (w == 0 && h == 0) {
return SDL3_SetRenderLogicalPresentation(renderer, 0, 0, SDL_LOGICAL_PRESENTATION_DISABLED, SDL_SCALEMODE_NEAREST);
- } else {
- return SDL3_SetRenderLogicalPresentation(renderer, w, h, SDL_LOGICAL_PRESENTATION_LETTERBOX, SDL_SCALEMODE_LINEAR);
}
+ return SDL3_SetRenderLogicalPresentation(renderer, w, h, SDL_LOGICAL_PRESENTATION_LETTERBOX, SDL_SCALEMODE_LINEAR);
}
-DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer *renderer, int *w, int *h)
+DECLSPEC void SDLCALL
+SDL_RenderGetLogicalSize(SDL_Renderer *renderer, int *w, int *h)
{
SDL3_GetRenderLogicalPresentation(renderer, w, h, NULL, NULL);
}
-DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer *renderer, SDL_bool enable)
+DECLSPEC int SDLCALL
+SDL_RenderSetIntegerScale(SDL_Renderer *renderer, SDL_bool enable)
{
SDL_ScaleMode scale_mode;
SDL_RendererLogicalPresentation mode;
@@ -3041,7 +3060,7 @@ DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer *renderer, SDL_bool
if (ret < 0) {
return ret;
}
-
+
if (enable && mode == SDL_LOGICAL_PRESENTATION_INTEGER_SCALE) {
return 0;
}
@@ -3052,12 +3071,12 @@ DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer *renderer, SDL_bool
if (enable) {
return SDL3_SetRenderLogicalPresentation(renderer, w, h, SDL_LOGICAL_PRESENTATION_INTEGER_SCALE, scale_mode);
- } else {
- return SDL3_SetRenderLogicalPresentation(renderer, w, h, SDL_LOGICAL_PRESENTATION_DISABLED, scale_mode);
}
+ return SDL3_SetRenderLogicalPresentation(renderer, w, h, SDL_LOGICAL_PRESENTATION_DISABLED, scale_mode);
}
-DECLSPEC SDL_bool SDLCALL SDL_RenderGetIntegerScale(SDL_Renderer *renderer)
+DECLSPEC SDL_bool SDLCALL
+SDL_RenderGetIntegerScale(SDL_Renderer *renderer)
{
SDL_RendererLogicalPresentation mode;
if (SDL3_GetRenderLogicalPresentation(renderer, NULL, NULL, &mode, NULL) == 0) {
diff --git a/src/sdl3_include_wrapper.h b/src/sdl3_include_wrapper.h
index d45c89d..592e4e6 100644
--- a/src/sdl3_include_wrapper.h
+++ b/src/sdl3_include_wrapper.h
@@ -366,7 +366,7 @@
#define SDL_GetRenderer IGNORE_THIS_VERSION_OF_SDL_GetRenderer
#define SDL_GetRenderWindow IGNORE_THIS_VERSION_OF_SDL_GetRenderWindow
#define SDL_GetRendererInfo IGNORE_THIS_VERSION_OF_SDL_GetRendererInfo
-#define SDL_GetRendererOutputSize IGNORE_THIS_VERSION_OF_SDL_GetRendererOutputSize
+#define SDL_GetRenderOutputSize IGNORE_THIS_VERSION_OF_SDL_GetRenderOutputSize
#define SDL_CreateTexture IGNORE_THIS_VERSION_OF_SDL_CreateTexture
#define SDL_CreateTextureFromSurface IGNORE_THIS_VERSION_OF_SDL_CreateTextureFromSurface
#define SDL_QueryTexture IGNORE_THIS_VERSION_OF_SDL_QueryTexture
@@ -386,13 +386,8 @@
#define SDL_LockTexture IGNORE_THIS_VERSION_OF_SDL_LockTexture
#define SDL_LockTextureToSurface IGNORE_THIS_VERSION_OF_SDL_LockTextureToSurface
#define SDL_UnlockTexture IGNORE_THIS_VERSION_OF_SDL_UnlockTexture
-#define SDL_RenderTargetSupported IGNORE_THIS_VERSION_OF_SDL_RenderTargetSupported
#define SDL_SetRenderTarget IGNORE_THIS_VERSION_OF_SDL_SetRenderTarget
#define SDL_GetRenderTarget IGNORE_THIS_VERSION_OF_SDL_GetRenderTarget
-#define SDL_SetRenderLogicalSize IGNORE_THIS_VERSION_OF_SDL_SetRenderLogicalSize
-#define SDL_GetRenderLogicalSize IGNORE_THIS_VERSION_OF_SDL_GetRenderLogicalSize
-#define SDL_SetRenderIntegerScale IGNORE_THIS_VERSION_OF_SDL_SetRenderIntegerScale
-#define SDL_GetRenderIntegerScale IGNORE_THIS_VERSION_OF_SDL_GetRenderIntegerScale
#define SDL_SetRenderViewport IGNORE_THIS_VERSION_OF_SDL_SetRenderViewport
#define SDL_GetRenderViewport IGNORE_THIS_VERSION_OF_SDL_GetRenderViewport
#define SDL_SetRenderClipRect IGNORE_THIS_VERSION_OF_SDL_SetRenderClipRect
@@ -400,8 +395,13 @@
#define SDL_RenderClipEnabled IGNORE_THIS_VERSION_OF_SDL_RenderClipEnabled
#define SDL_SetRenderScale IGNORE_THIS_VERSION_OF_SDL_SetRenderScale
#define SDL_GetRenderScale IGNORE_THIS_VERSION_OF_SDL_GetRenderScale
-#define SDL_RenderWindowToLogical IGNORE_THIS_VERSION_OF_SDL_RenderWindowToLogical
-#define SDL_RenderLogicalToWindow IGNORE_THIS_VERSION_OF_SDL_RenderLogicalToWindow
+#define SDL_RenderCoordinatesFromWindow IGNORE_THIS_VERSION_OF_SDL_RenderCoordinatesFromWindow
+#define SDL_RenderCoordinatesToWindow IGNORE_THIS_VERSION_OF_SDL_RenderCoordinatesToWindow
+#define SDL_GetRenderLogicalPresentation IGNORE_THIS_VERSION_OF_SDL_GetRenderLogicalPresentation
+#define SDL_SetRenderLogicalPresentation IGNORE_THIS_VERSION_OF_SDL_SetRenderLogicalPresentation
+#define SDL_ConvertEventToRenderCoordinates IGNORE_THIS_VERSION_OF_SDL_ConvertEventToRenderCoordinates
+#define SDL_GetCurrentRenderOutputSize IGNORE_THIS_VERSION_OF_SDL_GetCurrentRenderOutputSize
+#define SDL_GetRenderWindowSize IGNORE_THIS_VERSION_OF_SDL_GetRenderWindowSize
#define SDL_SetRenderDrawColor IGNORE_THIS_VERSION_OF_SDL_SetRenderDrawColor
#define SDL_GetRenderDrawColor IGNORE_THIS_VERSION_OF_SDL_GetRenderDrawColor
#define SDL_SetRenderDrawBlendMode IGNORE_THIS_VERSION_OF_SDL_SetRenderDrawBlendMode
@@ -2267,8 +2267,8 @@ typedef void (__cdecl *pfnSDL_CurrentEndThread) (unsigned);
#undef SDL_GetRendererInfo
#endif
-#ifdef SDL_GetRendererOutputSize
-#undef SDL_GetRendererOutputSize
+#ifdef SDL_GetRenderOutputSize
+#undef SDL_GetRenderOutputSize
#endif
#ifdef SDL_CreateTexture
@@ -2347,10 +2347,6 @@ typedef void (__cdecl *pfnSDL_CurrentEndThread) (unsigned);
#undef SDL_UnlockTexture
#endif
-#ifdef SDL_RenderTargetSupported
-#undef SDL_RenderTargetSupported
-#endif
-
#ifdef SDL_SetRenderTarget
#undef SDL_SetRenderTarget
#endif
@@ -2359,22 +2355,6 @@ typedef void (__cdecl *pfnSDL_CurrentEndThread) (unsigned);
#undef SDL_GetRenderTarget
#endif
-#ifdef SDL_SetRenderLogicalSize
-#undef SDL_SetRenderLogicalSize
-#endif
-
-#ifdef SDL_GetRenderLogicalSize
-#undef SDL_GetRenderLogicalSize
-#endif
-
-#ifdef SDL_SetRenderIntegerScale
-#undef SDL_SetRenderIntegerScale
-#endif
-
-#ifdef SDL_GetRenderIntegerScale
-#undef SDL_GetRenderIntegerScale
-#endif
-
#ifdef SDL_SetRenderViewport
#undef SDL_SetRenderViewport
#endif
@@ -2403,12 +2383,32 @@ typedef void (__cdecl *pfnSDL_CurrentEndThread) (unsigned);
#undef SDL_GetRenderScale
#endif
-#ifdef SDL_RenderWindowToLogical
-#undef SDL_RenderWindowToLogical
+#ifdef SDL_RenderCoordinatesFromWindow
+#undef SDL_RenderCoordinatesFromWindow
+#endif
+
+#ifdef SDL_RenderCoordinatesToWindow
+#undef SDL_RenderCoordinatesToWindow
+#endif
+
+#ifdef SDL_GetRenderLogicalPresentation
+#undef SDL_GetRenderLogicalPresentation
+#endif
+
+#ifdef SDL_SetRenderLogicalPresentation
+#undef SDL_SetRenderLogicalPresentation
+#endif
+
+#ifdef SDL_ConvertEventToRenderCoordinates
+#undef SDL_ConvertEventToRenderCoordinates
+#endif
+
+#ifdef SDL_GetCurrentRenderOutputSize
+#undef SDL_GetCurrentRenderOutputSize
#endif
-#ifdef SDL_RenderLogicalToWindow
-#undef SDL_RenderLogicalToWindow
+#ifdef SDL_GetRenderWindowSize
+#undef SDL_GetRenderWindowSize
#endif
#ifdef SDL_SetRenderDrawColor
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index 71b0d09..b42e2ae 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -316,11 +316,11 @@ SDL3_SYM_PASSTHROUGH(void,UnlockTexture,(SDL_Texture *a),(a),)
SDL3_SYM_PASSTHROUGH(int,SetRenderTarget,(SDL_Renderer *a, SDL_Texture *b),(a,b),return)
SDL3_SYM_PASSTHROUGH(SDL_Texture*,GetRenderTarget,(SDL_Renderer *a),(a),return)
SDL3_SYM_RENAMED(int,RenderSetViewport,SetRenderViewport,(SDL_Renderer *a, const SDL_Rect *b),(a,b),return)
-SDL3_SYM_RENAMED(void,RenderGetViewport,GetRenderViewport,(SDL_Renderer *a, SDL_Rect *b),(a,b),)
SDL3_SYM_RENAMED(int,RenderSetClipRect,SetRenderClipRect,(SDL_Renderer *a, const SDL_Rect *b),(a,b),return)
-SDL3_SYM_RENAMED(void,RenderGetClipRect,GetRenderClipRect,(SDL_Renderer *a, SDL_Rect *b),(a,b),)
SDL3_SYM_RENAMED(int,RenderSetScale,SetRenderScale,(SDL_Renderer *a, float b, float c),(a,b,c),return)
-SDL3_SYM_RENAMED(void,RenderGetScale,GetRenderScale,(SDL_Renderer *a, float *b, float *c),(a,b,c),)
+SDL3_SYM(int,GetRenderViewport,(SDL_Renderer *a, SDL_Rect *b),(a,b),return)
+SDL3_SYM(int,GetRenderClipRect,(SDL_Renderer *a, SDL_Rect *b),(a,b),return)
+SDL3_SYM(int,GetRenderScale,(SDL_Renderer *a, float *b, float *c),(a,b,c),return)
SDL3_SYM_PASSTHROUGH(int,SetRenderDrawColor,(SDL_Renderer *a, Uint8 b, Uint8 c, Uint8 d, Uint8 e),(a,b,c,d,e),return)
SDL3_SYM_PASSTHROUGH(int,GetRenderDrawColor,(SDL_Renderer *a, Uint8 *b, Uint8 *c, Uint8 *d, Uint8 *e),(a,b,c,d,e),return)
SDL3_SYM_PASSTHROUGH(int,SetRenderDrawBlendMode,(SDL_Renderer *a, SDL_BlendMode b),(a,b),return)
@@ -819,8 +819,8 @@ SDL3_SYM_PASSTHROUGH(int,hid_get_serial_number_string,(SDL_hid_device *a, wchar_
SDL3_SYM_PASSTHROUGH(int,hid_get_indexed_string,(SDL_hid_device *a, int b, wchar_t *c, size_t d),(a,b,c,d),return)
SDL3_SYM_PASSTHROUGH(int,SetWindowMouseRect,(SDL_Window *a, const SDL_Rect *b),(a,b),return)
SDL3_SYM_PASSTHROUGH(const SDL_Rect*,GetWindowMouseRect,(SDL_Window *a),(a),return)
-SDL3_SYM(void,RenderCoordinatesFromWindow,(SDL_Renderer *a, float b, float c, float *d, float *e),(a,b,c,d,e),)
-SDL3_SYM(void,RenderCoordinatesToWindow,(SDL_Renderer *a, float b, float c, float *d, float *e),(a,b,c,d,e),)
+SDL3_SYM(int,RenderCoordinatesFromWindow,(SDL_Renderer *a, float b, float c, float *d, float *e),(a,b,c,d,e),return)
+SDL3_SYM(int,RenderCoordinatesToWindow,(SDL_Renderer *a, float b, float c, float *d, float *e),(a,b,c,d,e),return)
SDL3_SYM_PASSTHROUGH(SDL_bool,JoystickHasRumble,(SDL_Joystick *a),(a),return)
SDL3_SYM_PASSTHROUGH(SDL_bool,JoystickHasRumbleTriggers,(SDL_Joystick *a),(a),return)
SDL3_SYM_RENAMED(SDL_bool,GameControllerHasRumble,GamepadHasRumble,(SDL_GameController *a),(a),return)