From 858a21f87ab6e478a6ab550f01aa715ee4b27de0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 22 Jan 2013 16:30:35 +0100 Subject: [PATCH] (360) Correctly initialize fbo_scale_x/fbo_scale_y --- config.def.h | 2 +- settings.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.def.h b/config.def.h index 066d65b7f0..ce20469682 100644 --- a/config.def.h +++ b/config.def.h @@ -248,7 +248,7 @@ static const float message_pos_offset_y = 0.05; static const uint32_t message_color = 0xffff00; // RGB hex value. // Render-to-texture before rendering to screen (multi-pass shaders) -#if defined(__CELLOS_LV2__) || defined(_XBOX360) +#if defined(__CELLOS_LV2__) static const bool render_to_texture = true; #else static const bool render_to_texture = false; diff --git a/settings.c b/settings.c index 0f3afe3945..fb945f7799 100644 --- a/settings.c +++ b/settings.c @@ -177,11 +177,11 @@ void config_set_defaults(void) g_settings.video.msg_color_g = ((message_color >> 8) & 0xff) / 255.0f; g_settings.video.msg_color_b = ((message_color >> 0) & 0xff) / 255.0f; -#if defined(HAVE_CG) || defined(HAVE_GLSL) +#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) g_settings.video.render_to_texture = render_to_texture; + g_settings.video.second_pass_smooth = second_pass_smooth; g_settings.video.fbo.scale_x = fbo_scale_x; g_settings.video.fbo.scale_y = fbo_scale_y; - g_settings.video.second_pass_smooth = second_pass_smooth; #endif g_settings.video.refresh_rate = refresh_rate;