Hopefully fixes awkward issue with scale not being applied correctly.

mme4crt · Mar 29, 2011 · 3455f83 · 3455f83
1 parent f730ba4
commit 3455f83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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);