libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-12 20:58:18 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

CGP fixes in D3D9.

Browse Source
This commit is contained in:
Themaister 2013-04-21 11:18:55 +02:00
parent 96c0fbc8bc
commit e95a15d4ed
3 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/d3d9/d3d9.cpp
View File

@ -716,9 +716,6 @@ void D3DVideo::init_imports()
#ifdef HAVE_PYTHON
if (*shader.script_path)
{
std::string rel_path = shader.script_path;
fill_pathname_resolve_relative(shader.script_path, cg_shader.c_str(),
rel_path.c_str(), sizeof(shader.script_path));
tracker_info.script = shader.script_path;
tracker_info.script_is_file = true;
}
@ -741,7 +738,10 @@ void D3DVideo::init_luts()
{
for (unsigned i = 0; i < shader.luts; i++)
{
chain->add_lut(shader.lut[i].id, shader.lut[i].path, shader.lut[i].filter == RARCH_FILTER_LINEAR);
chain->add_lut(shader.lut[i].id, shader.lut[i].path,
shader.lut[i].filter == RARCH_FILTER_UNSPEC ?
g_settings.video.smooth :
(shader.lut[i].filter == RARCH_FILTER_LINEAR));
}
}
@ -761,6 +761,8 @@ void D3DVideo::init_multipass()
config_file_free(conf);
gfx_shader_resolve_relative(&shader, cg_shader.c_str());
RARCH_LOG("[D3D9 Meta-Cg] Found %d shaders.\n", shader.passes);
for (unsigned i = 0; i < shader.passes; i++)
@ -770,17 +772,6 @@ void D3DVideo::init_multipass()
shader.pass[i].fbo.scale_x = shader.pass[i].fbo.scale_y = 1.0f;
shader.pass[i].fbo.type_x = shader.pass[i].fbo.type_y = RARCH_SCALE_INPUT;
}
std::string rel_shader = shader.pass[i].source.cg;
fill_pathname_resolve_relative(shader.pass[i].source.cg, cg_shader.c_str(),
rel_shader.c_str(), sizeof(shader.pass[i].source.cg));
}
for (unsigned i = 0; i < shader.luts; i++)
{
std::string rel_lut = shader.lut[i].path;
fill_pathname_resolve_relative(shader.lut[i].path, cg_shader.c_str(),
rel_lut.c_str(), sizeof(shader.lut[i].path));
}
}
@ -812,7 +803,7 @@ bool D3DVideo::set_shader(const std::string &path)
void D3DVideo::process_shader()
{
if (cg_shader.find(".cgp") != std::string::npos)
if (strcmp(path_get_extension(cg_shader.c_str()), "cgp") == 0)
init_multipass();
else
init_singlepass();

43
gfx/d3d9/render_chain.cpp
View File

@ -131,7 +131,7 @@ void RenderChain::add_pass(const LinkInfo &info)
if (FAILED(dev->CreateTexture(info.tex_w, info.tex_h, 1,
D3DUSAGE_RENDERTARGET,
passes.back().info.pass->fbo.fp_fbo ? D3DFMT_A32B32G32R32F : D3DFMT_X8R8G8B8,
passes.back().info.pass->fbo.fp_fbo ? D3DFMT_A32B32G32R32F : D3DFMT_A8R8G8B8,
D3DPOOL_DEFAULT,
&pass.tex, nullptr)))
{
@ -280,6 +280,19 @@ bool RenderChain::render(const void *data,
return true;
}
D3DTEXTUREFILTERTYPE RenderChain::translate_filter(enum gfx_filter_type type)
{
if (type == RARCH_FILTER_UNSPEC)
return g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT;
else
return type == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT;
}
D3DTEXTUREFILTERTYPE RenderChain::translate_filter(bool smooth)
{
return smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT;
}
void RenderChain::create_first_pass(const LinkInfo &info, PixelFormat fmt)
{
D3DXMATRIX ident;
@ -319,9 +332,9 @@ void RenderChain::create_first_pass(const LinkInfo &info, PixelFormat fmt)
dev->SetTexture(0, prev.tex[i]);
dev->SetSamplerState(0, D3DSAMP_MINFILTER,
info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(info.pass->filter));
dev->SetSamplerState(0, D3DSAMP_MAGFILTER,
info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(info.pass->filter));
dev->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
dev->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
dev->SetTexture(0, nullptr);
@ -593,9 +606,9 @@ void RenderChain::render_pass(Pass &pass, unsigned pass_index)
set_shaders(pass.fPrg, pass.vPrg);
dev->SetTexture(0, pass.tex);
dev->SetSamplerState(0, D3DSAMP_MINFILTER,
pass.info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(pass.info.pass->filter));
dev->SetSamplerState(0, D3DSAMP_MAGFILTER,
pass.info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(pass.info.pass->filter));
dev->SetVertexDeclaration(pass.vertex_decl);
for (unsigned i = 0; i < 4; i++)
@ -686,9 +699,9 @@ void RenderChain::bind_orig(Pass &pass)
unsigned index = cgGetParameterResourceIndex(param);
dev->SetTexture(index, passes[0].tex);
dev->SetSamplerState(index, D3DSAMP_MAGFILTER,
passes[0].info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(passes[0].info.pass->filter));
dev->SetSamplerState(index, D3DSAMP_MINFILTER,
passes[0].info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(passes[0].info.pass->filter));
dev->SetSamplerState(index, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
dev->SetSamplerState(index, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
bound_tex.push_back(index);
@ -750,9 +763,9 @@ void RenderChain::bind_prev(Pass &pass)
bound_tex.push_back(index);
dev->SetSamplerState(index, D3DSAMP_MAGFILTER,
passes[0].info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(passes[0].info.pass->filter));
dev->SetSamplerState(index, D3DSAMP_MINFILTER,
passes[0].info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(passes[0].info.pass->filter));
dev->SetSamplerState(index, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
dev->SetSamplerState(index, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
}
@ -810,9 +823,9 @@ void RenderChain::bind_pass(Pass &pass, unsigned pass_index)
dev->SetTexture(index, passes[i].tex);
dev->SetSamplerState(index, D3DSAMP_MAGFILTER,
passes[i].info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(passes[i].info.pass->filter));
dev->SetSamplerState(index, D3DSAMP_MINFILTER,
passes[i].info.pass->filter == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(passes[i].info.pass->filter));
dev->SetSamplerState(index, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
dev->SetSamplerState(index, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
}
@ -839,9 +852,9 @@ void RenderChain::bind_luts(Pass &pass)
bound_index = index;
dev->SetTexture(index, luts[i].tex);
dev->SetSamplerState(index, D3DSAMP_MAGFILTER,
luts[i].smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(luts[i].smooth));
dev->SetSamplerState(index, D3DSAMP_MINFILTER,
luts[i].smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(luts[i].smooth));
dev->SetSamplerState(index, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
dev->SetSamplerState(index, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
bound_tex.push_back(index);
@ -855,9 +868,9 @@ void RenderChain::bind_luts(Pass &pass)
{
dev->SetTexture(index, luts[i].tex);
dev->SetSamplerState(index, D3DSAMP_MAGFILTER,
luts[i].smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(luts[i].smooth));
dev->SetSamplerState(index, D3DSAMP_MINFILTER,
luts[i].smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
translate_filter(luts[i].smooth));
dev->SetSamplerState(index, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
dev->SetSamplerState(index, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
bound_tex.push_back(index);

3
gfx/d3d9/render_chain.hpp
View File

@ -147,6 +147,9 @@ class RenderChain
void render_pass(Pass &pass, unsigned pass_index);
void log_info(const LinkInfo &info);
D3DTEXTUREFILTERTYPE translate_filter(enum gfx_filter_type type);
D3DTEXTUREFILTERTYPE translate_filter(bool smooth);
void start_render();
void end_render();