mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 05:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly namespace video_shader_parse.c functions

Browse Source
This commit is contained in:
twinaphex 2015-01-19 21:09:39 +01:00
parent 0d89ef49d6
commit b0548e1329
9 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/d3d/d3d.cpp
View File

@ -618,7 +618,7 @@ static bool d3d_construct(d3d_video_t *d3d,
* to avoid set_shader() to be overridden * to avoid set_shader() to be overridden
* later. */ * later. */
enum rarch_shader_type type = enum rarch_shader_type type =
gfx_shader_parse_type(g_settings.video.shader_path, RARCH_SHADER_NONE); video_shader_parse_type(g_settings.video.shader_path, RARCH_SHADER_NONE);
if (g_settings.video.shader_enable && type == RARCH_SHADER_CG) if (g_settings.video.shader_enable && type == RARCH_SHADER_CG)
d3d->cg_shader = g_settings.video.shader_path; d3d->cg_shader = g_settings.video.shader_path;
@ -1149,7 +1149,7 @@ static bool d3d_init_multipass(d3d_video_t *d3d)
memset(&d3d->shader, 0, sizeof(d3d->shader)); memset(&d3d->shader, 0, sizeof(d3d->shader));
if (!gfx_shader_read_conf_cgp(conf, &d3d->shader)) if (!video_shader_read_conf_cgp(conf, &d3d->shader))
{ {
config_file_free(conf); config_file_free(conf);
RARCH_ERR("Failed to parse CGP file.\n"); RARCH_ERR("Failed to parse CGP file.\n");
@ -1158,7 +1158,7 @@ static bool d3d_init_multipass(d3d_video_t *d3d)
config_file_free(conf); config_file_free(conf);
gfx_shader_resolve_relative(&d3d->shader, d3d->cg_shader.c_str()); video_shader_resolve_relative(&d3d->shader, d3d->cg_shader.c_str());
RARCH_LOG("[D3D9 Meta-Cg] Found %u shaders.\n", d3d->shader.passes); RARCH_LOG("[D3D9 Meta-Cg] Found %u shaders.\n", d3d->shader.passes);

2
gfx/drivers/gl.c
View File

@ -224,7 +224,7 @@ static bool gl_shader_init(gl_t *gl)
return false; return false;
} }
type = gfx_shader_parse_type(shader_path, type = video_shader_parse_type(shader_path,
gl->core_context ? RARCH_SHADER_GLSL : DEFAULT_SHADER_TYPE); gl->core_context ? RARCH_SHADER_GLSL : DEFAULT_SHADER_TYPE);
if (type == RARCH_SHADER_NONE) if (type == RARCH_SHADER_NONE)

8
gfx/drivers_shader/shader_gl_cg.c
View File

@ -590,7 +590,7 @@ static bool load_plain(cg_shader_data_t *cg, const char *path)
cg->prg[1] = cg->prg[0]; cg->prg[1] = cg->prg[0];
} }
gfx_shader_resolve_parameters(NULL, cg->cg_shader); video_shader_resolve_parameters(NULL, cg->cg_shader);
return true; return true;
} }
@ -676,15 +676,15 @@ static bool load_preset(cg_shader_data_t *cg, const char *path)
if (!cg->cg_shader) if (!cg->cg_shader)
return false; return false;
if (!gfx_shader_read_conf_cgp(conf, cg->cg_shader)) if (!video_shader_read_conf_cgp(conf, cg->cg_shader))
{ {
RARCH_ERR("Failed to parse CGP file.\n"); RARCH_ERR("Failed to parse CGP file.\n");
config_file_free(conf); config_file_free(conf);
return false; return false;
} }
gfx_shader_resolve_relative(cg->cg_shader, path); video_shader_resolve_relative(cg->cg_shader, path);
gfx_shader_resolve_parameters(conf, cg->cg_shader); video_shader_resolve_parameters(conf, cg->cg_shader);
config_file_free(conf); config_file_free(conf);
if (cg->cg_shader->passes > GFX_MAX_SHADERS - 3) if (cg->cg_shader->passes > GFX_MAX_SHADERS - 3)

6
gfx/drivers_shader/shader_glsl.c
View File

@ -764,7 +764,7 @@ static bool gl_glsl_init(void *data, const char *path)
conf = config_file_new(path); conf = config_file_new(path);
if (conf) if (conf)
{ {
ret = gfx_shader_read_conf_cgp(conf, glsl->glsl_shader); ret = video_shader_read_conf_cgp(conf, glsl->glsl_shader);
glsl->glsl_shader->modern = true; glsl->glsl_shader->modern = true;
} }
else else
@ -792,8 +792,8 @@ static bool gl_glsl_init(void *data, const char *path)
glsl->glsl_shader->modern = true; glsl->glsl_shader->modern = true;
} }
gfx_shader_resolve_relative(glsl->glsl_shader, path); video_shader_resolve_relative(glsl->glsl_shader, path);
gfx_shader_resolve_parameters(conf, glsl->glsl_shader); video_shader_resolve_parameters(conf, glsl->glsl_shader);
if (conf) if (conf)
{ {

2
gfx/drivers_shader/shader_hlsl.c
View File

@ -316,7 +316,7 @@ static bool load_preset(hlsl_shader_data_t *hlsl, void *data, const char *path)
if (!hlsl->cg_shader) if (!hlsl->cg_shader)
return false; return false;
if (!gfx_shader_read_conf_cgp(conf, hlsl->cg_shader)) if (!video_shader_read_conf_cgp(conf, hlsl->cg_shader))
{ {
RARCH_ERR("Failed to parse CGP file.\n"); RARCH_ERR("Failed to parse CGP file.\n");
config_file_free(conf); config_file_free(conf);

44
gfx/video_shader_parse.c
View File

@ -73,7 +73,7 @@ static enum gfx_wrap_type wrap_str_to_mode(const char *wrap_mode)
} }
/** /**
* shader_parse_pass: * video_shader_parse_pass:
* @conf : Preset file to read from. * @conf : Preset file to read from.
* @pass : Shader passes handle. * @pass : Shader passes handle.
* @i : Index of shader pass. * @i : Index of shader pass.
@ -82,7 +82,7 @@ static enum gfx_wrap_type wrap_str_to_mode(const char *wrap_mode)
* *
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
static bool shader_parse_pass(config_file_t *conf, struct gfx_shader_pass *pass, unsigned i) static bool video_shader_parse_pass(config_file_t *conf, struct gfx_shader_pass *pass, unsigned i)
{ {
char shader_name[64], filter_name_buf[64], wrap_name_buf[64], wrap_mode[64]; char shader_name[64], filter_name_buf[64], wrap_name_buf[64], wrap_mode[64];
char frame_count_mod_buf[64], srgb_output_buf[64], fp_fbo_buf[64]; char frame_count_mod_buf[64], srgb_output_buf[64], fp_fbo_buf[64];
@ -244,7 +244,7 @@ static bool shader_parse_pass(config_file_t *conf, struct gfx_shader_pass *pass,
} }
/** /**
* shader_parse_textures: * video_shader_parse_textures:
* @conf : Preset file to read from. * @conf : Preset file to read from.
* @shader : Shader pass handle. * @shader : Shader pass handle.
* *
@ -252,7 +252,7 @@ static bool shader_parse_pass(config_file_t *conf, struct gfx_shader_pass *pass,
* *
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
static bool shader_parse_textures(config_file_t *conf, static bool video_shader_parse_textures(config_file_t *conf,
struct gfx_shader *shader) struct gfx_shader *shader)
{ {
const char *id; const char *id;
@ -303,7 +303,7 @@ static bool shader_parse_textures(config_file_t *conf,
} }
/** /**
* shader_parse_find_parameter: * video_shader_parse_find_parameter:
* @params : Shader parameter handle. * @params : Shader parameter handle.
* @num_params : Number of shader params in @params. * @num_params : Number of shader params in @params.
* @id : Identifier to search for. * @id : Identifier to search for.
@ -312,7 +312,7 @@ static bool shader_parse_textures(config_file_t *conf,
* *
* Returns: handle to shader parameter if successful, otherwise NULL. * Returns: handle to shader parameter if successful, otherwise NULL.
**/ **/
static struct gfx_shader_parameter *shader_parse_find_parameter( static struct video_shader_parameter *video_shader_parse_find_parameter(
struct gfx_shader_parameter *params, unsigned num_params, const char *id) struct gfx_shader_parameter *params, unsigned num_params, const char *id)
{ {
unsigned i; unsigned i;
@ -327,7 +327,7 @@ static struct gfx_shader_parameter *shader_parse_find_parameter(
} }
/** /**
* gfx_shader_resolve_parameters: * video_shader_resolve_parameters:
* @conf : Preset file to read from. * @conf : Preset file to read from.
* @shader : Shader passes handle. * @shader : Shader passes handle.
* *
@ -335,7 +335,7 @@ static struct gfx_shader_parameter *shader_parse_find_parameter(
* *
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool gfx_shader_resolve_parameters(config_file_t *conf, bool video_shader_resolve_parameters(config_file_t *conf,
struct gfx_shader *shader) struct gfx_shader *shader)
{ {
unsigned i; unsigned i;
@ -399,7 +399,7 @@ bool gfx_shader_resolve_parameters(config_file_t *conf,
id = strtok_r(NULL, ";", &save)) id = strtok_r(NULL, ";", &save))
{ {
struct gfx_shader_parameter *parameter = (struct gfx_shader_parameter*) struct gfx_shader_parameter *parameter = (struct gfx_shader_parameter*)
shader_parse_find_parameter(shader->parameters, shader->num_parameters, id); video_shader_parse_find_parameter(shader->parameters, shader->num_parameters, id);
if (!parameter) if (!parameter)
{ {
@ -416,7 +416,7 @@ bool gfx_shader_resolve_parameters(config_file_t *conf,
} }
/** /**
* shader_parse_imports: * video_shader_parse_imports:
* @conf : Preset file to read from. * @conf : Preset file to read from.
* @shader : Shader passes handle. * @shader : Shader passes handle.
* *
@ -424,7 +424,7 @@ bool gfx_shader_resolve_parameters(config_file_t *conf,
* *
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
static bool shader_parse_imports(config_file_t *conf, static bool video_shader_parse_imports(config_file_t *conf,
struct gfx_shader *shader) struct gfx_shader *shader)
{ {
char imports[1024]; char imports[1024];
@ -525,7 +525,7 @@ static bool shader_parse_imports(config_file_t *conf,
} }
/** /**
* gfx_shader_read_conf_cgp: * video_shader_read_conf_cgp:
* @conf : Preset file to read from. * @conf : Preset file to read from.
* @shader : Shader passes handle. * @shader : Shader passes handle.
* *
@ -534,7 +534,7 @@ static bool shader_parse_imports(config_file_t *conf,
* *
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool gfx_shader_read_conf_cgp(config_file_t *conf, struct gfx_shader *shader) bool video_shader_read_conf_cgp(config_file_t *conf, struct gfx_shader *shader)
{ {
unsigned shaders, i; unsigned shaders, i;
@ -557,14 +557,14 @@ bool gfx_shader_read_conf_cgp(config_file_t *conf, struct gfx_shader *shader)
shader->passes = min(shaders, GFX_MAX_SHADERS); shader->passes = min(shaders, GFX_MAX_SHADERS);
for (i = 0; i < shader->passes; i++) for (i = 0; i < shader->passes; i++)
{ {
if (!shader_parse_pass(conf, &shader->pass[i], i)) if (!video_shader_parse_pass(conf, &shader->pass[i], i))
return false; return false;
} }
if (!shader_parse_textures(conf, shader)) if (!video_shader_parse_textures(conf, shader))
return false; return false;
if (!shader_parse_imports(conf, shader)) if (!video_shader_parse_imports(conf, shader))
return false; return false;
return true; return true;
@ -693,14 +693,14 @@ static void shader_write_variable(config_file_t *conf,
} }
/** /**
* gfx_shader_write_conf_cgp: * video_shader_write_conf_cgp:
* @conf : Preset file to read from. * @conf : Preset file to read from.
* @shader : Shader passes handle. * @shader : Shader passes handle.
* *
* Saves preset and all associated state (passes, * Saves preset and all associated state (passes,
* textures, imports, etc) to disk. * textures, imports, etc) to disk.
**/ **/
void gfx_shader_write_conf_cgp(config_file_t *conf, void video_shader_write_conf_cgp(config_file_t *conf,
struct gfx_shader *shader) struct gfx_shader *shader)
{ {
unsigned i; unsigned i;
@ -819,7 +819,7 @@ void gfx_shader_write_conf_cgp(config_file_t *conf,
} }
/** /**
* gfx_shader_parse_type: * video_shader_parse_type:
* @path : Shader path. * @path : Shader path.
* @fallback : Fallback shader type in case no * @fallback : Fallback shader type in case no
* type could be found. * type could be found.
@ -829,7 +829,7 @@ void gfx_shader_write_conf_cgp(config_file_t *conf,
* Returns: value of shader type on success, otherwise will return * Returns: value of shader type on success, otherwise will return
* user-supplied @fallback value. * user-supplied @fallback value.
**/ **/
enum rarch_shader_type gfx_shader_parse_type(const char *path, enum rarch_shader_type video_shader_parse_type(const char *path,
enum rarch_shader_type fallback) enum rarch_shader_type fallback)
{ {
const char *ext = NULL; const char *ext = NULL;
@ -848,14 +848,14 @@ enum rarch_shader_type gfx_shader_parse_type(const char *path,
} }
/** /**
* gfx_shader_resolve_relative: * video_shader_resolve_relative:
* @shader : Shader pass handle. * @shader : Shader pass handle.
* @ref_path : Relative shader path. * @ref_path : Relative shader path.
* *
* Resolves relative shader path (@ref_path) into absolute * Resolves relative shader path (@ref_path) into absolute
* shader paths. * shader paths.
**/ **/
void gfx_shader_resolve_relative(struct gfx_shader *shader, void video_shader_resolve_relative(struct gfx_shader *shader,
const char *ref_path) const char *ref_path)
{ {
unsigned i; unsigned i;

20
gfx/video_shader_parse.h
View File

@ -153,7 +153,7 @@ struct gfx_shader
}; };
/** /**
* gfx_shader_read_conf_cgp: * video_shader_read_conf_cgp:
* @conf : Preset file to read from. * @conf : Preset file to read from.
* @shader : Shader passes handle. * @shader : Shader passes handle.
* *
@ -162,33 +162,33 @@ struct gfx_shader
* *
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool gfx_shader_read_conf_cgp(config_file_t *conf, bool video_shader_read_conf_cgp(config_file_t *conf,
struct gfx_shader *shader); struct gfx_shader *shader);
/** /**
* gfx_shader_write_conf_cgp: * video_shader_write_conf_cgp:
* @conf : Preset file to read from. * @conf : Preset file to read from.
* @shader : Shader passes handle. * @shader : Shader passes handle.
* *
* Saves preset and all associated state (passes, * Saves preset and all associated state (passes,
* textures, imports, etc) to disk. * textures, imports, etc) to disk.
**/ **/
void gfx_shader_write_conf_cgp(config_file_t *conf, void video_shader_write_conf_cgp(config_file_t *conf,
struct gfx_shader *shader); struct gfx_shader *shader);
/** /**
* gfx_shader_resolve_relative: * video_shader_resolve_relative:
* @shader : Shader pass handle. * @shader : Shader pass handle.
* @ref_path : Relative shader path. * @ref_path : Relative shader path.
* *
* Resolves relative shader path (@ref_path) into absolute * Resolves relative shader path (@ref_path) into absolute
* shader paths. * shader paths.
**/ **/
void gfx_shader_resolve_relative(struct gfx_shader *shader, void video_shader_resolve_relative(struct gfx_shader *shader,
const char *ref_path); const char *ref_path);
/** /**
* gfx_shader_resolve_parameters: * video_shader_resolve_parameters:
* @conf : Preset file to read from. * @conf : Preset file to read from.
* @shader : Shader passes handle. * @shader : Shader passes handle.
* *
@ -196,11 +196,11 @@ void gfx_shader_resolve_relative(struct gfx_shader *shader,
* *
* Returns: true (1) if successful, otherwise false (0). * Returns: true (1) if successful, otherwise false (0).
**/ **/
bool gfx_shader_resolve_parameters(config_file_t *conf, bool video_shader_resolve_parameters(config_file_t *conf,
struct gfx_shader *shader); struct gfx_shader *shader);
/** /**
* gfx_shader_parse_type: * video_shader_parse_type:
* @path : Shader path. * @path : Shader path.
* @fallback : Fallback shader type in case no * @fallback : Fallback shader type in case no
* type could be found. * type could be found.
@ -210,7 +210,7 @@ bool gfx_shader_resolve_parameters(config_file_t *conf,
* Returns: value of shader type on success, otherwise will return * Returns: value of shader type on success, otherwise will return
* user-supplied @fallback value. * user-supplied @fallback value.
**/ **/
enum rarch_shader_type gfx_shader_parse_type(const char *path, enum rarch_shader_type video_shader_parse_type(const char *path,
enum rarch_shader_type fallback); enum rarch_shader_type fallback);
#ifdef __cplusplus #ifdef __cplusplus

8
menu/menu_entries_cbs.c
View File

@ -279,7 +279,7 @@ static int action_ok_shader_pass_load(const char *path,
sizeof(driver.menu->shader->pass[hack_shader_pass].source.path)); sizeof(driver.menu->shader->pass[hack_shader_pass].source.path));
/* This will reset any changed parameters. */ /* This will reset any changed parameters. */
gfx_shader_resolve_parameters(NULL, driver.menu->shader); video_shader_resolve_parameters(NULL, driver.menu->shader);
menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options"); menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options");
return 0; return 0;
#else #else
@ -414,7 +414,7 @@ static int action_ok_shader_preset_load(const char *path,
fill_pathname_join(shader_path, menu_path, path, sizeof(shader_path)); fill_pathname_join(shader_path, menu_path, path, sizeof(shader_path));
menu_shader_manager_set_preset(driver.menu->shader, menu_shader_manager_set_preset(driver.menu->shader,
gfx_shader_parse_type(shader_path, RARCH_SHADER_NONE), video_shader_parse_type(shader_path, RARCH_SHADER_NONE),
shader_path); shader_path);
menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options"); menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options");
return 0; return 0;
@ -1349,7 +1349,7 @@ static int action_start_shader_num_passes(unsigned type, const char *label,
shader->passes = 0; shader->passes = 0;
driver.menu->need_refresh = true; driver.menu->need_refresh = true;
gfx_shader_resolve_parameters(NULL, driver.menu->shader); video_shader_resolve_parameters(NULL, driver.menu->shader);
#endif #endif
return 0; return 0;
} }
@ -1425,7 +1425,7 @@ static int action_toggle_shader_num_passes(unsigned type, const char *label,
} }
if (driver.menu->need_refresh) if (driver.menu->need_refresh)
gfx_shader_resolve_parameters(NULL, driver.menu->shader); video_shader_resolve_parameters(NULL, driver.menu->shader);
#endif #endif
return 0; return 0;

24
menu/menu_shader.c
View File

@ -70,10 +70,10 @@ void menu_shader_manager_init(void *data)
conf = config_file_new(g_settings.video.shader_path); conf = config_file_new(g_settings.video.shader_path);
if (conf) if (conf)
{ {
if (gfx_shader_read_conf_cgp(conf, shader)) if (video_shader_read_conf_cgp(conf, shader))
{ {
gfx_shader_resolve_relative(shader, g_settings.video.shader_path); video_shader_resolve_relative(shader, g_settings.video.shader_path);
gfx_shader_resolve_parameters(conf, shader); video_shader_resolve_parameters(conf, shader);
} }
config_file_free(conf); config_file_free(conf);
} }
@ -100,10 +100,10 @@ void menu_shader_manager_init(void *data)
if (conf) if (conf)
{ {
if (gfx_shader_read_conf_cgp(conf, shader)) if (video_shader_read_conf_cgp(conf, shader))
{ {
gfx_shader_resolve_relative(shader, preset_path); video_shader_resolve_relative(shader, preset_path);
gfx_shader_resolve_parameters(conf, shader); video_shader_resolve_parameters(conf, shader);
} }
config_file_free(conf); config_file_free(conf);
} }
@ -155,10 +155,10 @@ void menu_shader_manager_set_preset(struct gfx_shader *shader,
RARCH_LOG("Setting Menu shader: %s.\n", preset_path ? preset_path : "N/A (stock)"); RARCH_LOG("Setting Menu shader: %s.\n", preset_path ? preset_path : "N/A (stock)");
if (gfx_shader_read_conf_cgp(conf, shader)) if (video_shader_read_conf_cgp(conf, shader))
{ {
gfx_shader_resolve_relative(shader, preset_path); video_shader_resolve_relative(shader, preset_path);
gfx_shader_resolve_parameters(conf, shader); video_shader_resolve_parameters(conf, shader);
} }
config_file_free(conf); config_file_free(conf);
@ -227,7 +227,7 @@ void menu_shader_manager_save_preset(
if (!(conf = (config_file_t*)config_file_new(NULL))) if (!(conf = (config_file_t*)config_file_new(NULL)))
return; return;
gfx_shader_write_conf_cgp(conf, driver.menu->shader); video_shader_write_conf_cgp(conf, driver.menu->shader);
for (d = 0; d < ARRAY_SIZE(dirs); d++) for (d = 0; d < ARRAY_SIZE(dirs); d++)
{ {
@ -275,7 +275,7 @@ unsigned menu_shader_manager_get_type(const struct gfx_shader *shader)
for (i = 0; i < shader->passes; i++) for (i = 0; i < shader->passes; i++)
{ {
enum rarch_shader_type pass_type = enum rarch_shader_type pass_type =
gfx_shader_parse_type(shader->pass[i].source.path, video_shader_parse_type(shader->pass[i].source.path,
RARCH_SHADER_NONE); RARCH_SHADER_NONE);
switch (pass_type) switch (pass_type)
@ -315,7 +315,7 @@ void menu_shader_manager_apply_changes(void)
/* Fall-back */ /* Fall-back */
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
shader_type = gfx_shader_parse_type("", DEFAULT_SHADER_TYPE); shader_type = video_shader_parse_type("", DEFAULT_SHADER_TYPE);
#endif #endif
if (shader_type == RARCH_SHADER_NONE) if (shader_type == RARCH_SHADER_NONE)