From eacdbc935739cfea6abf009e41c90b8bb72ceb82 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Mon, 8 Jan 2024 14:19:02 -0500
Subject: [PATCH] Renamed SDL_GetTextureRenderer references to
SDL_GetRendererFromTexture.
(This was added to SDL3 and almost immediately renamed.)
---
src/sdl2_compat.c | 8 ++++----
src/sdl3_include_wrapper.h | 6 +++---
src/sdl3_syms.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index eb2b944..e58502e 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -6362,8 +6362,8 @@ SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh)
SDL_Renderer *renderer;
Sint64 tex;
- /* SDL3_GetTextureRenderer will do all the CHECK_TEXTURE_MAGIC stuff. */
- renderer = SDL3_GetTextureRenderer(texture);
+ /* SDL3_GetRendererFromTexture will do all the CHECK_TEXTURE_MAGIC stuff. */
+ renderer = SDL3_GetRendererFromTexture(texture);
if (!renderer) {
return -1;
}
@@ -6457,8 +6457,8 @@ SDL_GL_UnbindTexture(SDL_Texture *texture)
SDL_Renderer *renderer;
Sint64 tex;
- /* SDL3_GetTextureRenderer will do all the CHECK_TEXTURE_MAGIC stuff. */
- renderer = SDL3_GetTextureRenderer(texture);
+ /* SDL3_GetRendererFromTexture will do all the CHECK_TEXTURE_MAGIC stuff. */
+ renderer = SDL3_GetRendererFromTexture(texture);
if (!renderer) {
return -1;
}
diff --git a/src/sdl3_include_wrapper.h b/src/sdl3_include_wrapper.h
index 9fd6bce..5448478 100644
--- a/src/sdl3_include_wrapper.h
+++ b/src/sdl3_include_wrapper.h
@@ -345,7 +345,7 @@
#define SDL_GetTextureAlphaMod IGNORE_THIS_VERSION_OF_SDL_GetTextureAlphaMod
#define SDL_GetTextureBlendMode IGNORE_THIS_VERSION_OF_SDL_GetTextureBlendMode
#define SDL_GetTextureColorMod IGNORE_THIS_VERSION_OF_SDL_GetTextureColorMod
-#define SDL_GetTextureRenderer IGNORE_THIS_VERSION_OF_SDL_GetTextureRenderer
+#define SDL_GetRendererFromTexture IGNORE_THIS_VERSION_OF_SDL_GetRendererFromTexture
#define SDL_GetTextureScaleMode IGNORE_THIS_VERSION_OF_SDL_GetTextureScaleMode
#define SDL_GetThreadID IGNORE_THIS_VERSION_OF_SDL_GetThreadID
#define SDL_GetThreadName IGNORE_THIS_VERSION_OF_SDL_GetThreadName
@@ -2283,8 +2283,8 @@
#undef SDL_GetTextureColorMod
#endif
-#ifdef SDL_GetTextureRenderer
-#undef SDL_GetTextureRenderer
+#ifdef SDL_GetRendererFromTexture
+#undef SDL_GetRendererFromTexture
#endif
#ifdef SDL_GetTextureScaleMode
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index cd39816..c7dfc04 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -323,7 +323,7 @@ SDL3_SYM_PASSTHROUGH(int,SetTextureAlphaMod,(SDL_Texture *a, Uint8 b),(a,b),retu
SDL3_SYM_PASSTHROUGH(int,GetTextureAlphaMod,(SDL_Texture *a, Uint8 *b),(a,b),return)
SDL3_SYM_PASSTHROUGH(int,SetTextureBlendMode,(SDL_Texture *a, SDL_BlendMode b),(a,b),return)
SDL3_SYM_PASSTHROUGH(int,GetTextureBlendMode,(SDL_Texture *a, SDL_BlendMode *b),(a,b),return)
-SDL3_SYM(SDL_Renderer *,GetTextureRenderer,(SDL_Texture *a),(a),return)
+SDL3_SYM(SDL_Renderer *,GetRendererFromTexture,(SDL_Texture *a),(a),return)
SDL3_SYM_PASSTHROUGH(int,UpdateTexture,(SDL_Texture *a, const SDL_Rect *b, const void *c, int d),(a,b,c,d),return)
SDL3_SYM_PASSTHROUGH(int,UpdateYUVTexture,(SDL_Texture *a, const SDL_Rect *b, const Uint8 *c, int d, const Uint8 *e, int f, const Uint8 *g, int h),(a,b,c,d,e,f,g,h),return)
SDL3_SYM_PASSTHROUGH(int,LockTexture,(SDL_Texture *a, const SDL_Rect *b, void **c, int *d),(a,b,c,d),return)