diff --git a/360/media/hd/rarch_settings.xui b/360/media/hd/rarch_settings.xui
index 3b63fe65be..f6000a0ddc 100644
--- a/360/media/hd/rarch_settings.xui
+++ b/360/media/hd/rarch_settings.xui
@@ -50,6 +50,8 @@
XuiBackButton
Rewind:
Gamma Correction:
+Shader #1:
+Shader #2:
Hardware filtering shader #1:
Hardware filtering shader #2:
Custom Scaling/Dual Shaders
@@ -151,6 +153,18 @@ Custom Scaling/Dual Shaders
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/360/media/hd/rarch_shader_browser.xui b/360/media/hd/rarch_shader_browser.xui
new file mode 100644
index 0000000000..c8b579d554
--- /dev/null
+++ b/360/media/hd/rarch_shader_browser.xui
@@ -0,0 +1,217 @@
+
+
+1280.000000
+720.000000
+
+
+
+XuiSceneCoreFileBrowser
+920.000122
+552.000000
+176.000015,88.000015,0.000000
+RetroArchShaderBrowser
+
+
+
+XuiTxtTitle
+326.640015
+40.000000
+28.893612,12.519989,0.000000
+Shader selection - Select a shader
+0xff0f0f0f
+0x800f0f0f
+Arial Unicode MS
+21
+
+
+
+
+XuiRomList
+857.200195
+406.400024
+22.799980,81.600006,0.000000
+XuiBackButton1
+XuiBackButton1
+XuiBackButton1
+XuiBackButton1
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+
+XuiBackButton1
+219.000000
+36.000000
+680.000061,504.000061,0.000000
+XuiRomList
+XuiRomList
+XuiRomList
+XuiRomList
+Go back to menu
+22593
+
+
+
+
+XuiTxtRomPath
+166.559998
+28.480011
+96.000000,42.480011,0.000000
+0xff0f0f0f
+0x800f0f0f
+
+
+
+
+XuiLblPath
+72.880005
+28.000000
+26.000000,43.000000,0.000000
+PATH:
+
+
+
+
diff --git a/360/media/sd/rarch_settings.xui b/360/media/sd/rarch_settings.xui
index d54d1e308e..46b7aaee6f 100644
--- a/360/media/sd/rarch_settings.xui
+++ b/360/media/sd/rarch_settings.xui
@@ -50,6 +50,8 @@
XuiBackButton
Rewind:
Gamma Correction:
+Shader #1:
+Shader #2:
Hardware filtering shader #1:
Hardware filtering shader #2:
Cutom Scaling/Dual Shaders:
@@ -127,6 +129,18 @@ Cutom Scaling/Dual Shaders:
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/360/media/sd/rarch_shader_browser.xui b/360/media/sd/rarch_shader_browser.xui
new file mode 100644
index 0000000000..702f1ab0cc
--- /dev/null
+++ b/360/media/sd/rarch_shader_browser.xui
@@ -0,0 +1,193 @@
+
+
+1280.000000
+720.000000
+
+
+
+XuiSceneCoreFileBrowser
+575.888062
+336.017609
+353.995880,209.035965,0.000000
+RetroArchShaderBrowser
+
+
+
+XuiTxtTitle
+326.640015
+40.000000
+28.893612,12.519989,0.000000
+Shader selection - Select a shader
+0xff0f0f0f
+0x800f0f0f
+Arial Unicode MS
+21
+
+
+
+
+XuiRomList
+536.582458
+170.800018
+22.799980,81.600006,0.000000
+XuiBackButton1
+XuiBackButton1
+XuiBackButton1
+XuiBackButton1
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+control_ListItem
+226.000000
+45.000000
+7.000000,22.000000,0.000000
+5
+false
+XuiButton
+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
+
+
+
+
+
+XuiBackButton1
+219.000000
+36.000000
+338.715210,281.396820,0.000000
+XuiRomList
+XuiRomList
+XuiRomList
+XuiRomList
+Go back to menu
+22593
+
+
+
+
+XuiTxtRomPath
+166.559998
+28.480011
+96.000000,42.480011,0.000000
+0xff0f0f0f
+0x800f0f0f
+
+
+
+
+XuiLblPath
+72.880005
+28.000000
+26.000000,43.000000,0.000000
+PATH:
+
+
+
+
diff --git a/360/menu.cpp b/360/menu.cpp
index 5d9fd958bb..2d1ef77271 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -30,6 +30,8 @@ CRetroArch app;
filebrowser_t browser;
filebrowser_t tmp_browser;
char strbuffer[1024];
+bool hdmenus_allowed;
+uint32_t set_shader = 0;
static void return_to_game (void)
{
@@ -51,6 +53,7 @@ HRESULT CRetroArch::RegisterXuiClasses (void)
CRetroArchMain::Register();
CRetroArchFileBrowser::Register();
CRetroArchCoreBrowser::Register();
+ CRetroArchShaderBrowser::Register();
CRetroArchQuickMenu::Register();
CRetroArchSettings::Register();
@@ -62,6 +65,7 @@ HRESULT CRetroArch::UnregisterXuiClasses (void)
{
CRetroArchMain::Unregister();
CRetroArchCoreBrowser::Unregister();
+ CRetroArchShaderBrowser::Unregister();
CRetroArchFileBrowser::Unregister();
CRetroArchQuickMenu::Register();
CRetroArchSettings::Unregister();
@@ -116,6 +120,18 @@ HRESULT CRetroArchCoreBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled
return S_OK;
}
+HRESULT CRetroArchShaderBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
+{
+ GetChildById(L"XuiRomList", &m_shaderlist);
+ GetChildById(L"XuiBackButton1", &m_back);
+ GetChildById(L"XuiTxtRomPath", &m_shaderpathtitle);
+
+ filebrowser_new(&tmp_browser, "game:", "cg|CG");
+ filebrowser_fetch_directory_entries("game:", &tmp_browser, &m_shaderlist, &m_shaderpathtitle);
+
+ return S_OK;
+}
+
HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
{
GetChildById(L"XuiSettingsList", &m_settingslist);
@@ -348,6 +364,47 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
return S_OK;
}
+HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
+{
+ char path[MAX_PATH_LENGTH];
+
+ if(hObjPressed == m_shaderlist)
+ {
+ int index = m_shaderlist.GetCurSel();
+ if(tmp_browser.cur[index].d_type != FILE_ATTRIBUTE_DIRECTORY)
+ {
+ memset(strbuffer, 0, sizeof(strbuffer));
+ wcstombs(strbuffer, (const wchar_t *)m_shaderlist.GetText(index), sizeof(strbuffer));
+ switch(set_shader)
+ {
+ case 1:
+ sprintf(g_settings.video.cg_shader_path, "%s\\%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(tmp_browser), strbuffer);
+ hlsl_load_shader(set_shader, g_settings.video.cg_shader_path);
+ break;
+ case 2:
+ sprintf(g_settings.video.second_pass_shader, "%s\\%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(tmp_browser), strbuffer);
+ hlsl_load_shader(set_shader, g_settings.video.second_pass_shader);
+ break;
+ default:
+ break;
+ }
+ }
+ else if(tmp_browser.cur[index].d_type == FILE_ATTRIBUTE_DIRECTORY)
+ {
+ memset(strbuffer, 0, sizeof(strbuffer));
+ wcstombs(strbuffer, (const wchar_t *)m_shaderlist.GetText(index), sizeof(strbuffer));
+ snprintf(path, sizeof(path), "%s\\%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(tmp_browser), strbuffer);
+ filebrowser_fetch_directory_entries(path, &tmp_browser, &m_shaderlist, &m_shaderpathtitle);
+ }
+ }
+ else if(hObjPressed == m_back)
+ NavigateBack(app.hRetroArchSettings);
+
+ bHandled = TRUE;
+
+ return S_OK;
+}
+
HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
{
char path[MAX_PATH_LENGTH];
@@ -355,7 +412,7 @@ HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
if(hObjPressed == m_romlist)
{
int index = m_romlist.GetCurSel();
- if(browser.cur[index].d_type != FILE_ATTRIBUTE_DIRECTORY)
+ if(tmp_browser.cur[index].d_type != FILE_ATTRIBUTE_DIRECTORY)
{
memset(strbuffer, 0, sizeof(strbuffer));
wcstombs(strbuffer, (const wchar_t *)m_romlist.GetText(index), sizeof(strbuffer));
@@ -382,6 +439,7 @@ HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
{
int current_index;
+ HRESULT hr;
if ( hObjPressed == m_settingslist)
{
@@ -397,6 +455,26 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
g_console.gamma_correction_enable = !g_console.gamma_correction_enable;
m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_console.gamma_correction_enable ? L"Gamma correction: ON" : L"Gamma correction: OFF");
break;
+ case SETTING_SHADER:
+ set_shader = 1;
+ hr = XuiSceneCreate(hdmenus_allowed ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser);
+
+ if (FAILED(hr))
+ {
+ RARCH_ERR("Failed to load scene.\n");
+ }
+ NavigateForward(app.hShaderBrowser);
+ break;
+ case SETTING_SHADER_2:
+ set_shader = 2;
+ hr = XuiSceneCreate(hdmenus_allowed ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser);
+
+ if (FAILED(hr))
+ {
+ RARCH_ERR("Failed to load scene.\n");
+ }
+ 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");
@@ -424,7 +502,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
{
xdk360_video_t *vid = (xdk360_video_t*)g_d3d;
- bool hdmenus_allowed = vid->video_mode.fIsHiDef && (g_console.aspect_ratio_index >= ASPECT_RATIO_16_9);
+ hdmenus_allowed = vid->video_mode.fIsHiDef && (g_console.aspect_ratio_index >= ASPECT_RATIO_16_9);
HRESULT hr;
diff --git a/360/menu.h b/360/menu.h
index 314fc660e7..88d245c6f9 100644
--- a/360/menu.h
+++ b/360/menu.h
@@ -24,6 +24,8 @@ enum
{
SETTING_EMU_REWIND_ENABLED = 0,
SETTING_GAMMA_CORRECTION_ENABLED,
+ SETTING_SHADER,
+ SETTING_SHADER_2,
SETTING_HW_TEXTURE_FILTER,
SETTING_HW_TEXTURE_FILTER_2,
SETTING_SCALE_ENABLED
@@ -35,6 +37,7 @@ public:
HXUIOBJ hMainScene;
HXUIOBJ hFileBrowser;
HXUIOBJ hCoreBrowser;
+ HXUIOBJ hShaderBrowser;
HXUIOBJ hQuickMenu;
HXUIOBJ hRetroArchSettings;
protected:
@@ -105,6 +108,24 @@ public:
XUI_IMPLEMENT_CLASS(CRetroArchCoreBrowser, L"RetroArchCoreBrowser", XUI_CLASS_SCENE)
};
+class CRetroArchShaderBrowser: public CXuiSceneImpl
+{
+protected:
+ CXuiList m_shaderlist;
+ CXuiControl m_back;
+ CXuiTextElement m_shaderpathtitle;
+public:
+ HRESULT OnInit( XUIMessageInit* pInitData, int & bHandled );
+ HRESULT OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled );
+
+ XUI_BEGIN_MSG_MAP()
+ XUI_ON_XM_INIT( OnInit)
+ XUI_ON_XM_NOTIFY_PRESS( OnNotifyPress )
+ XUI_END_MSG_MAP();
+
+ XUI_IMPLEMENT_CLASS(CRetroArchShaderBrowser, L"RetroArchShaderBrowser", XUI_CLASS_SCENE)
+};
+
class CRetroArchQuickMenu: public CXuiSceneImpl
{
protected:
diff --git a/gfx/shader_hlsl.c b/gfx/shader_hlsl.c
index 015dd98bb3..6e68f1c0e1 100644
--- a/gfx/shader_hlsl.c
+++ b/gfx/shader_hlsl.c
@@ -141,11 +141,6 @@ static bool load_program(unsigned index, const char *prog, bool path_is_file)
ret_fp = false;
ret_vp = false;
- if (prg[index].f_ctable)
- prg[index].f_ctable->Release();
- if (prg[index].v_ctable)
- prg[index].v_ctable->Release();
-
if (path_is_file)
{
ret_fp = D3DXCompileShaderFromFile(prog, NULL, NULL,
@@ -174,11 +169,6 @@ static bool load_program(unsigned index, const char *prog, bool path_is_file)
goto end;
}
- if (prg[index].fprg)
- prg[index].fprg->Release();
- if (prg[index].vprg)
- prg[index].vprg->Release();
-
d3d_device_ptr->CreatePixelShader((const DWORD*)code_f->GetBufferPointer(), &prg[index].fprg);
d3d_device_ptr->CreateVertexShader((const DWORD*)code_v->GetBufferPointer(), &prg[index].vprg);
code_f->Release();
@@ -203,6 +193,76 @@ static bool load_stock(void)
return true;
}
+static void set_program_attributes(unsigned i)
+{
+ prg[i].vid_size_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.video_size");
+ prg[i].tex_size_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.texture_size");
+ prg[i].out_size_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.output_size");
+ prg[i].frame_cnt_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.frame_count");
+ prg[i].frame_dir_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.frame_direction");
+ prg[i].vid_size_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.video_size");
+ prg[i].tex_size_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.texture_size");
+ prg[i].out_size_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.output_size");
+ prg[i].frame_cnt_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.frame_count");
+ prg[i].frame_dir_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.frame_direction");
+ prg[i].mvp = prg[i].v_ctable->GetConstantByName(NULL, "$modelViewProj");
+}
+
+bool hlsl_load_shader(unsigned index, const char *path)
+{
+ bool retval = true;
+
+ if (!hlsl_active || index == 0)
+ retval = false;
+
+ if(retval)
+ {
+ //check if fragment program already exists
+ if (prg[index].fprg)
+ {
+ if (prg[index].fprg)
+ prg[index].fprg->Release();
+
+ if (prg[index].f_ctable)
+ prg[index].f_ctable->Release();
+ }
+
+ //check if vertex program already exists
+ if (prg[index].vprg)
+ {
+ if (prg[index].vprg)
+ prg[index].vprg->Release();
+
+ if (prg[index].v_ctable)
+ prg[index].v_ctable->Release();
+ }
+
+ if (path)
+ {
+ if (load_program(index, path, true))
+ {
+ set_program_attributes(index);
+ }
+ else
+ {
+ // Always make sure we have a valid shader.
+ prg[index] = prg[0];
+ retval = false;
+ }
+ }
+ else
+ prg[index] = prg[0];
+ }
+ else
+ goto end; // if retval is false, skip to end label
+
+ hlsl_active = true;
+ d3d_device_ptr->SetVertexShader(prg[index].vprg);
+ d3d_device_ptr->SetPixelShader(prg[index].fprg);
+end:
+ return retval;
+}
+
static bool load_plain(const char *path)
{
if (!load_stock())
@@ -264,21 +324,6 @@ static bool load_preset(const char *path)
return false;
}
-static void set_program_attributes(unsigned i)
-{
- prg[i].vid_size_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.video_size");
- prg[i].tex_size_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.texture_size");
- prg[i].out_size_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.output_size");
- prg[i].frame_cnt_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.frame_count");
- prg[i].frame_dir_f = prg[i].f_ctable->GetConstantByName(NULL, "$IN.frame_direction");
- prg[i].vid_size_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.video_size");
- prg[i].tex_size_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.texture_size");
- prg[i].out_size_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.output_size");
- prg[i].frame_cnt_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.frame_count");
- prg[i].frame_dir_v = prg[i].v_ctable->GetConstantByName(NULL, "$IN.frame_direction");
- prg[i].mvp = prg[i].v_ctable->GetConstantByName(NULL, "$modelViewProj");
-}
-
bool hlsl_init(const char *path, IDirect3DDevice9 * device_ptr)
{
if (!device_ptr)
diff --git a/gfx/shader_hlsl.h b/gfx/shader_hlsl.h
index 724c7378d8..2079ce5cda 100644
--- a/gfx/shader_hlsl.h
+++ b/gfx/shader_hlsl.h
@@ -34,6 +34,8 @@ void hlsl_set_params(unsigned width, unsigned height,
void hlsl_use(unsigned index);
+bool hlsl_load_shader(unsigned index, const char *path);
+
#define RARCH_HLSL_MAX_SHADERS 16
#endif
diff --git a/msvc-360/RetroArch-360/RetroArch-360.vcxproj b/msvc-360/RetroArch-360/RetroArch-360.vcxproj
index 394f41b4d8..ce22be6f28 100644
--- a/msvc-360/RetroArch-360/RetroArch-360.vcxproj
+++ b/msvc-360/RetroArch-360/RetroArch-360.vcxproj
@@ -647,7 +647,39 @@
$(OutDir)media\hd\rarch_settings.xur;
+
+
+ Document
+ $(OutDir)media\hd\rarch_shader_browser.xur
+ $(OutDir)media\hd\rarch_shader_browser.xur
+ $(OutDir)media\hd\rarch_shader_browser.xur
+ $(OutDir)media\hd\rarch_shader_browser.xur
+ $(OutDir)media\hd\rarch_shader_browser.xur
+ $(OutDir)media\hd\rarch_shader_browser.xur
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\hd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\hd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\hd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\hd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\hd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\hd\rarch_shader_browser.xur"
+
+
+ Document
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\sd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\sd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\sd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\sd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\sd\rarch_shader_browser.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)rarch_shader_browser.xui" "$(OutDir)media\sd\rarch_shader_browser.xur"
+ $(OutDir)media\sd\rarch_shader_browser.xur;
+ $(OutDir)media\sd\rarch_shader_browser.xur;
+ $(OutDir)media\sd\rarch_shader_browser.xur;
+ $(OutDir)media\sd\rarch_shader_browser.xur;
+ $(OutDir)media\sd\rarch_shader_browser.xur;
+ $(OutDir)media\sd\rarch_shader_browser.xur;
+
+
-
+
\ No newline at end of file
diff --git a/msvc-360/RetroArch-360/RetroArch-360.vcxproj.filters b/msvc-360/RetroArch-360/RetroArch-360.vcxproj.filters
index b3be3dd9d4..19b0675894 100644
--- a/msvc-360/RetroArch-360/RetroArch-360.vcxproj.filters
+++ b/msvc-360/RetroArch-360/RetroArch-360.vcxproj.filters
@@ -27,9 +27,6 @@
{60603fec-c1c0-4562-8573-b1dc3af0ee40}
-
- {3a05047b-b9ec-4821-bb28-d1b0e9e3e8bb}
-
{cf25b88e-c7b2-4823-876a-ed0dd8020821}
@@ -42,6 +39,9 @@
{76fa04d8-4379-4b8c-ae79-2aa78d380e06}
+
+ {3a05047b-b9ec-4821-bb28-d1b0e9e3e8bb}
+
@@ -148,7 +148,7 @@
Source Files\media
- Source Files\media\shader
+ Source Files\media\shaders
Source Files\media\sd
@@ -186,5 +186,11 @@
Source Files\media
+
+ Source Files\media\sd
+
+
+ Source Files\media\hd
+
-
+
\ No newline at end of file