mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-05 06:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Stub Shader Manager menu in - now to fill it in

Browse Source
This commit is contained in:
twinaphex 2013-04-10 11:20:28 +02:00
parent 4c0da898ae
commit c52530d03e
3 changed files with 116 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/menu/rgui.c
View File

@ -377,7 +377,7 @@ static void render_messagebox(rgui_handle_t *rgui, const char *message)
} }
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
static void shader_manager_get_str(rgui_handle_t *rgui, static void shader_manager_get_str(struct gfx_shader *shader,
char *type_str, size_t type_str_size, unsigned type); char *type_str, size_t type_str_size, unsigned type);
static int shader_manager_toggle_setting(rgui_handle_t *rgui, unsigned setting, rgui_action_t action); static int shader_manager_toggle_setting(rgui_handle_t *rgui, unsigned setting, rgui_action_t action);
#endif #endif
@ -451,7 +451,7 @@ static void render_text(rgui_handle_t *rgui)
w = 5; w = 5;
} }
else else
shader_manager_get_str(rgui, type_str, sizeof(type_str), type); shader_manager_get_str(&rgui->shader, type_str, sizeof(type_str), type);
} }
else else
#endif #endif
@ -1254,30 +1254,28 @@ static int shader_manager_toggle_setting(rgui_handle_t *rgui, unsigned setting,
return 0; return 0;
} }
static void shader_manager_get_str(rgui_handle_t *rgui, static void shader_manager_get_str(struct gfx_shader *shader,
char *type_str, size_t type_str_size, unsigned type) char *type_str, size_t type_str_size, unsigned type)
{ {
if (type == RGUI_SETTINGS_SHADER_APPLY) if (type == RGUI_SETTINGS_SHADER_APPLY)
*type_str = '\0'; *type_str = '\0';
else if (type == RGUI_SETTINGS_SHADER_PASSES) else if (type == RGUI_SETTINGS_SHADER_PASSES)
snprintf(type_str, type_str_size, "%u", rgui->shader.passes); snprintf(type_str, type_str_size, "%u", shader->passes);
else else
{ {
unsigned pass = (type - RGUI_SETTINGS_SHADER_0) / 3; unsigned pass = (type - RGUI_SETTINGS_SHADER_0) / 3;
switch ((type - RGUI_SETTINGS_SHADER_0) % 3) switch ((type - RGUI_SETTINGS_SHADER_0) % 3)
{ {
case 0: case 0:
if (*rgui->shader.pass[pass].source.cg) if (*shader->pass[pass].source.cg)
{
fill_pathname_base(type_str, fill_pathname_base(type_str,
rgui->shader.pass[pass].source.cg, type_str_size); shader->pass[pass].source.cg, type_str_size);
}
else else
strlcpy(type_str, "N/A", type_str_size); strlcpy(type_str, "N/A", type_str_size);
break; break;
case 1: case 1:
switch (rgui->shader.pass[pass].filter) switch (shader->pass[pass].filter)
{ {
case RARCH_FILTER_LINEAR: case RARCH_FILTER_LINEAR:
strlcpy(type_str, "Linear", type_str_size); strlcpy(type_str, "Linear", type_str_size);
@ -1295,7 +1293,7 @@ static void shader_manager_get_str(rgui_handle_t *rgui,
case 2: case 2:
{ {
unsigned scale = rgui->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

107
frontend/menu/rmenu.c
View File

@ -36,19 +36,21 @@
#include "../../driver.h" #include "../../driver.h"
#include "../../general.h" #include "../../general.h"
#define EXT_IMAGES "png|PNG|jpg|JPG|JPEG|jpeg" #ifdef HAVE_SHADER_MANAGER
#define EXT_SHADERS "cg|CG" #include "../../gfx/shader_parse.h"
#define EXT_CGP_PRESETS "cgp|CGP"
#define EXT_INPUT_PRESETS "cfg|CFG"
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
#define HAVE_SHADER_MANAGER
#endif #endif
#ifdef _XBOX1 #ifdef _XBOX1
#define HAVE_MENU_PANEL #define JPEG_FORMATS ""
#else
#define JPEG_FORMATS "|jpg|JPG|JPEG|jpeg"
#endif #endif
#define EXT_IMAGES "png|PNG"JPEG_FORMATS
#define EXT_SHADERS "cg"
#define EXT_CGP_PRESETS "cgp"
#define EXT_INPUT_PRESETS "cfg|CFG"
static bool set_libretro_core_as_launch; static bool set_libretro_core_as_launch;
struct texture_image *menu_texture; struct texture_image *menu_texture;
@ -60,6 +62,10 @@ filebrowser_t *browser;
filebrowser_t *tmpBrowser; filebrowser_t *tmpBrowser;
unsigned currently_selected_controller_menu = 0; unsigned currently_selected_controller_menu = 0;
#ifdef HAVE_SHADER_MANAGER
struct gfx_shader shader;
#endif
static const struct retro_keybind _rmenu_nav_binds[] = { static const struct retro_keybind _rmenu_nav_binds[] = {
{ 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) | (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_UP), 0 }, { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) | (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_UP), 0 },
{ 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN) | (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_DOWN), 0 }, { 0, 0, NULL, (enum retro_key)0, (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN) | (1ULL << RARCH_ANALOG_LEFT_Y_DPAD_DOWN), 0 },
@ -342,7 +348,8 @@ static void populate_setting_item(void *data, unsigned input)
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
case SETTING_SHADER_PRESETS: case SETTING_SHADER_PRESETS:
strlcpy(current_item->text, "Shader Presets (CGP)", sizeof(current_item->text)); strlcpy(current_item->text, "Shader Presets (CGP)", sizeof(current_item->text));
strlcpy(current_item->comment, "INFO - Select a [CG Preset] script.", sizeof(current_item->comment)); strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text));
strlcpy(current_item->comment, "INFO - Select a CGP file.", sizeof(current_item->comment));
break; break;
#endif #endif
case SETTING_EMU_SKIN: case SETTING_EMU_SKIN:
@ -426,7 +433,7 @@ static void populate_setting_item(void *data, unsigned input)
case SETTING_APPLY_SHADER_PRESET_ON_STARTUP: case SETTING_APPLY_SHADER_PRESET_ON_STARTUP:
strlcpy(current_item->text, "APPLY SHADER PRESET ON STARTUP", sizeof(current_item->text)); strlcpy(current_item->text, "APPLY SHADER PRESET ON STARTUP", sizeof(current_item->text));
strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text)); strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text));
strlcpy(current_item->comment, "INFO - Automatically load the currently selected [CG Preset] file on startup.", sizeof(current_item->comment)); strlcpy(current_item->comment, "INFO - Auto-load at startup the current shader settings.", sizeof(current_item->comment));
break; break;
#endif #endif
case SETTING_DEFAULT_VIDEO_ALL: case SETTING_DEFAULT_VIDEO_ALL:
@ -673,7 +680,7 @@ static void populate_setting_item(void *data, unsigned input)
case SETTING_SAVE_SHADER_PRESET: case SETTING_SAVE_SHADER_PRESET:
strlcpy(current_item->text, "SAVE SETTINGS AS CGP PRESET", sizeof(current_item->text)); strlcpy(current_item->text, "SAVE SETTINGS AS CGP PRESET", sizeof(current_item->text));
strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text)); strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text));
strlcpy(current_item->comment, "INFO - Save the current video settings to a [CG Preset] (CGP) file.", sizeof(current_item->comment)); strlcpy(current_item->comment, "INFO - Save current shader settings to a CGP file.", sizeof(current_item->comment));
break; break;
#endif #endif
case INGAME_MENU_LOAD_STATE: case INGAME_MENU_LOAD_STATE:
@ -706,6 +713,13 @@ static void populate_setting_item(void *data, unsigned input)
strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text)); strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text));
strlcpy(current_item->comment, "Set core-specific options.", sizeof(current_item->comment)); strlcpy(current_item->comment, "Set core-specific options.", sizeof(current_item->comment));
break; break;
#ifdef HAVE_SHADER_MANAGER
case INGAME_MENU_SHADER_MANAGER_MODE:
strlcpy(current_item->text, "ShaderMan", sizeof(current_item->text));
strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text));
strlcpy(current_item->comment, "Set and manage shader options.", sizeof(current_item->comment));
break;
#endif
case INGAME_MENU_FRAME_ADVANCE: case INGAME_MENU_FRAME_ADVANCE:
strlcpy(current_item->text, "Frame Advance", sizeof(current_item->text)); strlcpy(current_item->text, "Frame Advance", sizeof(current_item->text));
strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text)); strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text));
@ -802,6 +816,9 @@ static void display_menubar(uint8_t menu_type)
break; break;
case CONTROLS_MENU: case CONTROLS_MENU:
case INGAME_MENU_CORE_OPTIONS: case INGAME_MENU_CORE_OPTIONS:
#ifdef HAVE_SHADER_MANAGER
case INGAME_MENU_SHADER_MANAGER:
#endif
case INGAME_MENU_RESIZE: case INGAME_MENU_RESIZE:
if (driver.input->set_keybinds) if (driver.input->set_keybinds)
driver.input->set_keybinds(&key_label_l, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); driver.input->set_keybinds(&key_label_l, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
@ -847,6 +864,11 @@ static void display_menubar(uint8_t menu_type)
case INGAME_MENU_CORE_OPTIONS: case INGAME_MENU_CORE_OPTIONS:
strlcpy(title, "Core Options", sizeof(title)); strlcpy(title, "Core Options", sizeof(title));
break; break;
#ifdef HAVE_SHADER_MANAGER
case INGAME_MENU_SHADER_MANAGER:
strlcpy(title, "Shader Manager", sizeof(title));
break;
#endif
case INGAME_MENU_RESIZE: case INGAME_MENU_RESIZE:
strlcpy(title, "Resize Menu", sizeof(title)); strlcpy(title, "Resize Menu", sizeof(title));
break; break;
@ -1027,7 +1049,7 @@ static int select_file(uint8_t menu_type, uint64_t input)
break; break;
case PRESET_CHOICE: case PRESET_CHOICE:
strlcpy(extensions, EXT_CGP_PRESETS, sizeof(extensions)); strlcpy(extensions, EXT_CGP_PRESETS, sizeof(extensions));
strlcpy(comment, "INFO - Select a shader preset.", sizeof(comment)); strlcpy(comment, "INFO - Select a CGP file.", sizeof(comment));
break; break;
case INPUT_PRESET_CHOICE: case INPUT_PRESET_CHOICE:
strlcpy(extensions, EXT_INPUT_PRESETS, sizeof(extensions)); strlcpy(extensions, EXT_INPUT_PRESETS, sizeof(extensions));
@ -1059,7 +1081,16 @@ static int select_file(uint8_t menu_type, uint64_t input)
case SHADER_CHOICE: case SHADER_CHOICE:
break; break;
case PRESET_CHOICE: case PRESET_CHOICE:
strlcpy(g_extern.file_state.cgp_path, path, sizeof(g_extern.file_state.cgp_path)); {
config_file_t *conf = NULL;
strlcpy(g_extern.file_state.cgp_path, path, sizeof(g_extern.file_state.cgp_path));
conf = config_file_new(path);
if (conf)
gfx_shader_read_conf_cgp(conf, &shader);
config_file_free(conf);
}
break; break;
#endif #endif
case INPUT_PRESET_CHOICE: case INPUT_PRESET_CHOICE:
@ -2134,6 +2165,12 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
if (input & (1ULL << RMENU_DEVICE_NAV_B)) if (input & (1ULL << RMENU_DEVICE_NAV_B))
menu_stack_push(INGAME_MENU_CORE_OPTIONS); menu_stack_push(INGAME_MENU_CORE_OPTIONS);
break; break;
#ifdef HAVE_SHADER_MANAGER
case INGAME_MENU_SHADER_MANAGER_MODE:
if (input & (1ULL << RMENU_DEVICE_NAV_B))
menu_stack_push(INGAME_MENU_SHADER_MANAGER);
break;
#endif
case INGAME_MENU_SCREENSHOT_MODE: case INGAME_MENU_SCREENSHOT_MODE:
if (input & (1ULL << RMENU_DEVICE_NAV_B)) if (input & (1ULL << RMENU_DEVICE_NAV_B))
menu_stack_push(INGAME_MENU_SCREENSHOT); menu_stack_push(INGAME_MENU_SCREENSHOT);
@ -2974,6 +3011,39 @@ static int ingame_menu_core_options(uint8_t menu_type, uint64_t input)
return 0; return 0;
} }
#ifdef HAVE_SHADER_MANAGER
static int ingame_menu_shader_manager(uint8_t menu_type, uint64_t input)
{
static unsigned shader_opt_selected = 0;
float y_increment = POSITION_Y_START;
(void)menu_type;
(void)input;
(void)shader_opt_selected;
if (input & (1ULL << RMENU_DEVICE_NAV_A))
{
menu_stack_pop();
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
}
display_menubar(menu_type);
y_increment += POSITION_Y_INCREMENT;
font_params_t font_parms = {0};
font_parms.x = POSITION_X;
font_parms.y = y_increment;
font_parms.scale = CURRENT_PATH_FONT_SIZE;
font_parms.color = WHITE;
(void)font_parms;
return 0;
}
#endif
static int ingame_menu_screenshot(uint8_t menu_type, uint64_t input) static int ingame_menu_screenshot(uint8_t menu_type, uint64_t input)
{ {
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW);
@ -3043,7 +3113,11 @@ static int menu_input_process(uint8_t menu_type, uint64_t old_state)
* a cleaner way of telling RMenu that the menu stack should be popped * a cleaner way of telling RMenu that the menu stack should be popped
* for a submenu when doing the menu quit hotkey */ * for a submenu when doing the menu quit hotkey */
if (menu_type == INGAME_MENU_CORE_OPTIONS || menu_type == INGAME_MENU_RESIZE if (menu_type == INGAME_MENU_CORE_OPTIONS || menu_type == INGAME_MENU_RESIZE
|| menu_type == LIBRETRO_CHOICE) || menu_type == LIBRETRO_CHOICE
#ifdef HAVE_SHADER_MANAGER
|| menu_type == INGAME_MENU_SHADER_MANAGER
#endif
)
{ {
menu_stack_pop(); menu_stack_pop();
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
@ -3233,6 +3307,11 @@ bool menu_iterate(void)
case INGAME_MENU_CORE_OPTIONS: case INGAME_MENU_CORE_OPTIONS:
input_entry_ret = ingame_menu_core_options(menu_id, input); input_entry_ret = ingame_menu_core_options(menu_id, input);
break; break;
#ifdef HAVE_SHADER_MANAGER
case INGAME_MENU_SHADER_MANAGER:
input_entry_ret = ingame_menu_shader_manager(menu_id, input);
break;
#endif
case INGAME_MENU_SCREENSHOT: case INGAME_MENU_SCREENSHOT:
input_entry_ret = ingame_menu_screenshot(menu_id, input); input_entry_ret = ingame_menu_screenshot(menu_id, input);
break; break;

16
frontend/menu/rmenu.h
View File

@ -17,6 +17,14 @@
#ifndef _RMENU_H_ #ifndef _RMENU_H_
#define _RMENU_H_ #define _RMENU_H_
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
#define HAVE_SHADER_MANAGER
#endif
#ifdef _XBOX1
#define HAVE_MENU_PANEL
#endif
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL)
#define DEVICE_CAST gl_t* #define DEVICE_CAST gl_t*
#elif defined(_XBOX1) #elif defined(_XBOX1)
@ -64,10 +72,13 @@ enum
INGAME_MENU, INGAME_MENU,
INGAME_MENU_RESIZE, INGAME_MENU_RESIZE,
INGAME_MENU_CORE_OPTIONS, INGAME_MENU_CORE_OPTIONS,
#ifdef HAVE_SHADER_MANAGER
INGAME_MENU_SHADER_MANAGER,
#endif
INGAME_MENU_SCREENSHOT INGAME_MENU_SCREENSHOT
}; };
#ifndef _XBOX360 #ifndef HAVE_RMENU_XUI
enum enum
{ {
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__
@ -155,6 +166,9 @@ enum
INGAME_MENU_FRAME_ADVANCE, INGAME_MENU_FRAME_ADVANCE,
INGAME_MENU_SCREENSHOT_MODE, INGAME_MENU_SCREENSHOT_MODE,
INGAME_MENU_RESET, INGAME_MENU_RESET,
#ifdef HAVE_SHADER_MANAGER
INGAME_MENU_SHADER_MANAGER_MODE,
#endif
INGAME_MENU_CORE_OPTIONS_MODE, INGAME_MENU_CORE_OPTIONS_MODE,
INGAME_MENU_RETURN_TO_GAME, INGAME_MENU_RETURN_TO_GAME,
INGAME_MENU_CHANGE_GAME, INGAME_MENU_CHANGE_GAME,