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

(D3D9) Cleanups

Browse Source
This commit is contained in:
twinaphex 2022-04-17 02:23:05 +02:00
parent ee6570f3dc
commit 7bdcc8bfe1
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/d3d9_common.h
View File

@ -811,8 +811,6 @@ static INLINE void d3d9_convert_geometry(
}
}
void d3d9_set_mvp(void *data, const void *userdata);
RETRO_END_DECLS
#endif

16
gfx/drivers/d3d9.c
View File

@ -410,12 +410,6 @@ static void d3d9_viewport_info(void *data, struct video_viewport *vp)
vp->full_height = height;
}
void d3d9_set_mvp(void *data, const void *mat_data)
{
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data;
d3d9_set_vertex_shader_constantf(dev, 0, (const float*)mat_data, 4);
}
#if defined(HAVE_MENU) || defined(HAVE_OVERLAY)
static void d3d9_overlay_render(d3d9_video_t *d3d,
unsigned width,
@ -1564,7 +1558,7 @@ static bool d3d9_frame(void *data, const void *frame,
d3d9_set_viewports(d3d->dev, &screen_vp);
d3d9_clear(d3d->dev, 0, 0, D3DCLEAR_TARGET, 0, 1, 0);
d3d9_set_mvp(d3d->dev, &d3d->mvp_transposed);
d3d9_set_vertex_shader_constantf(d3d->dev, 0, (const float*)&d3d->mvp_transposed, 4);
if (!d3d->renderchain_driver->render(
d3d, frame, frame_width, frame_height,
pitch, d3d->dev_rotation))
@ -1587,7 +1581,7 @@ static bool d3d9_frame(void *data, const void *frame,
#ifdef HAVE_OVERLAY
if (d3d->overlays_enabled && overlay_behind_menu)
{
d3d9_set_mvp(d3d->dev, &d3d->mvp_transposed);
d3d9_set_vertex_shader_constantf(d3d->dev, 0, (const float*)&d3d->mvp_transposed, 4);
for (i = 0; i < d3d->overlays_size; i++)
d3d9_overlay_render(d3d, width, height, &d3d->overlays[i], true);
}
@ -1596,7 +1590,8 @@ static bool d3d9_frame(void *data, const void *frame,
#ifdef HAVE_MENU
if (d3d->menu && d3d->menu->enabled)
{
d3d9_set_mvp(d3d->dev, &d3d->mvp_transposed);
d3d9_set_vertex_shader_constantf(d3d->dev, 0, (const
float*)&d3d->mvp_transposed, 4);
d3d9_overlay_render(d3d, width, height, d3d->menu, false);
d3d->menu_display.offset = 0;
@ -1622,7 +1617,8 @@ static bool d3d9_frame(void *data, const void *frame,
#ifdef HAVE_OVERLAY
if (d3d->overlays_enabled && !overlay_behind_menu)
{
d3d9_set_mvp(d3d->dev, &d3d->mvp_transposed);
d3d9_set_vertex_shader_constantf(d3d->dev, 0, (const
float*)&d3d->mvp_transposed, 4);
for (i = 0; i < d3d->overlays_size; i++)
d3d9_overlay_render(d3d, width, height, &d3d->overlays[i], true);
}

2
gfx/drivers_display/gfx_display_d3d9.c
View File

@ -197,7 +197,7 @@ static void gfx_display_d3d9_draw(gfx_display_ctx_draw_t *draw,
matrix_4x4_multiply(m1, mop, m2);
matrix_4x4_multiply(m2, d3d->mvp_transposed, m1);
d3d9_set_mvp(d3d->dev, &m2);
d3d9_set_vertex_shader_constantf(d3d->dev, 0, (const float*)&m2, 4);
if (draw && draw->texture)
gfx_display_d3d9_bind_texture(draw, d3d);