mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(HLSL) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-04-14 03:09:15 +02:00
parent 5cc1b85f70
commit 8701af084a
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gfx/drivers_shader/shader_hlsl.c
View File

@ -310,31 +310,26 @@ static void hlsl_deinit_state(hlsl_shader_data_t *hlsl)
static bool hlsl_load_preset(hlsl_shader_data_t *hlsl, void *data, const char *path) static bool hlsl_load_preset(hlsl_shader_data_t *hlsl, void *data, const char *path)
{ {
config_file_t *conf = NULL;
if (!hlsl_load_stock(hlsl, data)) if (!hlsl_load_stock(hlsl, data))
return false; return false;
RARCH_LOG("Loading Cg meta-shader: %s\n", path); RARCH_LOG("Loading Cg meta-shader: %s\n", path);
config_file_t *conf = config_file_new(path);
conf = config_file_new(path);
if (!conf) if (!conf)
{ goto error;
RARCH_ERR("Failed to load preset.\n");
return false;
}
if (!hlsl->cg_shader) if (!hlsl->cg_shader)
hlsl->cg_shader = (struct video_shader*)calloc(1, sizeof(*hlsl->cg_shader)); hlsl->cg_shader = (struct video_shader*)calloc(1, sizeof(*hlsl->cg_shader));
if (!hlsl->cg_shader) if (!hlsl->cg_shader)
{ goto error;
config_file_free(conf);
return false;
}
if (!video_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); goto error;
return false;
} }
config_file_free(conf); config_file_free(conf);
@ -354,8 +349,15 @@ static bool hlsl_load_preset(hlsl_shader_data_t *hlsl, void *data, const char *p
} }
/* TODO - textures / imports */ /* TODO - textures / imports */
return true; return true;
error:
RARCH_ERR("Failed to load preset.\n");
if (conf)
config_file_free(conf);
conf = NULL;
return false;
} }
static void *hlsl_init(void *data, const char *path) static void *hlsl_init(void *data, const char *path)