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

Get rid of rarch_position_t structure and move RMenu texture to 

rmenu.c instead of somewhere in g_extern global
This commit is contained in:
twinaphex 2013-04-10 04:26:18 +02:00
parent 7728e80e0f
commit 43c9195a77
5 changed files with 50 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
frontend/menu/rmenu.c
View File

@ -47,6 +47,12 @@
static bool set_libretro_core_as_launch; static bool set_libretro_core_as_launch;
struct texture_image menu_texture;
#ifdef _XBOX1
struct texture_image menu_panel;
#endif
filebrowser_t *browser; filebrowser_t *browser;
filebrowser_t *tmpBrowser; filebrowser_t *tmpBrowser;
unsigned currently_selected_controller_menu = 0; unsigned currently_selected_controller_menu = 0;
@ -220,7 +226,7 @@ static void texture_image_border_load(const char *path)
glGenTextures(1, &menu_texture_id); glGenTextures(1, &menu_texture_id);
RARCH_LOG("Loading texture image for menu...\n"); RARCH_LOG("Loading texture image for menu...\n");
if (!texture_image_load(path, &g_extern.console.menu_texture)) if (!texture_image_load(path, &menu_texture))
{ {
RARCH_ERR("Failed to load texture image for menu.\n"); RARCH_ERR("Failed to load texture image for menu.\n");
return; return;
@ -233,53 +239,29 @@ static void texture_image_border_load(const char *path)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, RARCH_GL_INTERNAL_FORMAT32, glTexImage2D(GL_TEXTURE_2D, 0, RARCH_GL_INTERNAL_FORMAT32,
g_extern.console.menu_texture.width, g_extern.console.menu_texture.height, 0, menu_texture.width, menu_texture.height, 0,
RARCH_GL_TEXTURE_TYPE32, RARCH_GL_FORMAT32, g_extern.console.menu_texture.pixels); RARCH_GL_TEXTURE_TYPE32, RARCH_GL_FORMAT32, menu_texture.pixels);
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]); glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
free(g_extern.console.menu_texture.pixels); free(menu_texture.pixels);
#endif #endif
} }
static void rmenu_gfx_init(void) static void rmenu_gfx_init(void)
{ {
#ifdef _XBOX1
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;
texture_image_load("D:\\Media\\menuMainRomSelectPanel.png", &g_extern.console.menu_panel);
#endif
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE))
return; return;
#ifdef _XBOX1 #ifdef _XBOX1
strlcpy(g_extern.console.menu_texture_path,"D:\\Media\\main-menu_480p.png", xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;
sizeof(g_extern.console.menu_texture_path)); texture_image_load("D:\\Media\\menuMainRomSelectPanel.png", &menu_panel);
#endif
texture_image_load(g_extern.console.menu_texture_path, &g_extern.console.menu_texture);
#ifdef _XBOX1
texture_image_load(g_extern.menu_texture_path, &menu_texture);
#else #else
texture_image_border_load(g_extern.console.menu_texture_path); texture_image_border_load(g_extern.menu_texture_path);
#endif
}
static void rmenu_gfx_draw_panel(rarch_position_t *position)
{
#ifdef _XBOX1
g_extern.console.menu_panel.x = position->x;
g_extern.console.menu_panel.y = position->y;
g_extern.console.menu_panel.width = 510;
g_extern.console.menu_panel.height = 20;
texture_image_render(&g_extern.console.menu_panel);
#endif
}
static void rmenu_gfx_draw_bg(rarch_position_t *position)
{
#ifdef _XBOX1
g_extern.console.menu_texture.x = 0;
g_extern.console.menu_texture.y = 0;
texture_image_render(&g_extern.console.menu_texture);
#endif #endif
} }
@ -316,8 +298,8 @@ static void rmenu_gfx_frame(void *data)
static void rmenu_gfx_free(void) static void rmenu_gfx_free(void)
{ {
#ifdef _XBOX1 #ifdef _XBOX1
texture_image_free(&g_extern.console.menu_texture); texture_image_free(&menu_texture);
texture_image_free(&g_extern.console.menu_panel); texture_image_free(&menu_panel);
#endif #endif
} }
@ -397,7 +379,7 @@ static void populate_setting_item(void *data, unsigned input)
break; break;
#endif #endif
case SETTING_EMU_SKIN: case SETTING_EMU_SKIN:
fill_pathname_base(fname, g_extern.console.menu_texture_path, sizeof(fname)); fill_pathname_base(fname, g_extern.menu_texture_path, sizeof(fname));
strlcpy(current_item->text, "Menu Skin", sizeof(current_item->text)); strlcpy(current_item->text, "Menu Skin", sizeof(current_item->text));
strlcpy(current_item->setting_text, fname, sizeof(current_item->setting_text)); strlcpy(current_item->setting_text, fname, sizeof(current_item->setting_text));
strlcpy(current_item->comment, "INFO - Select a skin for the menu.", sizeof(current_item->comment)); strlcpy(current_item->comment, "INFO - Select a skin for the menu.", sizeof(current_item->comment));
@ -953,8 +935,11 @@ static void display_menubar(uint8_t menu_type)
break; break;
} }
rarch_position_t position = {0}; #ifdef _XBOX1
rmenu_gfx_draw_bg(&position); menu_texture.x = 0;
menu_texture.y = 0;
texture_image_render(&menu_texture);
#endif
font_parms.x = CORE_MSG_POSITION_X; font_parms.x = CORE_MSG_POSITION_X;
font_parms.y = CORE_MSG_POSITION_Y; font_parms.y = CORE_MSG_POSITION_Y;
@ -1045,10 +1030,13 @@ static void browser_render(void *data)
const char *current_pathname = filebrowser_get_current_path(b); const char *current_pathname = filebrowser_get_current_path(b);
if (strcmp(current_pathname, b->current_dir.list->elems[i].data) == 0) if (strcmp(current_pathname, b->current_dir.list->elems[i].data) == 0)
{ {
rarch_position_t position = {0}; #ifdef _XBOX1
font_parms.x = POSITION_X; menu_panel.x = 0;
position.y = y_increment; menu_panel.y = y_increment;
rmenu_gfx_draw_panel(&position); menu_panel.width = 510;
menu_panel.height = 20;
texture_image_render(&menu_panel);
#endif
} }
font_parms.x = POSITION_X; font_parms.x = POSITION_X;
@ -1118,10 +1106,12 @@ static int select_file(uint8_t menu_type, uint64_t input)
config_read_keybinds(path); config_read_keybinds(path);
break; break;
case BORDER_CHOICE: case BORDER_CHOICE:
#ifdef __CELLOS_LV2__ #ifdef _XBOX1
texture_image_load(path);
#else
texture_image_border_load(path); texture_image_border_load(path);
strlcpy(g_extern.console.menu_texture_path, path, sizeof(g_extern.console.menu_texture_path));
#endif #endif
strlcpy(g_extern.menu_texture_path, path, sizeof(g_extern.menu_texture_path));
break; break;
case LIBRETRO_CHOICE: case LIBRETRO_CHOICE:
strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro)); strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro));
@ -1508,7 +1498,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
} }
if (input & (1ULL << RMENU_DEVICE_NAV_START)) if (input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
if (!texture_image_load(default_paths.menu_border_file, &g_extern.console.menu_texture)) if (!texture_image_load(default_paths.menu_border_file, &menu_texture))
{ {
RARCH_ERR("Failed to load texture image for menu.\n"); RARCH_ERR("Failed to load texture image for menu.\n");
return false; return false;
@ -2323,11 +2313,13 @@ static int select_setting(uint8_t menu_type, uint64_t input)
if (item.enum_id != selected) if (item.enum_id != selected)
continue; continue;
rarch_position_t position = {0}; #ifdef _XBOX1
position.x = POSITION_X; menu_panel.x = POSITION_X;
position.y = y_increment; menu_panel.y = y_increment;
menu_panel.width = 510;
rmenu_gfx_draw_panel(&position); menu_panel.height = 20;
texture_image_render(&menu_panel);
#endif
font_parms.x = POSITION_X; font_parms.x = POSITION_X;
font_parms.y = COMMENT_POSITION_Y; font_parms.y = COMMENT_POSITION_Y;

1
frontend/platform/platform_xdk.c
View File

@ -305,6 +305,7 @@ static void get_environment_settings(int argc, char *argv[])
strlcpy(default_paths.filesystem_root_dir, "D:", sizeof(default_paths.filesystem_root_dir)); strlcpy(default_paths.filesystem_root_dir, "D:", sizeof(default_paths.filesystem_root_dir));
strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir)); strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir));
strlcpy(g_settings.screenshot_directory, "D:\\screenshots", sizeof(g_settings.screenshot_directory)); strlcpy(g_settings.screenshot_directory, "D:\\screenshots", sizeof(g_settings.screenshot_directory));
snprintf(default_paths.menu_border_file, "D:\\Media\\main-menu_480p.png", sizeof(default_paths.menu_border_file));
#elif defined(_XBOX360) #elif defined(_XBOX360)
strlcpy(default_paths.core_dir, "game:", sizeof(default_paths.core_dir)); strlcpy(default_paths.core_dir, "game:", sizeof(default_paths.core_dir));
strlcpy(default_paths.filesystem_root_dir, "game:\\", sizeof(default_paths.filesystem_root_dir)); strlcpy(default_paths.filesystem_root_dir, "game:\\", sizeof(default_paths.filesystem_root_dir));

12
general.h
View File

@ -38,10 +38,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_RMENU
#include "gfx/image.h"
#endif
// Platform-specific headers // Platform-specific headers
// PS3 // PS3
#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) #if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
@ -333,6 +329,9 @@ struct global
bool has_set_save_path; bool has_set_save_path;
bool has_set_state_path; bool has_set_state_path;
#ifdef HAVE_RMENU
char menu_texture_path[PATH_MAX];
#endif
char config_path[PATH_MAX]; char config_path[PATH_MAX];
char append_config_path[PATH_MAX]; char append_config_path[PATH_MAX];
@ -590,11 +589,6 @@ struct global
{ {
oskutil_params oskutil_handle; oskutil_params oskutil_handle;
} misc; } misc;
#endif
#ifdef HAVE_RMENU
struct texture_image menu_texture;
char menu_texture_path[PATH_MAX];
struct texture_image menu_panel;
#endif #endif
} console; } console;

8
gfx/gfx_context.h
View File

@ -38,14 +38,6 @@ enum gfx_ctx_api
GFX_CTX_OPENVG_API GFX_CTX_OPENVG_API
}; };
typedef struct rarch_position
{
float x;
float y;
float width;
float height;
} rarch_position_t;
typedef void (*gfx_ctx_proc_t)(void); typedef void (*gfx_ctx_proc_t)(void);
typedef struct gfx_ctx_driver typedef struct gfx_ctx_driver

6
settings.c
View File

@ -265,7 +265,7 @@ void config_set_defaults(void)
strlcpy(g_extern.console.main_wrap.default_rom_startup_dir, default_paths.filebrowser_startup_dir, sizeof(g_extern.console.main_wrap.default_rom_startup_dir)); strlcpy(g_extern.console.main_wrap.default_rom_startup_dir, default_paths.filebrowser_startup_dir, sizeof(g_extern.console.main_wrap.default_rom_startup_dir));
strlcpy(g_extern.console.main_wrap.default_savestate_dir, default_paths.savestate_dir, sizeof(g_extern.console.main_wrap.default_savestate_dir)); strlcpy(g_extern.console.main_wrap.default_savestate_dir, default_paths.savestate_dir, sizeof(g_extern.console.main_wrap.default_savestate_dir));
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
strlcpy(g_extern.console.menu_texture_path, default_paths.menu_border_file, sizeof(g_extern.console.menu_texture_path)); strlcpy(g_extern.menu_texture_path, default_paths.menu_border_file, sizeof(g_extern.menu_texture_path));
#endif #endif
g_settings.video.aspect_ratio_idx = aspect_ratio_idx; g_settings.video.aspect_ratio_idx = aspect_ratio_idx;
@ -483,7 +483,7 @@ bool config_load_file(const char *path)
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
if (config_get_path(conf, "menu_texture_path", tmp_str, sizeof(tmp_str))) if (config_get_path(conf, "menu_texture_path", tmp_str, sizeof(tmp_str)))
strlcpy(g_extern.console.menu_texture_path, tmp_str, sizeof(g_extern.console.menu_texture_path)); strlcpy(g_extern.menu_texture_path, tmp_str, sizeof(g_extern.menu_texture_path));
int low_ram_mode = 0; int low_ram_mode = 0;
if (config_get_int(conf, "rmenu_low_ram_mode_enable", &low_ram_mode)) if (config_get_int(conf, "rmenu_low_ram_mode_enable", &low_ram_mode))
@ -1214,7 +1214,7 @@ bool config_save_file(const char *path)
config_set_int(conf, "custom_viewport_y", g_extern.console.screen.viewports.custom_vp.y); config_set_int(conf, "custom_viewport_y", g_extern.console.screen.viewports.custom_vp.y);
config_set_string(conf, "default_rom_startup_dir", g_extern.console.main_wrap.default_rom_startup_dir); config_set_string(conf, "default_rom_startup_dir", g_extern.console.main_wrap.default_rom_startup_dir);
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
config_set_string(conf, "menu_texture_path", g_extern.console.menu_texture_path); config_set_string(conf, "menu_texture_path", g_extern.menu_texture_path);
#endif #endif
config_set_float(conf, "video_font_size", g_settings.video.font_size); config_set_float(conf, "video_font_size", g_settings.video.font_size);