From 31b87594aad532e5012e7d8518a1df969038f29a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 19 Dec 2016 19:08:37 +0100 Subject: [PATCH] Get rid of some implicit memsets for state tracker --- gfx/drivers_shader/shader_gl_cg.c | 16 +++++++++------- gfx/drivers_shader/shader_glsl.c | 20 ++++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 98d851bad9..6aee775f21 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -699,7 +699,7 @@ static bool gl_cg_load_imports(void *data) { unsigned i; retro_ctx_memory_info_t mem_info; - struct state_tracker_info tracker_info = {0}; + struct state_tracker_info tracker_info; cg_shader_data_t *cg = (cg_shader_data_t*)data; if (!cg->shader->variables) @@ -731,15 +731,17 @@ static bool gl_cg_load_imports(void *data) } } - mem_info.data = NULL; - mem_info.size = 0; - mem_info.id = RETRO_MEMORY_SYSTEM_RAM; + mem_info.data = NULL; + mem_info.size = 0; + mem_info.id = RETRO_MEMORY_SYSTEM_RAM; core_get_memory(&mem_info); - tracker_info.wram = (uint8_t*)mem_info.data; - tracker_info.info = cg->shader->variable; - tracker_info.info_elem = cg->shader->variables; + tracker_info.wram = (uint8_t*)mem_info.data; + tracker_info.info = cg->shader->variable; + tracker_info.info_elem = cg->shader->variables; + tracker_info.script = NULL; + tracker_info.script_is_file = false; #ifdef HAVE_PYTHON if (*cg->shader->script_path) diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 831cc669a8..5b577dff35 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -881,23 +881,27 @@ static void *gl_glsl_init(void *data, const char *path) if (glsl->shader->variables) { retro_ctx_memory_info_t mem_info; - struct state_tracker_info info = {0}; + struct state_tracker_info info; - mem_info.id = RETRO_MEMORY_SYSTEM_RAM; + mem_info.id = RETRO_MEMORY_SYSTEM_RAM; core_get_memory(&mem_info); - info.wram = (uint8_t*)mem_info.data; - info.info = glsl->shader->variable; - info.info_elem = glsl->shader->variables; + info.wram = (uint8_t*)mem_info.data; + info.info = glsl->shader->variable; + info.info_elem = glsl->shader->variables; + info.script = NULL; + info.script_class = NULL; #ifdef HAVE_PYTHON - info.script = glsl->shader->script; - info.script_class = *glsl->shader->script_class ? - glsl->shader->script_class : NULL; + info.script = glsl->shader->script; + if (*glsl->shader->script_class) + info.script_class= glsl->shader->script_class; #endif + info.script_is_file = NULL; glsl->state_tracker = state_tracker_init(&info); + if (!glsl->state_tracker) RARCH_WARN("Failed to init state tracker.\n"); }