mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 00:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some MSVC 2010 360 buildfixes

Browse Source
This commit is contained in:
twinaphex 2018-07-06 04:45:52 +02:00
parent 974aa3c8ac
commit 22d6930488
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers_font/xdk360_fonts.cpp
View File

@ -459,7 +459,7 @@ static void xdk360_render_msg_post(xdk360_video_font_t * font)
d3d9_set_texture(dev, 0, NULL);
d3d9_set_vertex_declaration(dev, NULL);
d3d9_set_vertex_shader(dev, 0, NULL);
d3d9_set_vertex_shader(dev, NULL);
d3d9_set_pixel_shader(dev, NULL);
d3d9_set_render_state(dev, D3DRS_VIEWPORTENABLE, font->m_dwSavedState);
}
@ -496,7 +496,7 @@ static void xdk360_render_msg_pre(xdk360_video_font_t * font)
d3d9_set_render_state(dev, D3DRS_VIEWPORTENABLE, FALSE);
d3d9_set_vertex_declaration(dev, font->s_FontLocals.m_pFontVertexDecl);
d3d9_set_vertex_shader(dev, 0, font->s_FontLocals.m_pFontVertexShader);
d3d9_set_vertex_shader(dev, font->s_FontLocals.m_pFontVertexShader);
d3d9_set_pixel_shader(dev, font->s_FontLocals.m_pFontPixelShader);
d3d9_set_vertex_shader_constantf(dev, 2, vTexScale, 1);
}

7
gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
View File

@ -62,7 +62,7 @@ static void *d3d9_hlsl_get_constant_by_name(void *data, const char *name)
static INLINE void d3d9_hlsl_set_param_2f(void *data, void *userdata, const char *name, const void *values)
{
LPD3DXCONSTANTTABLE prog = (LPD3DXCONSTANTTABLE)data;
D3DXHANDLE param = d3d9_hlsl_get_constant_by_name(prog, name);
D3DXHANDLE param = (D3DXHANDLE)d3d9_hlsl_get_constant_by_name(prog, name);
if (param)
d3d9x_constant_table_set_float_array((LPDIRECT3DDEVICE9)userdata, prog, (void*)param, values, 2);
}
@ -70,7 +70,7 @@ static INLINE void d3d9_hlsl_set_param_2f(void *data, void *userdata, const char
static INLINE void d3d9_hlsl_set_param_1f(void *data, void *userdata, const char *name, const void *value)
{
LPD3DXCONSTANTTABLE prog = (LPD3DXCONSTANTTABLE)data;
D3DXHANDLE param = d3d9_hlsl_get_constant_by_name(prog, name);
D3DXHANDLE param = (D3DXHANDLE)d3d9_hlsl_get_constant_by_name(prog, name);
float *val = (float*)value;
if (param)
d3d9x_constant_table_set_float(prog, (LPDIRECT3DDEVICE9)userdata, (void*)param, *val);
@ -90,7 +90,7 @@ static INLINE void d3d9_hlsl_set_param_matrix(void *data, void *userdata,
const char *name, const void *values)
{
LPD3DXCONSTANTTABLE prog = (LPD3DXCONSTANTTABLE)data;
D3DXHANDLE param = d3d9_hlsl_get_constant_by_name(prog, name);
D3DXHANDLE param = (D3DXHANDLE)d3d9_hlsl_get_constant_by_name(prog, name);
if (param)
d3d9x_constant_table_set_matrix((LPDIRECT3DDEVICE9)userdata, prog,
(void*)param, (D3DMATRIX*)values);
@ -390,7 +390,6 @@ static void d3d9_hlsl_destroy_resources(hlsl_renderchain_t *chain)
static void hlsl_d3d9_renderchain_free(void *data)
{
unsigned i;
hlsl_renderchain_t *chain = (hlsl_renderchain_t*)data;
if (!chain)