ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Menu display) Cleanups

This commit is contained in:
twinaphex 2016-04-15 03:24:21 +02:00
parent f4f839f776
commit 3cb6117226
3 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
menu/drivers_display/menu_display_d3d.cpp
View File

@ -42,6 +42,16 @@ static const float d3d_tex_coords[] = {
1, 0
};
static const float *menu_display_d3d_get_default_vertices(void)
{
return &d3d_vertexes[0];
}
static const float *menu_display_d3d_get_default_tex_coords(void)
{
return &d3d_tex_coords[0];
}
static d3d_video_t *d3d_get_ptr(void)
{
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(false);
@ -129,11 +139,11 @@ static void menu_display_d3d_draw(void *data)
mat = (math_matrix_4x4*)
menu_display_d3d_get_default_mvp();
if (!draw->coords->vertex)
draw->coords->vertex = &d3d_vertexes[0];
draw->coords->vertex = menu_display_d3d_get_default_vertices();
if (!draw->coords->tex_coord)
draw->coords->tex_coord = &d3d_tex_coords[0];
draw->coords->tex_coord = menu_display_d3d_get_default_tex_coords();
if (!draw->coords->lut_tex_coord)
draw->coords->lut_tex_coord = &d3d_tex_coords[0];
draw->coords->lut_tex_coord = menu_display_d3d_get_default_tex_coords();
vp.X = draw->x;
vp.Y = draw->y;
@ -153,10 +163,6 @@ static void menu_display_d3d_draw(void *data)
d3d_draw_primitive(d3d->dev, (D3DPRIMITIVETYPE)
menu_display_prim_to_d3d_enum(draw->prim_type),
0, draw->coords->vertices);
#if 0
gl->coords.color = gl->white_color_ptr;
#endif
}
static void menu_display_d3d_draw_bg(void *data)
@ -164,23 +170,18 @@ static void menu_display_d3d_draw_bg(void *data)
struct gfx_coords coords;
const float *new_vertex = NULL;
const float *new_tex_coord = NULL;
global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr();
d3d_video_t *d3d = d3d_get_ptr();
menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
if (!d3d || !draw)
if (!draw)
return;
(void)coords;
new_vertex = draw->vertex;
new_tex_coord = draw->tex_coord;
new_vertex = draw->vertex;
new_tex_coord = draw->tex_coord;
if (!new_vertex)
new_vertex = &d3d_vertexes[0];
new_vertex = menu_display_d3d_get_default_vertices();
if (!new_tex_coord)
new_tex_coord = &d3d_tex_coords[0];
new_tex_coord = menu_display_d3d_get_default_tex_coords()
coords.vertices = draw->vertex_count;
coords.vertex = new_vertex;
@ -188,18 +189,16 @@ static void menu_display_d3d_draw_bg(void *data)
coords.lut_tex_coord = new_tex_coord;
coords.color = (const float*)draw->color;
menu_display_ctl(MENU_DISPLAY_CTL_SET_VIEWPORT, NULL);
if (!draw->texture)
draw->texture = menu_display_white_texture;
draw->x = 0;
draw->y = 0;
draw->coords = &coords;
draw->matrix_data = (math_matrix_4x4*)
menu_display_d3d_get_default_mvp();
menu_display_d3d_draw(draw);
#if 0
gl->coords.color = gl->white_color_ptr;
#endif
}
static void menu_display_d3d_restore_clear_color(void)

36
menu/drivers_display/menu_display_gl.c
View File

@ -46,6 +46,16 @@ static gl_t *gl_get_ptr(void)
return gl;
}
static const float *menu_display_gl_get_default_vertices(void)
{
return &gl_vertexes[0];
}
static const float *menu_display_gl_get_default_tex_coords(void)
{
return &gl_tex_coords[0];
}
static void *menu_display_gl_get_default_mvp(void)
{
gl_t *gl = gl_get_ptr();
@ -111,11 +121,11 @@ static void menu_display_gl_draw(void *data)
if (!mat)
mat = (math_matrix_4x4*)menu_display_gl_get_default_mvp();
if (!draw->coords->vertex)
draw->coords->vertex = &gl_vertexes[0];
draw->coords->vertex = menu_display_gl_get_default_vertices();
if (!draw->coords->tex_coord)
draw->coords->tex_coord = &gl_tex_coords[0];
draw->coords->tex_coord = menu_display_gl_get_default_tex_coords();
if (!draw->coords->lut_tex_coord)
draw->coords->lut_tex_coord = &gl_tex_coords[0];
draw->coords->lut_tex_coord = menu_display_gl_get_default_tex_coords();
glViewport(draw->x, draw->y, draw->width, draw->height);
glBindTexture(GL_TEXTURE_2D, (GLuint)draw->texture);
@ -141,20 +151,18 @@ static void menu_display_gl_draw_bg(void *data)
struct gfx_coords coords;
const float *new_vertex = NULL;
const float *new_tex_coord = NULL;
settings_t *settings = config_get_ptr();
gl_t *gl = gl_get_ptr();
menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
if (!gl || !draw)
if (!draw)
return;
new_vertex = draw->vertex;
new_tex_coord = draw->tex_coord;
new_vertex = draw->vertex;
new_tex_coord = draw->tex_coord;
if (!new_vertex)
new_vertex = &gl_vertexes[0];
new_vertex = menu_display_gl_get_default_vertices();
if (!new_tex_coord)
new_tex_coord = &gl_tex_coords[0];
new_tex_coord = menu_display_gl_get_default_tex_coords();
coords.vertices = draw->vertex_count;
coords.vertex = new_vertex;
@ -162,9 +170,9 @@ static void menu_display_gl_draw_bg(void *data)
coords.lut_tex_coord = new_tex_coord;
coords.color = (const float*)draw->color;
draw->x = 0;
draw->y = 0;
draw->coords = &coords;
draw->x = 0;
draw->y = 0;
draw->coords = &coords;
if (!draw->texture)
draw->texture = menu_display_white_texture;
@ -173,8 +181,6 @@ static void menu_display_gl_draw_bg(void *data)
menu_display_gl_get_default_mvp();
menu_display_gl_draw(draw);
gl->coords.color = gl->white_color_ptr;
}
static void menu_display_gl_restore_clear_color(void)

18
menu/drivers_display/menu_display_vulkan.c
View File

@ -135,22 +135,30 @@ static void menu_display_vk_draw(void *data)
}
}
static const float *menu_display_vk_get_default_vertices(void)
{
return &vk_vertexes[0];
}
static const float *menu_display_vk_get_default_tex_coords(void)
{
return &vk_tex_coords[0];
}
static void menu_display_vk_draw_bg(void *data)
{
struct gfx_coords coords;
const float *new_vertex = NULL;
const float *new_tex_coord = NULL;
menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
settings_t *settings = config_get_ptr();
vk_t *vk = vk_get_ptr();
if (!vk || !draw)
if (!draw)
return;
if (!new_vertex)
new_vertex = &vk_vertexes[0];
new_vertex = menu_display_vk_get_default_vertices();
if (!new_tex_coord)
new_tex_coord = &vk_tex_coords[0];
new_tex_coord = menu_display_vk_get_default_tex_coords();
coords.vertices = draw->vertex_count;
coords.vertex = new_vertex;