From 3455f83fa7e941a27236274ea4295135638e3f93 Mon Sep 17 00:00:00 2001 From: Themaister Date: Tue, 29 Mar 2011 19:09:10 +0200 Subject: [PATCH] Hopefully fixes awkward issue with scale not being applied correctly. --- gfx/gl.c | 1 + ssnes.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/gfx/gl.c b/gfx/gl.c index b613231753..1f7506d7c9 100644 --- a/gfx/gl.c +++ b/gfx/gl.c @@ -954,6 +954,7 @@ static void* gl_init(video_info_t *video, const input_driver_t **input, void **i gl_init_fbo(gl, 256 * video->input_scale, 256 * video->input_scale); // Apparently need to set viewport for passes when we aren't using FBOs. + gl_shader_use(0); set_viewport(gl, gl->win_width, gl->win_height, false); gl_shader_use(1); set_viewport(gl, gl->win_width, gl->win_height, false); diff --git a/ssnes.c b/ssnes.c index a05202573b..3ec7d6ee27 100644 --- a/ssnes.c +++ b/ssnes.c @@ -1187,6 +1187,10 @@ static void check_shader_dir(void) if (should_apply) { const char *shader = g_extern.shader_dir.elems[g_extern.shader_dir.ptr]; + + strncpy(g_settings.video.bsnes_shader_path, shader, sizeof(g_settings.video.bsnes_shader_path) - 1); + g_settings.video.shader_type = SSNES_SHADER_BSNES; + msg_queue_clear(g_extern.msg_queue); char msg[512]; snprintf(msg, sizeof(msg), "XML shader #%u: \"%s\"", (unsigned)g_extern.shader_dir.ptr, shader);