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

Don't assert on API parameters 

This causes lots of spam in test automation and it's not clear it's useful to developers. If we need this level of validation, we should add a log category for it.
This commit is contained in:
Sam Lantinga 2021-11-10 09:41:43 -08:00
parent fed857787a
commit 6c4b4ee7a6
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hidapi/SDL_hidapi.c
View File

@ -462,7 +462,6 @@ DeleteHIDDeviceWrapper(SDL_hid_device *device)
} }
#define CHECK_DEVICE_MAGIC(device, retval) \ #define CHECK_DEVICE_MAGIC(device, retval) \
SDL_assert(device && device->magic == &device_magic); \
if (!device || device->magic != &device_magic) { \ if (!device || device->magic != &device_magic) { \
SDL_SetError("Invalid device"); \ SDL_SetError("Invalid device"); \
return retval; \ return retval; \

2
src/render/SDL_render.c
View File

@ -47,14 +47,12 @@ this should probably be removed at some point in the future. --ryan. */
#define SDL_WINDOWRENDERDATA "_SDL_WindowRenderData" #define SDL_WINDOWRENDERDATA "_SDL_WindowRenderData"
#define CHECK_RENDERER_MAGIC(renderer, retval) \ #define CHECK_RENDERER_MAGIC(renderer, retval) \
SDL_assert(renderer && renderer->magic == &renderer_magic); \
if (!renderer || renderer->magic != &renderer_magic) { \ if (!renderer || renderer->magic != &renderer_magic) { \
SDL_SetError("Invalid renderer"); \ SDL_SetError("Invalid renderer"); \
return retval; \ return retval; \
} }
#define CHECK_TEXTURE_MAGIC(texture, retval) \ #define CHECK_TEXTURE_MAGIC(texture, retval) \
SDL_assert(texture && texture->magic == &texture_magic); \
if (!texture || texture->magic != &texture_magic) { \ if (!texture || texture->magic != &texture_magic) { \
SDL_SetError("Invalid texture"); \ SDL_SetError("Invalid texture"); \
return retval; \ return retval; \

3
src/video/SDL_video.c
View File

@ -135,7 +135,6 @@ static SDL_VideoDevice *_this = NULL;
SDL_UninitializedVideo(); \ SDL_UninitializedVideo(); \
return retval; \ return retval; \
} \ } \
SDL_assert(window && window->magic == &_this->window_magic); \
if (!window || window->magic != &_this->window_magic) { \ if (!window || window->magic != &_this->window_magic) { \
SDL_SetError("Invalid window"); \ SDL_SetError("Invalid window"); \
return retval; \ return retval; \
@ -146,8 +145,6 @@ static SDL_VideoDevice *_this = NULL;
SDL_UninitializedVideo(); \ SDL_UninitializedVideo(); \
return retval; \ return retval; \
} \ } \
SDL_assert(_this->displays != NULL); \
SDL_assert(displayIndex >= 0 && displayIndex < _this->num_displays); \
if (displayIndex < 0 || displayIndex >= _this->num_displays) { \ if (displayIndex < 0 || displayIndex >= _this->num_displays) { \
SDL_SetError("displayIndex must be in the range 0 - %d", \ SDL_SetError("displayIndex must be in the range 0 - %d", \
_this->num_displays - 1); \ _this->num_displays - 1); \