Add on-screen error on auto shader preset load failures

Author: sonninnos

gfx/drivers_shader/glslang_util_cxx.cpp

@@ -33,6 +33,8 @@
 #if defined(HAVE_GLSLANG)
 #include "glslang.hpp"
 #endif
+
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 static std::string build_stage_source(
@@ -248,5 +250,16 @@ bool glslang_compile_shader(const char *shader_path, glslang_output *output)
    string_list_deinitialize(&lines);
 #endif
 
+   {
+      size_t _len;
+      char msg[NAME_MAX_LENGTH];
+
+      _len = snprintf(msg, sizeof(msg), "Failed to compile shader: \"%s\".",
+            path_basename(shader_path));
+
+      runloop_msg_queue_push(msg, _len, 1, 120, true, NULL,
+            MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_ERROR);
+   }
+
    return false;
 }

gfx/drivers_shader/shader_glsl.c

@@ -1229,6 +1229,17 @@ static void *gl_glsl_init(void *data, const char *path)
    if (glsl)
       free(glsl);
 
+   {
+      size_t _len;
+      char msg[NAME_MAX_LENGTH];
+
+      _len = snprintf(msg, sizeof(msg), "Failed to compile shader: \"%s\".",
+            path_basename(path));
+
+      runloop_msg_queue_push(msg, _len, 1, 120, true, NULL,
+            MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_ERROR);
+   }
+
    return NULL;
 }
 

gfx/video_shader_parse.c

@@ -3062,13 +3062,11 @@ bool video_shader_apply_shader(
 #endif
 
    /* Display error message */
-   _len = fill_pathname_join_delim(msg,
+   _len = snprintf(msg, sizeof(msg), "%s \"%s\".",
          msg_hash_to_str(MSG_FAILED_TO_APPLY_SHADER_PRESET),
-         preset_file ? preset_file : "null",
-         ' ',
-         sizeof(msg));
+         preset_file ? preset_file : "null");
 
-   runloop_msg_queue_push(msg, _len, 1, 180, true, NULL,
+   runloop_msg_queue_push(msg, _len, 1, 120, true, NULL,
          MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_ERROR);
    return false;
 }
@@ -3125,7 +3123,7 @@ const char *video_shader_get_current_shader_preset(void)
                      runloop_st->runtime_shader_preset_path,
                      sizeof(runloop_st->runtime_shader_preset_path)))
             {
-               RARCH_LOG("[Shaders] Specific shader preset found at \"%s\".\n",
+               RARCH_LOG("[Shaders] Shader preset found at \"%s\".\n",
                      runloop_st->runtime_shader_preset_path);
             }
          }

menu/menu_driver.c

@@ -7087,6 +7087,19 @@ bool menu_shader_manager_init(void)
    }
 
 end:
+
+   if (!ret)
+   {
+      size_t _len;
+      char msg[NAME_MAX_LENGTH];
+
+      _len = snprintf(msg, sizeof(msg), "Could not read shader preset: \"%s\".",
+            path_basename(path_shader));
+
+      runloop_msg_queue_push(msg, _len, 1, 120, true, NULL,
+            MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_ERROR);
+   }
+
    video_st->menu_driver_shader = menu_shader;
    command_event(CMD_EVENT_SHADER_PRESET_LOADED, NULL);
    return ret;