瀏覽代碼

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.
Sam Lantinga 3 年之前
父節點
當前提交
6c4b4ee7a6
共有 3 個文件被更改,包括 0 次插入6 次删除
  1. 0 1
      src/hidapi/SDL_hidapi.c
  2. 0 2
      src/render/SDL_render.c
  3. 0 3
      src/video/SDL_video.c

+ 0 - 1
src/hidapi/SDL_hidapi.c

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

+ 0 - 2
src/render/SDL_render.c

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

+ 0 - 3
src/video/SDL_video.c

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