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

(menu display driver) Cleanups to bind_texture

Browse Source
This commit is contained in:
twinaphex 2018-05-13 14:43:40 +02:00
parent 659d8a4ec6
commit 3d7eaee7c9
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/drivers_display/menu_display_d3d8.c
View File

@ -106,12 +106,10 @@ static void menu_display_d3d8_viewport(menu_display_ctx_draw_t *draw,
{
}
static void menu_display_d3d8_bind_texture(void *data, d3d8_video_t *d3d)
static void menu_display_d3d8_bind_texture(menu_display_ctx_draw_t *draw,
d3d8_video_t *d3d)
{
menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
if (!d3d || !draw || !draw->texture)
return;
LPDIRECT3DDEVICE8 dev = d3d->dev;
d3d8_set_texture(d3d->dev, 0, (void*)draw->texture);
d3d8_set_sampler_address_u(d3d->dev, 0, D3DTADDRESS_COMM_CLAMP);
@ -218,7 +216,9 @@ static void menu_display_d3d8_draw(menu_display_ctx_draw_t *draw,
mvp.data = d3d;
mvp.matrix = &m1;
video_driver_set_mvp(&mvp);
menu_display_d3d8_bind_texture(draw, (d3d8_video_t*)video_info->userdata);
if (draw && draw->texture)
menu_display_d3d8_bind_texture(draw, d3d);
d3d8_draw_primitive(d3d->dev,
menu_display_prim_to_d3d8_enum(draw->prim_type),
d3d->menu_display.offset,

16
menu/drivers_display/menu_display_d3d9.c
View File

@ -106,15 +106,10 @@ static void menu_display_d3d9_viewport(menu_display_ctx_draw_t *draw,
{
}
static void menu_display_d3d9_bind_texture(void *data, d3d9_video_t *d3d)
static void menu_display_d3d9_bind_texture(menu_display_ctx_draw_t *draw,
d3d9_video_t *d3d)
{
menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
LPDIRECT3DDEVICE9 dev;
if (!d3d || !draw || !draw->texture)
return;
dev = (LPDIRECT3DDEVICE9)d3d->dev;
LPDIRECT3DDEVICE9 dev = d3d->dev;
d3d9_set_texture(dev, 0, (LPDIRECT3DTEXTURE9)draw->texture);
d3d9_set_sampler_address_u(dev, 0, D3DTADDRESS_COMM_CLAMP);
@ -214,7 +209,10 @@ static void menu_display_d3d9_draw(menu_display_ctx_draw_t *draw,
mvp.data = d3d;
mvp.matrix = &m1;
video_driver_set_mvp(&mvp);
menu_display_d3d9_bind_texture(draw, (d3d9_video_t*)video_info->userdata);
if (draw && draw->texture)
menu_display_d3d9_bind_texture(draw, d3d);
d3d9_draw_primitive(dev,
(D3DPRIMITIVETYPE)menu_display_prim_to_d3d9_enum(draw->prim_type),
d3d->menu_display.offset,