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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2018-05-17 18:20:36 +02:00
parent a9cede28b4
commit fe1d3306af
2 changed files with 69 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
gfx/drivers_renderchain/d3d9_cg_renderchain.c
View File

@ -42,9 +42,14 @@
#pragma comment(lib, "cgd3d9") #pragma comment(lib, "cgd3d9")
#endif #endif
#define d3d9_cg_set_param_1f(param, x) if (param) cgD3D9SetUniform(param, x) static INLINE void d3d9_cg_set_param_1f(void *data, const void *value)
{
CGparameter param = (CGparameter)data;
if (param)
cgD3D9SetUniform(param, value);
}
static void set_cg_param(void *data, const char *name, const void *values) static INLINE void set_cg_param(void *data, const char *name, const void *values)
{ {
CGprogram prog = (CGprogram)data; CGprogram prog = (CGprogram)data;
CGparameter cgp = cgGetNamedParameter(prog, name); CGparameter cgp = cgGetNamedParameter(prog, name);
@ -623,10 +628,8 @@ static void d3d9_cg_destroy_resources(cg_renderchain_t *chain)
cgD3D9SetDevice(NULL); cgD3D9SetDevice(NULL);
} }
static void d3d9_cg_deinit_context_state(void *data) static void d3d9_cg_deinit_context_state(cg_renderchain_t *chain)
{ {
cg_renderchain_t *chain = (cg_renderchain_t*)data;
if (chain->cgCtx) if (chain->cgCtx)
{ {
RARCH_LOG("[D3D9 Cg]: Destroying context.\n"); RARCH_LOG("[D3D9 Cg]: Destroying context.\n");
@ -681,7 +684,8 @@ static bool d3d9_cg_renderchain_init_shader(d3d9_video_t *d3d,
static bool d3d9_cg_renderchain_create_first_pass( static bool d3d9_cg_renderchain_create_first_pass(
LPDIRECT3DDEVICE9 dev, LPDIRECT3DDEVICE9 dev,
cg_renderchain_t *chain, cg_renderchain_t *cg_chain,
d3d9_renderchain_t *chain,
const struct LinkInfo *info, unsigned _fmt) const struct LinkInfo *info, unsigned _fmt)
{ {
unsigned i; unsigned i;
@ -701,44 +705,44 @@ static bool d3d9_cg_renderchain_create_first_pass(
pass.attrib_map = (struct unsigned_vector_list*) pass.attrib_map = (struct unsigned_vector_list*)
unsigned_vector_list_new(); unsigned_vector_list_new();
chain->chain.prev.ptr = 0; chain->prev.ptr = 0;
for (i = 0; i < TEXTURES; i++) for (i = 0; i < TEXTURES; i++)
{ {
chain->chain.prev.last_width[i] = 0; chain->prev.last_width[i] = 0;
chain->chain.prev.last_height[i] = 0; chain->prev.last_height[i] = 0;
chain->chain.prev.vertex_buf[i] = (LPDIRECT3DVERTEXBUFFER9) chain->prev.vertex_buf[i] = (LPDIRECT3DVERTEXBUFFER9)
d3d9_vertex_buffer_new( d3d9_vertex_buffer_new(
chain->chain.dev, 4 * sizeof(struct D3D9Vertex), chain->dev, 4 * sizeof(struct D3D9Vertex),
D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, NULL); D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, NULL);
if (!chain->chain.prev.vertex_buf[i]) if (!chain->prev.vertex_buf[i])
return false; return false;
chain->chain.prev.tex[i] = (LPDIRECT3DTEXTURE9) chain->prev.tex[i] = (LPDIRECT3DTEXTURE9)
d3d9_texture_new(chain->chain.dev, NULL, d3d9_texture_new(chain->dev, NULL,
info->tex_w, info->tex_h, 1, 0, fmt, info->tex_w, info->tex_h, 1, 0, fmt,
D3DPOOL_MANAGED, 0, 0, 0, NULL, NULL, false); D3DPOOL_MANAGED, 0, 0, 0, NULL, NULL, false);
if (!chain->chain.prev.tex[i]) if (!chain->prev.tex[i])
return false; return false;
d3d9_set_texture(chain->chain.dev, 0, chain->chain.prev.tex[i]); d3d9_set_texture(chain->dev, 0, chain->prev.tex[i]);
d3d9_set_sampler_minfilter(dev, 0, d3d9_set_sampler_minfilter(dev, 0,
d3d_translate_filter(info->pass->filter)); d3d_translate_filter(info->pass->filter));
d3d9_set_sampler_magfilter(dev, 0, d3d9_set_sampler_magfilter(dev, 0,
d3d_translate_filter(info->pass->filter)); d3d_translate_filter(info->pass->filter));
d3d9_set_sampler_address_u(dev, 0, D3DTADDRESS_BORDER); d3d9_set_sampler_address_u(dev, 0, D3DTADDRESS_BORDER);
d3d9_set_sampler_address_v(dev, 0, D3DTADDRESS_BORDER); d3d9_set_sampler_address_v(dev, 0, D3DTADDRESS_BORDER);
d3d9_set_texture(chain->chain.dev, 0, NULL); d3d9_set_texture(chain->dev, 0, NULL);
} }
d3d9_cg_load_program(chain, &pass.fprg, d3d9_cg_load_program(cg_chain, &pass.fprg,
&pass.vprg, info->pass->source.path, true); &pass.vprg, info->pass->source.path, true);
if (!d3d9_cg_renderchain_init_shader_fvf(&chain->chain, &pass)) if (!d3d9_cg_renderchain_init_shader_fvf(chain, &pass))
return false; return false;
shader_pass_vector_list_append(chain->chain.passes, pass); shader_pass_vector_list_append(chain->passes, pass);
return true; return true;
} }
@ -766,7 +770,7 @@ static bool d3d9_cg_renderchain_init(
chain->chain.frame_count = 0; chain->chain.frame_count = 0;
chain->chain.pixel_size = (fmt == RETRO_PIXEL_FORMAT_RGB565) ? 2 : 4; chain->chain.pixel_size = (fmt == RETRO_PIXEL_FORMAT_RGB565) ? 2 : 4;
if (!d3d9_cg_renderchain_create_first_pass(dev, chain, info, fmt)) if (!d3d9_cg_renderchain_create_first_pass(dev, chain, &chain->chain, info, fmt))
return false; return false;
if (!d3d9_cg_load_program(chain, &chain->fStock, &chain->vStock, NULL, false)) if (!d3d9_cg_load_program(chain, &chain->fStock, &chain->vStock, NULL, false))
return false; return false;
@ -811,37 +815,8 @@ static bool d3d9_cg_renderchain_add_pass(
if (!d3d9_cg_renderchain_init_shader_fvf(&chain->chain, &pass)) if (!d3d9_cg_renderchain_init_shader_fvf(&chain->chain, &pass))
return false; return false;
pass.vertex_buf = (LPDIRECT3DVERTEXBUFFER9) return d3d9_renderchain_add_pass(&chain->chain, &pass,
d3d9_vertex_buffer_new(chain->chain.dev, info);
4 * sizeof(struct D3D9Vertex),
D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, NULL);
if (!pass.vertex_buf)
return false;
pass.tex = (LPDIRECT3DTEXTURE9)d3d9_texture_new(
chain->chain.dev,
NULL,
info->tex_w,
info->tex_h,
1,
D3DUSAGE_RENDERTARGET,
chain->chain.passes->data[
chain->chain.passes->count - 1].info.pass->fbo.fp_fbo
? D3DFMT_A32B32G32R32F : d3d9_get_argb8888_format(),
D3DPOOL_DEFAULT, 0, 0, 0, NULL, NULL, false);
if (!pass.tex)
return false;
d3d9_set_texture(chain->chain.dev, 0, pass.tex);
d3d9_set_sampler_address_u(chain->chain.dev, 0, D3DTADDRESS_BORDER);
d3d9_set_sampler_address_v(chain->chain.dev, 0, D3DTADDRESS_BORDER);
d3d9_set_texture(chain->chain.dev, 0, NULL);
shader_pass_vector_list_append(chain->chain.passes, pass);
return true;
} }
static bool d3d9_cg_renderchain_add_lut(void *data, static bool d3d9_cg_renderchain_add_lut(void *data,

42
gfx/drivers_renderchain/d3d9_renderchain.h
View File

@ -100,6 +100,48 @@ typedef struct d3d9_renderchain
struct lut_info_vector_list *luts; struct lut_info_vector_list *luts;
} d3d9_renderchain_t; } d3d9_renderchain_t;
static INLINE bool d3d9_renderchain_add_pass(d3d9_renderchain_t *chain,
struct shader_pass *pass,
const struct LinkInfo *info)
{
LPDIRECT3DTEXTURE9 tex;
LPDIRECT3DVERTEXBUFFER9 vertbuf = (LPDIRECT3DVERTEXBUFFER9)
d3d9_vertex_buffer_new(chain->dev,
4 * sizeof(struct D3D9Vertex),
D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, NULL);
if (!vertbuf)
return false;
pass->vertex_buf = vertbuf;
tex = (LPDIRECT3DTEXTURE9)d3d9_texture_new(
chain->dev,
NULL,
info->tex_w,
info->tex_h,
1,
D3DUSAGE_RENDERTARGET,
chain->passes->data[
chain->passes->count - 1].info.pass->fbo.fp_fbo
? D3DFMT_A32B32G32R32F : d3d9_get_argb8888_format(),
D3DPOOL_DEFAULT, 0, 0, 0, NULL, NULL, false);
if (!tex)
return false;
pass->tex = tex;
d3d9_set_texture(chain->dev, 0, pass->tex);
d3d9_set_sampler_address_u(chain->dev, 0, D3DTADDRESS_BORDER);
d3d9_set_sampler_address_v(chain->dev, 0, D3DTADDRESS_BORDER);
d3d9_set_texture(chain->dev, 0, NULL);
shader_pass_vector_list_append(chain->passes, *pass);
return true;
}
static INLINE bool d3d9_renderchain_add_lut(d3d9_renderchain_t *chain, static INLINE bool d3d9_renderchain_add_lut(d3d9_renderchain_t *chain,
const char *id, const char *path, bool smooth) const char *id, const char *path, bool smooth)
{ {