ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CXX_BUILD for D3D

This commit is contained in:
twinaphex 2018-01-15 21:44:34 +01:00
parent 6efe1128c0
commit 391fd3eadc
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/common/d3d_common.c
View File

@ -1107,7 +1107,7 @@ bool d3d_create_vertex_shader(LPDIRECT3DDEVICE dev, const DWORD *a, void **b)
if (!dev)
return false;
#if defined(__cplusplus)
if (dev->CreateVertexShader(a, b) != D3D_OK)
if (dev->CreateVertexShader(a, (IDirect3DVertexShader9**)b) != D3D_OK)
return false;
#else
if (IDirect3DDevice9_CreateVertexShader(dev, a,
@ -1126,7 +1126,7 @@ bool d3d_create_pixel_shader(LPDIRECT3DDEVICE dev, const DWORD *a, void **b)
if (!dev)
return false;
#if defined(__cplusplus)
if (dev->CreatePixelShader(a, b) != D3D_OK)
if (dev->CreatePixelShader(a, (IDirect3DPixelShader9**)b) != D3D_OK)
return false;
#else
if (IDirect3DDevice9_CreatePixelShader(dev, a,

2
gfx/drivers/d3d.h
View File

@ -102,7 +102,7 @@ typedef struct d3d_video
int size;
int offset;
LPDIRECT3DVERTEXBUFFER buffer;
LPDIRECT3DVERTEXDECLARATION decl;
void *decl;
}menu_display;
#ifdef HAVE_OVERLAY

3
gfx/drivers_renderchain/d3d9_cg_renderchain.c
View File

@ -1222,9 +1222,8 @@ static void d3d9_cg_renderchain_set_mvp(
else
d3d9_cg_renderchain_set_shader_mvp(chain, chain->vStock, mat_data);
#else
d3d_set_vertex_shader_constantf(d3d->dev, 0, mat_data, 4);
d3d_set_vertex_shader_constantf(d3d->dev, 0, (const float*)mat_data, 4);
#endif
}
static void cg_d3d9_renderchain_set_vertices(

4
menu/cbs/menu_cbs_ok.c
View File

@ -125,7 +125,7 @@ static char *lakka_get_project(void)
info.enum_idx = a; \
dl_type = b;
static unsigned action_ok_dl_to_enum(unsigned lbl)
static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl)
{
switch (lbl)
{
@ -209,7 +209,7 @@ static unsigned action_ok_dl_to_enum(unsigned lbl)
break;
}
return 0;
return MSG_UNKNOWN;
}
int generic_action_ok_displaylist_push(const char *path,

6
menu/drivers_display/menu_display_d3d.c
View File

@ -63,7 +63,7 @@ static void *menu_display_d3d_get_default_mvp(void)
return &id;
}
static unsigned menu_display_prim_to_d3d_enum(
static D3DPRIMITIVETYPE menu_display_prim_to_d3d_enum(
enum menu_display_prim_type prim_type)
{
switch (prim_type)
@ -76,7 +76,8 @@ static unsigned menu_display_prim_to_d3d_enum(
break;
}
return 0;
/* TOD/FIXME - hack */
return (D3DPRIMITIVETYPE)0;
}
static void menu_display_d3d_blend_begin(void)
@ -160,7 +161,6 @@ static void menu_display_d3d_draw(void *data)
if(d3d->menu_display.offset + draw->coords->vertices > d3d->menu_display.size)
return;
pv = (float*)d3d_vertex_buffer_lock(d3d->menu_display.buffer);
pv += d3d->menu_display.offset * 8;
vertex = draw->coords->vertex;