mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RARCH_CONSOLE) fixups for set_shader().

Browse Source
This commit is contained in:
Themaister 2013-01-08 04:07:30 +01:00
parent e12f805708
commit d9b640fafe
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
360/frontend-xdk/menu.cpp
View File

@ -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); 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) 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) if (g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); 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); 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) 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) if (g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }

8
console/rmenu/rmenu.c
View File

@ -676,7 +676,7 @@ int select_file(void *data, void *state)
if (g_settings.video.shader_type != RARCH_SHADER_NONE) 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) if (g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); 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) 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) if (g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); 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)); 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) 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) if (g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); 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)); 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) 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) if (g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }

5
gx/gx_video.c
View File

@ -999,15 +999,14 @@ static void gx_apply_state_changes(void)
gx->should_resize = true; 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)data;
(void)type; (void)type;
(void)path; (void)path;
(void)mask; (void)index;
RARCH_WARN("Shader support is not implemented for GX.\n"); RARCH_WARN("Shader support is not implemented for GX.\n");
return false; return false;
} }

17
xdk/xdk_d3d.cpp
View File

@ -327,31 +327,22 @@ void xdk_d3d_init_fbo(void *data)
} }
#endif #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; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
(void)data;
(void)type;
(void)path;
switch (type) switch (type)
{ {
#if defined(HAVE_HLSL) #if defined(HAVE_HLSL)
case RARCH_SHADER_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)) if (!hlsl_init(path, d3d->d3d_render_device))
return false; return false;
} }
else if (mask & (1ULL << RARCH_SHADER_PASS0)) else
{ {
if (!hlsl_load_shader(1, (mask & RARCH_SHADER_PASS0_STOCK) ? NULL : path)) if (!hlsl_load_shader(index, path))
return false;
}
else if (mask & (1ULL << RARCH_SHADER_PASS1))
{
if (!hlsl_load_shader(2, (mask & RARCH_SHADER_PASS1_STOCK) ? NULL : path))
return false; return false;
} }
break; break;