diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index 9392ab7674..4ea93953b0 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -180,6 +180,50 @@ static bool renderchain_d3d_init_first( return false; } +static void d3d9_log_info(const struct LinkInfo *info) +{ + RARCH_LOG("[D3D]: Render pass info:\n"); + RARCH_LOG("\tTexture width: %u\n", info->tex_w); + RARCH_LOG("\tTexture height: %u\n", info->tex_h); + + RARCH_LOG("\tScale type (X): "); + + switch (info->pass->fbo.type_x) + { + case RARCH_SCALE_INPUT: + RARCH_LOG("Relative @ %fx\n", info->pass->fbo.scale_x); + break; + + case RARCH_SCALE_VIEWPORT: + RARCH_LOG("Viewport @ %fx\n", info->pass->fbo.scale_x); + break; + + case RARCH_SCALE_ABSOLUTE: + RARCH_LOG("Absolute @ %u px\n", info->pass->fbo.abs_x); + break; + } + + RARCH_LOG("\tScale type (Y): "); + + switch (info->pass->fbo.type_y) + { + case RARCH_SCALE_INPUT: + RARCH_LOG("Relative @ %fx\n", info->pass->fbo.scale_y); + break; + + case RARCH_SCALE_VIEWPORT: + RARCH_LOG("Viewport @ %fx\n", info->pass->fbo.scale_y); + break; + + case RARCH_SCALE_ABSOLUTE: + RARCH_LOG("Absolute @ %u px\n", info->pass->fbo.abs_y); + break; + } + + RARCH_LOG("\tBilinear filter: %s\n", + info->pass->filter == RARCH_FILTER_LINEAR ? "true" : "false"); +} + static bool d3d9_init_chain(d3d9_video_t *d3d, const video_info_t *video_info) { struct LinkInfo link_info; @@ -222,6 +266,7 @@ static bool d3d9_init_chain(d3d9_video_t *d3d, const video_info_t *video_info) } RARCH_LOG("[D3D]: Renderchain driver: %s\n", d3d->renderchain_driver->ident); + d3d9_log_info(&link_info); #ifndef _XBOX current_width = link_info.tex_w; @@ -249,6 +294,7 @@ static bool d3d9_init_chain(d3d9_video_t *d3d, const video_info_t *video_info) RARCH_ERR("[D3D]: Failed to add pass.\n"); return false; } + d3d9_log_info(&link_info); } #endif diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c index b85636a4a3..d5b281e709 100644 --- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c +++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c @@ -791,52 +791,6 @@ static bool d3d9_cg_renderchain_init_shader(d3d9_video_t *d3d, return true; } -static void d3d9_cg_renderchain_log_info( - void *data, const void *info_data) -{ - const struct LinkInfo *info = (const struct LinkInfo*)info_data; - RARCH_LOG("[D3D]: Render pass info:\n"); - RARCH_LOG("\tTexture width: %u\n", info->tex_w); - RARCH_LOG("\tTexture height: %u\n", info->tex_h); - - RARCH_LOG("\tScale type (X): "); - - switch (info->pass->fbo.type_x) - { - case RARCH_SCALE_INPUT: - RARCH_LOG("Relative @ %fx\n", info->pass->fbo.scale_x); - break; - - case RARCH_SCALE_VIEWPORT: - RARCH_LOG("Viewport @ %fx\n", info->pass->fbo.scale_x); - break; - - case RARCH_SCALE_ABSOLUTE: - RARCH_LOG("Absolute @ %u px\n", info->pass->fbo.abs_x); - break; - } - - RARCH_LOG("\tScale type (Y): "); - - switch (info->pass->fbo.type_y) - { - case RARCH_SCALE_INPUT: - RARCH_LOG("Relative @ %fx\n", info->pass->fbo.scale_y); - break; - - case RARCH_SCALE_VIEWPORT: - RARCH_LOG("Viewport @ %fx\n", info->pass->fbo.scale_y); - break; - - case RARCH_SCALE_ABSOLUTE: - RARCH_LOG("Absolute @ %u px\n", info->pass->fbo.abs_y); - break; - } - - RARCH_LOG("\tBilinear filter: %s\n", - info->pass->filter == RARCH_FILTER_LINEAR ? "true" : "false"); -} - static bool d3d9_cg_renderchain_create_first_pass( cg_renderchain_t *chain, const struct LinkInfo *info, unsigned fmt) @@ -931,7 +885,6 @@ static bool d3d9_cg_renderchain_init( if (!d3d9_cg_renderchain_create_first_pass(chain, info, fmt)) return false; - d3d9_cg_renderchain_log_info(chain, info); if (!d3d9_cg_load_program(chain, &chain->fStock, &chain->vStock, NULL, false)) return false; @@ -1130,7 +1083,6 @@ static bool d3d9_cg_renderchain_add_pass( pass_vector_list_append(chain->passes, pass); - d3d9_cg_renderchain_log_info(chain, info); return true; } diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c index 66a8a2084c..45999e5c44 100644 --- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c +++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c @@ -67,52 +67,6 @@ static bool hlsl_d3d9_renderchain_init_shader_fvf(d3d9_video_t *d3d, VertexElements, (void**)&chain->vertex_decl); } -static void d3d9_hlsl_renderchain_log_info( - void *data, const void *info_data) -{ - const struct LinkInfo *info = (const struct LinkInfo*)info_data; - RARCH_LOG("[D3D]: Render pass info:\n"); - RARCH_LOG("\tTexture width: %u\n", info->tex_w); - RARCH_LOG("\tTexture height: %u\n", info->tex_h); - - RARCH_LOG("\tScale type (X): "); - - switch (info->pass->fbo.type_x) - { - case RARCH_SCALE_INPUT: - RARCH_LOG("Relative @ %fx\n", info->pass->fbo.scale_x); - break; - - case RARCH_SCALE_VIEWPORT: - RARCH_LOG("Viewport @ %fx\n", info->pass->fbo.scale_x); - break; - - case RARCH_SCALE_ABSOLUTE: - RARCH_LOG("Absolute @ %u px\n", info->pass->fbo.abs_x); - break; - } - - RARCH_LOG("\tScale type (Y): "); - - switch (info->pass->fbo.type_y) - { - case RARCH_SCALE_INPUT: - RARCH_LOG("Relative @ %fx\n", info->pass->fbo.scale_y); - break; - - case RARCH_SCALE_VIEWPORT: - RARCH_LOG("Viewport @ %fx\n", info->pass->fbo.scale_y); - break; - - case RARCH_SCALE_ABSOLUTE: - RARCH_LOG("Absolute @ %u px\n", info->pass->fbo.abs_y); - break; - } - - RARCH_LOG("\tBilinear filter: %s\n", - info->pass->filter == RARCH_FILTER_LINEAR ? "true" : "false"); -} - static bool hlsl_d3d9_renderchain_create_first_pass(d3d9_video_t *d3d, const video_info_t *info) { @@ -325,7 +279,6 @@ static bool hlsl_d3d9_renderchain_init( if (!hlsl_d3d9_renderchain_create_first_pass(d3d, video_info)) return false; - d3d9_hlsl_renderchain_log_info(chain, info); /* FIXME */ if (custom_vp->width == 0)