From 46a62a44fc3d9f17f28453eaf03005270ef444b2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 7 Jan 2013 18:44:22 +0100 Subject: [PATCH] (XDK) Build fixes --- 360/frontend-xdk/menu.cpp | 4 ++-- xdk/xdk_d3d.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp index b4a6a2aee8..61e7b35de1 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) { - device_ptr->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, (1ULL << RARCH_SHADER_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) { - device_ptr->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, (1ULL << RARCH_SHADER_PASS1)); if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); } diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index d5375c623c..6f7d0ad343 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -341,21 +341,22 @@ static bool xdk_d3d_set_shader(void *data, enum rarch_shader_type type, const ch case RARCH_SHADER_HLSL: if (mask & (1ULL << RARCH_SHADER_MULTIPASS)) { - if (!gl_hlsl_init(path)) + if (!hlsl_init(path, d3d->d3d_render_device)) return false; } else if (mask & (1ULL << RARCH_SHADER_PASS0)) { - if (!gl_hlsl_load_shader(1, (mask & RARCH_SHADER_PASS0_STOCK) ? NULL : path)) + if (!hlsl_load_shader(1, (mask & RARCH_SHADER_PASS0_STOCK) ? NULL : path)) return false; } else if (mask & (1ULL << RARCH_SHADER_PASS1)) { - if (!gl_hlsl_load_shader(2, (mask & RARCH_SHADER_PASS1_STOCK) ? NULL : path)) + if (!hlsl_load_shader(2, (mask & RARCH_SHADER_PASS1_STOCK) ? NULL : path)) return false; } break; #endif + case RARCH_SHADER_NONE: default: RARCH_ERR("Invalid shader type in gl_set_shader().\n"); return false;