libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Start preparing move of glViewport to menu_video_draw_frame

Browse Source
This commit is contained in:
twinaphex 2015-09-06 18:08:52 +02:00
parent daa477d98e
commit c84f4efd7b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/drivers/glui.c
View File

@ -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);

16
menu/drivers/xmb.c
View File

@ -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);
}