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

menu_display_d3d.c can now be compiled - does not work yet

Browse Source
This commit is contained in:
twinaphex 2015-11-08 23:32:46 +01:00
parent 2448d356e8
commit 3114d4df7a
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
griffin/griffin.c
View File

@ -823,11 +823,9 @@ MENU
#include "../menu/drivers_display/menu_display_gl.c" #include "../menu/drivers_display/menu_display_gl.c"
#endif #endif
#if 0
#if defined(HAVE_D3D) #if defined(HAVE_D3D)
#include "../menu/drivers_display/menu_display_d3d.c" #include "../menu/drivers_display/menu_display_d3d.c"
#endif #endif
#endif
#endif #endif

18
menu/drivers_display/menu_display_d3d.c
View File

@ -48,10 +48,10 @@ static void *menu_display_d3d_get_default_mvp(void)
if (!d3d) if (!d3d)
return NULL; return NULL;
return &d3d->mvp_no_rot; return NULL; /* TODO/FIXME */
} }
static GLenum menu_display_prim_to_d3d_enum(enum menu_display_prim_type prim_type) static unsigned menu_display_prim_to_d3d_enum(enum menu_display_prim_type prim_type)
{ {
switch (prim_type) switch (prim_type)
{ {
@ -129,16 +129,18 @@ static void menu_display_d3d_draw(
vp.MaxZ = 1.0f; vp.MaxZ = 1.0f;
d3d_set_viewport(d3d->dev, &vp); d3d_set_viewport(d3d->dev, &vp);
d3d_set_texture(d3d->dev, 0, texture); d3d_set_texture(d3d->dev, 0, (LPDIRECT3DTEXTURE9)texture);
#if 0 #if 0
gl->shader->set_coords(coords); gl->shader->set_coords(coords);
gl->shader->set_mvp(driver->video_data, mat); gl->shader->set_mvp(driver->video_data, mat);
#endif #endif
d3d_draw_primitive(d3d->dev, menu_display_prim_to_d3d_enum(prim_type), 0, coords->vertices); d3d_draw_primitive(d3d->dev, (D3DPRIMITIVETYPE)menu_display_prim_to_d3d_enum(prim_type), 0, coords->vertices);
#if 0
gl->coords.color = gl->white_color_ptr; gl->coords.color = gl->white_color_ptr;
#endif
} }
static void menu_display_d3d_draw_bg( static void menu_display_d3d_draw_bg(
@ -194,18 +196,24 @@ static void menu_display_d3d_draw_bg(
menu_display_d3d_blend_end(); menu_display_d3d_blend_end();
#if 0
gl->coords.color = gl->white_color_ptr; gl->coords.color = gl->white_color_ptr;
#endif
} }
static void menu_display_d3d_restore_clear_color(void) static void menu_display_d3d_restore_clear_color(void)
{ {
d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL);
DWORD clear_color = 0x00000000; DWORD clear_color = 0x00000000;
d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0); d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0);
} }
static void menu_display_d3d_clear_color(float r, float g, float b, float a) static void menu_display_d3d_clear_color(float r, float g, float b, float a)
{ {
DWORD clear_color = D3DCOLOR_ARGB(BYTE_CLAMP(a * 255.0f, r * 255.0f, g * 255.0f, b * 255.0f)); d3d_video_t *d3d = (d3d_video_t*)video_driver_get_ptr(NULL);
DWORD clear_color = D3DCOLOR_ARGB(BYTE_CLAMP(a * 255.0f), BYTE_CLAMP(r * 255.0f), BYTE_CLAMP(g * 255.0f), BYTE_CLAMP(b * 255.0f));
d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0); d3d_clear(d3d->dev, 0, NULL, D3DCLEAR_TARGET, clear_color, 0, 0);
} }