mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-18 13:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Avoid having to call expensive matrix identity functions"

Browse Source 
This reverts commit 7a87917c581ffbb89801950545a98c9672a5c2ce.
This commit is contained in:
twinaphex 2020-09-11 14:16:12 +02:00
parent 7a87917c58
commit 6a82772b72
2 changed files with 12 additions and 22 deletions

15
gfx/drivers_display/gfx_display_d3d8.c

@ -43,14 +43,6 @@ static const float d3d8_tex_coords[] = {
1, 0
};
static float d3d8_mvp_ident[16] =
{
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f
};
static const float *gfx_display_d3d8_get_default_vertices(void)
{
return &d3d8_vertexes[0];
@ -63,7 +55,10 @@ static const float *gfx_display_d3d8_get_default_tex_coords(void)
static void *gfx_display_d3d8_get_default_mvp(void *data)
{
return &d3d8_mvp_ident[0];
static math_matrix_4x4 id;
matrix_4x4_identity(id);
return &id;
}
static INT32 gfx_display_prim_to_d3d8_enum(
@ -190,7 +185,7 @@ static void gfx_display_d3d8_draw(gfx_display_ctx_draw_t *draw,
d3d8_vertex_buffer_unlock(d3d->menu_display.buffer);
if (!draw->matrix_data)
draw->matrix_data = &d3d8_mvp_ident[0];
draw->matrix_data = gfx_display_d3d8_get_default_mvp(d3d);
/* ugh */
matrix_4x4_scale(m1, 2.0, 2.0, 0);

19
gfx/drivers_display/gfx_display_d3d9.c

@ -43,14 +43,6 @@ static const float d3d9_tex_coords[] = {
1, 0
};
static float d3d9_mvp_ident[16] =
{
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f
};
static const float *gfx_display_d3d9_get_default_vertices(void)
{
return &d3d9_vertexes[0];
@ -63,7 +55,10 @@ static const float *gfx_display_d3d9_get_default_tex_coords(void)
static void *gfx_display_d3d9_get_default_mvp(void *data)
{
return &d3d9_mvp_ident[0];
static math_matrix_4x4 id;
matrix_4x4_identity(id);
return &id;
}
static INT32 gfx_display_prim_to_d3d9_enum(
@ -152,9 +147,9 @@ static void gfx_display_d3d9_draw(gfx_display_ctx_draw_t *draw,
color = draw->coords->color;
if (!vertex)
vertex = &d3d9_vertexes[0];
vertex = gfx_display_d3d9_get_default_vertices();
if (!tex_coord)
tex_coord = &d3d9_tex_coords[0];
tex_coord = gfx_display_d3d9_get_default_tex_coords();
for (i = 0; i < draw->coords->vertices; i++)
{
@ -183,7 +178,7 @@ static void gfx_display_d3d9_draw(gfx_display_ctx_draw_t *draw,
d3d->menu_display.buffer);
if (!draw->matrix_data)
draw->matrix_data = &d3d9_mvp_ident[0];
draw->matrix_data = gfx_display_d3d9_get_default_mvp(d3d);
/* ugh */
matrix_4x4_scale(m1, 2.0, 2.0, 0);