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

Create new functions for d3d_common.c

Browse Source
This commit is contained in:
twinaphex 2018-01-29 11:44:38 +01:00
parent 3d2c579bc7
commit ee813ab76b
3 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gfx/common/d3d_common.c
View File

@ -3046,3 +3046,40 @@ INT32 d3d_get_xrgb8888_format(void)
return D3DFMT_X8R8G8B8;
#endif
}
const void *d3dx_get_buffer_ptr(void *data)
{
#if defined(HAVE_D3DX) && defined(HAVE_D3D9)
ID3DXBuffer *listing = (ID3DXBuffer*)data;
if (!listing)
return NULL;
#ifdef __cplusplus
return listing->GetBufferPointer();
#else
return listing->lpVtbl->GetBufferPointer(listing);
#endif
#else
return NULL;
#endif
}
const bool d3dx_constant_table_set_float(void *p,
void *a,
const void *b, float val)
{
#if defined(HAVE_D3DX) && defined(HAVE_D3D9)
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)a;
D3DXHANDLE handle = (D3DXHANDLE)b;
LPD3DXCONSTANTTABLE consttbl = (LPD3DXCONSTANTTABLE)p;
if (!consttbl || !dev || !handle)
return false;
#ifdef __cplusplus
if (consttbl->SetFloat(dev, handle, val) == D3D_OK)
return true;
#else
if (consttbl->lpVtbl->SetFloat(consttbl, dev, handle, val) == D3D_OK)
return true;
#endif
#endif
return false;
}

5
gfx/common/d3d_common.h
View File

@ -263,6 +263,11 @@ bool d3dx_compile_shader_from_file(
void *pperrormsgs,
void *ppconstanttable);
const void *d3dx_get_buffer_ptr(void *data);
const bool d3dx_constant_table_set_float(void *p,
void *a, const void *b, float val);
INT32 d3d_get_rgb565_format(void);
INT32 d3d_get_argb8888_format(void);
INT32 d3d_get_xrgb8888_format(void);

42
gfx/drivers_shader/shader_hlsl.c
View File

@ -46,14 +46,6 @@
#define ID3DXConstantTable_SetFloatArray(p,a,b,c,d) (p)->SetFloatArray(a,b,c,d)
#endif
#ifndef ID3DXConstantTable_SetFloat
#define ID3DXConstantTable_SetFloat(p,a,b,c) (p)->SetFloat(a,b,c)
#endif
#ifndef ID3DXConstantTable_GetBufferPointer
#define ID3DXConstantTable_GetBufferPointer(p) (p)->GetBufferPointer()
#endif
#ifndef ID3DXConstantTable_GetConstantByName
#define ID3DXConstantTable_GetConstantByName(p,a,b) ((p)->GetConstantByName(a, b))
#endif
@ -72,14 +64,6 @@
#define ID3DXConstantTable_SetFloatArray(p,a,b,c,d) (p)->lpVtbl->SetFloatArray(p,a,b,c,d)
#endif
#ifndef ID3DXConstantTable_SetFloat
#define ID3DXConstantTable_SetFloat(p,a,b,c) (p)->lpVtbl->SetFloat(p,a,b,c)
#endif
#ifndef ID3DXConstantTable_GetBufferPointer
#define ID3DXConstantTable_GetBufferPointer(p) (p)->lpVtbl->GetBufferPointer(p)
#endif
#ifndef ID3DXConstantTable_GetConstantByName
#define ID3DXConstantTable_GetConstantByName(p,a,b) ((p)->lpVtbl->GetConstantByName(p, a, b))
#endif
@ -91,7 +75,6 @@
#endif
#define set_param_2f(param, xy, constanttable) if (param) { ID3DXConstantTable_SetFloatArray(constanttable, d3dr, param, xy, 2); }
#define set_param_1f(param, x, constanttable) if (param) { ID3DXConstantTable_SetFloat(constanttable, d3dr, param, x); }
#define get_constant_by_name(a, b, constanttable) ID3DXConstantTable_GetConstantByName(constanttable, a, b)
@ -216,14 +199,20 @@ static void hlsl_set_params(void *data, void *shader_data,
set_param_2f(hlsl->prg[hlsl->active_idx].vid_size_f, ori_size, hlsl->prg[hlsl->active_idx].f_ctable);
set_param_2f(hlsl->prg[hlsl->active_idx].tex_size_f, tex_size, hlsl->prg[hlsl->active_idx].f_ctable);
set_param_2f(hlsl->prg[hlsl->active_idx].out_size_f, out_size, hlsl->prg[hlsl->active_idx].f_ctable);
set_param_1f(hlsl->prg[hlsl->active_idx].frame_cnt_f, frame_cnt, hlsl->prg[hlsl->active_idx].f_ctable);
set_param_1f(hlsl->prg[hlsl->active_idx].frame_dir_f, state_manager_frame_is_reversed() ? -1.0 : 1.0, hlsl->prg[hlsl->active_idx].f_ctable);
if (hlsl->prg[hlsl->active_idx].frame_cnt_f)
d3dx_constant_table_set_float(hlsl->prg[hlsl->active_idx].f_ctable, d3dr,
hlsl->prg[hlsl->active_idx].frame_cnt_f, frame_cnt);
if (hlsl->prg[hlsl->active_idx].frame_dir_f)
d3dx_constant_table_set_float(hlsl->prg[hlsl->active_idx].f_ctable, d3dr, hlsl->prg[hlsl->active_idx].frame_dir_f, state_manager_frame_is_reversed() ? -1.0 : 1.0);
set_param_2f(hlsl->prg[hlsl->active_idx].vid_size_v, ori_size, hlsl->prg[hlsl->active_idx].v_ctable);
set_param_2f(hlsl->prg[hlsl->active_idx].tex_size_v, tex_size, hlsl->prg[hlsl->active_idx].v_ctable);
set_param_2f(hlsl->prg[hlsl->active_idx].out_size_v, out_size, hlsl->prg[hlsl->active_idx].v_ctable);
set_param_1f(hlsl->prg[hlsl->active_idx].frame_cnt_v, frame_cnt, hlsl->prg[hlsl->active_idx].v_ctable);
set_param_1f(hlsl->prg[hlsl->active_idx].frame_dir_v, state_manager_frame_is_reversed() ? -1.0 : 1.0, hlsl->prg[hlsl->active_idx].v_ctable);
if (hlsl->prg[hlsl->active_idx].frame_cnt_v)
d3dx_constant_table_set_float(hlsl->prg[hlsl->active_idx].v_ctable, d3dr,
hlsl->prg[hlsl->active_idx].frame_cnt_v, frame_cnt);
if (hlsl->prg[hlsl->active_idx].frame_dir_v)
d3dx_constant_table_set_float(hlsl->prg[hlsl->active_idx].v_ctable, d3dr, hlsl->prg[hlsl->active_idx].frame_dir_v, state_manager_frame_is_reversed() ? -1.0 : 1.0);
/* TODO - set lookup textures/FBO textures/state parameters/etc */
}
@ -270,8 +259,8 @@ static bool hlsl_compile_program(
goto error;
}
d3d_create_pixel_shader(d3dr, (const DWORD*)ID3DXConstantTable_GetBufferPointer(code_f), (void**)&program->fprg);
d3d_create_vertex_shader(d3dr, (const DWORD*)ID3DXConstantTable_GetBufferPointer(code_v), (void**)&program->vprg);
d3d_create_pixel_shader(d3dr, (const DWORD*)d3dx_get_buffer_ptr(code_f), (void**)&program->fprg);
d3d_create_vertex_shader(d3dr, (const DWORD*)d3dx_get_buffer_ptr(code_v), (void**)&program->vprg);
d3dxbuffer_release((void*)code_f);
d3dxbuffer_release((void*)code_v);
@ -280,9 +269,9 @@ static bool hlsl_compile_program(
error:
RARCH_ERR("Cg/HLSL error:\n");
if(listing_f)
RARCH_ERR("Fragment:\n%s\n", (char*)ID3DXConstantTable_GetBufferPointer(listing_f));
RARCH_ERR("Fragment:\n%s\n", (char*)d3dx_get_buffer_ptr(listing_f));
if(listing_v)
RARCH_ERR("Vertex:\n%s\n", (char*)ID3DXConstantTable_GetBufferPointer(listing_v));
RARCH_ERR("Vertex:\n%s\n", (char*)d3dx_get_buffer_ptr(listing_v));
d3dxbuffer_release((void*)listing_f);
d3dxbuffer_release((void*)listing_v);
@ -545,7 +534,8 @@ static bool hlsl_filter_type(void *data, unsigned idx, bool *smooth)
if (hlsl_data && idx
&& (hlsl_data->cg_shader->pass[idx - 1].filter != RARCH_FILTER_UNSPEC))
{
*smooth = hlsl_data->cg_shader->pass[idx - 1].filter = RARCH_FILTER_LINEAR;
*smooth = RARCH_FILTER_LINEAR;
hlsl_data->cg_shader->pass[idx - 1].filter = RARCH_FILTER_LINEAR;
return true;
}
return false;