mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(zahnrad) Use menu_texture_item

Browse Source
This commit is contained in:
twinaphex 2016-03-05 08:42:35 +01:00
parent 1742b96ec0
commit a73cbb6114
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
menu/drivers/zr.c
View File

@ -101,10 +101,6 @@ struct zrmenu
}; };
static struct zrmenu gui; static struct zrmenu gui;
struct zrmenu_texture_item
{
uintptr_t id;
};
typedef struct zrmenu_handle typedef struct zrmenu_handle
{ {
@ -121,8 +117,8 @@ typedef struct zrmenu_handle
float alpha; float alpha;
} arrow; } arrow;
struct zrmenu_texture_item bg; menu_texture_item bg;
struct zrmenu_texture_item list[ZR_TEXTURE_LAST]; menu_texture_item list[ZR_TEXTURE_LAST];
} textures; } textures;
gfx_font_raster_block_t list_block; gfx_font_raster_block_t list_block;
@ -937,7 +933,7 @@ static void zrmenu_context_reset_textures(zrmenu_handle_t *zr,
video_texture_image_load(&ti, path); video_texture_image_load(&ti, path);
video_driver_texture_load(&ti, video_driver_texture_load(&ti,
TEXTURE_FILTER_MIPMAP_LINEAR, &zr->textures.list[i].id); TEXTURE_FILTER_MIPMAP_LINEAR, &zr->textures.list[i]);
video_texture_image_free(&ti); video_texture_image_free(&ti);
} }
@ -974,7 +970,7 @@ static void zrmenu_draw_cursor(zrmenu_handle_t *zr,
draw.height = 64; draw.height = 64;
draw.coords = &coords; draw.coords = &coords;
draw.matrix_data = NULL; draw.matrix_data = NULL;
draw.texture = zr->textures.list[ZR_TEXTURE_POINTER].id; draw.texture = zr->textures.list[ZR_TEXTURE_POINTER];
draw.prim_type = MENU_DISPLAY_PRIM_TRIANGLESTRIP; draw.prim_type = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
menu_display_ctl(MENU_DISPLAY_CTL_DRAW, &draw); menu_display_ctl(MENU_DISPLAY_CTL_DRAW, &draw);
@ -1126,7 +1122,7 @@ static void zrmenu_context_destroy(void *data)
return; return;
for (i = 0; i < ZR_TEXTURE_LAST; i++) for (i = 0; i < ZR_TEXTURE_LAST; i++)
video_driver_texture_unload((uintptr_t*)&zr->textures.list[i].id); video_driver_texture_unload((uintptr_t*)&zr->textures.list[i]);
menu_display_ctl(MENU_DISPLAY_CTL_FONT_MAIN_DEINIT, NULL); menu_display_ctl(MENU_DISPLAY_CTL_FONT_MAIN_DEINIT, NULL);