From daa9e352cc24dd6966ab249f6a271d5d9703a562 Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Mon, 9 Jan 2023 00:50:43 +0100
Subject: [PATCH] Remove asserts

---
 audio/audio_driver.c                          | 19 +----
 audio/librsound.c                             | 49 ++----------
 camera/drivers/video4linux2.c                 |  4 -
 configuration.c                               | 17 -----
 core_info.c                                   |  3 -
 cores/libretro-ffmpeg/ffmpeg_core.c           |  1 -
 cores/libretro-imageviewer/image_core.c       |  1 -
 frontend/drivers/platform_darwin.m            | 15 ++--
 gfx/common/angle_common.c                     |  2 -
 gfx/common/d3d10_common.c                     |  1 -
 gfx/common/d3d11_common.c                     |  1 -
 gfx/common/d3d11_common.h                     |  1 -
 gfx/common/d3d12_common.c                     | 10 +--
 gfx/common/dxgi_common.c                      |  4 -
 gfx/common/egl_common.c                       |  1 -
 gfx/drivers/exynos_gfx.c                      |  2 -
 gfx/drivers/metal.m                           |  1 -
 gfx/drivers/omap_gfx.c                        | 12 +--
 gfx/drivers/psp1_gfx.c                        |  9 ---
 gfx/drivers/sdl_dingux_gfx.c                  |  2 -
 gfx/drivers/sdl_gfx.c                         | 10 +--
 gfx/drivers/sdl_rs90_gfx.c                    |  2 -
 gfx/drivers/vg.c                              |  3 -
 gfx/drivers/vulkan.c                          | 76 +++++++------------
 gfx/drivers_context/cocoa_gl_ctx.m            |  1 -
 gfx/drivers_context/cocoa_vk_ctx.m            |  1 -
 gfx/drivers_shader/shader_gl_cg.c             |  7 +-
 gfx/drivers_shader/shader_glsl.c              |  8 +-
 gfx/video_driver.c                            |  3 -
 gfx/video_filters/snes_ntsc/snes_ntsc_impl.h  |  9 +--
 input/drivers/rwebinput_input.c               | 10 ---
 input/input_driver.c                          |  6 --
 input/input_keymaps.c                         |  2 -
 libretro-common/compat/compat_getopt.c        |  8 --
 libretro-common/file/file_path_io.c           |  1 -
 libretro-common/formats/jpeg/rjpeg.c          |  7 +-
 libretro-common/formats/tga/rtga.c            |  1 -
 libretro-common/time/rtime.c                  |  3 -
 .../vfs/vfs_implementation_uwp.cpp            |  1 -
 menu/cbs/menu_cbs_ok.c                        |  8 +-
 play_feature_delivery/play_feature_delivery.c |  8 +-
 playlist.c                                    |  6 --
 record/drivers/record_ffmpeg.c                | 30 +++-----
 retroarch.c                                   |  2 -
 runloop.c                                     |  3 -
 tasks/task_bluetooth.c                        |  1 -
 tasks/task_content.c                          |  3 -
 tasks/task_http.c                             |  4 -
 tasks/task_save.c                             |  2 -
 tasks/task_wifi.c                             |  1 -
 ui/drivers/cocoa/cocoa_common.m               |  2 -
 ui/drivers/ui_qt.h                            |  3 +-
 52 files changed, 67 insertions(+), 320 deletions(-)

diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index c1c2713ce1..1d27c36571 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -24,7 +24,6 @@
 #include <string/stdstring.h>
 #include <encodings/utf.h>
 #include <clamping.h>
-#include <retro_assert.h>
 #include <memalign.h>
 #include <audio/conversion/float_to_s16.h>
 #include <audio/conversion/s16_to_float.h>
@@ -584,10 +583,6 @@ bool audio_driver_init_internal(
    convert_s16_to_float_init_simd();
    convert_float_to_s16_init_simd();
 
-   /* Used for recording even if audio isn't enabled. */
-   retro_assert(conv_buf != NULL);
-   retro_assert(audio_buf != NULL);
-
    if (!conv_buf || !audio_buf)
       goto error;
 
@@ -602,10 +597,7 @@ bool audio_driver_init_internal(
 #ifdef HAVE_REWIND
    /* Needs to be able to hold full content of a full max_bufsamples
     * in addition to its own. */
-   rewind_buf = (int16_t*)memalign_alloc(64, max_bufsamples * sizeof(int16_t));
-   retro_assert(rewind_buf != NULL);
-
-   if (!rewind_buf)
+   if (!(rewind_buf = (int16_t*)memalign_alloc(64, max_bufsamples * sizeof(int16_t))))
       goto error;
 
    audio_driver_st.rewind_buf    = rewind_buf;
@@ -727,14 +719,7 @@ bool audio_driver_init_internal(
 
    audio_driver_st.data_ptr   = 0;
 
-   retro_assert(settings->uints.audio_output_sample_rate <
-         audio_driver_st.input * AUDIO_MAX_RATIO);
-
-   samples_buf = (float*)memalign_alloc(64, outsamples_max * sizeof(float));
-
-   retro_assert(samples_buf != NULL);
-
-   if (!samples_buf)
+   if (!(samples_buf = (float*)memalign_alloc(64, outsamples_max * sizeof(float))))
       goto error;
 
    audio_driver_st.output_samples_buf = (float*)samples_buf;
diff --git a/audio/librsound.c b/audio/librsound.c
index 88a47a2256..d5358b2499 100644
--- a/audio/librsound.c
+++ b/audio/librsound.c
@@ -83,7 +83,6 @@
 
 #include <compat/strl.h>
 #include <retro_inline.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>
 
@@ -224,7 +223,6 @@ static INLINE int rsnd_format_to_samplesize ( uint16_t fmt )
 
 int rsd_samplesize( rsound_t *rd )
 {
-   retro_assert(rd != NULL);
    return rd->samplesize;
 }
 
@@ -1315,7 +1313,6 @@ int rsd_stop(rsound_t *rd)
 {
    const char buf[] = "RSD    5 STOP";
 
-   retro_assert(rd != NULL);
    rsnd_stop_thread(rd);
 
    /* Do not really care about errors here.
@@ -1329,7 +1326,6 @@ int rsd_stop(rsound_t *rd)
 size_t rsd_write( rsound_t *rsound, const void* buf, size_t size)
 {
    size_t max_write, written = 0;
-   retro_assert(rsound != NULL);
    if ( !rsound->ready_for_data )
       return 0;
 
@@ -1354,21 +1350,13 @@ size_t rsd_write( rsound_t *rsound, const void* buf, size_t size)
 
 int rsd_start(rsound_t *rsound)
 {
-   retro_assert(rsound != NULL);
-   retro_assert(rsound->rate > 0);
-   retro_assert(rsound->channels > 0);
-   retro_assert(rsound->host != NULL);
-   retro_assert(rsound->port != NULL);
-
    if ( rsnd_create_connection(rsound) < 0 )
       return -1;
-
    return 0;
 }
 
 int rsd_exec(rsound_t *rsound)
 {
-   retro_assert(rsound != NULL);
    RSD_DEBUG("[RSound] rsd_exec().\n");
 
    /* Makes sure we have a working connection */
@@ -1419,8 +1407,6 @@ int rsd_exec(rsound_t *rsound)
 /* ioctl()-ish param setting :D */
 int rsd_set_param(rsound_t *rd, enum rsd_settings option, void* param)
 {
-	retro_assert(rd != NULL);
-	retro_assert(param != NULL);
 	int retval = 0;
 
 	switch(option)
@@ -1517,27 +1503,18 @@ void rsd_delay_wait(rsound_t *rd)
 
 size_t rsd_pointer(rsound_t *rsound)
 {
-   retro_assert(rsound != NULL);
-   int ptr;
-
-   ptr = rsnd_get_ptr(rsound);
-
-   return ptr;
+   return rsnd_get_ptr(rsound);
 }
 
 size_t rsd_get_avail(rsound_t *rd)
 {
-   retro_assert(rd != NULL);
-   int ptr;
-   ptr = rsnd_get_ptr(rd);
-   return rd->buffer_size - ptr;
+   return rd->buffer_size - rsnd_get_ptr(rd);
 }
 
 size_t rsd_delay(rsound_t *rd)
 {
-   retro_assert(rd != NULL);
    int ptr = rsnd_get_delay(rd);
-   if ( ptr < 0 )
+   if (ptr < 0)
       ptr = 0;
 
    return ptr;
@@ -1545,16 +1522,12 @@ size_t rsd_delay(rsound_t *rd)
 
 size_t rsd_delay_ms(rsound_t* rd)
 {
-   retro_assert(rd);
-   retro_assert(rd->rate > 0 && rd->channels > 0);
-
    return (rsd_delay(rd) * 1000) / ( rd->rate * rd->channels * rd->samplesize );
 }
 
 int rsd_pause(rsound_t* rsound, int enable)
 {
-   retro_assert(rsound != NULL);
-   if ( enable )
+   if (enable)
       return rsd_stop(rsound);
 
    return rsd_start(rsound);
@@ -1567,8 +1540,6 @@ int rsd_init(rsound_t** rsound)
    if (*rsound == NULL)
       return -1;
 
-   retro_assert(rsound != NULL);
-
    (*rsound)->conn.socket = -1;
    (*rsound)->conn.ctl_socket = -1;
 
@@ -1629,17 +1600,10 @@ int rsd_simple_start(rsound_t** rsound, const char* host, const char* port, cons
 
 void rsd_set_callback(rsound_t *rsound, rsd_audio_callback_t audio_cb, rsd_error_callback_t err_cb, size_t max_size, void *userdata)
 {
-   retro_assert(rsound != NULL);
-
    rsound->audio_callback = audio_cb;
    rsound->error_callback = err_cb;
-   rsound->cb_max_size = max_size;
-   rsound->cb_data = userdata;
-
-   if (rsound->audio_callback)
-   {
-      retro_assert(rsound->error_callback);
-   }
+   rsound->cb_max_size    = max_size;
+   rsound->cb_data        = userdata;
 }
 
 void rsd_callback_lock(rsound_t *rsound)
@@ -1654,7 +1618,6 @@ void rsd_callback_unlock(rsound_t *rsound)
 
 int rsd_free(rsound_t *rsound)
 {
-   retro_assert(rsound != NULL);
    if (rsound->fifo_buffer)
       fifo_free(rsound->fifo_buffer);
    if (rsound->host)
diff --git a/camera/drivers/video4linux2.c b/camera/drivers/video4linux2.c
index 02bb3d5baf..d418d81e9b 100644
--- a/camera/drivers/video4linux2.c
+++ b/camera/drivers/video4linux2.c
@@ -20,7 +20,6 @@
 #include <malloc.h>
 #endif
 #include <string.h>
-#include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -37,7 +36,6 @@
 
 #include <memmap.h>
 
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <gfx/scaler/scaler.h>
 #include <gfx/video_frame.h>
@@ -380,8 +378,6 @@ static bool preprocess_image(void *data)
       return false;
    }
 
-   retro_assert(buf.index < v4l->n_buffers);
-
    ctx = &v4l->scaler;
 
    scaler_ctx_scale_direct(ctx, v4l->buffer_output, (const uint8_t*)v4l->buffers[buf.index].start);
diff --git a/configuration.c b/configuration.c
index afccb6b21b..22c1fb08d1 100644
--- a/configuration.c
+++ b/configuration.c
@@ -24,7 +24,6 @@
 #include <file/file_path.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
-#include <retro_assert.h>
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
 #include <array/rhmap.h>
@@ -2717,22 +2716,6 @@ void config_set_defaults(void *data)
    input_remapping_deinit(false);
    input_remapping_set_defaults(false);
 
-   /* Verify that binds are in proper order. */
-   for (i = 0; i < MAX_USERS; i++)
-   {
-      for (j = 0; j < RARCH_BIND_LIST_END; j++)
-      {
-         const struct retro_keybind *keyval = &input_config_binds[i][j];
-
-         /* No need to verify hotkeys for all users */
-         if (i > 0 && j > RARCH_CUSTOM_BIND_LIST_END)
-            continue;
-
-         if (keyval->valid)
-            retro_assert(j == keyval->id);
-      }
-   }
-
    configuration_set_string(settings,
          settings->paths.network_buildbot_url, DEFAULT_BUILDBOT_SERVER_URL);
    configuration_set_string(settings,
diff --git a/core_info.c b/core_info.c
index f9e571a7ef..e8a803af2a 100644
--- a/core_info.c
+++ b/core_info.c
@@ -15,7 +15,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <retro_assert.h>
 #include <compat/strl.h>
 #include <string/stdstring.h>
 #include <file/config_file.h>
@@ -386,7 +385,6 @@ static bool CCJSONEndObjectHandler(void *context)
          && (pCtx->array_depth == 1))
       pCtx->to_core_file_id = false;
 
-   retro_assert(pCtx->object_depth > 0);
    pCtx->object_depth--;
 
    return true;
@@ -406,7 +404,6 @@ static bool CCJSONEndArrayHandler(void *context)
    if ((pCtx->object_depth == 2) && (pCtx->array_depth == 2))
       pCtx->to_firmware = false;
 
-   retro_assert(pCtx->array_depth > 0);
    pCtx->array_depth--;
 
    return true;
diff --git a/cores/libretro-ffmpeg/ffmpeg_core.c b/cores/libretro-ffmpeg/ffmpeg_core.c
index 495e7fb87a..79cb59215c 100644
--- a/cores/libretro-ffmpeg/ffmpeg_core.c
+++ b/cores/libretro-ffmpeg/ffmpeg_core.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <assert.h>
 #include <stdarg.h>
 
 #ifdef RARCH_INTERNAL
diff --git a/cores/libretro-imageviewer/image_core.c b/cores/libretro-imageviewer/image_core.c
index 7109b3c5ca..f8fc8f5cc5 100644
--- a/cores/libretro-imageviewer/image_core.c
+++ b/cores/libretro-imageviewer/image_core.c
@@ -2,7 +2,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include <boolean.h>
 #include <lists/dir_list.h>
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index 44f9cb95a1..90c5824285 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -49,7 +49,6 @@
 
 #include <boolean.h>
 #include <compat/apple_compat.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <file/file_path.h>
 #include <streams/file_stream.h>
@@ -368,17 +367,13 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
 
 #if TARGET_OS_IPHONE
    if (realpath(home_dir_buf, resolved_home_dir_buf))
-   {
-      retro_assert(strlcpy(home_dir_buf,
+      strlcpy(home_dir_buf,
                resolved_home_dir_buf,
-               sizeof(home_dir_buf)) < sizeof(home_dir_buf));
-   }
+               sizeof(home_dir_buf));
    if (realpath(bundle_path_buf, resolved_bundle_dir_buf))
-   {
-      retro_assert(strlcpy(bundle_path_buf,
-               resolved_bundle_dir_buf,
-               sizeof(bundle_path_buf)) < sizeof(bundle_path_buf));
-   }
+      strlcpy(bundle_path_buf,
+            resolved_bundle_dir_buf,
+            sizeof(bundle_path_buf);
 #endif
 
    strlcat(home_dir_buf, "/RetroArch", sizeof(home_dir_buf));
diff --git a/gfx/common/angle_common.c b/gfx/common/angle_common.c
index 3b73255881..1e2d8f0219 100644
--- a/gfx/common/angle_common.c
+++ b/gfx/common/angle_common.c
@@ -15,8 +15,6 @@
 
 #include <stdlib.h>
 
-#include <retro_assert.h>
-
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
diff --git a/gfx/common/d3d10_common.c b/gfx/common/d3d10_common.c
index 6f813af9dc..569a5922c7 100644
--- a/gfx/common/d3d10_common.c
+++ b/gfx/common/d3d10_common.c
@@ -179,7 +179,6 @@ d3d10_get_closest_match(D3D10Device device,
          break;
       format++;
    }
-   assert(*format);
    return *format;
 }
 
diff --git a/gfx/common/d3d11_common.c b/gfx/common/d3d11_common.c
index 0e1f8138ea..79056b33aa 100644
--- a/gfx/common/d3d11_common.c
+++ b/gfx/common/d3d11_common.c
@@ -200,7 +200,6 @@ d3d11_get_closest_match(D3D11Device device, DXGI_FORMAT desired_format, UINT des
          break;
       format++;
    }
-   assert(*format);
    return *format;
 }
 
diff --git a/gfx/common/d3d11_common.h b/gfx/common/d3d11_common.h
index 631376a6c5..29684a6a65 100644
--- a/gfx/common/d3d11_common.h
+++ b/gfx/common/d3d11_common.h
@@ -25,7 +25,6 @@
 #endif
 #include <d3d11.h>
 
-#include <assert.h>
 #include <boolean.h>
 #include <retro_math.h>
 #include <gfx/math/matrix_4x4.h>
diff --git a/gfx/common/d3d12_common.c b/gfx/common/d3d12_common.c
index a908386a6e..a03b4e2e76 100644
--- a/gfx/common/d3d12_common.c
+++ b/gfx/common/d3d12_common.c
@@ -143,10 +143,7 @@ HRESULT WINAPI D3D12SerializeVersionedRootSignature(
 static void
 d3d12_descriptor_heap_slot_free(d3d12_descriptor_heap_t* heap, D3D12_CPU_DESCRIPTOR_HANDLE handle)
 {
-   unsigned i = (handle.ptr - heap->cpu.ptr) / heap->stride;
-   assert(i >= 0 && i < heap->desc.NumDescriptors);
-   assert(heap->map[i]);
-
+   unsigned i   = (handle.ptr - heap->cpu.ptr) / heap->stride;
    heap->map[i] = false;
    if (heap->start > (int)i)
       heap->start = i;
@@ -211,7 +208,6 @@ D3D12_CPU_DESCRIPTOR_HANDLE d3d12_descriptor_heap_slot_alloc(d3d12_descriptor_he
       }
    }
    /* if you get here try increasing NumDescriptors for this heap */
-   assert(0);
    return handle;
 }
 
@@ -233,7 +229,6 @@ static DXGI_FORMAT d3d12_get_closest_match(D3D12Device device, D3D12_FEATURE_DAT
          break;
       format++;
    }
-   assert(*format);
    return *format;
 }
 
@@ -285,8 +280,6 @@ void d3d12_init_texture(D3D12Device device, d3d12_texture_t* texture)
             D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, NULL, &texture->handle);
    }
 
-   assert(texture->srv_heap);
-
    {
       D3D12_SHADER_RESOURCE_VIEW_DESC desc = { texture->desc.Format };
 
@@ -316,7 +309,6 @@ void d3d12_init_texture(D3D12Device device, d3d12_texture_t* texture)
 
    if (texture->desc.Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET)
    {
-      assert(texture->rt_view.ptr);
       D3D12CreateRenderTargetView(device, texture->handle, NULL, texture->rt_view);
    }
    else
diff --git a/gfx/common/dxgi_common.c b/gfx/common/dxgi_common.c
index 2e7d62ffd9..124677e354 100644
--- a/gfx/common/dxgi_common.c
+++ b/gfx/common/dxgi_common.c
@@ -17,8 +17,6 @@
 #include <string/stdstring.h>
 #include <retro_environment.h>
 
-#include <assert.h>
-
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
@@ -287,7 +285,6 @@ DXGI_FORMAT* dxgi_get_format_fallback_list(DXGI_FORMAT format)
              break; \
          } \
          default: \
-            assert(0); \
             break; \
       } \
       break; \
@@ -323,7 +320,6 @@ void dxgi_copy(
       FORMAT_SRC(DXGI_FORMAT_EX_A4R4G4B4_UNORM);
 
       default:
-         assert(0);
          break;
    }
 }
diff --git a/gfx/common/egl_common.c b/gfx/common/egl_common.c
index f896ed8477..ebc71c4e3d 100644
--- a/gfx/common/egl_common.c
+++ b/gfx/common/egl_common.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-#include <retro_assert.h>
 #include <string/stdstring.h>
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/drivers/exynos_gfx.c b/gfx/drivers/exynos_gfx.c
index 0a29cf1796..26a9e78ca3 100644
--- a/gfx/drivers/exynos_gfx.c
+++ b/gfx/drivers/exynos_gfx.c
@@ -29,7 +29,6 @@
 #include <exynos/exynos_fimg2d.h>
 
 #include <retro_inline.h>
-#include <retro_assert.h>
 #include <string/stdstring.h>
 
 #ifdef HAVE_CONFIG_H
@@ -267,7 +266,6 @@ static const char *exynos_buffer_name(enum exynos_buffer_type type)
       case EXYNOS_BUFFER_AUX:
          return "aux";
       default:
-         retro_assert(false);
          break;
    }
 
diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m
index ec9dfe3dff..e5434e52de 100644
--- a/gfx/drivers/metal.m
+++ b/gfx/drivers/metal.m
@@ -33,7 +33,6 @@
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 #include <retro_math.h>
-#include <retro_assert.h>
 #include <libretro.h>
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/drivers/omap_gfx.c b/gfx/drivers/omap_gfx.c
index ba0a86c165..95f48f211c 100644
--- a/gfx/drivers/omap_gfx.c
+++ b/gfx/drivers/omap_gfx.c
@@ -24,7 +24,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
-#include <assert.h>
 
 #include <sys/mman.h>
 #include <linux/omapfb.h>
@@ -38,7 +37,6 @@
 #endif
 
 #include <retro_inline.h>
-#include <retro_assert.h>
 #include <gfx/scaler/scaler.h>
 #include <gfx/video_frame.h>
 #include <string/stdstring.h>
@@ -682,13 +680,9 @@ static void omapfb_prepare(omapfb_data_t *pdata)
    /* issue flip before getting free page */
    omapfb_page_flip(pdata);
 
-   page            = omapfb_get_page(pdata);
-
-   retro_assert(page != NULL);
-
-   pdata->old_page = pdata->cur_page;
-   pdata->cur_page = page;
-
+   page                  = omapfb_get_page(pdata);
+   pdata->old_page       = pdata->cur_page;
+   pdata->cur_page       = page;
    pdata->cur_page->used = true;
 }
 
diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c
index 753c971279..fd8ff73001 100644
--- a/gfx/drivers/psp1_gfx.c
+++ b/gfx/drivers/psp1_gfx.c
@@ -21,7 +21,6 @@
 #include <pspgum.h>
 #include <psprtc.h>
 
-#include <retro_assert.h>
 #include <retro_inline.h>
 #include <retro_math.h>
 
@@ -678,14 +677,6 @@ static void psp_set_texture_frame(void *data, const void *frame, bool rgb32,
 {
    psp1_video_t *psp = (psp1_video_t*)data;
 
-   (void) rgb32;
-   (void) alpha;
-
-#ifdef DEBUG
-   /* psp->menu.frame buffer size is (480 * 272)*2 Bytes */
-   retro_assert((width*height) < (480 * 272));
-#endif
-
    psp_set_screen_coords(psp->menu.frame_coords, 0, 0,
          SCEGU_SCR_WIDTH, SCEGU_SCR_HEIGHT, 0);
    psp_set_tex_coords(psp->menu.frame_coords, width, height);
diff --git a/gfx/drivers/sdl_dingux_gfx.c b/gfx/drivers/sdl_dingux_gfx.c
index 08e3a05329..80683054b1 100644
--- a/gfx/drivers/sdl_dingux_gfx.c
+++ b/gfx/drivers/sdl_dingux_gfx.c
@@ -22,9 +22,7 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_video.h>
 
-#include <retro_assert.h>
 #include <gfx/video_frame.h>
-#include <retro_assert.h>
 #include <string/stdstring.h>
 #include <encodings/utf.h>
 #include <features/features_cpu.h>
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index 4584037fd3..73e9d0096c 100644
--- a/gfx/drivers/sdl_gfx.c
+++ b/gfx/drivers/sdl_gfx.c
@@ -18,10 +18,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <retro_assert.h>
 #include <gfx/scaler/scaler.h>
 #include <gfx/video_frame.h>
-#include <retro_assert.h>
 #include "../../verbosity.h"
 
 #ifdef HAVE_CONFIG_H
@@ -270,14 +268,12 @@ static void *sdl_gfx_init(const video_info_t *video,
          return NULL;
    }
 
-   vid = (sdl_video_t*)calloc(1, sizeof(*vid));
-   if (!vid)
+   if (!(vid = (sdl_video_t*)calloc(1, sizeof(*vid))))
       return NULL;
 
    video_info = SDL_GetVideoInfo();
-   retro_assert(video_info);
-   full_x = video_info->current_w;
-   full_y = video_info->current_h;
+   full_x     = video_info->current_w;
+   full_y     = video_info->current_h;
    RARCH_LOG("[SDL]: Detecting desktop resolution %ux%u.\n", full_x, full_y);
 
    if (!video->fullscreen)
diff --git a/gfx/drivers/sdl_rs90_gfx.c b/gfx/drivers/sdl_rs90_gfx.c
index 954d9dcb5c..66bb309c1b 100644
--- a/gfx/drivers/sdl_rs90_gfx.c
+++ b/gfx/drivers/sdl_rs90_gfx.c
@@ -23,9 +23,7 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_video.h>
 
-#include <retro_assert.h>
 #include <gfx/video_frame.h>
-#include <retro_assert.h>
 #include <string/stdstring.h>
 #include <encodings/utf.h>
 #include <features/features_cpu.h>
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index 7a2b58e1fa..46222cefe1 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -24,7 +24,6 @@
 #include <EGL/eglext.h>
 
 #include <retro_inline.h>
-#include <retro_assert.h>
 #include <gfx/math/matrix_3x3.h>
 #include <libretro.h>
 
@@ -387,8 +386,6 @@ static void vg_copy_frame(void *data, const void *frame,
                0,
                &img);
 
-      retro_assert(img != EGL_NO_IMAGE_KHR);
-
       if (new_egl)
       {
          vgDestroyImage(vg->mImage);
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 014e160c89..c47a66b734 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -25,7 +25,6 @@
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 #include <retro_math.h>
-#include <retro_assert.h>
 #include <string/stdstring.h>
 #include <libretro.h>
 
@@ -65,8 +64,6 @@ static struct vk_descriptor_manager vulkan_create_descriptor_manager(
    int i;
    struct vk_descriptor_manager manager;
 
-   retro_assert(num_sizes <= VULKAN_MAX_DESCRIPTOR_POOL_SIZES);
-
    manager.current    = NULL;
    manager.count      = 0;
 
@@ -80,7 +77,6 @@ static struct vk_descriptor_manager vulkan_create_descriptor_manager(
    manager.num_sizes  = num_sizes;
 
    manager.head       = vulkan_alloc_descriptor_pool(device, &manager);
-   retro_assert(manager.head);
    return manager;
 }
 
@@ -580,7 +576,6 @@ static void vulkan_init_pipelines(vk_t *vk)
             break;
 
          default:
-            retro_assert(0 && "No shader for menu pipeline.");
             break;
       }
 
@@ -617,7 +612,6 @@ static void vulkan_init_pipelines(vk_t *vk)
             break;
 
          default:
-            retro_assert(0 && "No shader for menu pipeline.");
             break;
       }
 
@@ -1226,11 +1220,8 @@ static void vulkan_set_image(void *handle,
       VkSemaphore *new_semaphores = (VkSemaphore*)realloc(vk->hw.semaphores,
             sizeof(VkSemaphore) * (vk->hw.num_semaphores + 1));
 
-      /* If this fails, we're screwed anyways. */
-      retro_assert(stage_flags && new_semaphores);
-
       vk->hw.wait_dst_stages = stage_flags;
-      vk->hw.semaphores = new_semaphores;
+      vk->hw.semaphores      = new_semaphores;
 
       for (i = 0; i < (int) vk->hw.num_semaphores; i++)
       {
@@ -1245,7 +1236,6 @@ static void vulkan_set_image(void *handle,
 
 static void vulkan_wait_sync_index(void *handle)
 {
-   (void)handle;
    /* no-op. RetroArch already waits for this
     * in gfx_ctx_swap_buffers(). */
 }
@@ -1261,29 +1251,26 @@ static void vulkan_set_command_buffers(void *handle, uint32_t num_cmd,
          realloc(vk->hw.cmd,
             sizeof(VkCommandBuffer) * required_capacity);
 
-      /* If this fails, we're just screwed. */
-      retro_assert(hw_cmd);
-
-      vk->hw.cmd          = hw_cmd;
-      vk->hw.capacity_cmd = required_capacity;
+      vk->hw.cmd              = hw_cmd;
+      vk->hw.capacity_cmd     = required_capacity;
    }
 
-   vk->hw.num_cmd = num_cmd;
+   vk->hw.num_cmd             = num_cmd;
    memcpy(vk->hw.cmd, cmd, sizeof(VkCommandBuffer) * num_cmd);
 }
 
 static void vulkan_lock_queue(void *handle)
 {
-   vk_t *vk = (vk_t*)handle;
 #ifdef HAVE_THREADS
+   vk_t *vk = (vk_t*)handle;
    slock_lock(vk->context->queue_lock);
 #endif
 }
 
 static void vulkan_unlock_queue(void *handle)
 {
-   vk_t *vk = (vk_t*)handle;
 #ifdef HAVE_THREADS
+   vk_t *vk = (vk_t*)handle;
    slock_unlock(vk->context->queue_lock);
 #endif
 }
@@ -1304,26 +1291,26 @@ static void vulkan_init_hw_render(vk_t *vk)
    if (hwr->context_type != RETRO_HW_CONTEXT_VULKAN)
       return;
 
-   vk->flags                  |= VK_FLAG_HW_ENABLE;
+   vk->flags                    |= VK_FLAG_HW_ENABLE;
 
-   iface->interface_type       = RETRO_HW_RENDER_INTERFACE_VULKAN;
-   iface->interface_version    = RETRO_HW_RENDER_INTERFACE_VULKAN_VERSION;
-   iface->instance             = vk->context->instance;
-   iface->gpu                  = vk->context->gpu;
-   iface->device               = vk->context->device;
+   iface->interface_type         = RETRO_HW_RENDER_INTERFACE_VULKAN;
+   iface->interface_version      = RETRO_HW_RENDER_INTERFACE_VULKAN_VERSION;
+   iface->instance               = vk->context->instance;
+   iface->gpu                    = vk->context->gpu;
+   iface->device                 = vk->context->device;
 
-   iface->queue                = vk->context->queue;
-   iface->queue_index          = vk->context->graphics_queue_index;
+   iface->queue                  = vk->context->queue;
+   iface->queue_index            = vk->context->graphics_queue_index;
 
-   iface->handle               = vk;
-   iface->set_image            = vulkan_set_image;
-   iface->get_sync_index       = vulkan_get_sync_index;
-   iface->get_sync_index_mask  = vulkan_get_sync_index_mask;
-   iface->wait_sync_index      = vulkan_wait_sync_index;
-   iface->set_command_buffers  = vulkan_set_command_buffers;
-   iface->lock_queue           = vulkan_lock_queue;
-   iface->unlock_queue         = vulkan_unlock_queue;
-   iface->set_signal_semaphore = vulkan_set_signal_semaphore;
+   iface->handle                 = vk;
+   iface->set_image              = vulkan_set_image;
+   iface->get_sync_index         = vulkan_get_sync_index;
+   iface->get_sync_index_mask    = vulkan_get_sync_index_mask;
+   iface->wait_sync_index        = vulkan_wait_sync_index;
+   iface->set_command_buffers    = vulkan_set_command_buffers;
+   iface->lock_queue             = vulkan_lock_queue;
+   iface->unlock_queue           = vulkan_unlock_queue;
+   iface->set_signal_semaphore   = vulkan_set_signal_semaphore;
 
    iface->get_device_proc_addr   = vkGetDeviceProcAddr;
    iface->get_instance_proc_addr = vulkan_symbol_wrapper_instance_proc_addr();
@@ -2058,7 +2045,6 @@ static void vulkan_inject_black_frame(vk_t *vk, video_frame_info_t *video_info)
       static const VkPipelineStageFlags wait_stage        =
          VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 
-      assert(!vk->context->swapchain_wait_semaphores[frame_index]);
       vk->context->swapchain_wait_semaphores[frame_index] =
          vk->context->swapchain_acquire_semaphore;
       vk->context->swapchain_acquire_semaphore            = VK_NULL_HANDLE;
@@ -2169,8 +2155,6 @@ static bool vulkan_frame(void *data, const void *frame,
        vk->hw.src_queue_family != VK_QUEUE_FAMILY_IGNORED &&
        vk->hw.src_queue_family != vk->context->graphics_queue_index)
    {
-      retro_assert(vk->hw.image);
-
       /* Acquire ownership of image from other queue family. */
       VULKAN_TRANSFER_IMAGE_OWNERSHIP(vk->cmd,
             vk->hw.image->create_info.image,
@@ -2659,8 +2643,6 @@ static bool vulkan_frame(void *data, const void *frame,
        vk->hw.src_queue_family != VK_QUEUE_FAMILY_IGNORED &&
        vk->hw.src_queue_family != vk->context->graphics_queue_index)
    {
-      retro_assert(vk->hw.image);
-
       /* Release ownership of image back to other queue family. */
       VULKAN_TRANSFER_IMAGE_OWNERSHIP(vk->cmd,
             vk->hw.image->create_info.image,
@@ -2705,12 +2687,11 @@ static bool vulkan_frame(void *data, const void *frame,
       if (    (vk->context->flags & VK_CTX_FLAG_HAS_ACQUIRED_SWAPCHAIN)
            && (vk->context->swapchain_acquire_semaphore != VK_NULL_HANDLE))
       {
-         assert(!vk->context->swapchain_wait_semaphores[frame_index]);
-         vk->context->swapchain_wait_semaphores[frame_index] =
+         vk->context->swapchain_wait_semaphores[frame_index]    =
             vk->context->swapchain_acquire_semaphore;
-         vk->context->swapchain_acquire_semaphore = VK_NULL_HANDLE;
+         vk->context->swapchain_acquire_semaphore               = VK_NULL_HANDLE;
 
-         vk->hw.semaphores[submit_info.waitSemaphoreCount] = vk->context->swapchain_wait_semaphores[frame_index];
+         vk->hw.semaphores[submit_info.waitSemaphoreCount]      = vk->context->swapchain_wait_semaphores[frame_index];
          vk->hw.wait_dst_stages[submit_info.waitSemaphoreCount] = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
          submit_info.waitSemaphoreCount++;
       }
@@ -2718,13 +2699,12 @@ static bool vulkan_frame(void *data, const void *frame,
    else if ((vk->context->flags & VK_CTX_FLAG_HAS_ACQUIRED_SWAPCHAIN)
          && (vk->context->swapchain_acquire_semaphore != VK_NULL_HANDLE))
    {
-      static const VkPipelineStageFlags wait_stage =
+      static const VkPipelineStageFlags wait_stage        =
          VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 
-      assert(!vk->context->swapchain_wait_semaphores[frame_index]);
       vk->context->swapchain_wait_semaphores[frame_index] =
          vk->context->swapchain_acquire_semaphore;
-      vk->context->swapchain_acquire_semaphore = VK_NULL_HANDLE;
+      vk->context->swapchain_acquire_semaphore            = VK_NULL_HANDLE;
 
       submit_info.waitSemaphoreCount = 1;
       submit_info.pWaitSemaphores    = &vk->context->swapchain_wait_semaphores[frame_index];
diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index 06f0202e5c..e92fd67be1 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -32,7 +32,6 @@
 #include <GLKit/GLKit.h>
 #endif
 
-#include <retro_assert.h>
 #include <retro_timers.h>
 #include <compat/apple_compat.h>
 #include <string/stdstring.h>
diff --git a/gfx/drivers_context/cocoa_vk_ctx.m b/gfx/drivers_context/cocoa_vk_ctx.m
index 1d48dcd86e..5711341b1b 100755
--- a/gfx/drivers_context/cocoa_vk_ctx.m
+++ b/gfx/drivers_context/cocoa_vk_ctx.m
@@ -27,7 +27,6 @@
 #include <AppKit/NSScreen.h>
 #endif
 
-#include <retro_assert.h>
 #include <retro_timers.h>
 #include <compat/apple_compat.h>
 #include <string/stdstring.h>
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 7cf177ca79..18386a9e5c 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -26,7 +26,6 @@
 #include <compat/posix_string.h>
 #include <file/config_file.h>
 #include <file/file_path.h>
-#include <retro_assert.h>
 #include <string/stdstring.h>
 
 #ifdef HAVE_CONFIG_H
@@ -234,12 +233,8 @@ static void cg_error_handler(CGcontext ctx, CGerror error, void *data)
 
 static void gl_cg_reset_attrib(void *data)
 {
-   unsigned i;
+   int i;
    cg_shader_data_t *cg = (cg_shader_data_t*)data;
-
-   /* Add sanity check that we did not overflow. */
-   retro_assert(cg->attribs_index <= ARRAY_SIZE(cg->attribs_elems));
-
    for (i = 0; i < cg->attribs_index; i++)
       cgGLDisableClientState(cg->attribs_elems[i]);
    cg->attribs_index = 0;
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 5b3006588e..fafa00ea71 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -20,7 +20,6 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <file/file_path.h>
-#include <retro_assert.h>
 #include <streams/file_stream.h>
 #include <string/stdstring.h>
 
@@ -615,10 +614,6 @@ static bool gl_glsl_compile_programs(
 static void gl_glsl_reset_attrib(glsl_shader_data_t *glsl)
 {
    unsigned i;
-
-   /* Add sanity check that we did not overflow. */
-   retro_assert(glsl->attribs_index <= ARRAY_SIZE(glsl->attribs_elems));
-
    for (i = 0; i < glsl->attribs_index; i++)
       glDisableVertexAttribArray(glsl->attribs_elems[i]);
    glsl->attribs_index = 0;
@@ -631,8 +626,7 @@ static void gl_glsl_set_vbo(GLfloat **buffer, size_t *buffer_elems,
    {
       GLfloat *new_buffer = (GLfloat*)
          realloc(*buffer, elems * sizeof(GLfloat));
-      retro_assert(new_buffer);
-      *buffer = new_buffer;
+      *buffer             = new_buffer;
    }
 
    memcpy(*buffer, data, elems * sizeof(GLfloat));
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 12969ea2e4..f94add1fa9 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -17,7 +17,6 @@
 #include <math.h>
 #include <string/stdstring.h>
 #include <retro_math.h>
-#include <retro_assert.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -1986,11 +1985,9 @@ void video_driver_lock_new(void)
 #ifdef HAVE_THREADS
    if (!video_st->display_lock)
       video_st->display_lock = slock_new();
-   retro_assert(video_st->display_lock);
 
    if (!video_st->context_lock)
       video_st->context_lock = slock_new();
-   retro_assert(video_st->context_lock);
 #endif
 }
 
diff --git a/gfx/video_filters/snes_ntsc/snes_ntsc_impl.h b/gfx/video_filters/snes_ntsc/snes_ntsc_impl.h
index 6507ae63b1..66a851240b 100644
--- a/gfx/video_filters/snes_ntsc/snes_ntsc_impl.h
+++ b/gfx/video_filters/snes_ntsc/snes_ntsc_impl.h
@@ -4,7 +4,6 @@
 
 /* Common implementation of NTSC filters */
 
-#include <retro_assert.h>
 #include <math.h>
 
 /* Copyright (C) 2006 Shay Green. This module is free software; you
@@ -119,9 +118,8 @@ static void init_filters( init_t* impl, snes_ntsc_setup_t const* setup )
 		sum = 1.0f / sum;
 		for ( i = 0; i < kernel_half * 2 + 1; i++ )
 		{
-			int x = kernel_size * 3 / 2 - kernel_half + i;
+			int x        = kernel_size * 3 / 2 - kernel_half + i;
 			kernels [x] *= sum;
-			retro_assert( kernels [x] == kernels [x] ); /* catch numerical instability */
 		}
 	}
 
@@ -147,17 +145,14 @@ static void init_filters( init_t* impl, snes_ntsc_setup_t const* setup )
 		/* normalize even and odd phases separately */
 		for ( i = 0; i < 2; i++ )
 		{
-			float sum = 0;
 			int x;
+			float sum = 0;
 			for ( x = i; x < kernel_size; x += 2 )
 				sum += kernels [x];
 
 			sum = 1.0f / sum;
 			for ( x = i; x < kernel_size; x += 2 )
-			{
 				kernels [x] *= sum;
-				retro_assert( kernels [x] == kernels [x] ); /* catch numerical instability */
-			}
 		}
 	}
 
diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c
index 1ed614a609..4a9fbeca60 100644
--- a/input/drivers/rwebinput_input.c
+++ b/input/drivers/rwebinput_input.c
@@ -19,7 +19,6 @@
 #include <string.h>
 
 #include <boolean.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <encodings/crc32.h>
 #include <encodings/utf.h>
@@ -205,12 +204,8 @@ static void rwebinput_generate_lut(void)
    int i;
    struct rarch_key_map *key_map;
 
-   retro_assert(ARRAY_SIZE(rarch_key_map_rwebinput) ==
-      ARRAY_SIZE(rwebinput_key_to_code_map) + 1);
-
    for (i = 0; i < ARRAY_SIZE(rwebinput_key_to_code_map); i++)
    {
-      int j;
       uint32_t crc;
       const rwebinput_key_to_code_map_entry_t *key_to_code =
          &rwebinput_key_to_code_map[i];
@@ -218,10 +213,6 @@ static void rwebinput_generate_lut(void)
       crc = encoding_crc32(0, (const uint8_t *)key_to_code->key,
          strlen(key_to_code->key));
 
-      /* sanity check: make sure there's no collisions */
-      for (j = 0; j < i; j++)
-         retro_assert(rarch_key_map_rwebinput[j].sym != crc);
-
       key_map->rk  = key_to_code->rk;
       key_map->sym = crc;
    }
@@ -246,7 +237,6 @@ static EM_BOOL rwebinput_keyboard_cb(int event_type,
       size_t new_max = MAX(1, rwebinput->keyboard.max_size << 1);
       rwebinput->keyboard.events = realloc(rwebinput->keyboard.events,
          new_max * sizeof(rwebinput->keyboard.events[0]));
-      retro_assert(rwebinput->keyboard.events != NULL);
       rwebinput->keyboard.max_size = new_max;
    }
 
diff --git a/input/input_driver.c b/input/input_driver.c
index 21d8588e26..f4faf08d61 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -23,7 +23,6 @@
 #include <string/stdstring.h>
 #include <encodings/utf.h>
 #include <clamping.h>
-#include <retro_assert.h>
 
 #include "input_driver.h"
 #include "input_keymaps.h"
@@ -560,8 +559,6 @@ bool input_driver_button_combo(
       retro_time_t current_time,
       input_bits_t* p_input)
 {
-   retro_assert(p_input  != NULL);
-
    switch (mode)
    {
       case INPUT_COMBO_DOWN_Y_L_R:
@@ -3290,9 +3287,6 @@ void input_config_reset(void)
    unsigned i;
    input_driver_state_t *input_st = &input_driver_st;
 
-   retro_assert(sizeof(input_config_binds[0]) >= sizeof(retro_keybinds_1));
-   retro_assert(sizeof(input_config_binds[1]) >= sizeof(retro_keybinds_rest));
-
    memcpy(input_config_binds[0], retro_keybinds_1, sizeof(retro_keybinds_1));
 
    for (i = 1; i < MAX_USERS; i++)
diff --git a/input/input_keymaps.c b/input/input_keymaps.c
index 512ec2d397..3ae68d5735 100644
--- a/input/input_keymaps.c
+++ b/input/input_keymaps.c
@@ -20,7 +20,6 @@
 #include <ctype.h>
 
 #include <compat/strl.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 
 #ifdef HAVE_CONFIG_H
@@ -2039,7 +2038,6 @@ void input_keymaps_translate_rk_to_str(enum retro_key key, char *buf, size_t siz
 {
    unsigned i;
 
-   retro_assert(size >= 2);
    *buf = '\0';
 
    if (key >= RETROK_a && key <= RETROK_z)
diff --git a/libretro-common/compat/compat_getopt.c b/libretro-common/compat/compat_getopt.c
index cec68d499b..2d1652236a 100644
--- a/libretro-common/compat/compat_getopt.c
+++ b/libretro-common/compat/compat_getopt.c
@@ -35,8 +35,6 @@
 #include <compat/strcasestr.h>
 #include <compat/posix_string.h>
 
-#include <retro_assert.h>
-
 char *optarg;
 int optind, opterr, optopt;
 
@@ -184,8 +182,6 @@ static void shuffle_block(char **begin, char **last, char **end)
    ptrdiff_t    len = last - begin;
    const char **tmp = (const char**)calloc(len, sizeof(const char*));
 
-   retro_assert(tmp);
-
    memcpy((void*)tmp, begin, len * sizeof(const char*));
    memmove(begin, last, (end - last) * sizeof(const char*));
    memcpy(end - len, tmp, len * sizeof(const char*));
@@ -198,8 +194,6 @@ int getopt_long(int argc, char *argv[],
 {
    int short_index, long_index;
 
-   (void)longindex;
-
    if (optind == 0)
       optind = 1;
 
@@ -227,8 +221,6 @@ int getopt_long(int argc, char *argv[],
       long_index = 0;
    }
 
-   retro_assert(short_index == 0 || long_index == 0);
-
    if (short_index == 0)
       return parse_short(optstring, &argv[optind]);
    if (long_index == 0)
diff --git a/libretro-common/file/file_path_io.c b/libretro-common/file/file_path_io.c
index 0003e785d8..d8f8187c8b 100644
--- a/libretro-common/file/file_path_io.c
+++ b/libretro-common/file/file_path_io.c
@@ -29,7 +29,6 @@
 
 #include <boolean.h>
 #include <file/file_path.h>
-#include <retro_assert.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <retro_miscellaneous.h>
diff --git a/libretro-common/formats/jpeg/rjpeg.c b/libretro-common/formats/jpeg/rjpeg.c
index 535888e8e4..166731c0ac 100644
--- a/libretro-common/formats/jpeg/rjpeg.c
+++ b/libretro-common/formats/jpeg/rjpeg.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <retro_assert.h>
 #include <retro_inline.h>
 #include <boolean.h>
 #include <formats/image.h>
@@ -412,7 +411,6 @@ static INLINE int rjpeg_jpeg_huff_decode(rjpeg_jpeg *j, rjpeg_huffman *h)
 
    /* convert the huffman code to the symbol id */
    c = ((j->code_buffer >> (32 - k)) & rjpeg_bmask[k]) + h->delta[k];
-   retro_assert((((j->code_buffer) >> (32 - h->size[c])) & rjpeg_bmask[h->size[c]]) == h->code[c]);
 
    /* convert the id to a symbol */
    j->code_bits -= k;
@@ -432,9 +430,8 @@ static INLINE int rjpeg_extend_receive(rjpeg_jpeg *j, int n)
    if (j->code_bits < n)
       rjpeg_grow_buffer_unsafe(j);
 
-   sgn = (int32_t)j->code_buffer >> 31; /* sign bit is always in MSB */
-   k = RJPEG_LROT(j->code_buffer, n);
-   retro_assert(n >= 0 && n < (int) (sizeof(rjpeg_bmask)/sizeof(*rjpeg_bmask)));
+   sgn             = (int32_t)j->code_buffer >> 31; /* sign bit is always in MSB */
+   k               = RJPEG_LROT(j->code_buffer, n);
    j->code_buffer  = k & ~rjpeg_bmask[n];
    k              &= rjpeg_bmask[n];
    j->code_bits   -= n;
diff --git a/libretro-common/formats/tga/rtga.c b/libretro-common/formats/tga/rtga.c
index 93a786ee0a..01b96e35a5 100644
--- a/libretro-common/formats/tga/rtga.c
+++ b/libretro-common/formats/tga/rtga.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <retro_assert.h>
 #include <retro_inline.h>
 
 #include <formats/image.h>
diff --git a/libretro-common/time/rtime.c b/libretro-common/time/rtime.c
index d66c228fbc..fee0dabcb7 100644
--- a/libretro-common/time/rtime.c
+++ b/libretro-common/time/rtime.c
@@ -22,7 +22,6 @@
 
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
-#include <retro_assert.h>
 #include <stdlib.h>
 #endif
 
@@ -41,8 +40,6 @@ void rtime_init(void)
 #ifdef HAVE_THREADS
    if (!rtime_localtime_lock)
       rtime_localtime_lock = slock_new();
-
-   retro_assert(rtime_localtime_lock);
 #endif
 }
 
diff --git a/libretro-common/vfs/vfs_implementation_uwp.cpp b/libretro-common/vfs/vfs_implementation_uwp.cpp
index 3458332471..529159461f 100644
--- a/libretro-common/vfs/vfs_implementation_uwp.cpp
+++ b/libretro-common/vfs/vfs_implementation_uwp.cpp
@@ -48,7 +48,6 @@
 #include <encodings/utf.h>
 #include <retro_miscellaneous.h>
 #include <file/file_path.h>
-#include <retro_assert.h>
 #include <string/stdstring.h>
 #include <retro_environment.h>
 #include <uwp/uwp_async.h>
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 87e6c8032b..0e3d97b821 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -18,7 +18,6 @@
 #include <compat/strl.h>
 #include <array/rbuf.h>
 #include <file/file_path.h>
-#include <retro_assert.h>
 #include <string/stdstring.h>
 #include <streams/file_stream.h>
 #include <lists/string_list.h>
@@ -5967,8 +5966,6 @@ static int action_ok_open_uwp_permission_settings(const char *path,
 {
 #ifdef __WINRT__
    uwp_open_broadfilesystemaccess_settings();
-#else
-   retro_assert(false);
 #endif
    return 0;
 }
@@ -5976,11 +5973,8 @@ static int action_ok_open_uwp_permission_settings(const char *path,
 static int action_ok_open_picker(const char *path,
    const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   int ret;
    char *new_path = NULL;
-   retro_assert(false);
-
-   ret = generic_action_ok_displaylist_push(path, new_path,
+   int ret        = generic_action_ok_displaylist_push(path, new_path,
       msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES),
       MENU_SETTING_ACTION_FAVORITES_DIR, idx,
       entry_idx, ACTION_OK_DL_CONTENT_LIST);
diff --git a/play_feature_delivery/play_feature_delivery.c b/play_feature_delivery/play_feature_delivery.c
index 1bcd3462a8..1bc7a5a32d 100644
--- a/play_feature_delivery/play_feature_delivery.c
+++ b/play_feature_delivery/play_feature_delivery.c
@@ -20,7 +20,6 @@
 
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
-#include <retro_assert.h>
 #include <stdlib.h>
 #endif
 
@@ -207,13 +206,8 @@ void play_feature_delivery_init(void)
 #ifdef HAVE_THREADS
    if (!state->enabled_lock)
       state->enabled_lock = slock_new();
-
-   retro_assert(state->enabled_lock);
-
    if (!state->status_lock)
-      state->status_lock = slock_new();
-
-   retro_assert(state->status_lock);
+      state->status_lock  = slock_new();
 #endif
 
    /* Note: Would like to cache whether this
diff --git a/playlist.c b/playlist.c
index 9b9e0ba4a2..6658c15a44 100644
--- a/playlist.c
+++ b/playlist.c
@@ -15,14 +15,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
 #include <libretro.h>
 #include <boolean.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <compat/posix_string.h>
 #include <string/stdstring.h>
@@ -2127,8 +2125,6 @@ static bool JSONEndArrayHandler(void *context)
 {
    JSONContext *pCtx = (JSONContext *)context;
 
-   retro_assert(pCtx->array_depth > 0);
-
    pCtx->array_depth--;
 
    if (pCtx->in_items && pCtx->array_depth == 0 && pCtx->object_depth <= 1)
@@ -2193,8 +2189,6 @@ static bool JSONEndObjectHandler(void *context)
                RBUF_LEN(pCtx->playlist->entries) + 1);
    }
 
-   retro_assert(pCtx->object_depth > 0);
-
    pCtx->object_depth--;
 
    return true;
diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c
index d07ff913ba..cb5114b945 100644
--- a/record/drivers/record_ffmpeg.c
+++ b/record/drivers/record_ffmpeg.c
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <retro_assert.h>
 #include <compat/msvc.h>
 #include <compat/strl.h>
 
@@ -869,22 +868,18 @@ static void ffmpeg_thread(void *data);
 
 static bool init_thread(ffmpeg_t *handle)
 {
-   handle->lock = slock_new();
-   handle->cond_lock = slock_new();
-   handle->cond = scond_new();
+   handle->lock       = slock_new();
+   handle->cond_lock  = slock_new();
+   handle->cond       = scond_new();
    handle->audio_fifo = fifo_new(32000 * sizeof(int16_t) *
          handle->params.channels * MAX_FRAMES / 60); /* Some arbitrary max size. */
-   handle->attr_fifo = fifo_new(sizeof(struct record_video_data) * MAX_FRAMES);
+   handle->attr_fifo  = fifo_new(sizeof(struct record_video_data) * MAX_FRAMES);
    handle->video_fifo = fifo_new(handle->params.fb_width * handle->params.fb_height *
             handle->video.pix_size * MAX_FRAMES);
 
-   handle->alive = true;
+   handle->alive     = true;
    handle->can_sleep = true;
-   handle->thread = sthread_create(ffmpeg_thread, handle);
-
-   retro_assert(handle->lock && handle->cond_lock &&
-      handle->cond && handle->audio_fifo &&
-      handle->attr_fifo && handle->video_fifo && handle->thread);
+   handle->thread    = sthread_create(ffmpeg_thread, handle);
 
    return true;
 }
@@ -1643,19 +1638,14 @@ static bool ffmpeg_finalize(void *data)
 
 static void ffmpeg_thread(void *data)
 {
-   size_t audio_buf_size;
-   void *audio_buf = NULL;
-   ffmpeg_t *ff    = (ffmpeg_t*)data;
+   ffmpeg_t *ff          = (ffmpeg_t*)data;
    /* For some reason, FFmpeg has a tendency to crash
     * if we don't overallocate a bit. */
-   void *video_buf = av_malloc(2 * ff->params.fb_width *
+   void *video_buf       = av_malloc(2 * ff->params.fb_width *
          ff->params.fb_height * ff->video.pix_size);
-
-   retro_assert(video_buf);
-
-   audio_buf_size = ff->config.audio_enable ?
+   size_t audio_buf_size = ff->config.audio_enable ?
       (ff->audio.codec->frame_size * ff->params.channels * sizeof(int16_t)) : 0;
-   audio_buf      = audio_buf_size ? av_malloc(audio_buf_size) : NULL;
+   void *audio_buf       = audio_buf_size ? av_malloc(audio_buf_size) : NULL;
 
    while (ff->alive)
    {
diff --git a/retroarch.c b/retroarch.c
index 1441ba95e7..bb6b9c932a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -81,7 +81,6 @@
 #include <compat/getopt.h>
 #include <compat/posix_string.h>
 #include <file/file_path.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <lists/dir_list.h>
 
@@ -5861,7 +5860,6 @@ void retroarch_fail(int error_code, const char *error)
    /* We cannot longjmp unless we're in retroarch_main_init().
     * If not, something went very wrong, and we should
     * just exit right away. */
-   retro_assert(global->error_on_init);
    strlcpy(global->error_string,
          error, sizeof(global->error_string));
    longjmp(global->error_sjlj_context, error_code);
diff --git a/runloop.c b/runloop.c
index 0814f48c45..1755a510ca 100644
--- a/runloop.c
+++ b/runloop.c
@@ -84,7 +84,6 @@
 #include <compat/posix_string.h>
 #include <streams/file_stream.h>
 #include <file/file_path.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <queues/message_queue.h>
 #include <lists/dir_list.h>
@@ -3486,7 +3485,6 @@ static bool init_libretro_symbols(
                /* for a secondary core, we already have a
                 * primary library loaded, so we can skip
                 * some checks and just load the library */
-               retro_assert(lib_path != NULL && lib_handle_p != NULL);
                lib_handle_local = dylib_load(lib_path);
 
                if (!lib_handle_local)
@@ -8987,7 +8985,6 @@ void runloop_path_set_special(char **argv, unsigned num_content)
    string_list_initialize(&subsystem_paths);
 
    runloop_st->subsystem_fullpaths     = string_list_new();
-   retro_assert(runloop_st->subsystem_fullpaths);
 
    attr.i = 0;
 
diff --git a/tasks/task_bluetooth.c b/tasks/task_bluetooth.c
index f1e32aa97b..9ffa21950a 100644
--- a/tasks/task_bluetooth.c
+++ b/tasks/task_bluetooth.c
@@ -14,7 +14,6 @@
 
 #include <string.h>
 #include <compat/strl.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
 
diff --git a/tasks/task_content.c b/tasks/task_content.c
index f9fb184fc7..261bafbedd 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -60,7 +60,6 @@
 #include <array/rbuf.h>
 
 #include <retro_miscellaneous.h>
-#include <retro_assert.h>
 
 #ifdef HAVE_MENU
 #include "../menu/menu_driver.h"
@@ -1418,8 +1417,6 @@ static bool content_load(content_ctx_info_t *info,
       malloc(sizeof(*wrap_args))))
       return false;
 
-   retro_assert(wrap_args);
-
    wrap_args->argv           = NULL;
    wrap_args->content_path   = NULL;
    wrap_args->sram_path      = NULL;
diff --git a/tasks/task_http.c b/tasks/task_http.c
index f4eb9704f7..efa2c27e30 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -406,7 +406,6 @@ void* task_push_http_transfer_with_user_agent(const char *url, bool mute,
    if (user_agent)
       net_http_connection_set_user_agent(conn, user_agent);
 
-   /* assert: task_push_http_transfer_generic will free conn on failure */
    return task_push_http_transfer_generic(conn, url, mute, type, cb, user_data);
 }
 
@@ -425,7 +424,6 @@ void* task_push_http_transfer_with_headers(const char *url, bool mute,
    if (headers)
       net_http_connection_set_headers(conn, headers);
 
-   /* assert: task_push_http_transfer_generic will free conn on failure */
    return task_push_http_transfer_generic(conn, url, mute, type, cb, user_data);
 }
 
@@ -456,7 +454,6 @@ void* task_push_http_post_transfer_with_user_agent(const char *url,
    if (user_agent)
       net_http_connection_set_user_agent(conn, user_agent);
 
-   /* assert: task_push_http_transfer_generic will free conn on failure */
    return task_push_http_transfer_generic(conn, url, mute, type, cb, user_data);
 }
 
@@ -476,7 +473,6 @@ void* task_push_http_post_transfer_with_headers(const char *url,
    if (headers)
       net_http_connection_set_headers(conn, headers);
 
-   /* assert: task_push_http_transfer_generic will free conn on failure */
    return task_push_http_transfer_generic(conn, url, mute, type, cb, user_data);
 }
 
diff --git a/tasks/task_save.c b/tasks/task_save.c
index 85b23650bd..87a23f4365 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <compat/strl.h>
-#include <retro_assert.h>
 #include <lists/string_list.h>
 #include <streams/interface_stream.h>
 #include <streams/file_stream.h>
@@ -2132,7 +2131,6 @@ void path_deinit_savefile(void)
 void path_init_savefile_new(void)
 {
    task_save_files = string_list_new();
-   retro_assert(task_save_files);
 }
 
 void *savefile_ptr_get(void)
diff --git a/tasks/task_wifi.c b/tasks/task_wifi.c
index 767a71e3f1..ad5a8e5be9 100644
--- a/tasks/task_wifi.c
+++ b/tasks/task_wifi.c
@@ -15,7 +15,6 @@
 
 #include <string.h>
 #include <compat/strl.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
 
diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index c54c6c0358..a8fc9958e0 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -17,8 +17,6 @@
 #import <AvailabilityMacros.h>
 #include <sys/stat.h>
 
-#include <retro_assert.h>
-
 #include "cocoa_common.h"
 #include "apple_platform.h"
 #include "../ui_cocoa.h"
diff --git a/ui/drivers/ui_qt.h b/ui/drivers/ui_qt.h
index aaacd70ad1..f32a8ed52b 100644
--- a/ui/drivers/ui_qt.h
+++ b/ui/drivers/ui_qt.h
@@ -53,7 +53,6 @@ extern "C" {
 #include "../../config.h"
 #endif
 
-#include <retro_assert.h>
 #include <retro_common_api.h>
 #include <queues/task_queue.h>
 
@@ -182,7 +181,7 @@ class ThumbnailWidget : public QStackedWidget
 public:
    ThumbnailWidget(QWidget *parent = 0);
    ThumbnailWidget(ThumbnailType type, QWidget *parent = 0);
-   ThumbnailWidget(const ThumbnailWidget& other) { retro_assert(false && "DONT EVER USE THIS"); }
+   ThumbnailWidget(const ThumbnailWidget& other) { /* DONT EVER USE THIS */ }
 
    void setPixmap(const QPixmap &pixmap, bool acceptDrops);
 signals: