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

Get rid of menu_texture_item

This commit is contained in:
twinaphex 2020-02-17 22:28:21 +01:00
parent 898044933a
commit 53356fe61a
14 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cheevos-new/badges.c
View File

@ -63,11 +63,11 @@ void set_badge_info (badges_ctx_t *badge_struct, int id,
set_badge_menu_texture(badge_struct, id);
}
menu_texture_item get_badge_texture(int id)
uintptr_t get_badge_texture(int id)
{
settings_t *settings = config_get_ptr();
if (!settings || !settings->bools.cheevos_badges_enable)
return (menu_texture_item)NULL;
return (uintptr_t)NULL;
return badges_ctx.menu_texture_list[id];
}

14
cheevos-new/badges.h
View File

@ -16,9 +16,9 @@
#ifndef __RARCH_CHEEVOS_BADGE_H
#define __RARCH_CHEEVOS_BADGE_H
#include <stdint.h>
#include <retro_common_api.h>
#include "../menu/menu_driver.h"
#include <boolean.h>
RETRO_BEGIN_DECLS
@ -28,13 +28,17 @@ typedef struct
{
bool badge_locked[CHEEVOS_BADGE_LIMIT];
const char * badge_id_list[CHEEVOS_BADGE_LIMIT];
menu_texture_item menu_texture_list[CHEEVOS_BADGE_LIMIT];
uintptr_t menu_texture_list[CHEEVOS_BADGE_LIMIT];
} badges_ctx_t;
bool badge_exists(const char* filepath);
void set_badge_menu_texture(badges_ctx_t * badges, int i);
extern void set_badge_info (badges_ctx_t *badge_struct, int id, const char *badge_id, bool active);
extern menu_texture_item get_badge_texture(int id);
void set_badge_info(badges_ctx_t *badge_struct,
int id, const char *badge_id, bool active);
uintptr_t get_badge_texture(int id);
extern badges_ctx_t badges_ctx;
static badges_ctx_t new_badges_ctx;

4
menu/drivers/materialui.c
View File

@ -1307,8 +1307,8 @@ typedef struct materialui_handle
struct
{
menu_texture_item bg;
menu_texture_item list[MUI_TEXTURE_LAST];
uintptr_t bg;
uintptr_t list[MUI_TEXTURE_LAST];
} textures;
/* Font data */

2
menu/drivers/ozone/ozone.c
View File

@ -2324,7 +2324,7 @@ static int ozone_list_bind_init(menu_file_list_cbs_t *cbs,
}
#ifdef HAVE_GFX_WIDGETS
static bool ozone_get_load_content_animation_data(void *userdata, menu_texture_item *icon, char **playlist_name)
static bool ozone_get_load_content_animation_data(void *userdata, uintptr_t *icon, char **playlist_name)
{
ozone_handle_t *ozone = (ozone_handle_t*) userdata;

6
menu/drivers/ozone/ozone.h
View File

@ -100,9 +100,9 @@ struct ozone_handle
video_font_raster_block_t sidebar;
} raster_blocks;
menu_texture_item textures[OZONE_THEME_TEXTURE_LAST];
menu_texture_item icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LAST];
menu_texture_item tab_textures[OZONE_TAB_TEXTURE_LAST];
uintptr_t textures[OZONE_THEME_TEXTURE_LAST];
uintptr_t icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LAST];
uintptr_t tab_textures[OZONE_TAB_TEXTURE_LAST];
char title[PATH_MAX_LENGTH];

4
menu/drivers/ozone/ozone_entries.c
View File

@ -230,7 +230,7 @@ void ozone_compute_entries_position(ozone_handle_t *ozone)
OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO */
if (ozone->is_playlist && entries_end == 1)
{
menu_texture_item tex = ozone_entries_icon_get_texture(ozone, entry.enum_idx, entry.type, false);
uintptr_t tex = ozone_entries_icon_get_texture(ozone, entry.enum_idx, entry.type, false);
ozone->empty_playlist = tex == ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO];
}
else
@ -480,7 +480,7 @@ border_iterate:
for (i = 0; i < entries_end; i++)
{
menu_texture_item tex;
uintptr_t tex;
menu_entry_t entry;
gfx_animation_ctx_ticker_t ticker;
gfx_animation_ctx_ticker_smooth_t ticker_smooth;

2
menu/drivers/ozone/ozone_texture.c
View File

@ -28,7 +28,7 @@
#include "../../../cheevos-new/badges.h"
#include "../../../verbosity.h"
menu_texture_item ozone_entries_icon_get_texture(ozone_handle_t *ozone,
uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
enum msg_hash_enums enum_idx, unsigned type, bool active)
{
switch (enum_idx)

2
menu/drivers/ozone/ozone_texture.h
View File

@ -212,7 +212,7 @@ enum
const char *ozone_entries_icon_texture_path(unsigned id);
menu_texture_item ozone_entries_icon_get_texture(ozone_handle_t *ozone,
uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
enum msg_hash_enums enum_idx, unsigned type, bool active);
bool ozone_reset_theme_textures(ozone_handle_t *ozone);

2
menu/drivers/ozone/ozone_theme.h
View File

@ -137,7 +137,7 @@ typedef struct ozone_theme
float *cursor_border_0;
float *cursor_border_1;
menu_texture_item textures[OZONE_THEME_TEXTURE_LAST];
uintptr_t textures[OZONE_THEME_TEXTURE_LAST];
const char *name;
} ozone_theme_t;

4
menu/drivers/stripes.c
View File

@ -262,8 +262,8 @@ typedef struct stripes_handle
struct
{
menu_texture_item bg;
menu_texture_item list[STRIPES_TEXTURE_LAST];
uintptr_t bg;
uintptr_t list[STRIPES_TEXTURE_LAST];
} textures;
stripes_node_t main_menu_node;

6
menu/drivers/xmb.c
View File

@ -310,8 +310,8 @@ typedef struct xmb_handle
struct
{
menu_texture_item bg;
menu_texture_item list[XMB_TEXTURE_LAST];
uintptr_t bg;
uintptr_t list[XMB_TEXTURE_LAST];
} textures;
xmb_node_t main_menu_node;
@ -6588,7 +6588,7 @@ static int xmb_menu_entry_action(
}
#ifdef HAVE_GFX_WIDGETS
static bool xmb_get_load_content_animation_data(void *userdata, menu_texture_item *icon, char **playlist_name)
static bool xmb_get_load_content_animation_data(void *userdata, uintptr_t *icon, char **playlist_name)
{
xmb_handle_t *xmb = (xmb_handle_t*) userdata;

2
menu/menu_defines.h
View File

@ -340,8 +340,6 @@ enum playlist_entry_remove_enable_type
PLAYLIST_ENTRY_REMOVE_ENABLE_LAST
};
typedef uintptr_t menu_texture_item;
RETRO_END_DECLS
#endif

2
menu/menu_driver.c
View File

@ -1667,7 +1667,7 @@ void menu_driver_frame(video_frame_info_t *video_info)
menu_driver_ctx->frame(menu_userdata, video_info);
}
bool menu_driver_get_load_content_animation_data(menu_texture_item *icon, char **playlist_name)
bool menu_driver_get_load_content_animation_data(uintptr_t *icon, char **playlist_name)
{
return menu_driver_ctx && menu_driver_ctx->get_load_content_animation_data
&& menu_driver_ctx->get_load_content_animation_data(menu_userdata, icon, playlist_name);

5
menu/menu_driver.h
View File

@ -284,7 +284,7 @@ typedef struct menu_ctx_driver
enum menu_input_pointer_gesture gesture,
menu_file_list_cbs_t *cbs,
menu_entry_t *entry, unsigned action);
bool (*get_load_content_animation_data)(void *userdata, menu_texture_item *icon, char **playlist_name);
bool (*get_load_content_animation_data)(void *userdata, uintptr_t *icon, char **playlist_name);
/* This will be invoked whenever a menu entry action
* (menu_entry_action()) is performed */
int (*entry_action)(void *userdata, menu_entry_t *entry, size_t i, enum menu_action action);
@ -419,7 +419,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data);
void menu_driver_frame(video_frame_info_t *video_info);
bool menu_driver_get_load_content_animation_data(menu_texture_item *icon, char **playlist_name);
bool menu_driver_get_load_content_animation_data(
uintptr_t *icon, char **playlist_name);
bool menu_driver_iterate(menu_ctx_iterate_t *iterate);