From d9b640fafe9ef42fae7d44329f1e57591e6a176c Mon Sep 17 00:00:00 2001 From: Themaister Date: Tue, 8 Jan 2013 04:07:30 +0100 Subject: [PATCH] (RARCH_CONSOLE) fixups for set_shader(). --- 360/frontend-xdk/menu.cpp | 4 ++-- console/rmenu/rmenu.c | 8 ++++---- gx/gx_video.c | 5 ++--- xdk/xdk_d3d.cpp | 17 ++++------------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp index 3dfeab2e9f..a95dd3a629 100644 --- a/360/frontend-xdk/menu.cpp +++ b/360/frontend-xdk/menu.cpp @@ -875,7 +875,7 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand snprintf(g_settings.video.cg_shader_path, sizeof(g_settings.video.cg_shader_path), "%s\\%s", filebrowser_get_current_dir(&tmp_browser), str_buffer); if (g_settings.video.shader_type != RARCH_SHADER_NONE) { - driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.cg_shader_path, (1ULL << RARCH_SHADER_PASS0)); + driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.cg_shader_path, RARCH_SHADER_INDEX_PASS0); if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); } @@ -886,7 +886,7 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand snprintf (g_settings.video.second_pass_shader, sizeof(g_settings.video.second_pass_shader), "%s\\%s", filebrowser_get_current_dir(&tmp_browser), str_buffer); if (g_settings.video.shader_type != RARCH_SHADER_NONE) { - driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.second_pass_shader, (1ULL << RARCH_SHADER_PASS1)); + driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.second_pass_shader, RARCH_SHADER_INDEX_PASS1); if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); } diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c index 5e62c437f6..844b2e4eb6 100644 --- a/console/rmenu/rmenu.c +++ b/console/rmenu/rmenu.c @@ -676,7 +676,7 @@ int select_file(void *data, void *state) if (g_settings.video.shader_type != RARCH_SHADER_NONE) { - driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, 1ULL << RARCH_SHADER_PASS0); + driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS0); if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); } @@ -688,7 +688,7 @@ int select_file(void *data, void *state) if (g_settings.video.shader_type != RARCH_SHADER_NONE) { - driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, 1ULL << RARCH_SHADER_PASS1); + driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS1); if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); } @@ -1086,7 +1086,7 @@ static void set_setting_action(void *data, unsigned switchvalue, uint64_t input) strlcpy(g_settings.video.cg_shader_path, default_paths.shader_file, sizeof(g_settings.video.cg_shader_path)); if (g_settings.video.shader_type != RARCH_SHADER_NONE) { - driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, (1ULL << RARCH_SHADER_PASS0) | (1ULL << RARCH_SHADER_PASS0_STOCK)); + driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS0); if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); } @@ -1106,7 +1106,7 @@ static void set_setting_action(void *data, unsigned switchvalue, uint64_t input) strlcpy(g_settings.video.second_pass_shader, default_paths.shader_file, sizeof(g_settings.video.second_pass_shader)); if (g_settings.video.shader_type != RARCH_SHADER_NONE) { - driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, (1ULL << RARCH_SHADER_PASS1) | (1ULL << RARCH_SHADER_PASS1_STOCK)); + driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS1); if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); } diff --git a/gx/gx_video.c b/gx/gx_video.c index aa35a2bfcb..3c43d87888 100644 --- a/gx/gx_video.c +++ b/gx/gx_video.c @@ -999,15 +999,14 @@ static void gx_apply_state_changes(void) gx->should_resize = true; } -static bool gx_set_shader(void *data, enum rarch_shader_type type, const char *path, unsigned mask) +static bool gx_set_shader(void *data, enum rarch_shader_type type, const char *path, unsigned index) { (void)data; (void)type; (void)path; - (void)mask; + (void)index; RARCH_WARN("Shader support is not implemented for GX.\n"); - return false; } diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index 6f7d0ad343..0317442e4e 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -327,31 +327,22 @@ void xdk_d3d_init_fbo(void *data) } #endif -static bool xdk_d3d_set_shader(void *data, enum rarch_shader_type type, const char *path, unsigned mask) +static bool xdk_d3d_set_shader(void *data, enum rarch_shader_type type, const char *path, unsigned index) { xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data; - (void)data; - (void)type; - (void)path; - switch (type) { #if defined(HAVE_HLSL) case RARCH_SHADER_HLSL: - if (mask & (1ULL << RARCH_SHADER_MULTIPASS)) + if (index == RARCH_SHADER_INDEX_MULTIPASS) { if (!hlsl_init(path, d3d->d3d_render_device)) return false; } - else if (mask & (1ULL << RARCH_SHADER_PASS0)) + else { - if (!hlsl_load_shader(1, (mask & RARCH_SHADER_PASS0_STOCK) ? NULL : path)) - return false; - } - else if (mask & (1ULL << RARCH_SHADER_PASS1)) - { - if (!hlsl_load_shader(2, (mask & RARCH_SHADER_PASS1_STOCK) ? NULL : path)) + if (!hlsl_load_shader(index, path)) return false; } break;