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

(RGUI/GLUI) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-06-25 08:26:59 +02:00
parent f9e92439ef
commit 293c915438
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/drivers/glui.c
View File

@ -123,7 +123,8 @@ static void glui_render_quad(gl_t *gl, int x, int y, int w, int h,
coords.color = color; coords.color = color;
menu_gl_draw_frame(gl->shader, &coords, &gl->mvp_no_rot, true, glui->textures.white); menu_gl_draw_frame(gl->shader, &coords,
&gl->mvp_no_rot, true, glui->textures.white);
gl->coords.color = gl->white_color_ptr; gl->coords.color = gl->white_color_ptr;
} }
@ -214,7 +215,8 @@ static void glui_render_messagebox(const char *message)
{ {
const char *msg = list->elems[i].data; const char *msg = list->elems[i].data;
if (msg) if (msg)
glui_blit_line(x, y + i * disp->font.size, msg, normal_color, TEXT_ALIGN_CENTER); glui_blit_line(x, y + i * disp->font.size,
msg, normal_color, TEXT_ALIGN_CENTER);
} }
end: end:

7
menu/drivers/rgui.c
View File

@ -191,12 +191,10 @@ static bool init_font(menu_handle_t *menu, const uint8_t *font_bmp_buf)
uint8_t *font = (uint8_t *) calloc(1, FONT_OFFSET(256)); uint8_t *font = (uint8_t *) calloc(1, FONT_OFFSET(256));
if (!font) if (!font)
{
RARCH_ERR("Font memory allocation failed.\n");
return false; return false;
}
menu->display.font.alloc_framebuf = true; menu->display.font.alloc_framebuf = true;
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
{ {
unsigned y = i / 16; unsigned y = i / 16;
@ -614,10 +612,7 @@ static void *rgui_init(void)
ret = rguidisp_init_font(menu); ret = rguidisp_init_font(menu);
if (!ret) if (!ret)
{
RARCH_ERR("No font bitmap or binary, abort");
goto error; goto error;
}
fill_rect(frame_buf, 0, frame_buf->height, fill_rect(frame_buf, 0, frame_buf->height,
frame_buf->width, 4, gray_filler); frame_buf->width, 4, gray_filler);