From 229891db59be09cd2646a9959a52aae4989f43c2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 7 Apr 2013 03:00:08 +0200 Subject: [PATCH] (360) Build fix --- frontend/menu/rmenu_xui.cpp | 55 -------------------------------- frontend/menu/rmenu_xui.h | 1 - gfx/shader_parse.h | 2 +- media/360/hd/rarch_quickmenu.xui | 13 +++++++- media/360/hd/rarch_settings.xui | 17 +++++++--- media/360/sd/rarch_quickmenu.xui | 13 +++++++- media/360/sd/rarch_settings.xui | 17 +++++++--- xdk/xdk_d3d.cpp | 8 +++-- 8 files changed, 55 insertions(+), 71 deletions(-) diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index aa1ecf8c21..98f54c921e 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -41,7 +41,6 @@ enum { MENU_XUI_ITEM_ORIENTATION, MENU_XUI_ITEM_RESIZE_MODE, MENU_XUI_ITEM_FRAME_ADVANCE, - MENU_XUI_ITEM_SCREENSHOT_MODE, MENU_XUI_ITEM_RESET, MENU_XUI_ITEM_RETURN_TO_GAME, MENU_XUI_ITEM_QUIT_RARCH, @@ -50,7 +49,6 @@ enum { enum { S_LBL_ASPECT_RATIO = 0, - S_LBL_SHADER, S_LBL_RARCH_VERSION, S_LBL_ROTATION, S_LBL_LOAD_STATE_SLOT, @@ -283,9 +281,6 @@ static void menu_settings_create_menu_item_label_w(wchar_t *strwbuf, unsigned se case S_LBL_ASPECT_RATIO: snprintf(str, size, "Aspect Ratio: %s", aspectratio_lut[g_settings.video.aspect_ratio_idx].name); break; - case S_LBL_SHADER: - snprintf(str, size, "Shader #1: %s", g_settings.video.cg_shader_path); - break; case S_LBL_RARCH_VERSION: snprintf(str, size, "RetroArch %s", PACKAGE_VERSION); break; @@ -684,8 +679,6 @@ HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled) m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_AUDIO_RESAMPLER_TYPE, strstr(g_settings.audio.resampler, "sinc") ? L"Audio Resampler: Sinc" : L"Audio Resampler: Hermite"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering"); - menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_SHADER, sizeof(strw_buffer)); - m_settingslist.SetText(SETTING_SHADER, strw_buffer); menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_REWIND_GRANULARITY, sizeof(strw_buffer)); m_settingslist.SetText(SETTING_EMU_REWIND_GRANULARITY, strw_buffer); m_settingslist.SetText(SETTING_ENABLE_SRAM_PATH, (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) ? L"SRAM Path Enable: ON" : L"SRAM Path Enable: OFF"); @@ -771,21 +764,6 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled driver.video->restart(); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); break; - case SETTING_SHADER: - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_FIRST_SHADER); - hr = XuiSceneCreate((g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser); - - if (hr < 0) - RARCH_ERR("Failed to load scene.\n"); - - hCur = app.hShaderBrowser; - - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - msg_queue_push(g_extern.msg_queue, - "INFO - Select a shader from the menu.", 1, 180); - - NavigateForward(app.hShaderBrowser); - break; case SETTING_HW_TEXTURE_FILTER: g_settings.video.smooth = !g_settings.video.smooth; m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering"); @@ -1148,10 +1126,6 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled process_input_ret = -1; } break; - case MENU_XUI_ITEM_SCREENSHOT_MODE: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - device_ptr->ctx_driver->rmenu_screenshot_dump(NULL); - break; case MENU_XUI_ITEM_RESET: if (g_extern.main_is_init) { @@ -1204,35 +1178,6 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand if(path_file_exists(tmp_browser->current_dir.list->elems[index].data)) { convert_wchar_to_char(str_buffer, (const wchar_t *)m_list.GetText(index), sizeof(str_buffer)); - - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_FIRST_SHADER)) - { - snprintf(g_settings.video.cg_shader_path, sizeof(g_settings.video.cg_shader_path), "%s\\%s", tmp_browser->directory_path, 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, RARCH_SHADER_INDEX_PASS0); - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - msg_queue_push(g_extern.msg_queue, "INFO - Shader successfully loaded.", 1, 180); - XuiSceneNavigateBack(hCur, app.hMainScene, XUSER_INDEX_ANY); - } - else - RARCH_ERR("Shaders are unsupported on this platform.\n"); - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_FIRST_SHADER); - } - - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_SECOND_SHADER)) - { - snprintf (g_settings.video.second_pass_shader, sizeof(g_settings.video.second_pass_shader), "%s\\%s", tmp_browser->directory_path, 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, RARCH_SHADER_INDEX_PASS1); - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - msg_queue_push(g_extern.msg_queue, "INFO - Shader successfully loaded.", 1, 180); - } - else - RARCH_ERR("Shaders are unsupported on this platform.\n"); - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_SECOND_SHADER); - } } else if(tmp_browser->current_dir.list->elems[index].attr.b) { diff --git a/frontend/menu/rmenu_xui.h b/frontend/menu/rmenu_xui.h index 0be51719cc..1ea3ad7f4b 100644 --- a/frontend/menu/rmenu_xui.h +++ b/frontend/menu/rmenu_xui.h @@ -25,7 +25,6 @@ enum SETTING_EMU_SHOW_DEBUG_INFO_MSG, SETTING_AUDIO_RESAMPLER_TYPE, SETTING_GAMMA_CORRECTION_ENABLED, - SETTING_SHADER, SETTING_HW_TEXTURE_FILTER, SETTING_ENABLE_SRAM_PATH, SETTING_ENABLE_STATE_PATH, diff --git a/gfx/shader_parse.h b/gfx/shader_parse.h index 5a7e5fe51f..ef7b2c2665 100644 --- a/gfx/shader_parse.h +++ b/gfx/shader_parse.h @@ -16,7 +16,7 @@ #ifndef SHADER_PARSE_H #define SHADER_PARSE_H -#include "boolean.h" +#include "../boolean.h" #include "../conf/config_file.h" #include "state_tracker.h" #include "../general.h" diff --git a/media/360/hd/rarch_quickmenu.xui b/media/360/hd/rarch_quickmenu.xui index a28e65012f..7c75f3dd38 100644 --- a/media/360/hd/rarch_quickmenu.xui +++ b/media/360/hd/rarch_quickmenu.xui @@ -36,7 +36,6 @@ Aspect Ratio: Orientation: Resize Mode Frame Advance -Screenshot Mode Reset Return to Game Return to Dashboard @@ -162,6 +161,18 @@ Return to Dashboard 0.000000,10.000000,0.000000 + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + diff --git a/media/360/hd/rarch_settings.xui b/media/360/hd/rarch_settings.xui index b2468419c0..c03c785b91 100644 --- a/media/360/hd/rarch_settings.xui +++ b/media/360/hd/rarch_settings.xui @@ -36,12 +36,7 @@ Info messages: Debug info messages: Audio Resampler: Gamma Correction: -Shader #1: -Shader #2: Hardware filtering shader #1: -Hardware filtering shader #2: -Custom Scaling/Dual Shaders: -Custom Scaling Factor: SRAM Path Enable: Savestate Path Enable: @@ -274,6 +269,18 @@ Savestate Path Enable: 0.000000,10.000000,0.000000 + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + diff --git a/media/360/sd/rarch_quickmenu.xui b/media/360/sd/rarch_quickmenu.xui index 7b3390a6be..d93fa9fb9d 100644 --- a/media/360/sd/rarch_quickmenu.xui +++ b/media/360/sd/rarch_quickmenu.xui @@ -36,7 +36,6 @@ Aspect Ratio: Orientation: Resize Mode Frame Advance -Screenshot Mode Reset Return to Game Return to Dashboard @@ -138,6 +137,18 @@ Return to Dashboard 0.000000,10.000000,0.000000 + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + diff --git a/media/360/sd/rarch_settings.xui b/media/360/sd/rarch_settings.xui index a43371eec9..0b05e10e02 100644 --- a/media/360/sd/rarch_settings.xui +++ b/media/360/sd/rarch_settings.xui @@ -36,12 +36,7 @@ Info messages: Debug info messages: Audio Resampler: Gamma Correction: -Shader #1: -Shader #2: Hardware filtering shader #1: -Hardware filtering shader #2: -Cutom Scaling/Dual Shaders: -Cutom Scaling Factor: SRAM Path Enable: Savestate Path Enable: @@ -250,6 +245,18 @@ Savestate Path Enable: 0.000000,10.000000,0.000000 + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index 9b63faac06..2cf924d1d1 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -168,9 +168,9 @@ static void check_window(void *data) static bool hlsl_shader_init(void) { xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; - const char *shader_path = g_settings.video.cg_shader_path; + const char *shader_path = g_settings.video.shader_path; - return hlsl_init(g_settings.video.cg_shader_path, d3d->d3d_render_device); + return hlsl_init(shader_path, d3d->d3d_render_device); } #endif @@ -1109,6 +1109,10 @@ static void xdk_d3d_set_osd_msg(void *data, const char *msg, void *userdata) static const video_poke_interface_t d3d_poke_interface = { xdk_d3d_set_blend, xdk_d3d_set_filtering, +#ifdef HAVE_FBO + NULL, + NULL, +#endif xdk_d3d_set_aspect_ratio, xdk_d3d_apply_state_changes, #ifdef HAVE_RGUI