From daf3f3bb086de528058cfa6376ed727e45a2b6fa Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 Apr 2015 18:33:42 +0200 Subject: [PATCH] (D3D) Buildfix --- gfx/d3d/d3d.cpp | 5 ++--- gfx/d3d/render_chain.cpp | 6 ++++-- gfx/d3d/render_chain.h | 3 ++- gfx/d3d/render_chain_xdk.h | 9 +++++++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index e21d747405..b0b9fc2098 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -1571,9 +1571,8 @@ static bool d3d_frame(void *data, const void *frame, d3d->screen_height, d3d->video_info.force_aspect, global->system.aspect_ratio); -#ifndef _XBOX - renderchain_set_final_viewport(d3d->chain, &d3d->final_viewport); -#endif + renderchain_set_final_viewport(d3d, + d3d->chain, &d3d->final_viewport); d3d->should_resize = false; } diff --git a/gfx/d3d/render_chain.cpp b/gfx/d3d/render_chain.cpp index cd37e1c72d..3d7383b8e1 100644 --- a/gfx/d3d/render_chain.cpp +++ b/gfx/d3d/render_chain.cpp @@ -865,9 +865,11 @@ static void d3d_recompute_pass_sizes(d3d_video_t *d3d) } } -void renderchain_set_final_viewport(void *data, const void *viewport_data) +void renderchain_set_final_viewport(void *data, + void *renderchain_data, const void *viewport_data) { - renderchain_t *chain = (renderchain_t*)data; + d3d_video_t *d3d = (d3d_video_t*)data; + renderchain_t *chain = (renderchain_t*)renderchain_data; const D3DVIEWPORT *final_viewport = (const D3DVIEWPORT*)viewport_data; if (chain) diff --git a/gfx/d3d/render_chain.h b/gfx/d3d/render_chain.h index 968be06b11..f177c08264 100644 --- a/gfx/d3d/render_chain.h +++ b/gfx/d3d/render_chain.h @@ -78,7 +78,8 @@ bool renderchain_init(void *data, const video_info_t *video_info, void renderchain_clear(void *data); -void renderchain_set_final_viewport(void *data, const void *viewport_data); +void renderchain_set_final_viewport(void *data, + void *renderchain_data, const void *viewport_data); bool renderchain_set_pass_size(void *data, unsigned pass_index, unsigned width, unsigned height); diff --git a/gfx/d3d/render_chain_xdk.h b/gfx/d3d/render_chain_xdk.h index d1f9ead504..930d8ce3e1 100644 --- a/gfx/d3d/render_chain_xdk.h +++ b/gfx/d3d/render_chain_xdk.h @@ -294,5 +294,10 @@ static void renderchain_render_pass(void *data, const void *frame, renderchain_set_mvp(d3d, d3d->screen_width, d3d->screen_height, d3d->dev_rotation); } - - +void renderchain_set_final_viewport(void *data, + void *renderchain_data, const void *viewport_data) +{ + (void)data; + (void)renderchain_data; + (void)viewport_data; +}