diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 8080e6c857..960a73fb25 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -129,14 +129,14 @@ static void glui_render_quad(gl_t *gl, int x, int y, int w, int h, video_driver_get_size(NULL, &height); - glViewport(x, height - y - h, w, h); - coords.vertices = 4; coords.vertex = glui_vertexes; coords.tex_coord = glui_tex_coords; coords.lut_tex_coord = glui_tex_coords; coords.color = (coord_color) ? coord_color : color; + glViewport(x, height - y - h, w, h); + menu_video_draw_frame(gl->shader, &coords, &gl->mvp_no_rot, true, glui->textures.white); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 922a59d7c4..ff5197eb84 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -384,14 +384,14 @@ static void xmb_draw_icon(gl_t *gl, xmb_handle_t *xmb, matrix_4x4_scale(&mscal, scale_factor, scale_factor, 1); matrix_4x4_multiply(&mymat, &mscal, &mymat); - glViewport(x, height - y, xmb->icon.size, xmb->icon.size); - coords.vertices = 4; coords.vertex = rmb_vertex; coords.tex_coord = rmb_tex_coord; coords.lut_tex_coord = rmb_tex_coord; coords.color = color; + glViewport(x, height - y, xmb->icon.size, xmb->icon.size); + menu_video_draw_frame(gl->shader, &coords, &mymat, false, texture); } @@ -439,14 +439,14 @@ static void xmb_draw_icon_predone(gl_t *gl, xmb_handle_t *xmb, if (gl->shader && gl->shader->use) gl->shader->use(gl, GL_SHADER_STOCK_BLEND); - glViewport(x, height - y, xmb->icon.size, xmb->icon.size); - coords.vertices = 4; coords.vertex = rmb_vertex; coords.tex_coord = rmb_tex_coord; coords.lut_tex_coord = rmb_tex_coord; coords.color = color; + glViewport(x, height - y, xmb->icon.size, xmb->icon.size); + menu_video_draw_frame(gl->shader, &coords, mymat, false, texture); } @@ -488,14 +488,14 @@ static void xmb_draw_boxart(gl_t *gl, xmb_handle_t *xmb) matrix_4x4_scale(&mscal, 1, 1, 1); matrix_4x4_multiply(&mymat, &mscal, &mymat); - glViewport(x, height - y, xmb->boxart_size, xmb->boxart_size); - coords.vertices = 4; coords.vertex = rmb_vertex; coords.tex_coord = rmb_tex_coord; coords.lut_tex_coord = rmb_tex_coord; coords.color = color; + glViewport(x, height - y, xmb->boxart_size, xmb->boxart_size); + menu_video_draw_frame(gl->shader, &coords, &mymat, false, xmb->boxart); } @@ -1461,8 +1461,6 @@ static void xmb_draw_cursor(gl_t *gl, xmb_handle_t *xmb, float x, float y) matrix_4x4_rotate_z(&mrot, 0); matrix_4x4_multiply(&mymat, &mrot, &gl->mvp_no_rot); - glViewport(x, height - y, xmb->cursor.size, xmb->cursor.size); - coords.vertices = 4; coords.vertex = rmb_vertex; coords.tex_coord = rmb_tex_coord; @@ -1471,6 +1469,8 @@ static void xmb_draw_cursor(gl_t *gl, xmb_handle_t *xmb, float x, float y) xmb_draw_icon_begin(gl); + glViewport(x, height - y, xmb->cursor.size, xmb->cursor.size); + menu_video_draw_frame(gl->shader, &coords, &mymat, true, xmb->textures.list[XMB_TEXTURE_POINTER].id); }