mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D8/9) Cleanups

Browse Source
This commit is contained in:
twinaphex 2022-04-22 16:01:56 +02:00
parent 669af1d9c6
commit 845a469d4c
3 changed files with 8 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/common/d3d8_common.h
View File

@ -207,26 +207,6 @@ static INLINE void d3d8_surface_free(LPDIRECT3DSURFACE8 surf)
IDirect3DSurface8_Release(surf);
}
static INLINE bool d3d8_device_get_render_target(
LPDIRECT3DDEVICE8 dev,
unsigned idx, void **data)
{
if (dev &&
SUCCEEDED(IDirect3DDevice8_GetRenderTarget(dev,
(LPDIRECT3DSURFACE8*)data)))
return true;
return false;
}
static INLINE bool d3d8_get_render_state(LPDIRECT3DDEVICE8 dev,
D3DRENDERSTATETYPE state, DWORD *value)
{
if (dev &&
IDirect3DDevice8_GetRenderState(dev, state, value) == D3D_OK)
return true;
return false;
}
static INLINE bool d3d8_surface_lock_rect(
LPDIRECT3DSURFACE8 surf, void *data2)
{

27
gfx/common/d3d9_common.h
View File

@ -222,33 +222,6 @@ static INLINE void d3d9_free_pixel_shader(LPDIRECT3DDEVICE9 dev,
IDirect3DPixelShader9_Release(ps);
}
static INLINE bool d3d9_set_pixel_shader(
LPDIRECT3DDEVICE9 dev,
LPDIRECT3DPIXELSHADER9 shader)
{
#ifdef _XBOX
/* Returns void on Xbox */
IDirect3DDevice9_SetPixelShader(dev, shader);
#else
if (IDirect3DDevice9_SetPixelShader(dev, shader) != D3D_OK)
return false;
#endif
return true;
}
static INLINE bool d3d9_set_vertex_shader(
LPDIRECT3DDEVICE9 dev, LPDIRECT3DVERTEXSHADER9 shader)
{
#ifdef _XBOX
IDirect3DDevice9_SetVertexShader(dev, shader);
#else
if (IDirect3DDevice9_SetVertexShader(dev, shader) != D3D_OK)
return false;
#endif
return true;
}
static INLINE bool d3d9_set_vertex_shader_constantf(
LPDIRECT3DDEVICE9 dev,
UINT start_register,

18
gfx/drivers/d3d9hlsl.c
View File

@ -114,13 +114,11 @@ static INLINE void d3d9_hlsl_set_param_1f(LPD3DXCONSTANTTABLE prog, LPDIRECT3DDE
d3d9x_constant_table_set_float(prog, userdata, (void*)param, *val);
}
static INLINE void d3d9_hlsl_bind_program(struct shader_pass *pass,
LPDIRECT3DDEVICE9 dev)
static INLINE void d3d9_hlsl_bind_program(LPDIRECT3DDEVICE9 dev,
struct shader_pass *pass)
{
if (!pass)
return;
d3d9_set_vertex_shader(dev, (LPDIRECT3DVERTEXSHADER9)pass->vprg);
d3d9_set_pixel_shader(dev, (LPDIRECT3DPIXELSHADER9)pass->fprg);
IDirect3DDevice9_SetVertexShader(dev, (LPDIRECT3DVERTEXSHADER9)pass->vprg);
IDirect3DDevice9_SetPixelShader(dev, (LPDIRECT3DPIXELSHADER9)pass->fprg);
}
static INLINE void d3d9_hlsl_set_param_matrix(LPD3DXCONSTANTTABLE prog, LPDIRECT3DDEVICE9 userdata,
@ -550,7 +548,7 @@ static bool hlsl_d3d9_renderchain_init(
if (!d3d9_hlsl_load_program(chain->chain.dev, &chain->stock_shader, stock_hlsl_program))
return false;
d3d9_hlsl_bind_program(&chain->stock_shader, dev);
d3d9_hlsl_bind_program(dev, &chain->stock_shader);
return true;
}
@ -577,9 +575,9 @@ static void hlsl_d3d9_renderchain_render_pass(
with the stock shader as at least the last pass
is not setup correctly */
#if 0
d3d9_hlsl_bind_program(pass, chain->chain.dev);
d3d9_hlsl_bind_program(chain->chain.dev, pass);
#else
d3d9_hlsl_bind_program(&chain->stock_shader, chain->chain.dev);
d3d9_hlsl_bind_program(chain->chain.dev, &chain->stock_shader);
#endif
IDirect3DDevice9_SetTexture(chain->chain.dev, 0,
@ -786,7 +784,7 @@ static bool hlsl_d3d9_renderchain_render(
d3d9_surface_free(back_buffer);
d3d9_renderchain_end_render(&chain->chain);
d3d9_hlsl_bind_program(&chain->stock_shader, chain->chain.dev);
d3d9_hlsl_bind_program(chain->chain.dev, &chain->stock_shader);
hlsl_d3d9_renderchain_calc_and_set_shader_mvp(
chain, &chain->stock_shader,
chain->chain.final_viewport->Width,