mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-27 03:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

move translate_filter to d3d_common.cpp

Browse Source
This commit is contained in:
twinaphex 2016-01-09 06:28:26 +01:00
parent a25d2d65f0
commit 4178950483
3 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/common/d3d_common.cpp
View File

@ -509,3 +509,22 @@ void d3d_device_free(LPDIRECT3DDEVICE dev, LPDIRECT3D pd3d)
if (pd3d)
pd3d->Release();
}
D3DTEXTUREFILTERTYPE d3d_translate_filter(unsigned type)
{
settings_t *settings = config_get_ptr();
switch (type)
{
case RARCH_FILTER_UNSPEC:
if (!settings->video.smooth)
break;
/* fall-through */
case RARCH_FILTER_LINEAR:
return D3DTEXF_LINEAR;
case RARCH_FILTER_NEAREST:
break;
}
return D3DTEXF_POINT;
}

2
gfx/common/d3d_common.h
View File

@ -113,6 +113,8 @@ bool d3d_reset(LPDIRECT3DDEVICE dev, D3DPRESENT_PARAMETERS *d3dpp);
void d3d_device_free(LPDIRECT3DDEVICE dev, LPDIRECT3D pd3d);
D3DTEXTUREFILTERTYPE d3d_translate_filter(unsigned type);
#ifdef __cplusplus
}
#endif

44
gfx/d3d/render_chain_cg.cpp
View File

@ -87,24 +87,6 @@ typedef struct cg_renderchain
CGcontext cgCtx;
} cg_renderchain_t;
static INLINE D3DTEXTUREFILTERTYPE translate_filter(unsigned type)
{
settings_t *settings = config_get_ptr();
switch (type)
{
case RARCH_FILTER_UNSPEC:
if (!settings->video.smooth)
break;
/* fall-through */
case RARCH_FILTER_LINEAR:
return D3DTEXF_LINEAR;
case RARCH_FILTER_NEAREST:
break;
}
return D3DTEXF_POINT;
}
static const char *stock_cg_d3d9_program =
"void main_vertex"
@ -156,7 +138,7 @@ static INLINE bool validate_param_name(const char *name)
return true;
}
static INLINE CGparameter find_param_from_semantic(
static INLINE CGparameter d3d9_cg_find_param_from_semantic(
CGparameter param, const char *sem)
{
for (; param; param = cgGetNextParameter(param))
@ -471,9 +453,9 @@ static void renderchain_bind_orig(cg_renderchain_t *chain, void *pass_data)
index = cgGetParameterResourceIndex(param);
d3d_set_texture(chain->dev, index, chain->passes[0].tex);
d3d_set_sampler_magfilter(chain->dev, index,
translate_filter(chain->passes[0].info.pass->filter));
d3d_translate_filter(chain->passes[0].info.pass->filter));
d3d_set_sampler_minfilter(chain->dev, index,
translate_filter(chain->passes[0].info.pass->filter));
d3d_translate_filter(chain->passes[0].info.pass->filter));
d3d_set_sampler_address_u(chain->dev, index, D3DTADDRESS_BORDER);
d3d_set_sampler_address_v(chain->dev, index, D3DTADDRESS_BORDER);
chain->bound_tex.push_back(index);
@ -546,9 +528,9 @@ static void renderchain_bind_prev(void *data, void *pass_data)
chain->bound_tex.push_back(index);
d3d_set_sampler_magfilter(chain->dev, index,
translate_filter(chain->passes[0].info.pass->filter));
d3d_translate_filter(chain->passes[0].info.pass->filter));
d3d_set_sampler_minfilter(chain->dev, index,
translate_filter(chain->passes[0].info.pass->filter));
d3d_translate_filter(chain->passes[0].info.pass->filter));
d3d_set_sampler_address_u(chain->dev, index, D3DTADDRESS_BORDER);
d3d_set_sampler_address_v(chain->dev, index, D3DTADDRESS_BORDER);
}
@ -576,9 +558,9 @@ static void cg_d3d9_renderchain_add_lut_internal(void *data,
d3d_set_texture(chain->dev, index, chain->luts[i].tex);
d3d_set_sampler_magfilter(chain->dev, index,
translate_filter(chain->luts[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST));
d3d_translate_filter(chain->luts[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST));
d3d_set_sampler_minfilter(chain->dev, index,
translate_filter(chain->luts[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST));
d3d_translate_filter(chain->luts[i].smooth ? RARCH_FILTER_LINEAR : RARCH_FILTER_NEAREST));
d3d_set_sampler_address_u(chain->dev, index, D3DTADDRESS_BORDER);
d3d_set_sampler_address_v(chain->dev, index, D3DTADDRESS_BORDER);
chain->bound_tex.push_back(index);
@ -627,9 +609,9 @@ static void renderchain_bind_pass(cg_renderchain_t *chain,
d3d_set_texture(chain->dev, index, chain->passes[i].tex);
d3d_set_sampler_magfilter(chain->dev, index,
translate_filter(chain->passes[i].info.pass->filter));
d3d_translate_filter(chain->passes[i].info.pass->filter));
d3d_set_sampler_minfilter(chain->dev, index,
translate_filter(chain->passes[i].info.pass->filter));
d3d_translate_filter(chain->passes[i].info.pass->filter));
d3d_set_sampler_address_u(chain->dev, index, D3DTADDRESS_BORDER);
d3d_set_sampler_address_v(chain->dev, index, D3DTADDRESS_BORDER);
}
@ -853,9 +835,9 @@ static bool renderchain_create_first_pass(cg_renderchain_t *chain,
d3d_set_texture(chain->dev, 0, chain->prev.tex[i]);
d3d_set_sampler_minfilter(chain->dev, 0,
translate_filter(info->pass->filter));
d3d_translate_filter(info->pass->filter));
d3d_set_sampler_magfilter(chain->dev, 0,
translate_filter(info->pass->filter));
d3d_translate_filter(info->pass->filter));
d3d_set_sampler_address_u(chain->dev, 0, D3DTADDRESS_BORDER);
d3d_set_sampler_address_v(chain->dev, 0, D3DTADDRESS_BORDER);
d3d_set_texture(chain->dev, 0, NULL);
@ -1322,9 +1304,9 @@ static void renderchain_render_pass(
d3d_set_texture(chain->dev, 0, pass->tex);
d3d_set_sampler_minfilter(chain->dev, 0,
translate_filter(pass->info.pass->filter));
d3d_translate_filter(pass->info.pass->filter));
d3d_set_sampler_magfilter(chain->dev, 0,
translate_filter(pass->info.pass->filter));
d3d_translate_filter(pass->info.pass->filter));
d3d_set_vertex_declaration(chain->dev, pass->vertex_decl);
for (i = 0; i < 4; i++)