From 3114d4df7a71d94d0052d5376c8930d0dc710653 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 8 Nov 2015 23:32:46 +0100
Subject: [PATCH] menu_display_d3d.c can now be compiled - does not work yet

---
 griffin/griffin.c                       |  2 --
 menu/drivers_display/menu_display_d3d.c | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/griffin/griffin.c b/griffin/griffin.c
index 7e9244db5c..7a86cfc961 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -823,11 +823,9 @@ MENU
 #include "../menu/drivers_display/menu_display_gl.c"
 #endif
 
-#if 0
 #if defined(HAVE_D3D)
 #include "../menu/drivers_display/menu_display_d3d.c"
 #endif
-#endif
 
 #endif
 
diff --git a/menu/drivers_display/menu_display_d3d.c b/menu/drivers_display/menu_display_d3d.c
index 2582d901a6..3f2296b0e2 100644
--- a/menu/drivers_display/menu_display_d3d.c
+++ b/menu/drivers_display/menu_display_d3d.c
@@ -48,10 +48,10 @@ static void *menu_display_d3d_get_default_mvp(void)
    if (!d3d)
       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)
    {
@@ -129,16 +129,18 @@ static void menu_display_d3d_draw(
    vp.MaxZ   = 1.0f;
 
    d3d_set_viewport(d3d->dev, &vp);
-   d3d_set_texture(d3d->dev, 0, texture);
+   d3d_set_texture(d3d->dev, 0, (LPDIRECT3DTEXTURE9)texture);
 
 #if 0
    gl->shader->set_coords(coords);
    gl->shader->set_mvp(driver->video_data, mat);
 #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;
+#endif
 }
 
 static void menu_display_d3d_draw_bg(
@@ -194,18 +196,24 @@ static void menu_display_d3d_draw_bg(
 
    menu_display_d3d_blend_end();
 
+#if 0
    gl->coords.color = gl->white_color_ptr;
+#endif
 }
 
 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;
+
    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)
 {
-   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);
 }