encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the new SDL_clamp() macro where sensible 

There were a few places throughout the SDL code where values were
clamped using SDL_min() and SDL_max(). Now that we have an SDL_clamp()
macro, use this instead.
This commit is contained in:
David Gow 2021-08-14 22:29:05 +08:00 committed by Sam Lantinga
parent 35c1bbfa49
commit fbc364908a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/events/SDL_events.c
View File

@ -146,7 +146,7 @@ static int SDL_DoEventLogging = 0;
static void SDLCALL static void SDLCALL
SDL_EventLoggingChanged(void *userdata, const char *name, const char *oldValue, const char *hint) SDL_EventLoggingChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
{ {
SDL_DoEventLogging = (hint && *hint) ? SDL_max(SDL_min(SDL_atoi(hint), 2), 0) : 0; SDL_DoEventLogging = (hint && *hint) ? SDL_clamp(SDL_atoi(hint), 0, 2) : 0;
} }
static void static void

6
src/joystick/iphoneos/SDL_mfijoystick.m
View File

@ -783,9 +783,9 @@ IOS_AccelerometerUpdate(SDL_Joystick *joystick)
*/ */
/* clamp the data */ /* clamp the data */
accel.x = SDL_min(SDL_max(accel.x, -maxgforce), maxgforce); accel.x = SDL_clamp(accel.x, -maxgforce, maxgforce);
accel.y = SDL_min(SDL_max(accel.y, -maxgforce), maxgforce); accel.y = SDL_clamp(accel.y, -maxgforce, maxgforce);
accel.z = SDL_min(SDL_max(accel.z, -maxgforce), maxgforce); accel.z = SDL_clamp(accel.z, -maxgforce, maxgforce);
/* pass in data mapped to range of SInt16 */ /* pass in data mapped to range of SInt16 */
SDL_PrivateJoystickAxis(joystick, 0, (accel.x / maxgforce) * maxsint16); SDL_PrivateJoystickAxis(joystick, 0, (accel.x / maxgforce) * maxsint16);

2
src/video/wayland/SDL_waylandevents.c
View File

@ -925,7 +925,7 @@ keyboard_handle_repeat_info(void *data, struct wl_keyboard *wl_keyboard,
int32_t rate, int32_t delay) int32_t rate, int32_t delay)
{ {
struct SDL_WaylandInput *input = data; struct SDL_WaylandInput *input = data;
input->keyboard_repeat.repeat_rate = SDL_max(0, SDL_min(rate, 1000)); input->keyboard_repeat.repeat_rate = SDL_clamp(rate, 0, 1000);
input->keyboard_repeat.repeat_delay = delay; input->keyboard_repeat.repeat_delay = delay;
input->keyboard_repeat.is_initialized = SDL_TRUE; input->keyboard_repeat.is_initialized = SDL_TRUE;
} }

12
test/testvulkan.c
View File

@ -722,13 +722,13 @@ static SDL_bool createSwapchain(void)
// Clamp the size to the allowable image extent. // Clamp the size to the allowable image extent.
// SDL_Vulkan_GetDrawableSize()'s result it not always in this range (bug #3287) // SDL_Vulkan_GetDrawableSize()'s result it not always in this range (bug #3287)
vulkanContext.swapchainSize.width = SDL_max(vulkanContext.surfaceCapabilities.minImageExtent.width, vulkanContext.swapchainSize.width = SDL_clamp(w,
SDL_min(w, vulkanContext.surfaceCapabilities.minImageExtent.width,
vulkanContext.surfaceCapabilities.maxImageExtent.width)); vulkanContext.surfaceCapabilities.maxImageExtent.width);
vulkanContext.swapchainSize.height = SDL_max(vulkanContext.surfaceCapabilities.minImageExtent.height, vulkanContext.swapchainSize.height = SDL_clamp(h,
SDL_min(h, vulkanContext.surfaceCapabilities.minImageExtent.height,
vulkanContext.surfaceCapabilities.maxImageExtent.height)); vulkanContext.surfaceCapabilities.maxImageExtent.height);
if(w == 0 || h == 0) if(w == 0 || h == 0)
return SDL_FALSE; return SDL_FALSE;