From f03dc4cb6213e2d6fd99b7ae746079869c0634f1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 3 Jun 2013 00:43:17 +0200 Subject: [PATCH] Cleanups --- ps3/altivec_mem.h | 4 ++++ settings.c | 1 - xdk/xdk_d3d.cpp | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ps3/altivec_mem.h b/ps3/altivec_mem.h index 30c126c917..35b30904db 100644 --- a/ps3/altivec_mem.h +++ b/ps3/altivec_mem.h @@ -63,7 +63,11 @@ extern "C" { #define ptrdiff_t(a, b) ((word_t)(a)-(word_t)(b)) #define CMP_LT_OR_GT(a, b) ((a) - (b)) + +#ifndef MIN #define MIN(a,b) ((a) <= (b) ? (a) : (b)) +#endif + #define DIFF(a, b) ((a)-(b)) #ifdef LSB_FIRST diff --git a/settings.c b/settings.c index 5f358a1b03..e1afb03784 100644 --- a/settings.c +++ b/settings.c @@ -523,7 +523,6 @@ bool config_load_file(const char *path) CONFIG_GET_BOOL_EXTERN(console.screen.gamma_correction, "gamma_correction"); bool msg_enable = false; - bool throttle_enable = false; bool triple_buffering_enable = false; bool custom_bgm_enable = false; bool flicker_filter_enable = false; diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index 0579724a27..6c1d8a366c 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -877,8 +877,8 @@ static bool xdk_d3d_frame(void *data, const void *frame, if (d3d->should_resize) { #ifdef _XBOX1 - D3DDevice_SetFlickerFilter(g_extern.console.screen.flicker_filter_index); - D3DDevice_SetSoftDisplayFilter(g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE)); + d3dr->SetFlickerFilter(g_extern.console.screen.flicker_filter_index); + d3dr->SetSoftDisplayFilter(g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE)); #endif xdk_d3d_set_viewport(false); d3d->should_resize = false;