Simplify menu_display_draw_frame

This commit is contained in:
twinaphex 2015-11-02 18:55:05 +01:00
parent b1c66c5dec
commit 10051a657c
5 changed files with 10 additions and 12 deletions

View File

@ -202,7 +202,7 @@ static void glui_draw_icon(gl_t *gl, glui_handle_t *glui,
height - y - glui->icon_size,
glui->icon_size,
glui->icon_size,
&coords, &mymat, texture, 4,
&coords, &mymat, texture,
MENU_DISPLAY_PRIM_TRIANGLESTRIP);
menu_display_blend_end(gl);
@ -263,7 +263,7 @@ static void glui_render_quad(gl_t *gl, int x, int y, int w, int h,
height - y - h,
w,
h,
&coords, &mymat, glui->textures.white, 4,
&coords, &mymat, glui->textures.white,
MENU_DISPLAY_PRIM_TRIANGLESTRIP );
gl->coords.color = gl->white_color_ptr;
@ -603,7 +603,7 @@ static void glui_draw_cursor(gl_t *gl, glui_handle_t *glui,
64,
64,
&coords, &mymat,
glui->textures.list[GLUI_TEXTURE_POINTER].id, 4,
glui->textures.list[GLUI_TEXTURE_POINTER].id,
MENU_DISPLAY_PRIM_TRIANGLESTRIP);
menu_display_blend_end(gl);

View File

@ -378,7 +378,7 @@ static void xmb_draw_icon(gl_t *gl, xmb_handle_t *xmb,
height - y,
xmb->icon.size,
xmb->icon.size,
&coords, &mymat, texture, 4,
&coords, &mymat, texture,
MENU_DISPLAY_PRIM_TRIANGLESTRIP);
}
@ -410,7 +410,7 @@ static void xmb_draw_icon_predone(gl_t *gl, xmb_handle_t *xmb,
height - y,
xmb->icon.size,
xmb->icon.size,
&coords, mymat, texture, 4,
&coords, mymat, texture,
MENU_DISPLAY_PRIM_TRIANGLESTRIP);
}
@ -442,7 +442,7 @@ static void xmb_draw_boxart(gl_t *gl, xmb_handle_t *xmb, GRfloat *color, unsigne
height - y,
xmb->boxart_size,
xmb->boxart_size,
&coords, &mymat, xmb->boxart, 4,
&coords, &mymat, xmb->boxart,
MENU_DISPLAY_PRIM_TRIANGLESTRIP);
}
@ -1447,7 +1447,7 @@ static void xmb_draw_cursor(gl_t *gl, xmb_handle_t *xmb,
height - y - (xmb->cursor.size/2),
xmb->cursor.size,
xmb->cursor.size,
&coords, &mymat, xmb->textures.list[XMB_TEXTURE_POINTER].id, 4,
&coords, &mymat, xmb->textures.list[XMB_TEXTURE_POINTER].id,
MENU_DISPLAY_PRIM_TRIANGLESTRIP);
menu_display_blend_end(gl);

View File

@ -1064,7 +1064,7 @@ static void zarch_frame(void)
zui->width,
zui->height,
(struct gfx_coords*)&zui->ca,
&zui->mvp, zui->textures.white, zui->ca.coords.vertices,
&zui->mvp, zui->textures.white,
MENU_DISPLAY_PRIM_TRIANGLES);
menu_display_blend_end(gl);

View File

@ -530,7 +530,6 @@ void menu_display_draw_frame(
struct gfx_coords *coords,
math_matrix_4x4 *mat,
GLuint texture,
size_t vertex_count,
enum menu_display_prim_type prim_type
)
{
@ -550,7 +549,7 @@ void menu_display_draw_frame(
gl->shader->set_coords(coords);
gl->shader->set_mvp(driver->video_data, mat);
glDrawArrays(menu_display_prim_to_gl_enum(prim_type), 0, vertex_count);
glDrawArrays(menu_display_prim_to_gl_enum(prim_type), 0, coords->vertices);
}
void menu_display_frame_background(
@ -591,7 +590,7 @@ void menu_display_frame_background(
menu_display_draw_frame(0, 0, width, height,
&coords, &gl->mvp_no_rot,
texture, vertex_count, prim_type);
texture, prim_type);
menu_display_blend_end(gl);

View File

@ -99,7 +99,6 @@ void menu_display_draw_frame(
struct gfx_coords *coords,
math_matrix_4x4 *mat,
GLuint texture,
size_t vertex_count,
enum menu_display_prim_type prim_type
);