From bad8859169cae062789b1f3656326a75930a3475 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 6 Apr 2015 18:20:08 +0200 Subject: [PATCH] (render_chain_driver.h) Remove dependency on video_info_t --- gfx/d3d/render_chain_cg.cpp | 8 +++++--- gfx/d3d/render_chain_driver.h | 2 +- gfx/d3d/render_chain_null.cpp | 2 +- gfx/d3d/render_chain_xdk.cpp | 10 +++++----- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp index bf444490e8..b74272cc0d 100644 --- a/gfx/d3d/render_chain_cg.cpp +++ b/gfx/d3d/render_chain_cg.cpp @@ -914,13 +914,15 @@ static bool renderchain_create_first_pass(void *data, const void *info_data, return true; } -static bool cg_d3d9_renderchain_init(void *data, const video_info_t *video_info, +static bool cg_d3d9_renderchain_init(void *data, + const void *_video_info, void *dev_, const void *final_viewport_, const void *info_data, unsigned fmt) { - const LinkInfo *info = (const LinkInfo*)info_data; - cg_renderchain_t *chain = (cg_renderchain_t*)data; + const LinkInfo *info = (const LinkInfo*)info_data; + cg_renderchain_t *chain = (cg_renderchain_t*)data; + const video_info_t *video_info = (const video_info_t*)_video_info; if (!chain) return false; diff --git a/gfx/d3d/render_chain_driver.h b/gfx/d3d/render_chain_driver.h index f7e7437713..7c6f6fce9a 100644 --- a/gfx/d3d/render_chain_driver.h +++ b/gfx/d3d/render_chain_driver.h @@ -44,7 +44,7 @@ typedef struct renderchain_driver bool (*init_shader)(void *data); bool (*init_shader_fvf)(void *data, void *pass_data); bool (*init)(void *data, - const video_info_t *video_info, + const void *video_info_data, void *dev_data, const void *final_viewport_data, const void *info_data, diff --git a/gfx/d3d/render_chain_null.cpp b/gfx/d3d/render_chain_null.cpp index d02bb06b40..f9aba89b06 100644 --- a/gfx/d3d/render_chain_null.cpp +++ b/gfx/d3d/render_chain_null.cpp @@ -67,7 +67,7 @@ static bool null_renderchain_init_shader(void *data) } static bool null_renderchain_init(void *data, - const video_info_t *info, + const void *info, void *dev_data, const void *final_viewport_data, const void *info_data, diff --git a/gfx/d3d/render_chain_xdk.cpp b/gfx/d3d/render_chain_xdk.cpp index 1163bc7cd7..8037e28ecc 100644 --- a/gfx/d3d/render_chain_xdk.cpp +++ b/gfx/d3d/render_chain_xdk.cpp @@ -289,22 +289,22 @@ static bool xdk_renderchain_init_shader(void *data) } static bool xdk_renderchain_init(void *data, - const video_info_t *info, + const void *_info, void *dev_data, const void *final_viewport_data, const void *info_data, unsigned fmt ) { - d3d_video_t *chain = (d3d_video_t*)data; - LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; - global_t *global = global_get_ptr(); + d3d_video_t *chain = (d3d_video_t*)data; + LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; + global_t *global = global_get_ptr(); + const video_info_t *info = (const video_info_t*)_info; (void)dev_data; (void)final_viewport_data; (void)info_data; (void)fmt; - chain->pixel_size = fmt ? sizeof(uint32_t) : sizeof(uint16_t); if (!renderchain_create_first_pass(chain, info))