Fix SDL2 builds and most SDL_FRect hacks.

Author: AliceLR

src/SDLmzx.h

@@ -39,6 +39,8 @@ __M_BEGIN_DECLS
 #endif
 #endif
 
+#include <limits.h>
+
 /* SDL1 backwards compatibility for SDL2 ************************************/
 
 #if !SDL_VERSION_ATLEAST(2,0,0)
@@ -242,8 +244,8 @@ typedef SDL_GameControllerButton  SDL_GamepadButton;
 #define SDL_GAMEPAD_BUTTON_BACK           SDL_CONTROLLER_BUTTON_BACK
 #define SDL_GAMEPAD_BUTTON_GUIDE          SDL_CONTROLLER_BUTTON_GUIDE
 #define SDL_GAMEPAD_BUTTON_START          SDL_CONTROLLER_BUTTON_START
-#define SDL_GAMEPAD_BUTTON_LEFT_STICK     SDL_CONTROLLER_BUTTON_LEFT_STICK
-#define SDL_GAMEPAD_BUTTON_RIGHT_STICK    SDL_CONTROLLER_BUTTON_RIGHT_STICK
+#define SDL_GAMEPAD_BUTTON_LEFT_STICK     SDL_CONTROLLER_BUTTON_LEFTSTICK
+#define SDL_GAMEPAD_BUTTON_RIGHT_STICK    SDL_CONTROLLER_BUTTON_RIGHTSTICK
 #define SDL_GAMEPAD_BUTTON_LEFT_SHOULDER  SDL_CONTROLLER_BUTTON_LEFTSHOULDER
 #define SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
 #define SDL_GAMEPAD_BUTTON_DPAD_UP        SDL_CONTROLLER_BUTTON_DPAD_UP
@@ -308,23 +310,70 @@ static inline void SDL_SetJoystickEventsEnabled(SDL_bool enabled)
 #define SDL_DestroyPalette(p)                       SDL_FreePalette(p)
 #define SDL_CreatePixelFormat(f)                    SDL_AllocFormat(f)
 #define SDL_DestroyPixelFormat(pf)                  SDL_FreeFormat(pf)
-#define SDL_GetMasksForPixelFormatEnum(f,b,r,g,b,a) SDL_PixelFormatEnumToMasks(f,b,r,g,b,a)
+#define SDL_GetMasksForPixelFormatEnum(f,b,R,G,B,A) SDL_PixelFormatEnumToMasks(f,b,R,G,B,A)
+#endif
+
+/**
+ * SDL_rect.h
+ */
+#if SDL_VERSION_ATLEAST(2,0,0)
+#if !SDL_VERSION_ATLEAST(2,0,10)
+struct SDL_FRect
+{
+  float x;
+  float y;
+  float w;
+  float h;
+};
+#endif
+
+#define SDL_F_TO_INT(f) \
+ ((f) >= INT_MAX) ? INT_MAX : ((f) <= INT_MIN) ? INT_MIN : (int)(f)
+
+/* SDL_RenderTexture support function--convert an SDL_FRect to SDL_Rect. */
+static inline SDL_Rect sdl_frect_to_rect(const SDL_FRect *src)
+{
+  SDL_Rect tmp =
+  {
+    SDL_F_TO_INT(src->x),
+    SDL_F_TO_INT(src->y),
+    SDL_F_TO_INT(src->w),
+    SDL_F_TO_INT(src->h)
+  };
+  return tmp;
+}
 #endif
 
-/* SDL_render.h */
+/**
+ * SDL_render.h
+ */
 #if !SDL_VERSION_ATLEAST(3,0,0) && SDL_VERSION_ATLEAST(2,0,0)
 typedef int SDL_RendererLogicalPresentation;
 #define SDL_LOGICAL_PRESENTATION_DISABLED 0
-#define SDL_SCALEMODE_BEST SDL_ScaleModeBest
-#define SDL_SCALEMODE_LINEAR SDL_ScaleModeLinear
-#define SDL_SCALEMODE_NEAREST SDL_ScaleModeNearest
-#define SDL_SetRenderClipRect(r, rect)  SDL_RenderSetClipRect(r, rect)
+#define SDL_SCALEMODE_BEST                SDL_ScaleModeBest
+#define SDL_SCALEMODE_LINEAR              SDL_ScaleModeLinear
+#define SDL_SCALEMODE_NEAREST             SDL_ScaleModeNearest
+#define SDL_SetRenderClipRect(r, rect)    SDL_RenderSetClipRect(r, rect)
+#define SDL_SetRenderLogicalSize(r, w, h) SDL_RenderSetLogicalSize(r, w, h)
 
 static inline int SDL_SetRenderLogicalPresentation(SDL_Renderer *render,
- int w, int h, SDL_RendererLogicalPresentiation p, SDL_ScaleMode s)
+ int w, int h, SDL_RendererLogicalPresentation p, SDL_ScaleMode s)
 {
   return SDL_SetRenderLogicalSize(render, w, h);
 }
+
+static inline int SDL_RenderTexture(SDL_Renderer *renderer, SDL_Texture *texture,
+ const SDL_FRect *src_frect, const SDL_FRect *dest_frect)
+{
+  SDL_Rect src_rect = sdl_frect_to_rect(src_frect);
+
+#if SDL_VERSION_ATLEAST(2,0,10)
+  return SDL_RenderCopyF(renderer, texture, &src_rect, dest_frect);
+#else
+  SDL_Rect dest_rect = sdl_frect_to_rect(dest_frect);
+  return SDL_RenderCopy(renderer, texture, &src_rect, &dest_rect);
+#endif
+}
 #endif
 
 /* SDL_surface.h */

src/render_sdl.c

@@ -792,7 +792,7 @@ boolean sdlrender_set_video_mode(struct graphics_data *graphics,
   // Flag removed in SDL3; all drivers support it and its presence needs to be
   // tested by trying to create a target texture instead.
   if(requires_blend_ops)
-    sdl_renderer_flags |= SDL_RENDERER_TARGETTEXTURE;
+    sdl_rendererflags |= SDL_RENDERER_TARGETTEXTURE;
 #endif
 
   if(graphics->sdl_render_driver[0])

src/render_sdlaccel.c

@@ -551,13 +551,8 @@ static void sdlaccel_render_layer(struct graphics_data *graphics,
   SDL_Texture *chars_tex = render_data->sdl.texture[TEX_CHARS];
   SDL_Texture *bg_tex = render_data->sdl.texture[TEX_BACKGROUND];
 
-#if SDL_VERSION_ATLEAST(3,0,0)
   SDL_FRect dest_bg = { offx, offy, w * CHAR_W, h * CHAR_H };
   SDL_FRect src_bg = { 0, 0, w, h };
-#else
-  SDL_Rect dest_bg = { offx, offy, w * CHAR_W, h * CHAR_H };
-  SDL_Rect src_bg = { 0, 0, w, h };
-#endif
   void *_bg;
   int bg_pitch;
   uint32_t *bg;
@@ -651,13 +646,8 @@ static void sdlaccel_render_layer(struct graphics_data *graphics,
 #else /* !RENDER_GEOMETRY */
     /* Render foreground and partially transparent chars. */
     {
-#if SDL_VERSION_ATLEAST(3,0,0)
     SDL_FRect dest_rect = { 0, 0, CHAR_W, CHAR_H };
     SDL_FRect src_rect = { 0, 0, CHAR_W, CHAR_H };
-#else
-    SDL_Rect dest_rect = { 0, 0, CHAR_W, CHAR_H };
-    SDL_Rect src_rect = { 0, 0, CHAR_W, CHAR_H };
-#endif
     next = layer->data;
     for(y = 0; y < h; y++)
     {
@@ -756,13 +746,8 @@ static void sdlaccel_sync_screen(struct graphics_data *graphics)
   struct sdlaccel_render_data *render_data = graphics->render_data;
   SDL_Renderer *renderer = render_data->sdl.renderer;
   SDL_Texture *screen_tex = render_data->sdl.texture[TEX_SCREEN];
-#if SDL_VERSION_ATLEAST(3,0,0)
   SDL_FRect src;
   SDL_FRect dest;
-#else
-  SDL_Rect src;
-  SDL_Rect dest;
-#endif
   int width = render_data->w;
   int height = render_data->h;
   int v_width, v_height;

src/render_softscale.c

@@ -266,13 +266,8 @@ static void softscale_sync_screen(struct graphics_data *graphics)
   SDL_Renderer *renderer = render_data->sdl.renderer;
   SDL_Texture *texture = render_data->sdl.texture[0];
   SDL_Rect *texture_rect = &(render_data->texture_rect);
-#if SDL_VERSION_ATLEAST(3,0,0)
   SDL_FRect src_rect;
   SDL_FRect dest_rect;
-#else
-  SDL_Rect src_rect;
-  SDL_Rect dest_rect;
-#endif
   int width = render_data->w;
   int height = render_data->h;
   int v_width, v_height;