From 637bcd0b728c580a53198654b9bcc5f333a4a6e3 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sun, 7 Nov 2021 11:19:07 -0800
Subject: [PATCH] Fixed build warnings
---
src/joystick/iphoneos/SDL_mfijoystick.m | 18 +++++++++++-------
src/render/metal/SDL_render_metal.m | 7 -------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/joystick/iphoneos/SDL_mfijoystick.m b/src/joystick/iphoneos/SDL_mfijoystick.m
index e657829d69..aa01657584 100644
--- a/src/joystick/iphoneos/SDL_mfijoystick.m
+++ b/src/joystick/iphoneos/SDL_mfijoystick.m
@@ -1085,13 +1085,17 @@ @implementation SDL_RumbleMotor {
-(void)cleanup
{
- if (self.player != nil) {
- [self.player cancelAndReturnError:nil];
- self.player = nil;
- }
- if (self.engine != nil) {
- [self.engine stopWithCompletionHandler:nil];
- self.engine = nil;
+ @autoreleasepool {
+ if (@available(macos 11.0, iOS 14.0, tvOS 14.0, *)) {
+ if (self.player != nil) {
+ [self.player cancelAndReturnError:nil];
+ self.player = nil;
+ }
+ if (self.engine != nil) {
+ [self.engine stopWithCompletionHandler:nil];
+ self.engine = nil;
+ }
+ }
}
}
diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m
index 1709fcea07..05d8a944bd 100644
--- a/src/render/metal/SDL_render_metal.m
+++ b/src/render/metal/SDL_render_metal.m
@@ -1029,13 +1029,6 @@ - (void)dealloc
}}
-// normalize a value from 0.0f to len into 0.0f to 1.0f.
-static inline float
-normtex(const float _val, const float len)
-{
- return _val / len;
-}
-
static int
METAL_QueueSetViewport(SDL_Renderer * renderer, SDL_RenderCommand *cmd)
{