From 80890f3aaeb0c69b91b5a186eeebad6892c392bb Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 28 Dec 2022 19:40:31 -0800
Subject: [PATCH] SDL API renaming: SDL_render.h
Fixes https://github.com/libsdl-org/SDL/issues/6883
---
docs/README-migration.md | 6 ++++++
include/SDL3/SDL_oldnames.h | 8 ++++++++
include/SDL3/SDL_system.h | 4 ++--
src/dynapi/SDL_dynapi.sym | 4 ++--
src/dynapi/SDL_dynapi_overrides.h | 4 ++--
src/dynapi/SDL_dynapi_procs.h | 4 ++--
src/render/direct3d/SDL_render_d3d.c | 2 +-
src/render/direct3d11/SDL_render_d3d11.c | 2 +-
8 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/docs/README-migration.md b/docs/README-migration.md
index 578e6b366c15..8ef2630b012e 100644
--- a/docs/README-migration.md
+++ b/docs/README-migration.md
@@ -763,6 +763,12 @@ The following functions have been renamed:
* SDL_UpperBlit => SDL_BlitSurface
* SDL_UpperBlitScaled => SDL_BlitSurfaceScaled
+## SDL_system.h
+
+The following functions have been renamed:
+* SDL_RenderGetD3D11Device => SDL_GetRenderD3D11Device
+* SDL_RenderGetD3D9Device => SDL_GetRenderD3D9Device
+
## SDL_syswm.h
This header no longer includes platform specific headers and type definitions, instead allowing you to include the ones appropriate for your use case. You should define one or more of the following to enable the relevant platform-specific support:
diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h
index f42a43ef24d2..3ca97e3aedec 100644
--- a/include/SDL3/SDL_oldnames.h
+++ b/include/SDL3/SDL_oldnames.h
@@ -341,6 +341,10 @@
#define SDL_UpperBlit SDL_BlitSurface
#define SDL_UpperBlitScaled SDL_BlitSurfaceScaled
+/* ##SDL_system.h */
+#define SDL_RenderGetD3D11Device SDL_GetRenderD3D11Device
+#define SDL_RenderGetD3D9Device SDL_GetRenderD3D9Device
+
/* ##SDL_video.h */
#define SDL_GetPointDisplayIndex SDL_GetDisplayIndexForPoint
#define SDL_GetRectDisplayIndex SDL_GetDisplayIndexForRect
@@ -656,6 +660,10 @@
#define SDL_UpperBlit SDL_UpperBlit_renamed_SDL_BlitSurface
#define SDL_UpperBlitScaled SDL_UpperBlitScaled_renamed_SDL_BlitSurfaceScaled
+/* ##SDL_system.h */
+#define SDL_RenderGetD3D11Device SDL_RenderGetD3D11Device_renamed_SDL_GetRenderD3D11Device
+#define SDL_RenderGetD3D9Device SDL_RenderGetD3D9Device_renamed_SDL_GetRenderD3D9Device
+
/* ##SDL_video.h */
#define SDL_GetPointDisplayIndex SDL_GetPointDisplayIndex_renamed_SDL_GetDisplayIndexForPoint
#define SDL_GetRectDisplayIndex SDL_GetRectDisplayIndex_renamed_SDL_GetDisplayIndexForRect
diff --git a/include/SDL3/SDL_system.h b/include/SDL3/SDL_system.h
index 1c8de768b241..1f3e80770640 100644
--- a/include/SDL3/SDL_system.h
+++ b/include/SDL3/SDL_system.h
@@ -88,7 +88,7 @@ typedef struct IDirect3DDevice9 IDirect3DDevice9;
*
* \since This function is available since SDL 3.0.0.
*/
-extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer);
+extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_GetRenderD3D9Device(SDL_Renderer * renderer);
typedef struct ID3D11Device ID3D11Device;
@@ -104,7 +104,7 @@ typedef struct ID3D11Device ID3D11Device;
*
* \since This function is available since SDL 3.0.0.
*/
-extern DECLSPEC ID3D11Device* SDLCALL SDL_RenderGetD3D11Device(SDL_Renderer * renderer);
+extern DECLSPEC ID3D11Device* SDLCALL SDL_GetRenderD3D11Device(SDL_Renderer * renderer);
#endif /* defined(__WIN32__) || defined(__WINGDK__) */
diff --git a/src/dynapi/SDL_dynapi.sym b/src/dynapi/SDL_dynapi.sym
index 9dabd6f38575..851065b96e4e 100644
--- a/src/dynapi/SDL_dynapi.sym
+++ b/src/dynapi/SDL_dynapi.sym
@@ -539,9 +539,9 @@ SDL3_0.0.0 {
SDL_RenderFlush;
SDL_RenderGeometry;
SDL_RenderGeometryRaw;
- SDL_RenderGetD3D11Device;
+ SDL_GetRenderD3D11Device;
SDL_RenderGetD3D12Device;
- SDL_RenderGetD3D9Device;
+ SDL_GetRenderD3D9Device;
SDL_RenderLine;
SDL_RenderLineF;
SDL_RenderLines;
diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
index f1a18313ab61..071cf0728f2a 100644
--- a/src/dynapi/SDL_dynapi_overrides.h
+++ b/src/dynapi/SDL_dynapi_overrides.h
@@ -565,9 +565,9 @@
#define SDL_RenderFlush SDL_RenderFlush_REAL
#define SDL_RenderGeometry SDL_RenderGeometry_REAL
#define SDL_RenderGeometryRaw SDL_RenderGeometryRaw_REAL
-#define SDL_RenderGetD3D11Device SDL_RenderGetD3D11Device_REAL
+#define SDL_GetRenderD3D11Device SDL_GetRenderD3D11Device_REAL
#define SDL_RenderGetD3D12Device SDL_RenderGetD3D12Device_REAL
-#define SDL_RenderGetD3D9Device SDL_RenderGetD3D9Device_REAL
+#define SDL_GetRenderD3D9Device SDL_GetRenderD3D9Device_REAL
#define SDL_RenderLine SDL_RenderLine_REAL
#define SDL_RenderLineF SDL_RenderLineF_REAL
#define SDL_RenderLines SDL_RenderLines_REAL
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index 81cc2eda5ea9..f84b2c84216b 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -74,8 +74,8 @@ SDL_DYNAPI_PROC(void,SDL_UnregisterApp,(void),(),)
#if defined(__WIN32__) || defined(__WINGDK__)
SDL_DYNAPI_PROC(SDL_bool,SDL_DXGIGetOutputInfo,(int a, int *b, int *c),(a,b,c),return)
SDL_DYNAPI_PROC(int,SDL_Direct3D9GetAdapterIndex,(int a),(a),return)
-SDL_DYNAPI_PROC(ID3D11Device*,SDL_RenderGetD3D11Device,(SDL_Renderer *a),(a),return)
-SDL_DYNAPI_PROC(IDirect3DDevice9*,SDL_RenderGetD3D9Device,(SDL_Renderer *a),(a),return)
+SDL_DYNAPI_PROC(ID3D11Device*,SDL_GetRenderD3D11Device,(SDL_Renderer *a),(a),return)
+SDL_DYNAPI_PROC(IDirect3DDevice9*,SDL_GetRenderD3D9Device,(SDL_Renderer *a),(a),return)
#endif
#if defined(__GDK__)
diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c
index 78f64f8ddb4b..12179ff8d7b3 100644
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@@ -1738,7 +1738,7 @@ SDL_RenderDriver D3D_RenderDriver = {
#if defined(__WIN32__) || defined(__WINGDK__)
/* This function needs to always exist on Windows, for the Dynamic API. */
IDirect3DDevice9 *
-SDL_RenderGetD3D9Device(SDL_Renderer *renderer)
+SDL_GetRenderD3D9Device(SDL_Renderer *renderer)
{
IDirect3DDevice9 *device = NULL;
diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c
index 6526806c67ea..915ba0fb0aa3 100644
--- a/src/render/direct3d11/SDL_render_d3d11.c
+++ b/src/render/direct3d11/SDL_render_d3d11.c
@@ -2417,7 +2417,7 @@ SDL_RenderDriver D3D11_RenderDriver = {
#if defined(__WIN32__) || defined(__WINGDK__)
/* This function needs to always exist on Windows, for the Dynamic API. */
ID3D11Device *
-SDL_RenderGetD3D11Device(SDL_Renderer *renderer)
+SDL_GetRenderD3D11Device(SDL_Renderer *renderer)
{
ID3D11Device *device = NULL;