From 9c1a9ecb4b1a6edea1f097bf49917c6272a434a8 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sat, 31 Dec 2022 11:19:32 -0800
Subject: [PATCH] Removed non-float versions of SDL render API drawing
functions
This simplifies the API and removes a level of API translation between the int variants of the functions and the float implementation
Fixes https://github.com/libsdl-org/SDL/issues/6656
---
docs/README-migration.md | 40 +--
include/SDL3/SDL_oldnames.h | 56 ++--
include/SDL3/SDL_render.h | 490 +++++-------------------------
src/dynapi/SDL_dynapi.sym | 10 -
src/dynapi/SDL_dynapi_overrides.h | 10 -
src/dynapi/SDL_dynapi_procs.h | 30 +-
src/render/SDL_render.c | 363 ++--------------------
src/test/SDL_test_font.c | 10 +-
test/gamepadmap.c | 11 +-
test/testautomation_render.c | 114 +++----
test/testdraw2.c | 34 +--
test/testdrawchessboard.c | 11 +-
test/testgamepad.c | 30 +-
test/testhittesting.c | 7 +-
test/testime.c | 28 +-
test/testintersections.c | 22 +-
test/testjoystick.c | 10 +-
test/testmouse.c | 8 +-
test/testnative.c | 24 +-
test/testoffscreen.c | 12 +-
test/testoverlay2.c | 4 +-
test/testrelative.c | 6 +-
test/testrendercopyex.c | 16 +-
test/testrendertarget.c | 27 +-
test/testscale.c | 12 +-
test/testshape.c | 8 +-
test/testsprite2.c | 113 +++----
test/testspriteminimal.c | 22 +-
test/testviewport.c | 56 ++--
29 files changed, 465 insertions(+), 1119 deletions(-)
diff --git a/docs/README-migration.md b/docs/README-migration.md
index 385b16a7e22c..fdf6711fb81b 100644
--- a/docs/README-migration.md
+++ b/docs/README-migration.md
@@ -472,24 +472,16 @@ to decide for you.
SDL_RenderWindowToLogical() and SDL_RenderLogicalToWindow() take floating point coordinates in both directions.
The following functions have been renamed:
-* SDL_RenderCopy() => SDL_RenderTexture()
-* SDL_RenderCopyEx() => SDL_RenderTextureRotated()
-* SDL_RenderCopyExF() => SDL_RenderTextureRotatedFloat()
-* SDL_RenderCopyF() => SDL_RenderTextureFloat()
-* SDL_RenderDrawLine() => SDL_RenderLine()
-* SDL_RenderDrawLineF() => SDL_RenderLineFloat()
-* SDL_RenderDrawLines() => SDL_RenderLines()
-* SDL_RenderDrawLinesF() => SDL_RenderLinesFloat()
-* SDL_RenderDrawPoint() => SDL_RenderPoint()
-* SDL_RenderDrawPointF() => SDL_RenderPointFloat()
-* SDL_RenderDrawPoints() => SDL_RenderPoints()
-* SDL_RenderDrawPointsF() => SDL_RenderPointsFloat()
-* SDL_RenderDrawRect() => SDL_RenderRect()
-* SDL_RenderDrawRectF() => SDL_RenderRectFloat()
-* SDL_RenderDrawRects() => SDL_RenderRects()
-* SDL_RenderDrawRectsF() => SDL_RenderRectsFloat()
-* SDL_RenderFillRectF() => SDL_RenderFillRectFloat()
-* SDL_RenderFillRectsF() => SDL_RenderFillRectsFloat()
+* SDL_RenderCopyExF() => SDL_RenderTextureRotated()
+* SDL_RenderCopyF() => SDL_RenderTexture()
+* SDL_RenderDrawLineF() => SDL_RenderLine()
+* SDL_RenderDrawLinesF() => SDL_RenderLines()
+* SDL_RenderDrawPointF() => SDL_RenderPoint()
+* SDL_RenderDrawPointsF() => SDL_RenderPoints()
+* SDL_RenderDrawRectF() => SDL_RenderRect()
+* SDL_RenderDrawRectsF() => SDL_RenderRects()
+* SDL_RenderFillRectF() => SDL_RenderFillRect()
+* SDL_RenderFillRectsF() => SDL_RenderFillRects()
* SDL_RenderGetClipRect() => SDL_GetRenderClipRect()
* SDL_RenderGetIntegerScale() => SDL_GetRenderIntegerScale()
* SDL_RenderGetLogicalSize() => SDL_GetRenderLogicalSize()
@@ -506,6 +498,18 @@ The following functions have been renamed:
* SDL_RenderSetVSync() => SDL_SetRenderVSync()
* SDL_RenderSetViewport() => SDL_SetRenderViewport()
+The following functions have been removed:
+* SDL_RenderCopy()
+* SDL_RenderCopyEx()
+* SDL_RenderDrawLine()
+* SDL_RenderDrawLines()
+* SDL_RenderDrawPoint()
+* SDL_RenderDrawPoints()
+* SDL_RenderDrawRect()
+* SDL_RenderDrawRects()
+* SDL_RenderFillRect()
+* SDL_RenderFillRects()
+
## SDL_rwops.h
The following symbols have been renamed:
diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h
index d8b7ad704c72..2683dc6dcab6 100644
--- a/include/SDL3/SDL_oldnames.h
+++ b/include/SDL3/SDL_oldnames.h
@@ -276,24 +276,16 @@
#define SDL_UnionRect SDL_GetRectUnion
/* ##SDL_render.h */
-#define SDL_RenderCopy SDL_RenderTexture
-#define SDL_RenderCopyEx SDL_RenderTextureRotated
-#define SDL_RenderCopyExF SDL_RenderTextureRotatedFloat
-#define SDL_RenderCopyF SDL_RenderTextureFloat
-#define SDL_RenderDrawLine SDL_RenderLine
-#define SDL_RenderDrawLineF SDL_RenderLineFloat
-#define SDL_RenderDrawLines SDL_RenderLines
-#define SDL_RenderDrawLinesF SDL_RenderLinesFloat
-#define SDL_RenderDrawPoint SDL_RenderPoint
-#define SDL_RenderDrawPointF SDL_RenderPointFloat
-#define SDL_RenderDrawPoints SDL_RenderPoints
-#define SDL_RenderDrawPointsF SDL_RenderPointsFloat
-#define SDL_RenderDrawRect SDL_RenderRect
-#define SDL_RenderDrawRectF SDL_RenderRectFloat
-#define SDL_RenderDrawRects SDL_RenderRects
-#define SDL_RenderDrawRectsF SDL_RenderRectsFloat
-#define SDL_RenderFillRectF SDL_RenderFillRectFloat
-#define SDL_RenderFillRectsF SDL_RenderFillRectsFloat
+#define SDL_RenderCopyExF SDL_RenderTextureRotated
+#define SDL_RenderCopyF SDL_RenderTexture
+#define SDL_RenderDrawLineF SDL_RenderLine
+#define SDL_RenderDrawLinesF SDL_RenderLines
+#define SDL_RenderDrawPointF SDL_RenderPoint
+#define SDL_RenderDrawPointsF SDL_RenderPoints
+#define SDL_RenderDrawRectF SDL_RenderRect
+#define SDL_RenderDrawRectsF SDL_RenderRects
+#define SDL_RenderFillRectF SDL_RenderFillRect
+#define SDL_RenderFillRectsF SDL_RenderFillRects
#define SDL_RenderGetClipRect SDL_GetRenderClipRect
#define SDL_RenderGetIntegerScale SDL_GetRenderIntegerScale
#define SDL_RenderGetLogicalSize SDL_GetRenderLogicalSize
@@ -607,24 +599,16 @@
#define SDL_UnionRect SDL_UnionRect_renamed_SDL_GetRectUnion
/* ##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_RenderTextureRotatedFloat
-#define SDL_RenderCopyF SDL_RenderCopyF_renamed_SDL_RenderTextureFloat
-#define SDL_RenderDrawLine SDL_RenderDrawLine_renamed_SDL_RenderLine
-#define SDL_RenderDrawLineF SDL_RenderDrawLineF_renamed_SDL_RenderLineFloat
-#define SDL_RenderDrawLines SDL_RenderDrawLines_renamed_SDL_RenderLines
-#define SDL_RenderDrawLinesF SDL_RenderDrawLinesF_renamed_SDL_RenderLinesFloat
-#define SDL_RenderDrawPoint SDL_RenderDrawPoint_renamed_SDL_RenderPoint
-#define SDL_RenderDrawPointF SDL_RenderDrawPointF_renamed_SDL_RenderPointFloat
-#define SDL_RenderDrawPoints SDL_RenderDrawPoints_renamed_SDL_RenderPoints
-#define SDL_RenderDrawPointsF SDL_RenderDrawPointsF_renamed_SDL_RenderPointsFloat
-#define SDL_RenderDrawRect SDL_RenderDrawRect_renamed_SDL_RenderRect
-#define SDL_RenderDrawRectF SDL_RenderDrawRectF_renamed_SDL_RenderRectFloat
-#define SDL_RenderDrawRects SDL_RenderDrawRects_renamed_SDL_RenderRects
-#define SDL_RenderDrawRectsF SDL_RenderDrawRectsF_renamed_SDL_RenderRectsFloat
-#define SDL_RenderFillRectF SDL_RenderFillRectF_renamed_SDL_RenderFillRectFloat
-#define SDL_RenderFillRectsF SDL_RenderFillRectsF_renamed_SDL_RenderFillRectsFloat
+#define SDL_RenderCopyExF SDL_RenderCopyExF_renamed_SDL_RenderTextureRotated
+#define SDL_RenderCopyF SDL_RenderCopyF_renamed_SDL_RenderTexture
+#define SDL_RenderDrawLineF SDL_RenderDrawLineF_renamed_SDL_RenderLine
+#define SDL_RenderDrawLinesF SDL_RenderDrawLinesF_renamed_SDL_RenderLines
+#define SDL_RenderDrawPointF SDL_RenderDrawPointF_renamed_SDL_RenderPoint
+#define SDL_RenderDrawPointsF SDL_RenderDrawPointsF_renamed_SDL_RenderPoints
+#define SDL_RenderDrawRectF SDL_RenderDrawRectF_renamed_SDL_RenderRect
+#define SDL_RenderDrawRectsF SDL_RenderDrawRectsF_renamed_SDL_RenderRects
+#define SDL_RenderFillRectF SDL_RenderFillRectF_renamed_SDL_RenderFillRect
+#define SDL_RenderFillRectsF SDL_RenderFillRectsF_renamed_SDL_RenderFillRects
#define SDL_RenderGetClipRect SDL_RenderGetClipRect_renamed_SDL_GetRenderClipRect
#define SDL_RenderGetIntegerScale SDL_RenderGetIntegerScale_renamed_SDL_GetRenderIntegerScale
#define SDL_RenderGetLogicalSize SDL_RenderGetLogicalSize_renamed_SDL_GetRenderLogicalSize
diff --git a/include/SDL3/SDL_render.h b/include/SDL3/SDL_render.h
index c772c4759422..c65ce6e739f4 100644
--- a/include/SDL3/SDL_render.h
+++ b/include/SDL3/SDL_render.h
@@ -211,9 +211,7 @@ extern DECLSPEC const char *SDLCALL SDL_GetRenderDriver(int index);
* \sa SDL_CreateRenderer
* \sa SDL_CreateWindow
*/
-extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(
- int width, int height, Uint32 window_flags,
- SDL_Window **window, SDL_Renderer **renderer);
+extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(int width, int height, Uint32 window_flags, SDL_Window **window, SDL_Renderer **renderer);
/**
@@ -241,8 +239,7 @@ extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(
* \sa SDL_GetRenderDriver
* \sa SDL_GetRendererInfo
*/
-extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window,
- const char *name, Uint32 flags);
+extern DECLSPEC SDL_Renderer *SDLCALL SDL_CreateRenderer(SDL_Window *window, const char *name, Uint32 flags);
/**
* Create a 2D software rendering context for a surface.
@@ -263,7 +260,7 @@ extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window,
* \sa SDL_CreateWindowRenderer
* \sa SDL_DestroyRenderer
*/
-extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface);
+extern DECLSPEC SDL_Renderer *SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface *surface);
/**
* Get the renderer associated with a window.
@@ -276,7 +273,7 @@ extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface *
*
* \sa SDL_CreateRenderer
*/
-extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window);
+extern DECLSPEC SDL_Renderer *SDLCALL SDL_GetRenderer(SDL_Window *window);
/**
* Get the window associated with a renderer.
@@ -287,7 +284,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_GetRenderWindow(SDL_Renderer *renderer);
+extern DECLSPEC SDL_Window *SDLCALL SDL_GetRenderWindow(SDL_Renderer *renderer);
/**
* Get information about a rendering context.
@@ -302,8 +299,7 @@ extern DECLSPEC SDL_Window * SDLCALL SDL_GetRenderWindow(SDL_Renderer *renderer)
*
* \sa SDL_CreateRenderer
*/
-extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer,
- SDL_RendererInfo * info);
+extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer *renderer, SDL_RendererInfo *info);
/**
* Get the output size in pixels of a rendering context.
@@ -322,8 +318,7 @@ extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer,
*
* \sa SDL_GetRenderer
*/
-extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer,
- int *w, int *h);
+extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer *renderer, int *w, int *h);
/**
* Create a texture for a rendering context.
@@ -347,10 +342,7 @@ extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer,
* \sa SDL_QueryTexture
* \sa SDL_UpdateTexture
*/
-extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer,
- Uint32 format,
- int access, int w,
- int h);
+extern DECLSPEC SDL_Texture *SDLCALL SDL_CreateTexture(SDL_Renderer *renderer, Uint32 format, int access, int w, int h);
/**
* Create a texture from an existing surface.
@@ -376,7 +368,7 @@ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer,
* \sa SDL_DestroyTexture
* \sa SDL_QueryTexture
*/
-extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface);
+extern DECLSPEC SDL_Texture *SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer *renderer, SDL_Surface *surface);
/**
* Query the attributes of a texture.
@@ -400,9 +392,7 @@ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer
*
* \sa SDL_CreateTexture
*/
-extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture,
- Uint32 * format, int *access,
- int *w, int *h);
+extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture *texture, Uint32 *format, int *access, int *w, int *h);
/**
* Set an additional color value multiplied into render copy operations.
@@ -428,8 +418,7 @@ extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture,
* \sa SDL_GetTextureColorMod
* \sa SDL_SetTextureAlphaMod
*/
-extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture,
- Uint8 r, Uint8 g, Uint8 b);
+extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture *texture, Uint8 r, Uint8 g, Uint8 b);
/**
@@ -447,9 +436,7 @@ extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture,
* \sa SDL_GetTextureAlphaMod
* \sa SDL_SetTextureColorMod
*/
-extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture,
- Uint8 * r, Uint8 * g,
- Uint8 * b);
+extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture *texture, Uint8 *r, Uint8 *g, Uint8 *b);
/**
* Set an additional alpha value multiplied into render copy operations.
@@ -472,8 +459,7 @@ extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture,
* \sa SDL_GetTextureAlphaMod
* \sa SDL_SetTextureColorMod
*/
-extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture,
- Uint8 alpha);
+extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture *texture, Uint8 alpha);
/**
* Get the additional alpha value multiplied into render copy operations.
@@ -488,8 +474,7 @@ extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture,
* \sa SDL_GetTextureColorMod
* \sa SDL_SetTextureAlphaMod
*/
-extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture,
- Uint8 * alpha);
+extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture *texture, Uint8 *alpha);
/**
* Set the blend mode for a texture, used by SDL_RenderTexture().
@@ -507,8 +492,7 @@ extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture,
* \sa SDL_GetTextureBlendMode
* \sa SDL_RenderTexture
*/
-extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture,
- SDL_BlendMode blendMode);
+extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture *texture, SDL_BlendMode blendMode);
/**
* Get the blend mode used for texture copy operations.
@@ -522,8 +506,7 @@ extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture,
*
* \sa SDL_SetTextureBlendMode
*/
-extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture,
- SDL_BlendMode *blendMode);
+extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture *texture, SDL_BlendMode *blendMode);
/**
* Set the scale mode used for texture scale operations.
@@ -538,8 +521,7 @@ extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture,
*
* \sa SDL_GetTextureScaleMode
*/
-extern DECLSPEC int SDLCALL SDL_SetTextureScaleMode(SDL_Texture * texture,
- SDL_ScaleMode scaleMode);
+extern DECLSPEC int SDLCALL SDL_SetTextureScaleMode(SDL_Texture *texture, SDL_ScaleMode scaleMode);
/**
* Get the scale mode used for texture scale operations.
@@ -552,8 +534,7 @@ extern DECLSPEC int SDLCALL SDL_SetTextureScaleMode(SDL_Texture * texture,
*
* \sa SDL_SetTextureScaleMode
*/
-extern DECLSPEC int SDLCALL SDL_GetTextureScaleMode(SDL_Texture * texture,
- SDL_ScaleMode *scaleMode);
+extern DECLSPEC int SDLCALL SDL_GetTextureScaleMode(SDL_Texture *texture, SDL_ScaleMode *scaleMode);
/**
* Associate a user-specified pointer with a texture.
@@ -566,8 +547,7 @@ extern DECLSPEC int SDLCALL SDL_GetTextureScaleMode(SDL_Texture * texture,
*
* \sa SDL_GetTextureUserData
*/
-extern DECLSPEC int SDLCALL SDL_SetTextureUserData(SDL_Texture * texture,
- void *userdata);
+extern DECLSPEC int SDLCALL SDL_SetTextureUserData(SDL_Texture *texture, void *userdata);
/**
* Get the user-specified pointer associated with a texture
@@ -580,7 +560,7 @@ extern DECLSPEC int SDLCALL SDL_SetTextureUserData(SDL_Texture * texture,
*
* \sa SDL_SetTextureUserData
*/
-extern DECLSPEC void * SDLCALL SDL_GetTextureUserData(SDL_Texture * texture);
+extern DECLSPEC void *SDLCALL SDL_GetTextureUserData(SDL_Texture *texture);
/**
* Update the given texture rectangle with new pixel data.
@@ -611,9 +591,7 @@ extern DECLSPEC void * SDLCALL SDL_GetTextureUserData(SDL_Texture * texture);
* \sa SDL_LockTexture
* \sa SDL_UnlockTexture
*/
-extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture,
- const SDL_Rect * rect,
- const void *pixels, int pitch);
+extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture *texture, const SDL_Rect *rect, const void *pixels, int pitch);
/**
* Update a rectangle within a planar YV12 or IYUV texture with new pixel
@@ -642,8 +620,8 @@ extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture,
*
* \sa SDL_UpdateTexture
*/
-extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture,
- const SDL_Rect * rect,
+extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture *texture,
+ const SDL_Rect *rect,
const Uint8 *Yplane, int Ypitch,
const Uint8 *Uplane, int Upitch,
const Uint8 *Vplane, int Vpitch);
@@ -668,8 +646,8 @@ extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture,
*
* \since This function is available since SDL 3.0.0.
*/
-extern DECLSPEC int SDLCALL SDL_UpdateNVTexture(SDL_Texture * texture,
- const SDL_Rect * rect,
+extern DECLSPEC int SDLCALL SDL_UpdateNVTexture(SDL_Texture *texture,
+ const SDL_Rect *rect,
const Uint8 *Yplane, int Ypitch,
const Uint8 *UVplane, int UVpitch);
@@ -700,8 +678,8 @@ extern DECLSPEC int SDLCALL SDL_UpdateNVTexture(SDL_Texture * texture,
*
* \sa SDL_UnlockTexture
*/
-extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture,
- const SDL_Rect * rect,
+extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture *texture,
+ const SDL_Rect *rect,
void **pixels, int *pitch);
/**
@@ -757,7 +735,7 @@ extern DECLSPEC int SDLCALL SDL_LockTextureToSurface(SDL_Texture *texture,
*
* \sa SDL_LockTexture
*/
-extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture);
+extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture *texture);
/**
* Determine whether a renderer supports the use of render targets.
@@ -793,8 +771,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *rendere
*
* \sa SDL_GetRenderTarget
*/
-extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer,
- SDL_Texture *texture);
+extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer, SDL_Texture *texture);
/**
* Get the current render target.
@@ -809,7 +786,7 @@ extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer,
*
* \sa SDL_SetRenderTarget
*/
-extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer);
+extern DECLSPEC SDL_Texture *SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer);
/**
* Set a device independent resolution for rendering.
@@ -837,7 +814,7 @@ extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer
*
* \sa SDL_GetRenderLogicalSize
*/
-extern DECLSPEC int SDLCALL SDL_SetRenderLogicalSize(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.
@@ -858,7 +835,7 @@ extern DECLSPEC int SDLCALL SDL_SetRenderLogicalSize(SDL_Renderer * renderer, in
*
* \sa SDL_SetRenderLogicalSize
*/
-extern DECLSPEC void SDLCALL SDL_GetRenderLogicalSize(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.
@@ -877,8 +854,7 @@ extern DECLSPEC void SDLCALL SDL_GetRenderLogicalSize(SDL_Renderer * renderer, i
* \sa SDL_GetRenderIntegerScale
* \sa SDL_SetRenderLogicalSize
*/
-extern DECLSPEC int SDLCALL SDL_SetRenderIntegerScale(SDL_Renderer * renderer,
- SDL_bool enable);
+extern DECLSPEC int SDLCALL SDL_SetRenderIntegerScale(SDL_Renderer *renderer, SDL_bool enable);
/**
* Get whether integer scales are forced for resolution-independent rendering.
@@ -891,7 +867,7 @@ extern DECLSPEC int SDLCALL SDL_SetRenderIntegerScale(SDL_Renderer * renderer,
*
* \sa SDL_SetRenderIntegerScale
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_GetRenderIntegerScale(SDL_Renderer * renderer);
+extern DECLSPEC SDL_bool SDLCALL SDL_GetRenderIntegerScale(SDL_Renderer *renderer);
/**
* Set the drawing area for rendering on the current target.
@@ -909,8 +885,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetRenderIntegerScale(SDL_Renderer * render
*
* \sa SDL_GetRenderViewport
*/
-extern DECLSPEC int SDLCALL SDL_SetRenderViewport(SDL_Renderer * renderer,
- const SDL_Rect * rect);
+extern DECLSPEC int SDLCALL SDL_SetRenderViewport(SDL_Renderer *renderer, const SDL_Rect *rect);
/**
* Get the drawing area for the current target.
@@ -922,8 +897,7 @@ extern DECLSPEC int SDLCALL SDL_SetRenderViewport(SDL_Renderer * renderer,
*
* \sa SDL_SetRenderViewport
*/
-extern DECLSPEC void SDLCALL SDL_GetRenderViewport(SDL_Renderer * renderer,
- SDL_Rect * rect);
+extern DECLSPEC void SDLCALL SDL_GetRenderViewport(SDL_Renderer *renderer, SDL_Rect *rect);
/**
* Set the clip rectangle for rendering on the specified target.
@@ -940,8 +914,7 @@ extern DECLSPEC void SDLCALL SDL_GetRenderViewport(SDL_Renderer * renderer,
* \sa SDL_GetRenderClipRect
* \sa SDL_RenderClipEnabled
*/
-extern DECLSPEC int SDLCALL SDL_SetRenderClipRect(SDL_Renderer * renderer,
- const SDL_Rect * rect);
+extern DECLSPEC int SDLCALL SDL_SetRenderClipRect(SDL_Renderer *renderer, const SDL_Rect *rect);
/**
* Get the clip rectangle for the current target.
@@ -956,8 +929,7 @@ extern DECLSPEC int SDLCALL SDL_SetRenderClipRect(SDL_Renderer * renderer,
* \sa SDL_RenderClipEnabled
* \sa SDL_SetRenderClipRect
*/
-extern DECLSPEC void SDLCALL SDL_GetRenderClipRect(SDL_Renderer * renderer,
- SDL_Rect * rect);
+extern DECLSPEC void SDLCALL SDL_GetRenderClipRect(SDL_Renderer *renderer, SDL_Rect *rect);
/**
* Get whether clipping is enabled on the given renderer.
@@ -971,7 +943,7 @@ extern DECLSPEC void SDLCALL SDL_GetRenderClipRect(SDL_Renderer * renderer,
* \sa SDL_GetRenderClipRect
* \sa SDL_SetRenderClipRect
*/
-extern DECLSPEC SDL_bool SDLCALL SDL_RenderClipEnabled(SDL_Renderer * renderer);
+extern DECLSPEC SDL_bool SDLCALL SDL_RenderClipEnabled(SDL_Renderer *renderer);
/**
@@ -996,8 +968,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RenderClipEnabled(SDL_Renderer * renderer);
* \sa SDL_GetRenderScale
* \sa SDL_SetRenderLogicalSize
*/
-extern DECLSPEC int SDLCALL SDL_SetRenderScale(SDL_Renderer * renderer,
- float scaleX, float scaleY);
+extern DECLSPEC int SDLCALL SDL_SetRenderScale(SDL_Renderer *renderer, float scaleX, float scaleY);
/**
* Get the drawing scale for the current target.
@@ -1010,8 +981,7 @@ extern DECLSPEC int SDLCALL SDL_SetRenderScale(SDL_Renderer * renderer,
*
* \sa SDL_SetRenderScale
*/
-extern DECLSPEC void SDLCALL SDL_GetRenderScale(SDL_Renderer * renderer,
- float *scaleX, float *scaleY);
+extern DECLSPEC void SDLCALL SDL_GetRenderScale(SDL_Renderer *renderer, float *scaleX, float *scaleY);
/**
* Get logical coordinates of point in renderer when given real coordinates of
@@ -1093,9 +1063,7 @@ extern DECLSPEC void SDLCALL SDL_RenderLogicalToWindow(SDL_Renderer *renderer,
* \sa SDL_RenderFillRect
* \sa SDL_RenderFillRects
*/
-extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer,
- Uint8 r, Uint8 g, Uint8 b,
- Uint8 a);
+extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer *renderer, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
/**
* Get the color used for drawing operations (Rect, Line and Clear).
@@ -1116,9 +1084,7 @@ extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer,
*
* \sa SDL_SetRenderDrawColor
*/
-extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer,
- Uint8 * r, Uint8 * g, Uint8 * b,
- Uint8 * a);
+extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer *renderer, Uint8 *r, Uint8 *g, Uint8 *b, Uint8 *a);
/**
* Set the blend mode used for drawing operations (Fill and Line).
@@ -1142,8 +1108,7 @@ extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer,
* \sa SDL_RenderFillRect
* \sa SDL_RenderFillRects
*/
-extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer,
- SDL_BlendMode blendMode);
+extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer *renderer, SDL_BlendMode blendMode);
/**
* Get the blend mode used for drawing operations.
@@ -1157,8 +1122,7 @@ extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer,
*
* \sa SDL_SetRenderDrawBlendMode
*/
-extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer,
- SDL_BlendMode *blendMode);
+extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer *renderer, SDL_BlendMode *blendMode);
/**
* Clear the current rendering target with the drawing color.
@@ -1174,307 +1138,7 @@ extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer,
*
* \sa SDL_SetRenderDrawColor
*/
-extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer);
-
-/**
- * Draw a point on the current rendering target.
- *
- * 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
- * \param y the y coordinate of the point
- * \returns 0 on success or a negative error code on failure; call
- * SDL_GetError() for more information.
- *
- * \since This function is available since SDL 3.0.0.
- *
- * \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_RenderPoint(SDL_Renderer * renderer,
- int x, int y);
-
-/**
- * Draw multiple points on the current rendering target.
- *
- * \param renderer the rendering context
- * \param points an array of SDL_Point structures that represent the points to
- * draw
- * \param count the number of points to draw
- * \returns 0 on success or a negative error code on failure; call
- * SDL_GetError() for more information.
- *
- * \since This function is available since SDL 3.0.0.
- *
- * \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_RenderPoints(SDL_Renderer * renderer,
- const SDL_Point * points,
- int count);
-
-/**
- * Draw a line on the current rendering target.
- *
- * SDL_RenderLine() draws the line to include both end points. If you want
- * to draw multiple, connecting lines use SDL_RenderLines() instead.
- *
- * \param renderer the rendering context
- * \param x1 the x coordinate of the start point
- * \param y1 the y coordinate of the start point
- * \param x2 the x coordinate of the end point
- * \param y2 the y coordinate of the end point
- * \returns 0 on success or a negative error code on failure; call
- * SDL_GetError() for more information.
- *
- * \since This function is available since SDL 3.0.0.
- *
- * \sa SDL_RenderLines
- * \sa SDL_RenderPoint
- * \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_RenderLine(SDL_Renderer * renderer,
- int x1, int y1, int x2, int y2);
-
-/**
- * Draw a series of connected lines on the current rendering target.
- *
- * \param renderer the rendering context
- * \param points an array of SDL_Point structures representing points along
- * the lines
- * \param count the number of points, drawing count-1 lines
- * \returns 0 on success or a negative error code on failure; call
- * SDL_GetError() for more information.
- *
- * \since This function is available since SDL 3.0.0.
- *
- * \sa SDL_
(Patch may be truncated, please check the link at the top of this post.)