Merge pull request #2854 from lakkatv/master

(XMB) White texture that will be used for the ribbon
This commit is contained in:
Twinaphex 2016-04-12 04:54:32 +02:00
commit fff07d46b3

View File

@ -2264,6 +2264,8 @@ static void *xmb_init(void **userdata)
menu_display_ctl(MENU_DISPLAY_CTL_SET_WIDTH, &width);
menu_display_ctl(MENU_DISPLAY_CTL_SET_HEIGHT, &height);
menu_display_allocate_white_texture();
xmb_init_horizontal_list(xmb);
xmb_font(xmb);
@ -2316,6 +2318,7 @@ static void xmb_context_bg_destroy(xmb_handle_t *xmb)
if (!xmb)
return;
video_driver_texture_unload(&xmb->textures.bg);
video_driver_texture_unload(&menu_display_white_texture);
}
static bool xmb_load_image(void *userdata, void *data, enum menu_image_type type)
@ -2334,6 +2337,7 @@ static bool xmb_load_image(void *userdata, void *data, enum menu_image_type type
video_driver_texture_load(data,
TEXTURE_FILTER_MIPMAP_LINEAR,
&xmb->textures.bg);
menu_display_allocate_white_texture();
break;
case MENU_IMAGE_THUMBNAIL:
{
@ -2486,6 +2490,8 @@ static void xmb_context_reset_textures(
video_texture_image_free(&ti);
}
menu_display_allocate_white_texture();
xmb->main_menu_node.icon = xmb->textures.list[XMB_TEXTURE_MAIN_MENU];
xmb->main_menu_node.alpha = XMB_CATEGORIES_ACTIVE_ALPHA;
xmb->main_menu_node.zoom = XMB_CATEGORIES_ACTIVE_ZOOM;