From 0d54115235e7a8c9a7fa301919c3b9584eea2ebc Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Tue, 27 Dec 2022 06:21:13 -0800
Subject: [PATCH] SDL API renaming: SDL_render.h
Fixes https://github.com/libsdl-org/SDL/issues/6883
---
WhatsNew.txt | 32 ++++
Xcode-iOS/Demos/src/accelerometer.c | 6 +-
Xcode-iOS/Demos/src/happy.c | 8 +-
Xcode-iOS/Demos/src/keyboard.c | 8 +-
Xcode-iOS/Demos/src/mixer.c | 4 +-
Xcode-iOS/Demos/src/rectangles.c | 4 +-
Xcode-iOS/Demos/src/touch.c | 6 +-
docs/README-migration.md | 34 ++++
include/SDL3/SDL_blendmode.h | 2 +-
include/SDL3/SDL_hints.h | 2 +-
include/SDL3/SDL_oldnames.h | 68 ++++++++
include/SDL3/SDL_render.h | 260 ++++++++++++++--------------
src/dynapi/SDL_dynapi.sym | 64 +++----
src/dynapi/SDL_dynapi_overrides.h | 64 +++----
src/dynapi/SDL_dynapi_procs.h | 64 +++----
src/render/SDL_render.c | 118 ++++++-------
src/test/SDL_test_common.c | 24 +--
src/test/SDL_test_font.c | 2 +-
src/video/SDL_video.c | 4 +-
test/controllermap.c | 8 +-
test/testautomation_render.c | 70 ++++----
test/testdraw2.c | 18 +-
test/testdrawchessboard.c | 2 +-
test/testgamecontroller.c | 12 +-
test/testgeometry.c | 2 +-
test/testime.c | 6 +-
test/testintersections.c | 18 +-
test/testmouse.c | 8 +-
test/testnative.c | 4 +-
test/testoverlay2.c | 6 +-
test/testrelative.c | 2 +-
test/testrendercopyex.c | 8 +-
test/testrendertarget.c | 18 +-
test/testscale.c | 6 +-
test/testshape.c | 2 +-
test/testsprite2.c | 32 ++--
test/testspriteminimal.c | 2 +-
test/teststreaming.c | 2 +-
test/testviewport.c | 38 ++--
test/testwm2.c | 2 +-
test/testyuv.c | 2 +-
41 files changed, 588 insertions(+), 454 deletions(-)
diff --git a/WhatsNew.txt b/WhatsNew.txt
index 00baaa859f0a..288bd847720b 100644
--- a/WhatsNew.txt
+++ b/WhatsNew.txt
@@ -80,6 +80,38 @@ General:
* SDL_NewAudioStream => SDL_CreateAudioStream
* SDL_NumJoysticks => SDL_GetNumJoysticks
* SDL_PixelFormatEnumToMasks => SDL_GetMasksForPixelFormatEnum
+ * SDL_RenderCopy => SDL_RenderTexture
+ * SDL_RenderCopyEx => SDL_RenderTextureRotated
+ * SDL_RenderCopyExF => SDL_RenderTextureRotatedF
+ * SDL_RenderCopyF => SDL_RenderTextureF
+ * SDL_RenderDrawLine => SDL_RenderLine
+ * SDL_RenderDrawLineF => SDL_RenderLineF
+ * SDL_RenderDrawLines => SDL_RenderLines
+ * SDL_RenderDrawLinesF => SDL_RenderLinesF
+ * SDL_RenderDrawPoint => SDL_RenderPoint
+ * SDL_RenderDrawPointF => SDL_RenderPointF
+ * SDL_RenderDrawPoints => SDL_RenderPoints
+ * SDL_RenderDrawPointsF => SDL_RenderPointsF
+ * SDL_RenderDrawRect => SDL_RenderRect
+ * SDL_RenderDrawRectF => SDL_RenderRectF
+ * SDL_RenderDrawRects => SDL_RenderRects
+ * SDL_RenderDrawRectsF => SDL_RenderRectsF
+ * SDL_RenderGetClipRect => SDL_GetRenderClipRect
+ * SDL_RenderGetIntegerScale => SDL_GetRenderIntegerScale
+ * SDL_RenderGetLogicalSize => SDL_GetRenderLogicalSize
+ * SDL_RenderGetMetalCommandEncoder => SDL_GetRenderMetalCommandEncoder
+ * SDL_RenderGetMetalLayer => SDL_GetRenderMetalLayer
+ * SDL_RenderGetScale => SDL_GetRenderScale
+ * SDL_RenderGetViewport => SDL_GetRenderViewport
+ * SDL_RenderGetWindow => SDL_GetRenderWindow
+ * SDL_RenderIsClipEnabled => SDL_IsRenderClipEnabled
+ * SDL_RenderSetClipRect => SDL_SetRenderClipRect
+ * SDL_RenderSetIntegerScale => SDL_SetRenderIntegerScale
+ * SDL_RenderSetLogicalSize => SDL_SetRenderLogicalSize
+ * SDL_RenderSetScale => SDL_SetRenderScale
+ * SDL_RenderSetVSync => SDL_SetRenderVSync
+ * SDL_RenderSetViewport => SDL_SetRenderViewport
+ * SDL_RenderTargetSupported => SDL_IsRenderTargetSupported
* Removed the following functions from the API, see docs/README-migration.md for details:
* SDL_AudioInit()
* SDL_AudioQuit()
diff --git a/Xcode-iOS/Demos/src/accelerometer.c b/Xcode-iOS/Demos/src/accelerometer.c
index cf8a236b6c19..b676e2be24c0 100644
--- a/Xcode-iOS/Demos/src/accelerometer.c
+++ b/Xcode-iOS/Demos/src/accelerometer.c
@@ -98,13 +98,13 @@ render(SDL_Renderer *renderer, int w, int h, double deltaTime)
}
/* draw the background */
- SDL_RenderCopy(renderer, space, NULL, NULL);
+ SDL_RenderTexture(renderer, space, NULL, NULL);
/* draw the ship */
shipData.rect.x = shipData.x;
shipData.rect.y = shipData.y;
- SDL_RenderCopy(renderer, ship, NULL, &shipData.rect);
+ SDL_RenderTexture(renderer, ship, NULL, &shipData.rect);
/* update screen */
SDL_RenderPresent(renderer);
@@ -174,7 +174,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, 0);
SDL_GetWindowSize(window, &w, &h);
- SDL_RenderSetLogicalSize(renderer, w, h);
+ SDL_SetRenderLogicalSize(renderer, w, h);
/* print out some info about joysticks and try to open accelerometer for use */
printf("There are %d joysticks available\n", SDL_GetNumJoysticks());
diff --git a/Xcode-iOS/Demos/src/happy.c b/Xcode-iOS/Demos/src/happy.c
index 197a1c6f269b..50bb799da1bb 100644
--- a/Xcode-iOS/Demos/src/happy.c
+++ b/Xcode-iOS/Demos/src/happy.c
@@ -29,7 +29,7 @@ initializeHappyFaces(SDL_Renderer *renderer)
int i;
int w;
int h;
- SDL_RenderGetLogicalSize(renderer, &w, &h);
+ SDL_GetRenderLogicalSize(renderer, &w, &h);
for (i = 0; i < NUM_HAPPY_FACES; i++) {
faces[i].x = randomFloat(0.0f, w - HAPPY_FACE_SIZE);
@@ -48,7 +48,7 @@ render(SDL_Renderer *renderer, double deltaTime)
int w;
int h;
- SDL_RenderGetLogicalSize(renderer, &w, &h);
+ SDL_GetRenderLogicalSize(renderer, &w, &h);
/* setup boundaries for happyface bouncing */
int maxx = w - HAPPY_FACE_SIZE;
@@ -93,7 +93,7 @@ render(SDL_Renderer *renderer, double deltaTime)
}
dstRect.x = faces[i].x;
dstRect.y = faces[i].y;
- SDL_RenderCopy(renderer, texture, &srcRect, &dstRect);
+ SDL_RenderTexture(renderer, texture, &srcRect, &dstRect);
}
/* update screen */
SDL_RenderPresent(renderer);
@@ -149,7 +149,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, 0);
SDL_GetWindowSize(window, &width, &height);
- SDL_RenderSetLogicalSize(renderer, width, height);
+ SDL_SetRenderLogicalSize(renderer, width, height);
initializeTexture(renderer);
initializeHappyFaces(renderer);
diff --git a/Xcode-iOS/Demos/src/keyboard.c b/Xcode-iOS/Demos/src/keyboard.c
index 606783a95717..d4b6f86b8498 100644
--- a/Xcode-iOS/Demos/src/keyboard.c
+++ b/Xcode-iOS/Demos/src/keyboard.c
@@ -135,7 +135,7 @@ void
getPositionForCharNumber(int n, int *x, int *y)
{
int renderW, renderH;
- SDL_RenderGetLogicalSize(renderer, &renderW, &renderH);
+ SDL_GetRenderLogicalSize(renderer, &renderW, &renderH);
int x_padding = 16; /* padding space on left and right side of screen */
int y_padding = 32; /* padding space at top of screen */
@@ -157,7 +157,7 @@ drawGlyph(int glyph, int positionIndex)
getPositionForCharNumber(positionIndex, &x, &y);
SDL_Rect srcRect = { GLYPH_SIZE_IMAGE * glyph, 0, GLYPH_SIZE_IMAGE, GLYPH_SIZE_IMAGE };
SDL_Rect dstRect = { x, y, GLYPH_SIZE_SCREEN, GLYPH_SIZE_SCREEN };
- SDL_RenderCopy(renderer, texture, &srcRect, &dstRect);
+ SDL_RenderTexture(renderer, texture, &srcRect, &dstRect);
}
/* this function loads our font into an SDL_Texture and returns the SDL_Texture */
@@ -227,7 +227,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, SDL_RENDERER_PRESENTVSYNC);
SDL_GetWindowSize(window, &width, &height);
- SDL_RenderSetLogicalSize(renderer, width, height);
+ SDL_SetRenderLogicalSize(renderer, width, height);
/* load up our font */
loadFont();
@@ -253,7 +253,7 @@ main(int argc, char *argv[])
if (event.window.event == SDL_WINDOWEVENT_RESIZED) {
width = event.window.data1;
height = event.window.data2;
- SDL_RenderSetLogicalSize(renderer, width, height);
+ SDL_SetRenderLogicalSize(renderer, width, height);
#ifdef TEST_INPUT_RECT
textrect.x = 0;
textrect.y = height - GLYPH_SIZE_IMAGE;
diff --git a/Xcode-iOS/Demos/src/mixer.c b/Xcode-iOS/Demos/src/mixer.c
index 642602c76449..910e2f0e4b65 100644
--- a/Xcode-iOS/Demos/src/mixer.c
+++ b/Xcode-iOS/Demos/src/mixer.c
@@ -61,7 +61,7 @@ initializeButtons(SDL_Renderer *renderer)
SDL_Color downColor = { 191, 191, 221, 255 }; /* color of drum when pressed */
int renderW, renderH;
- SDL_RenderGetLogicalSize(renderer, &renderW, &renderH);
+ SDL_GetRenderLogicalSize(renderer, &renderW, &renderH);
buttonRect.x = spacing;
buttonRect.y = spacing;
@@ -287,7 +287,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, 0);
SDL_GetWindowSize(window, &width, &height);
- SDL_RenderSetLogicalSize(renderer, width, height);
+ SDL_SetRenderLogicalSize(renderer, width, height);
/* initialize the mixer */
SDL_memset(&mixer, 0, sizeof(mixer));
diff --git a/Xcode-iOS/Demos/src/rectangles.c b/Xcode-iOS/Demos/src/rectangles.c
index 1667ded6fd4e..fb5d89e296fd 100644
--- a/Xcode-iOS/Demos/src/rectangles.c
+++ b/Xcode-iOS/Demos/src/rectangles.c
@@ -17,7 +17,7 @@ render(SDL_Renderer *renderer)
int renderW;
int renderH;
- SDL_RenderGetLogicalSize(renderer, &renderW, &renderH);
+ SDL_GetRenderLogicalSize(renderer, &renderW, &renderH);
/* Come up with a random rectangle */
SDL_Rect rect;
@@ -69,7 +69,7 @@ main(int argc, char *argv[])
}
SDL_GetWindowSize(window, &windowW, &windowH);
- SDL_RenderSetLogicalSize(renderer, windowW, windowH);
+ SDL_SetRenderLogicalSize(renderer, windowW, windowH);
/* Fill screen with black */
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
diff --git a/Xcode-iOS/Demos/src/touch.c b/Xcode-iOS/Demos/src/touch.c
index 67459f41467f..3b909fd156b5 100644
--- a/Xcode-iOS/Demos/src/touch.c
+++ b/Xcode-iOS/Demos/src/touch.c
@@ -46,7 +46,7 @@ drawLine(SDL_Renderer *renderer, float startx, float starty, float dx, float dy)
x += dx_prime;
y += dy_prime;
/* draw brush blot */
- SDL_RenderCopy(renderer, brush, NULL, &dstRect);
+ SDL_RenderTexture(renderer, brush, NULL, &dstRect);
}
}
@@ -96,7 +96,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, 0);
SDL_GetWindowSize(window, &w, &h);
- SDL_RenderSetLogicalSize(renderer, w, h);
+ SDL_SetRenderLogicalSize(renderer, w, h);
/* load brush texture */
initializeTexture(renderer);
@@ -127,7 +127,7 @@ main(int argc, char *argv[])
}
}
- SDL_RenderCopy(renderer, target, NULL, NULL);
+ SDL_RenderTexture(renderer, target, NULL, NULL);
SDL_RenderPresent(renderer);
}
diff --git a/docs/README-migration.md b/docs/README-migration.md
index cefbbc565326..41b2642bab92 100644
--- a/docs/README-migration.md
+++ b/docs/README-migration.md
@@ -247,6 +247,40 @@ which index is the "opengl" or whatnot driver, you can just pass that string dir
here, now. Passing NULL is the same as passing -1 here in SDL2, to signify you want SDL
to decide for you.
+The following functions have been renamed:
+* SDL_RenderCopy => SDL_RenderTexture
+* SDL_RenderCopyEx => SDL_RenderTextureRotated
+* SDL_RenderCopyExF => SDL_RenderTextureRotatedF
+* SDL_RenderCopyF => SDL_RenderTextureF
+* SDL_RenderDrawLine => SDL_RenderLine
+* SDL_RenderDrawLineF => SDL_RenderLineF
+* SDL_RenderDrawLines => SDL_RenderLines
+* SDL_RenderDrawLinesF => SDL_RenderLinesF
+* SDL_RenderDrawPoint => SDL_RenderPoint
+* SDL_RenderDrawPointF => SDL_RenderPointF
+* SDL_RenderDrawPoints => SDL_RenderPoints
+* SDL_RenderDrawPointsF => SDL_RenderPointsF
+* SDL_RenderDrawRect => SDL_RenderRect
+* SDL_RenderDrawRectF => SDL_RenderRectF
+* SDL_RenderDrawRects => SDL_RenderRects
+* SDL_RenderDrawRectsF => SDL_RenderRectsF
+* SDL_RenderGetClipRect => SDL_GetRenderClipRect
+* SDL_RenderGetIntegerScale => SDL_GetRenderIntegerScale
+* SDL_RenderGetLogicalSize => SDL_GetRenderLogicalSize
+* SDL_RenderGetMetalCommandEncoder => SDL_GetRenderMetalCommandEncoder
+* SDL_RenderGetMetalLayer => SDL_GetRenderMetalLayer
+* SDL_RenderGetScale => SDL_GetRenderScale
+* SDL_RenderGetViewport => SDL_GetRenderViewport
+* SDL_RenderGetWindow => SDL_GetRenderWindow
+* SDL_RenderIsClipEnabled => SDL_IsRenderClipEnabled
+* SDL_RenderSetClipRect => SDL_SetRenderClipRect
+* SDL_RenderSetIntegerScale => SDL_SetRenderIntegerScale
+* SDL_RenderSetLogicalSize => SDL_SetRenderLogicalSize
+* SDL_RenderSetScale => SDL_SetRenderScale
+* SDL_RenderSetVSync => SDL_SetRenderVSync
+* SDL_RenderSetViewport => SDL_SetRenderViewport
+* SDL_RenderTargetSupported => SDL_IsRenderTargetSupported
+
## SDL_rwops.h
The following macros have been renamed:
diff --git a/include/SDL3/SDL_blendmode.h b/include/SDL3/SDL_blendmode.h
index 9c7f45740a22..5b197f601caf 100644
--- a/include/SDL3/SDL_blendmode.h
+++ b/include/SDL3/SDL_blendmode.h
@@ -35,7 +35,7 @@ extern "C" {
#endif
/**
- * \brief The blend mode used in SDL_RenderCopy() and drawing operations.
+ * \brief The blend mode used in SDL_RenderTexture() and drawing operations.
*/
typedef enum
{
diff --git a/include/SDL3/SDL_hints.h b/include/SDL3/SDL_hints.h
index 5b900c8ce189..dc93e09cf541 100644
--- a/include/SDL3/SDL_hints.h
+++ b/include/SDL3/SDL_hints.h
@@ -1400,7 +1400,7 @@ extern "C" {
#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER"
/**
- * \brief A variable controlling the scaling policy for SDL_RenderSetLogicalSize.
+ * \brief A variable controlling the scaling policy for SDL_SetRenderLogicalSize.
*
* This variable can be set to the following values:
* "0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen
diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h
index 318824490f5e..732df3151d7e 100644
--- a/include/SDL3/SDL_oldnames.h
+++ b/include/SDL3/SDL_oldnames.h
@@ -137,6 +137,40 @@
#define __MACOSX__ __MACOS__
#endif
+/* ##SDL_render.h */
+#define SDL_RenderCopy SDL_RenderTexture
+#define SDL_RenderCopyEx SDL_RenderTextureRotated
+#define SDL_RenderCopyExF SDL_RenderTextureRotatedF
+#define SDL_RenderCopyF SDL_RenderTextureF
+#define SDL_RenderDrawLine SDL_RenderLine
+#define SDL_RenderDrawLineF SDL_RenderLineF
+#define SDL_RenderDrawLines SDL_RenderLines
+#define SDL_RenderDrawLinesF SDL_RenderLinesF
+#define SDL_RenderDrawPoint SDL_RenderPoint
+#define SDL_RenderDrawPointF SDL_RenderPointF
+#define SDL_RenderDrawPoints SDL_RenderPoints
+#define SDL_RenderDrawPointsF SDL_RenderPointsF
+#define SDL_RenderDrawRect SDL_RenderRect
+#define SDL_RenderDrawRectF SDL_RenderRectF
+#define SDL_RenderDrawRects SDL_RenderRects
+#define SDL_RenderDrawRectsF SDL_RenderRectsF
+#define SDL_RenderGetClipRect SDL_GetRenderClipRect
+#define SDL_RenderGetIntegerScale SDL_GetRenderIntegerScale
+#define SDL_RenderGetLogicalSize SDL_GetRenderLogicalSize
+#define SDL_RenderGetMetalCommandEncoder SDL_GetRenderMetalCommandEncoder
+#define SDL_RenderGetMetalLayer SDL_GetRenderMetalLayer
+#define SDL_RenderGetScale SDL_GetRenderScale
+#define SDL_RenderGetViewport SDL_GetRenderViewport
+#define SDL_RenderGetWindow SDL_GetRenderWindow
+#define SDL_RenderIsClipEnabled SDL_IsRenderClipEnabled
+#define SDL_RenderSetClipRect SDL_SetRenderClipRect
+#define SDL_RenderSetIntegerScale SDL_SetRenderIntegerScale
+#define SDL_RenderSetLogicalSize SDL_SetRenderLogicalSize
+#define SDL_RenderSetScale SDL_SetRenderScale
+#define SDL_RenderSetVSync SDL_SetRenderVSync
+#define SDL_RenderSetViewport SDL_SetRenderViewport
+#define SDL_RenderTargetSupported SDL_IsRenderTargetSupported
+
/* ##SDL_rwops.h */
#define RW_SEEK_CUR SDL_RW_SEEK_CUR
#define RW_SEEK_END SDL_RW_SEEK_END
@@ -242,6 +276,40 @@
#define __MACOSX__ __MACOSX___renamed___MACOS__
#endif
+/* ##SDL_render.h */
+#define SDL_RenderCopy SDL_RenderCopy_renamed_SDL_RenderTexture
+#define SDL_RenderCopyEx SDL_RenderCopyEx_renamed_SDL_RenderTextureRotated
+#define SDL_RenderCopyExF SDL_RenderCopyExF_renamed_SDL_RenderTextureRotatedF
+#define SDL_RenderCopyF SDL_RenderCopyF_renamed_SDL_RenderTextureF
+#define SDL_RenderDrawLine SDL_RenderDrawLine_renamed_SDL_RenderLine
+#define SDL_RenderDrawLineF SDL_RenderDrawLineF_renamed_SDL_RenderLineF
+#define SDL_RenderDrawLines SDL_RenderDrawLines_renamed_SDL_RenderLines
+#define SDL_RenderDrawLinesF SDL_RenderDrawLinesF_renamed_SDL_RenderLinesF
+#define SDL_RenderDrawPoint SDL_RenderDrawPoint_renamed_SDL_RenderPoint
+#define SDL_RenderDrawPointF SDL_RenderDrawPointF_renamed_SDL_RenderPointF
+#define SDL_RenderDrawPoints SDL_RenderDrawPoints_renamed_SDL_RenderPoints
+#define SDL_RenderDrawPointsF SDL_RenderDrawPointsF_renamed_SDL_RenderPointsF
+#define SDL_RenderDrawRect SDL_RenderDrawRect_renamed_SDL_RenderRect
+#define SDL_RenderDrawRectF SDL_RenderDrawRectF_renamed_SDL_RenderRectF
+#define SDL_RenderDrawRects SDL_RenderDrawRects_renamed_SDL_RenderRects
+#define SDL_RenderDrawRectsF SDL_RenderDrawRectsF_renamed_SDL_RenderRectsF
+#define SDL_RenderGetClipRect SDL_RenderGetClipRect_renamed_SDL_GetRenderClipRect
+#define SDL_RenderGetIntegerScale SDL_RenderGetIntegerScale_renamed_SDL_GetRenderIntegerScale
+#define SDL_RenderGetLogicalSize SDL_RenderGetLogicalSize_renamed_SDL_GetRenderLogicalSize
+#define SDL_RenderGetMetalCommandEncoder SDL_RenderGetMetalCommandEncoder_renamed_SDL_GetRenderMetalCommandEncoder
+#define SDL_RenderGetMetalLayer SDL_RenderGetMetalLayer_renamed_SDL_GetRenderMetalLayer
+#define SDL_RenderGetScale SDL_RenderGetScale_renamed_SDL_GetRenderScale
+#define SDL_RenderGetViewport SDL_RenderGetViewport_renamed_SDL_GetRenderViewport
+#define SDL_RenderGetWindow SDL_RenderGetWindow_renamed_SDL_GetRenderWindow
+#define SDL_RenderIsClipEnabled SDL_RenderIsClipEnabled_renamed_SDL_IsRenderClipEnabled
+#define SDL_RenderSetClipRect SDL_RenderSetClipRect_renamed_SDL_SetRenderClipRect
+#define SDL_RenderSetIntegerScale SDL_RenderSetIntegerScale_renamed_SDL_SetRenderIntegerScale
+#define SDL_RenderSetLogicalSize SDL_RenderSetLogicalSize_renamed_SDL_SetRenderLogicalSize
+#define SDL_RenderSetScale SDL_RenderSetScale_renamed_SDL_SetRenderScale
+#define SDL_RenderSetVSync SDL_RenderSetVSync_renamed_SDL_SetRenderVSync
+#define SDL_RenderSetViewport SDL_RenderSetViewport_renamed_SDL_SetRenderViewport
+#define SDL_RenderTargetSupported SDL_RenderTargetSupported_renamed_SDL_IsRenderTargetSupported
+
/* ##SDL_rwops.h */
#define RW_SEEK_CUR RW_SEEK_CUR_renamed_SDL_RW_SEEK_CUR
#define RW_SEEK_END RW_SEEK_END_renamed_SDL_RW_SEEK_END
diff --git a/include/SDL3/SDL_render.h b/include/SDL3/SDL_render.h
index daa31bf70c7b..c53722ac5591 100644
--- a/include/SDL3/SDL_render.h
+++ b/include/SDL3/SDL_render.h
@@ -116,7 +116,7 @@ typedef enum
} SDL_TextureAccess;
/**
- * The texture channel modulation used in SDL_RenderCopy().
+ * The texture channel modulation used in SDL_RenderTexture().
*/
typedef enum
{
@@ -126,7 +126,7 @@ typedef enum
} SDL_TextureModulate;
/**
- * Flip constants for SDL_RenderCopyEx
+ * Flip constants for SDL_RenderTextureRotated
*/
typedef enum
{
@@ -287,7 +287,7 @@ extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window);
*
* \since This function is available since SDL 3.0.0.
*/
-extern DECLSPEC SDL_Window * SDLCALL SDL_RenderGetWindow(SDL_Renderer *renderer);
+extern DECLSPEC SDL_Window * SDLCALL SDL_GetRenderWindow(SDL_Renderer *renderer);
/**
* Get information about a rendering context.
@@ -492,7 +492,7 @@ extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture,
Uint8 * alpha);
/**
- * Set the blend mode for a texture, used by SDL_RenderCopy().
+ * Set the blend mode for a texture, used by SDL_RenderTexture().
*
* If the blend mode is not supported, the closest supported mode is chosen
* and this function returns -1.
@@ -505,7 +505,7 @@ extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture,
* \since This function is available since SDL 3.0.0.
*
* \sa SDL_GetTextureBlendMode
- * \sa SDL_RenderCopy
+ * \sa SDL_RenderTexture
*/
extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture,
SDL_BlendMode blendMode);
@@ -769,7 +769,7 @@ extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture);
*
* \sa SDL_SetRenderTarget
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer);
+extern DECLSPEC SDL_bool SDLCALL SDL_IsRenderTargetSupported(SDL_Renderer *renderer);
/**
* Set a texture as the current rendering target.
@@ -835,16 +835,16 @@ extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderGetLogicalSize
+ * \sa SDL_GetRenderLogicalSize
*/
-extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h);
+extern DECLSPEC int SDLCALL SDL_SetRenderLogicalSize(SDL_Renderer * renderer, int w, int h);
/**
* Get device independent resolution for rendering.
*
* When using the main rendering target (eg no target texture is set): this
* may return 0 for `w` and `h` if the SDL_Renderer has never had its logical
- * size set by SDL_RenderSetLogicalSize(). Otherwise it returns the logical
+ * size set by SDL_SetRenderLogicalSize(). Otherwise it returns the logical
* width and height.
*
* When using a target texture: Never return 0 for `w` and `h` at first. Then
@@ -856,9 +856,9 @@ extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, in
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderSetLogicalSize
+ * \sa SDL_SetRenderLogicalSize
*/
-extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h);
+extern DECLSPEC void SDLCALL SDL_GetRenderLogicalSize(SDL_Renderer * renderer, int *w, int *h);
/**
* Set whether to force integer scales for resolution-independent rendering.
@@ -874,10 +874,10 @@ extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, i
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderGetIntegerScale
- * \sa SDL_RenderSetLogicalSize
+ * \sa SDL_GetRenderIntegerScale
+ * \sa SDL_SetRenderLogicalSize
*/
-extern DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer * renderer,
+extern DECLSPEC int SDLCALL SDL_SetRenderIntegerScale(SDL_Renderer * renderer,
SDL_bool enable);
/**
@@ -889,9 +889,9 @@ extern DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer * renderer,
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderSetIntegerScale
+ * \sa SDL_SetRenderIntegerScale
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_RenderGetIntegerScale(SDL_Renderer * renderer);
+extern DECLSPEC SDL_bool SDLCALL SDL_GetRenderIntegerScale(SDL_Renderer * renderer);
/**
* Set the drawing area for rendering on the current target.
@@ -907,9 +907,9 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RenderGetIntegerScale(SDL_Renderer * render
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderGetViewport
+ * \sa SDL_GetRenderViewport
*/
-extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer,
+extern DECLSPEC int SDLCALL SDL_SetRenderViewport(SDL_Renderer * renderer,
const SDL_Rect * rect);
/**
@@ -920,9 +920,9 @@ extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer,
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderSetViewport
+ * \sa SDL_SetRenderViewport
*/
-extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer,
+extern DECLSPEC void SDLCALL SDL_GetRenderViewport(SDL_Renderer * renderer,
SDL_Rect * rect);
/**
@@ -937,10 +937,10 @@ extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer,
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderGetClipRect
- * \sa SDL_RenderIsClipEnabled
+ * \sa SDL_GetRenderClipRect
+ * \sa SDL_IsRenderClipEnabled
*/
-extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer,
+extern DECLSPEC int SDLCALL SDL_SetRenderClipRect(SDL_Renderer * renderer,
const SDL_Rect * rect);
/**
@@ -953,10 +953,10 @@ extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer,
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderIsClipEnabled
- * \sa SDL_RenderSetClipRect
+ * \sa SDL_IsRenderClipEnabled
+ * \sa SDL_SetRenderClipRect
*/
-extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer,
+extern DECLSPEC void SDLCALL SDL_GetRenderClipRect(SDL_Renderer * renderer,
SDL_Rect * rect);
/**
@@ -968,10 +968,10 @@ extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer,
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderGetClipRect
- * \sa SDL_RenderSetClipRect
+ * \sa SDL_GetRenderClipRect
+ * \sa SDL_SetRenderClipRect
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_RenderIsClipEnabled(SDL_Renderer * renderer);
+extern DECLSPEC SDL_bool SDLCALL SDL_IsRenderClipEnabled(SDL_Renderer * renderer);
/**
@@ -993,10 +993,10 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RenderIsClipEnabled(SDL_Renderer * renderer
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderGetScale
- * \sa SDL_RenderSetLogicalSize
+ * \sa SDL_GetRenderScale
+ * \sa SDL_SetRenderLogicalSize
*/
-extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer,
+extern DECLSPEC int SDLCALL SDL_SetRenderScale(SDL_Renderer * renderer,
float scaleX, float scaleY);
/**
@@ -1008,9 +1008,9 @@ extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer,
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderSetScale
+ * \sa SDL_SetRenderScale
*/
-extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer,
+extern DECLSPEC void SDLCALL SDL_GetRenderScale(SDL_Renderer * renderer,
float *scaleX, float *scaleY);
/**
@@ -1029,10 +1029,10 @@ extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer,
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderGetScale
- * \sa SDL_RenderSetScale
- * \sa SDL_RenderGetLogicalSize
- * \sa SDL_RenderSetLogicalSize
+ * \sa SDL_GetRenderScale
+ * \sa SDL_SetRenderScale
+ * \sa SDL_GetRenderLogicalSize
+ * \sa SDL_SetRenderLogicalSize
*/
extern DECLSPEC void SDLCALL SDL_RenderWindowToLogical(SDL_Renderer * renderer,
int windowX, int windowY,
@@ -1055,10 +1055,10 @@ extern DECLSPEC void SDLCALL SDL_RenderWindowToLogical(SDL_Renderer * renderer,
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderGetScale
- * \sa SDL_RenderSetScale
- * \sa SDL_RenderGetLogicalSize
- * \sa SDL_RenderSetLogicalSize
+ * \sa SDL_GetRenderScale
+ * \sa SDL_SetRenderScale
+ * \sa SDL_GetRenderLogicalSize
+ * \sa SDL_SetRenderLogicalSize
*/
extern DECLSPEC void SDLCALL SDL_RenderLogicalToWindow(SDL_Renderer * renderer,
float logicalX, float logicalY,
@@ -1084,12 +1084,12 @@ extern DECLSPEC void SDLCALL SDL_RenderLogicalToWindow(SDL_Renderer * renderer,
*
* \sa SDL_GetRenderDrawColor
* \sa SDL_RenderClear
- * \sa SDL_RenderDrawLine
- * \sa SDL_RenderDrawLines
- * \sa SDL_RenderDrawPoint
- * \sa SDL_RenderDrawPoints
- * \sa SDL_RenderDrawRect
- * \sa SDL_RenderDrawRects
+ * \sa SDL_RenderLine
+ * \sa SDL_RenderLines
+ * \sa SDL_RenderPoint
+ * \sa SDL_RenderPoints
+ * \sa SDL_RenderRect
+ * \sa SDL_RenderRects
* \sa SDL_RenderFillRect
* \sa SDL_RenderFillRects
*/
@@ -1133,12 +1133,12 @@ extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer,
* \since This function is available since SDL 3.0.0.
*
* \sa SDL_GetRenderDrawBlendMode
- * \sa SDL_RenderDrawLine
- * \sa SDL_RenderDrawLines
- * \sa SDL_RenderDrawPoint
- * \sa SDL_RenderDrawPoints
- * \sa SDL_RenderDrawRect
- * \sa SDL_RenderDrawRects
+ * \sa SDL_RenderLine
+ * \sa SDL_RenderLines
+ * \sa SDL_RenderPoint
+ * \sa SDL_RenderPoints
+ * \sa SDL_RenderRect
+ * \sa SDL_RenderRects
* \sa SDL_RenderFillRect
* \sa SDL_RenderFillRects
*/
@@ -1179,8 +1179,8 @@ extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer);
/**
* Draw a point on the current rendering target.
*
- * SDL_RenderDrawPoint() draws a single point. If you want to draw multiple,
- * use SDL_RenderDrawPoints() instead.
+ * SDL_RenderPoint() draws a single point. If you want to draw multiple,
+ * use SDL_RenderPoints() instead.
*
* \param renderer the rendering context
* \param x the x coordinate of the point
@@ -1190,18 +1190,18 @@ extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer);
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderDrawLine
- * \sa SDL_RenderDrawLines
- * \sa SDL_RenderDrawPoints
- * \sa SDL_RenderDrawRect
- * \sa SDL_RenderDrawRects
+ * \sa SDL_RenderLine
+ * \sa SDL_RenderLines
+ * \sa SDL_RenderPoints
+ * \sa SDL_RenderRect
+ * \sa SDL_RenderRects
* \sa SDL_RenderFillRect
* \sa SDL_RenderFillRects
* \sa SDL_RenderPresent
* \sa SDL_SetRenderDrawBlendMode
* \sa SDL_SetRenderDrawColor
*/
-extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer,
+extern DECLSPEC int SDLCALL SDL_RenderPoint(SDL_Renderer * renderer,
int x, int y);
/**
@@ -1216,26 +1216,26 @@ extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer,
*
* \since This function is available since SDL 3.0.0.
*
- * \sa SDL_RenderDrawLine
- * \sa SDL_RenderDrawLines
- * \sa SDL_RenderDrawPoint
- * \sa SDL_RenderDrawRect
- * \sa SDL_RenderDrawRects
+ * \sa SDL_RenderLine
+ * \sa SDL_RenderLines
+ * \sa SDL_RenderPoint
+ * \sa SDL_RenderRect
+ * \sa SDL_RenderRects
* \sa SDL_RenderFillRect
* \sa SDL_RenderFillRects
* \sa SDL_RenderPresent
* \sa SDL_SetRenderDrawBlendMode
* \sa SDL_SetRenderDrawColor
*/
-extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer,
+extern DECLSPEC int SDLCALL SDL_RenderPoints(SDL_Renderer * renderer,
const SDL_Point * points,
int count);
/**
* Draw a line on the current rendering target.
*
- * SDL_RenderDrawLine(
(Patch may be truncated, please check the link at the top of this post.)