ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(D3D) Cleanups pt. 3

This commit is contained in:
twinaphex 2015-04-05 00:44:54 +02:00
parent 880a7813a1
commit 9081500780
3 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/d3d/d3d.cpp
View File

@ -914,7 +914,7 @@ static void d3d_recompute_pass_sizes(d3d_video_t *d3d)
for (i = 1; i < d3d->shader.passes; i++) for (i = 1; i < d3d->shader.passes; i++)
{ {
renderchain_convert_geometry(d3d->chain, &link_info, renderchain_convert_geometry(d3d->chain, &link_info,
out_width, out_height, &out_width, &out_height,
current_width, current_height, &d3d->final_viewport); current_width, current_height, &d3d->final_viewport);
link_info.tex_w = next_pow2(out_width); link_info.tex_w = next_pow2(out_width);
@ -1035,7 +1035,7 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
for (i = 1; i < d3d->shader.passes; i++) for (i = 1; i < d3d->shader.passes; i++)
{ {
renderchain_convert_geometry(d3d->chain, &link_info, renderchain_convert_geometry(d3d->chain, &link_info,
out_width, out_height, &out_width, &out_height,
current_width, current_height, &d3d->final_viewport); current_width, current_height, &d3d->final_viewport);
link_info.pass = &d3d->shader.pass[i]; link_info.pass = &d3d->shader.pass[i];

60
gfx/d3d/render_chain.cpp
View File

@ -21,9 +21,18 @@
static INLINE D3DTEXTUREFILTERTYPE translate_filter(unsigned type) static INLINE D3DTEXTUREFILTERTYPE translate_filter(unsigned type)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (type == RARCH_FILTER_UNSPEC)
return settings->video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT; switch (type)
return type == RARCH_FILTER_LINEAR ? D3DTEXF_LINEAR : D3DTEXF_POINT; {
case RARCH_FILTER_UNSPEC:
return settings->video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT;
case RARCH_FILTER_LINEAR:
return D3DTEXF_LINEAR;
case RARCH_FILTER_NEAREST:
return D3DTEXF_POINT;
}
return D3DTEXF_POINT;
} }
static INLINE D3DTEXTUREFILTERTYPE translate_filter(bool smooth) static INLINE D3DTEXTUREFILTERTYPE translate_filter(bool smooth)
@ -52,11 +61,12 @@ void renderchain_free(void *data)
bool renderchain_init(void *data, const video_info_t *video_info, bool renderchain_init(void *data, const video_info_t *video_info,
LPDIRECT3DDEVICE dev_, LPDIRECT3DDEVICE dev_,
CGcontext cgCtx_, void *shader_context,
const D3DVIEWPORT *final_viewport_, const D3DVIEWPORT *final_viewport_,
const LinkInfo *info, PixelFormat fmt) const LinkInfo *info, PixelFormat fmt)
{ {
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
CGcontext cgCtx_ = (CGcontext)shader_context;
if (!chain) if (!chain)
return false; return false;
@ -159,15 +169,16 @@ bool renderchain_set_pass_size(void *data, unsigned pass_index,
return true; return true;
} }
bool renderchain_add_pass(void *data, const LinkInfo *info) bool renderchain_add_pass(void *data, const void *info_data)
{ {
Pass pass; Pass pass;
renderchain_t *chain = (renderchain_t*)data; const LinkInfo *info = (const LinkInfo*)info_data;
renderchain_t *chain = (renderchain_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev;
pass.info = *info; pass.info = *info;
pass.last_width = 0; pass.last_width = 0;
pass.last_height = 0; pass.last_height = 0;
renderchain_compile_shaders(chain, pass.fPrg, renderchain_compile_shaders(chain, pass.fPrg,
pass.vPrg, info->pass->source.path); pass.vPrg, info->pass->source.path);
@ -287,7 +298,7 @@ bool renderchain_render(void *chain_data, const void *data,
current_width = width; current_width = width;
current_height = height; current_height = height;
renderchain_convert_geometry(chain, &chain->passes[0].info, renderchain_convert_geometry(chain, &chain->passes[0].info,
out_width, out_height, &out_width, &out_height,
current_width, current_height, chain->final_viewport); current_width, current_height, chain->final_viewport);
#ifdef _XBOX1 #ifdef _XBOX1
@ -310,7 +321,7 @@ bool renderchain_render(void *chain_data, const void *data,
d3dr->SetRenderTarget(0, target); d3dr->SetRenderTarget(0, target);
renderchain_convert_geometry(chain, &from_pass->info, renderchain_convert_geometry(chain, &from_pass->info,
out_width, out_height, &out_width, &out_height,
current_width, current_height, chain->final_viewport); current_width, current_height, chain->final_viewport);
/* Clear out whole FBO. */ /* Clear out whole FBO. */
@ -342,7 +353,7 @@ bool renderchain_render(void *chain_data, const void *data,
Pass *last_pass = (Pass*)&chain->passes.back(); Pass *last_pass = (Pass*)&chain->passes.back();
renderchain_convert_geometry(chain, &last_pass->info, renderchain_convert_geometry(chain, &last_pass->info,
out_width, out_height, &out_width, &out_height,
current_width, current_height, chain->final_viewport); current_width, current_height, chain->final_viewport);
renderchain_set_viewport(chain, chain->final_viewport); renderchain_set_viewport(chain, chain->final_viewport);
renderchain_set_vertices(chain, last_pass, renderchain_set_vertices(chain, last_pass,
@ -432,12 +443,14 @@ bool renderchain_create_first_pass(void *data, const LinkInfo *info,
return true; return true;
} }
void renderchain_set_vertices(void *data, Pass *pass, void renderchain_set_vertices(
void *data, void *pass_data,
unsigned width, unsigned height, unsigned width, unsigned height,
unsigned out_width, unsigned out_height, unsigned out_width, unsigned out_height,
unsigned vp_width, unsigned vp_height, unsigned vp_width, unsigned vp_height,
unsigned rotation) unsigned rotation)
{ {
Pass *pass = (Pass*)pass_data;
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
const LinkInfo *info = (const LinkInfo*)&pass->info; const LinkInfo *info = (const LinkInfo*)&pass->info;
@ -541,11 +554,13 @@ void renderchain_set_mvp(void *data, CGprogram &vPrg,
renderchain_set_shader_mvp(chain, vPrg, tmp); renderchain_set_shader_mvp(chain, vPrg, tmp);
} }
void renderchain_convert_geometry(void *data, const LinkInfo *info, void renderchain_convert_geometry(
unsigned &out_width, unsigned &out_height, void *data, const void *info_data,
unsigned *out_width, unsigned *out_height,
unsigned width, unsigned height, unsigned width, unsigned height,
D3DVIEWPORT *final_viewport) D3DVIEWPORT *final_viewport)
{ {
const LinkInfo *info = (const LinkInfo*)info_data;
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
if (!chain || !info) if (!chain || !info)
@ -554,30 +569,30 @@ void renderchain_convert_geometry(void *data, const LinkInfo *info,
switch (info->pass->fbo.type_x) switch (info->pass->fbo.type_x)
{ {
case RARCH_SCALE_VIEWPORT: case RARCH_SCALE_VIEWPORT:
out_width = info->pass->fbo.scale_x * final_viewport->Width; *out_width = info->pass->fbo.scale_x * final_viewport->Width;
break; break;
case RARCH_SCALE_ABSOLUTE: case RARCH_SCALE_ABSOLUTE:
out_width = info->pass->fbo.abs_x; *out_width = info->pass->fbo.abs_x;
break; break;
case RARCH_SCALE_INPUT: case RARCH_SCALE_INPUT:
out_width = info->pass->fbo.scale_x * width; *out_width = info->pass->fbo.scale_x * width;
break; break;
} }
switch (info->pass->fbo.type_y) switch (info->pass->fbo.type_y)
{ {
case RARCH_SCALE_VIEWPORT: case RARCH_SCALE_VIEWPORT:
out_height = info->pass->fbo.scale_y * final_viewport->Height; *out_height = info->pass->fbo.scale_y * final_viewport->Height;
break; break;
case RARCH_SCALE_ABSOLUTE: case RARCH_SCALE_ABSOLUTE:
out_height = info->pass->fbo.abs_y; *out_height = info->pass->fbo.abs_y;
break; break;
case RARCH_SCALE_INPUT: case RARCH_SCALE_INPUT:
out_height = info->pass->fbo.scale_y * height; *out_height = info->pass->fbo.scale_y * height;
break; break;
} }
} }
@ -601,9 +616,10 @@ void renderchain_blit_to_texture(void *data, const void *frame,
&d3dlr, frame, width, height, pitch); &d3dlr, frame, width, height, pitch);
} }
void renderchain_render_pass(void *data, Pass *pass, unsigned pass_index) void renderchain_render_pass(void *data, void *pass_data, unsigned pass_index)
{ {
unsigned i; unsigned i;
Pass *pass = (Pass*)pass_data;
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev;

13
gfx/d3d/render_chain.h
View File

@ -106,7 +106,7 @@ void renderchain_free(void *data);
bool renderchain_init(void *data, const video_info_t *video_info, bool renderchain_init(void *data, const video_info_t *video_info,
LPDIRECT3DDEVICE dev_, LPDIRECT3DDEVICE dev_,
CGcontext cgCtx_, void *shader_data,
const D3DVIEWPORT *final_viewport_, const D3DVIEWPORT *final_viewport_,
const LinkInfo *info, const LinkInfo *info,
PixelFormat fmt); PixelFormat fmt);
@ -119,7 +119,7 @@ void renderchain_set_final_viewport(void *data,
bool renderchain_set_pass_size(void *data, unsigned pass_index, bool renderchain_set_pass_size(void *data, unsigned pass_index,
unsigned width, unsigned height); unsigned width, unsigned height);
bool renderchain_add_pass(void *data, const LinkInfo *info); bool renderchain_add_pass(void *data, const void *info_data);
bool renderchain_add_lut(void *data, const std::string &id, bool renderchain_add_lut(void *data, const std::string &id,
const std::string &path, const std::string &path,
@ -141,7 +141,8 @@ D3DTEXTUREFILTERTYPE renderchain_translate_filter(bool smooth);
bool renderchain_create_first_pass(void *data, bool renderchain_create_first_pass(void *data,
const LinkInfo *info, PixelFormat fmt); const LinkInfo *info, PixelFormat fmt);
void renderchain_set_vertices(void *data, Pass *pass, void renderchain_set_vertices(
void *data, void *pass_data,
unsigned width, unsigned height, unsigned width, unsigned height,
unsigned out_width, unsigned out_height, unsigned out_width, unsigned out_height,
unsigned vp_width, unsigned vp_height, unsigned vp_width, unsigned vp_height,
@ -153,8 +154,8 @@ void renderchain_set_mvp(void *data, CGprogram &vPrg,
unsigned vp_width, unsigned vp_height, unsigned vp_width, unsigned vp_height,
unsigned rotation); unsigned rotation);
void renderchain_convert_geometry(void *data, const LinkInfo *info, void renderchain_convert_geometry(void *data, const void *info_data,
unsigned &out_width, unsigned &out_height, unsigned *out_width, unsigned *out_height,
unsigned width, unsigned height, unsigned width, unsigned height,
D3DVIEWPORT *final_viewport); D3DVIEWPORT *final_viewport);
@ -162,7 +163,7 @@ void renderchain_blit_to_texture(void *data, const void *frame,
unsigned width, unsigned height, unsigned width, unsigned height,
unsigned pitch); unsigned pitch);
void renderchain_render_pass(void *data, Pass *pass, unsigned pass_index); void renderchain_render_pass(void *data, void *pass_data, unsigned pass_index);
void renderchain_log_info(void *data, const LinkInfo *info); void renderchain_log_info(void *data, const LinkInfo *info);