RFC: Retroarch preset inject

gfx/drivers_shader/glslang_util.c

@@ -97,8 +97,89 @@ enum slang_texture_semantic slang_name_to_texture_semantic_array(
    return SLANG_INVALID_TEXTURE_SEMANTIC;
 }
 
+/* inj_to_define
+ * check if str is in format inj_char KEY = VALUE
+ * (spaces are not mandatory)
+ * returns true if str is in that format and fills "value" ans "key" accordingly
+*/
+bool inj_to_define(char *str, char *key, char *value, char inj_char) {
+   // remove spaces tabs and double quotes
+   int i = 0, j = 0;
+   while (str[i] != '\0') {
+      if (str[i] != ' ' && str[i] != '"' && str[i] != '\t') {
+      str[j++] = str[i];
+      }
+      i++;
+   }
+   str[j] = '\0';
+
+   // Does it start with inj_char
+   if (*str != inj_char) return false;
+
+   // Is it in format KEY=VALUE now?
+   char *eq_pos = strchr(str, '=');
+   if (!eq_pos) return false;
+
+   // Extract KEY,VALUE
+   *eq_pos = '\0';             // Substitute '=' with \0 to divide key and value
+   strcpy(key, str + 1);       // copy key skipping inj_char
+   strcpy(value, eq_pos + 1);  // copy value
+
+   return true;
+}
+
+bool inject(const char *inject_file, struct string_list *output, const char *inject_prefix){
+
+   /* Read inject file contents */
+   union string_list_elem_attr attr;
+   uint8_t *buf              = NULL;
+   int64_t buf_len           = 0;
+   struct string_list lines  = {0};
+   bool    ret               = false;
+
+   if (filestream_read_file(inject_file, (void**)&buf, &buf_len)) {
+      string_list_initialize(&lines);  
+      ret = string_separate_noalloc(&lines, (char*)buf, "\n");
+   }
+
+   if (buf) 
+      free(buf);
+   if (!ret) 
+      return false;
+   if (lines.size < 1)
+      goto error;
+
+   /* Cycle through its lines searching for matching format (*KEY = VALUE) */
+   for (size_t j = 0; j < lines.size; j++) {
+      char *line   = lines.elems[j].data;
+      char inj_key[100];
+      char inj_value[100];
+      char tmp[350];  //size of: #undef $inj_key \n #define $inj_key $inj_value 
+      tmp[0] = '\0';
+      attr.i = 0;
+
+      /* Inject them */
+      if (inj_to_define(line, inj_key, inj_value, *inject_prefix )) { 
+         snprintf(tmp, sizeof(tmp), "#undef %s", inj_key);
+         RARCH_DBG("[shader]: Injected #undef %s\n", inj_key);
+         if (!string_list_append(output, tmp, attr)) goto error;
+
+         snprintf(tmp, sizeof(tmp), "#define %s %s", inj_key, inj_value);
+         if (!string_list_append(output, tmp, attr)) goto error;       
+         RARCH_DBG("[shader]: Injected #define %s %s\n", inj_key, inj_value);
+      }
+
+   }
+
+   return true;
+
+   error:
+      string_list_deinitialize(&lines);
+      return false;
+}
+
 bool glslang_read_shader_file(const char *path,
-      struct string_list *output, bool root_file)
+      struct string_list *output, bool root_file, const char *preset_path)
 {
    size_t i;
    char tmp[PATH_MAX_LENGTH];
@@ -186,7 +267,25 @@ bool glslang_read_shader_file(const char *path,
    for (i = root_file ? 1 : 0; i < lines.size; i++)
    {
       const char *line   = lines.elems[i].data;
-
+
+      const char inject_prefix[] = "*" ;
+      const char preset_defines_keyword[] = "#pragma inject_preset_code";
+
+      /* Check for injection directives*/
+      if (!strncmp(preset_defines_keyword, line, STRLEN_CONST(preset_defines_keyword)) && preset_path != NULL )
+      {
+         /* From preset path */
+         inject(preset_path, output, inject_prefix);
+         /* ...and from inc file */
+         /* Strip existing extension and append .inc */
+         char *inc_file_path = strdup(preset_path); 
+         char *p_ptr = strrchr(inc_file_path, '.');
+         if (p_ptr != NULL) *p_ptr = '\0';
+         strcat(inc_file_path, ".inc");
+         if (filestream_exists(inc_file_path)) //Does the inc file exist?
+            inject(inc_file_path, output, inject_prefix); //Inject
+      }
+
       /* Check for 'include' statements */
       if (!strncmp("#include ", line, STRLEN_CONST("#include ")))
       {
@@ -209,7 +308,7 @@ bool glslang_read_shader_file(const char *path,
                include_path, path, include_file, sizeof(include_path));
 
          /* Parse include file */
-         if (!glslang_read_shader_file(include_path, output, false))
+         if (!glslang_read_shader_file(include_path, output, false, preset_path))
             goto error;
 
          /* After including a file, use line directive
@@ -239,13 +338,25 @@ bool glslang_read_shader_file(const char *path,
             goto error;
    }
 
+   /* 
+      if (preset_path != NULL) {
+      RARCH_LOG("RAW SHADER------------------------------------------\n");
+      for (size_t i = 0; i < output -> size; i++)
+      {
+         const char *line = output -> elems[i].data;
+         RARCH_LOG("    %s\n", line);
+      }
+      RARCH_LOG("/RAW SHADER------------------------------------------/\n");
+   }
+
+   */
    string_list_deinitialize(&lines);
-
    return true;
 
 error:
    string_list_deinitialize(&lines);
    return false;
+
 }
 
 const char *glslang_format_to_string(enum glslang_format fmt)

gfx/drivers_shader/glslang_util.h

@@ -121,7 +121,7 @@ const char *glslang_format_to_string(glslang_format fmt);
 enum glslang_format glslang_find_format(const char *fmt);
 
 bool glslang_read_shader_file(const char *path,
-      struct string_list *output, bool root_file);
+      struct string_list *output, bool root_file, const char *preset_path);
 
 bool slang_texture_semantic_is_array(enum slang_texture_semantic sem);
 

gfx/drivers_shader/glslang_util_cxx.cpp

@@ -210,17 +210,17 @@ bool glslang_parse_meta(const struct string_list *lines, glslang_meta *meta)
    return true;
 }
 
-bool glslang_compile_shader(const char *shader_path, glslang_output *output)
+bool glslang_compile_shader(const char *shader_path, glslang_output *output, const char *preset_path)
 {
 #if defined(HAVE_GLSLANG)
    struct string_list lines;
-   
+
    if (!string_list_initialize(&lines))
       return false;
 
    RARCH_LOG("[slang]: Compiling shader: \"%s\".\n", shader_path);
 
-   if (!glslang_read_shader_file(shader_path, &lines, true))
+   if (!glslang_read_shader_file(shader_path, &lines, true, preset_path))
       goto error;
    output->meta = glslang_meta{};
    if (!glslang_parse_meta(&lines, &output->meta))

gfx/drivers_shader/glslang_util_cxx.h

@@ -53,7 +53,7 @@ struct glslang_output
    glslang_meta meta;
 };
 
-bool glslang_compile_shader(const char *shader_path, glslang_output *output);
+bool glslang_compile_shader(const char *shader_path, glslang_output *output, const char *preset_path);
 
 /* Helpers for internal use. */
 bool glslang_parse_meta(const struct string_list *lines, glslang_meta *meta);

gfx/drivers_shader/shader_gl3.cpp

@@ -213,7 +213,7 @@ static uint32_t gl3_get_cross_compiler_target_version(void)
 #ifdef HAVE_OPENGLES3
    if (!version || sscanf(version, "OpenGL ES %u.%u", &major, &minor) != 2)
       return 300;
-   
+
    if (major == 2 && minor == 0)
       return 100;
 #else
@@ -2153,7 +2153,7 @@ bool gl3_filter_chain::init_feedback()
 bool gl3_filter_chain::init_alias()
 {
    int i;
-    
+
    common.texture_semantic_map.clear();
    common.texture_semantic_uniform_map.clear();
 
@@ -2517,7 +2517,7 @@ gl3_filter_chain_t *gl3_filter_chain_create_from_preset(
       pass_info.address       = GLSLANG_FILTER_CHAIN_ADDRESS_REPEAT;
       pass_info.max_levels    = 0;
 
-      if (!glslang_compile_shader(pass->source.path, &output))
+      if (!glslang_compile_shader(pass->source.path, &output, path))
       {
          RARCH_ERR("[GLCore]: Failed to compile shader: \"%s\".\n",
                pass->source.path);

gfx/drivers_shader/shader_vulkan.cpp

@@ -1484,7 +1484,7 @@ bool vulkan_filter_chain::init_feedback()
 bool vulkan_filter_chain::init_alias()
 {
    int i;
-   
+
    common.texture_semantic_map.clear();
    common.texture_semantic_uniform_map.clear();
 
@@ -3082,7 +3082,7 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset(
       pass_info.address       = GLSLANG_FILTER_CHAIN_ADDRESS_REPEAT;
       pass_info.max_levels    = 0;
 
-      if (!glslang_compile_shader(pass->source.path, &output))
+      if (!glslang_compile_shader(pass->source.path, &output, path ))
       {
          RARCH_ERR("[Vulkan]: Failed to compile shader: \"%s\".\n",
                pass->source.path);

gfx/drivers_shader/slang_process.cpp

@@ -391,11 +391,11 @@ bool slang_preprocess_parse_parameters(const char *shader_path,
 {
    glslang_meta meta;
    struct string_list lines = {0};
-   
+
    if (!string_list_initialize(&lines))
       goto error;
 
-   if (!glslang_read_shader_file(shader_path, &lines, true))
+   if (!glslang_read_shader_file(shader_path, &lines, true, NULL))
       goto error;
    meta = glslang_meta{};
    if (!glslang_parse_meta(&lines, &meta))
@@ -422,7 +422,7 @@ bool slang_process(
    Compiler*          ps_compiler = NULL;
    video_shader_pass& pass        = shader_info->pass[pass_number];
 
-   if (!glslang_compile_shader(pass.source.path, &output))
+   if (!glslang_compile_shader(pass.source.path, &output, shader_info->loaded_preset_path))
       return false;
 
    if (!slang_preprocess_parse_parameters(output.meta, shader_info))