mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Zarch) Move zui_finish to zarch_frame

Browse Source
This commit is contained in:
twinaphex 2015-10-24 23:21:18 +02:00
parent fa82818ad2
commit eed81c349e
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
menu/drivers/zarch.c
View File

@ -138,7 +138,6 @@ typedef struct zarch_handle
GRuint id; GRuint id;
char path[PATH_MAX_LENGTH]; char path[PATH_MAX_LENGTH];
} bg; } bg;
GRuint white;
} textures; } textures;
/* LAY_PICK_CORE */ /* LAY_PICK_CORE */
@ -903,7 +902,6 @@ static void zui_render(void)
break; break;
} }
zui_finish(zui, 0, 0, zui->width, zui->height, true, zui->textures.white);
} }
static void zarch_draw_cursor(gl_t *gl, float x, float y) static void zarch_draw_cursor(gl_t *gl, float x, float y)
@ -986,6 +984,8 @@ static void zarch_frame(void)
gl->shader->use(gl, GL_SHADER_STOCK_BLEND); gl->shader->use(gl, GL_SHADER_STOCK_BLEND);
zui_finish(zui, 0, 0, zui->width, zui->height, true, 0);
menu_display_ctl(MENU_DISPLAY_CTL_UNSET_VIEWPORT, NULL); menu_display_ctl(MENU_DISPLAY_CTL_UNSET_VIEWPORT, NULL);
} }
@ -1092,19 +1092,6 @@ static void zarch_context_destroy(void)
zarch_context_bg_destroy(zarch); zarch_context_bg_destroy(zarch);
} }
static void zarch_allocate_white_texture(zui_t *zarch)
{
struct texture_image ti;
static const uint8_t white_data[] = { 0xff, 0xff, 0xff, 0xff };
ti.width = 1;
ti.height = 1;
ti.pixels = (uint32_t*)&white_data;
zarch->textures.white = video_texture_load(&ti,
TEXTURE_BACKEND_OPENGL, TEXTURE_FILTER_NEAREST);
}
static bool zarch_load_image(void *data, menu_image_type_t type) static bool zarch_load_image(void *data, menu_image_type_t type)
{ {
zui_t *zarch = NULL; zui_t *zarch = NULL;
@ -1126,7 +1113,6 @@ static bool zarch_load_image(void *data, menu_image_type_t type)
zarch_context_bg_destroy(zarch); zarch_context_bg_destroy(zarch);
zarch->textures.bg.id = video_texture_load(data, zarch->textures.bg.id = video_texture_load(data,
TEXTURE_BACKEND_OPENGL, TEXTURE_FILTER_MIPMAP_LINEAR); TEXTURE_BACKEND_OPENGL, TEXTURE_FILTER_MIPMAP_LINEAR);
zarch_allocate_white_texture(zarch);
break; break;
case MENU_IMAGE_BOXART: case MENU_IMAGE_BOXART:
break; break;
@ -1152,7 +1138,6 @@ static void zarch_context_reset(void)
RARCH_WARN("Failed to load font."); RARCH_WARN("Failed to load font.");
zarch_context_bg_destroy(zui); zarch_context_bg_destroy(zui);
zarch_allocate_white_texture(zui);
rarch_main_data_msg_queue_push(DATA_TYPE_IMAGE, rarch_main_data_msg_queue_push(DATA_TYPE_IMAGE,
settings->menu.wallpaper, "cb_menu_wallpaper", 0, 1, true); settings->menu.wallpaper, "cb_menu_wallpaper", 0, 1, true);