ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Menu) Refactor menu shader passes - shader pass needs to be 

fixed still
This commit is contained in:
twinaphex 2014-09-05 02:23:35 +02:00
parent 18754d5e4c
commit 030977b020
4 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/backend/menu_common_backend.c
View File

@ -1722,7 +1722,7 @@ static int menu_action_ok(const char *dir,
else if (!strcmp(menu_label, "video_shader_pass") else if (!strcmp(menu_label, "video_shader_pass")
&& type == MENU_FILE_PLAIN) && type == MENU_FILE_PLAIN)
{ {
unsigned pass = (menu_type) / 3; unsigned pass = menu_type - MENU_SETTINGS_SHADER_PASS_0;
fill_pathname_join(driver.menu->shader->pass[pass].source.path, fill_pathname_join(driver.menu->shader->pass[pass].source.path,
dir, path, sizeof(driver.menu->shader->pass[pass].source.path)); dir, path, sizeof(driver.menu->shader->pass[pass].source.path));

62
frontend/menu/backend/menu_common_shader_backend.c
View File

@ -155,21 +155,18 @@ static void menu_common_shader_manager_get_str(struct gfx_shader *shader,
else if (!strcmp(label, "video_shader_default_filter")) else if (!strcmp(label, "video_shader_default_filter"))
snprintf(type_str, type_str_size, "%s", snprintf(type_str, type_str_size, "%s",
g_settings.video.smooth ? "Linear" : "Nearest"); g_settings.video.smooth ? "Linear" : "Nearest");
else if (type >= MENU_SETTINGS_SHADER_0 && type <= MENU_SETTINGS_SHADER_LAST) else if (!strcmp(label, "video_shader_pass"))
{ {
unsigned pass = (type - MENU_SETTINGS_SHADER_0) / 3; unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_0);
switch ((type - MENU_SETTINGS_SHADER_0) % 3)
{
case 0:
if (*shader->pass[pass].source.path) if (*shader->pass[pass].source.path)
fill_pathname_base(type_str, fill_pathname_base(type_str,
shader->pass[pass].source.path, type_str_size); shader->pass[pass].source.path, type_str_size);
else else
strlcpy(type_str, "N/A", type_str_size); strlcpy(type_str, "N/A", type_str_size);
break; }
else if (!strcmp(label, "video_shader_filter_pass"))
case 1:
{ {
unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_FILTER_0);
static const char *modes[] = { static const char *modes[] = {
"Don't care", "Don't care",
"Linear", "Linear",
@ -179,18 +176,14 @@ static void menu_common_shader_manager_get_str(struct gfx_shader *shader,
strlcpy(type_str, modes[shader->pass[pass].filter], strlcpy(type_str, modes[shader->pass[pass].filter],
type_str_size); type_str_size);
} }
break; else if (!strcmp(label, "video_shader_scale_pass"))
case 2:
{ {
unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_SCALE_0);
unsigned scale = shader->pass[pass].fbo.scale_x; unsigned scale = shader->pass[pass].fbo.scale_x;
if (!scale) if (!scale)
strlcpy(type_str, "Don't care", type_str_size); strlcpy(type_str, "Don't care", type_str_size);
else else
snprintf(type_str, type_str_size, "%ux", scale); snprintf(type_str, type_str_size, "%ux", scale);
break;
}
}
} }
} }
@ -328,9 +321,6 @@ static int menu_common_shader_manager_setting_toggle(
rarch_setting_t *current_setting = NULL; rarch_setting_t *current_setting = NULL;
rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list(); rarch_setting_t *setting_data = (rarch_setting_t *)setting_data_get_list();
unsigned dist_shader = id - MENU_SETTINGS_SHADER_0;
unsigned dist_filter = id - MENU_SETTINGS_SHADER_0_FILTER;
unsigned dist_scale = id - MENU_SETTINGS_SHADER_0_SCALE;
if (!strcmp(label, "video_shader_default_filter")) if (!strcmp(label, "video_shader_default_filter"))
{ {
@ -398,9 +388,12 @@ static int menu_common_shader_manager_setting_toggle(
} }
else if (!strcmp(label, "video_shader_pass")) else if (!strcmp(label, "video_shader_pass"))
{ {
unsigned pass = id - MENU_SETTINGS_SHADER_PASS_0;
struct gfx_shader *shader = (struct gfx_shader*)driver.menu->shader; struct gfx_shader *shader = (struct gfx_shader*)driver.menu->shader;
struct gfx_shader_pass *shader_pass = NULL;
dist_shader /= 3; if (shader)
shader_pass = (struct gfx_shader_pass*)&shader->pass[pass];
switch (action) switch (action)
{ {
@ -410,8 +403,9 @@ static int menu_common_shader_manager_setting_toggle(
"video_shader_pass", "video_shader_pass",
id, driver.menu->selection_ptr); id, driver.menu->selection_ptr);
break; break;
case MENU_ACTION_START: case MENU_ACTION_START:
if (shader_pass)
*shader_pass->source.path = '\0';
break; break;
default: default:
@ -420,16 +414,16 @@ static int menu_common_shader_manager_setting_toggle(
} }
else if (!strcmp(label, "video_shader_filter_pass")) else if (!strcmp(label, "video_shader_filter_pass"))
{ {
dist_filter /= 3; unsigned pass = id - MENU_SETTINGS_SHADER_PASS_FILTER_0;
struct gfx_shader *shader = (struct gfx_shader*)driver.menu->shader; struct gfx_shader *shader = (struct gfx_shader*)driver.menu->shader;
struct gfx_shader_pass *pass = (struct gfx_shader_pass*) struct gfx_shader_pass *shader_pass = (struct gfx_shader_pass*)
&shader->pass[dist_filter]; &shader->pass[pass];
switch (action) switch (action)
{ {
case MENU_ACTION_START: case MENU_ACTION_START:
if (shader) if (shader)
shader->pass[dist_filter].filter = RARCH_FILTER_UNSPEC; shader->pass[pass].filter = RARCH_FILTER_UNSPEC;
break; break;
case MENU_ACTION_LEFT: case MENU_ACTION_LEFT:
@ -437,8 +431,8 @@ static int menu_common_shader_manager_setting_toggle(
case MENU_ACTION_OK: case MENU_ACTION_OK:
{ {
unsigned delta = (action == MENU_ACTION_LEFT) ? 2 : 1; unsigned delta = (action == MENU_ACTION_LEFT) ? 2 : 1;
if (pass) if (shader_pass)
pass->filter = ((pass->filter + delta) % 3); shader_pass->filter = ((shader_pass->filter + delta) % 3);
break; break;
} }
@ -448,18 +442,18 @@ static int menu_common_shader_manager_setting_toggle(
} }
else if (!strcmp(label, "video_shader_scale_pass")) else if (!strcmp(label, "video_shader_scale_pass"))
{ {
dist_scale /= 3; unsigned pass = id - MENU_SETTINGS_SHADER_PASS_SCALE_0;
struct gfx_shader *shader = (struct gfx_shader*)driver.menu->shader; struct gfx_shader *shader = (struct gfx_shader*)driver.menu->shader;
struct gfx_shader_pass *pass = (struct gfx_shader_pass*) struct gfx_shader_pass *shader_pass = (struct gfx_shader_pass*)
&shader->pass[dist_scale]; &shader->pass[pass];
switch (action) switch (action)
{ {
case MENU_ACTION_START: case MENU_ACTION_START:
if (shader) if (shader)
{ {
pass->fbo.scale_x = pass->fbo.scale_y = 0; shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = 0;
pass->fbo.valid = false; shader_pass->fbo.valid = false;
} }
break; break;
@ -467,14 +461,14 @@ static int menu_common_shader_manager_setting_toggle(
case MENU_ACTION_RIGHT: case MENU_ACTION_RIGHT:
case MENU_ACTION_OK: case MENU_ACTION_OK:
{ {
unsigned current_scale = pass->fbo.scale_x; unsigned current_scale = shader_pass->fbo.scale_x;
unsigned delta = action == MENU_ACTION_LEFT ? 5 : 1; unsigned delta = action == MENU_ACTION_LEFT ? 5 : 1;
current_scale = (current_scale + delta) % 6; current_scale = (current_scale + delta) % 6;
if (pass) if (shader_pass)
{ {
pass->fbo.valid = current_scale; shader_pass->fbo.valid = current_scale;
pass->fbo.scale_x = pass->fbo.scale_y = current_scale; shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = current_scale;
} }
break; break;
} }

10
frontend/menu/menu_common.h
View File

@ -92,10 +92,12 @@ typedef enum
MENU_SETTINGS_SHADER_OPTIONS, MENU_SETTINGS_SHADER_OPTIONS,
MENU_SETTINGS_SHADER_PARAMETER_0, MENU_SETTINGS_SHADER_PARAMETER_0,
MENU_SETTINGS_SHADER_PARAMETER_LAST = MENU_SETTINGS_SHADER_PARAMETER_0 + (GFX_MAX_PARAMETERS - 1), MENU_SETTINGS_SHADER_PARAMETER_LAST = MENU_SETTINGS_SHADER_PARAMETER_0 + (GFX_MAX_PARAMETERS - 1),
MENU_SETTINGS_SHADER_0, MENU_SETTINGS_SHADER_PASS_0,
MENU_SETTINGS_SHADER_0_FILTER, MENU_SETTINGS_SHADER_PASS_LAST = MENU_SETTINGS_SHADER_PASS_0 + (GFX_MAX_SHADERS - 1),
MENU_SETTINGS_SHADER_0_SCALE, MENU_SETTINGS_SHADER_PASS_FILTER_0,
MENU_SETTINGS_SHADER_LAST = MENU_SETTINGS_SHADER_0_SCALE + (3 * (GFX_MAX_SHADERS - 1)), MENU_SETTINGS_SHADER_PASS_FILTER_LAST = MENU_SETTINGS_SHADER_PASS_FILTER_0 + (GFX_MAX_SHADERS - 1),
MENU_SETTINGS_SHADER_PASS_SCALE_0,
MENU_SETTINGS_SHADER_PASS_SCALE_LAST = MENU_SETTINGS_SHADER_PASS_SCALE_0 + (GFX_MAX_SHADERS - 1),
MENU_SETTINGS_BIND_PLAYER, MENU_SETTINGS_BIND_PLAYER,
MENU_SETTINGS_BIND_DEVICE, MENU_SETTINGS_BIND_DEVICE,

6
frontend/menu/menu_entries.c
View File

@ -509,15 +509,15 @@ int menu_entries_push_list(menu_handle_t *menu,
snprintf(buf, sizeof(buf), "Shader #%u", i); snprintf(buf, sizeof(buf), "Shader #%u", i);
file_list_push(list, buf, "video_shader_pass", file_list_push(list, buf, "video_shader_pass",
MENU_SETTINGS_SHADER_0 + 3 * i, 0); MENU_SETTINGS_SHADER_PASS_0 + i, 0);
snprintf(buf, sizeof(buf), "Shader #%u Filter", i); snprintf(buf, sizeof(buf), "Shader #%u Filter", i);
file_list_push(list, buf, "video_shader_filter_pass", file_list_push(list, buf, "video_shader_filter_pass",
MENU_SETTINGS_SHADER_0_FILTER + 3 * i, 0); MENU_SETTINGS_SHADER_PASS_FILTER_0 + i, 0);
snprintf(buf, sizeof(buf), "Shader #%u Scale", i); snprintf(buf, sizeof(buf), "Shader #%u Scale", i);
file_list_push(list, buf, "video_shader_scale_pass", file_list_push(list, buf, "video_shader_scale_pass",
MENU_SETTINGS_SHADER_0_SCALE + 3 * i, 0); MENU_SETTINGS_SHADER_PASS_SCALE_0 + i, 0);
} }
} }
else if (!strcmp(label, "disk_options")) else if (!strcmp(label, "disk_options"))