(render_chain_driver.h) Remove dependency on video_info_t

This commit is contained in:
twinaphex 2015-04-06 18:20:08 +02:00
parent e210c2f9ee
commit bad8859169
4 changed files with 12 additions and 10 deletions

View File

@ -914,13 +914,15 @@ static bool renderchain_create_first_pass(void *data, const void *info_data,
return true; 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_, void *dev_,
const void *final_viewport_, const void *final_viewport_,
const void *info_data, unsigned fmt) const void *info_data, unsigned fmt)
{ {
const LinkInfo *info = (const LinkInfo*)info_data; const LinkInfo *info = (const LinkInfo*)info_data;
cg_renderchain_t *chain = (cg_renderchain_t*)data; cg_renderchain_t *chain = (cg_renderchain_t*)data;
const video_info_t *video_info = (const video_info_t*)_video_info;
if (!chain) if (!chain)
return false; return false;

View File

@ -44,7 +44,7 @@ typedef struct renderchain_driver
bool (*init_shader)(void *data); bool (*init_shader)(void *data);
bool (*init_shader_fvf)(void *data, void *pass_data); bool (*init_shader_fvf)(void *data, void *pass_data);
bool (*init)(void *data, bool (*init)(void *data,
const video_info_t *video_info, const void *video_info_data,
void *dev_data, void *dev_data,
const void *final_viewport_data, const void *final_viewport_data,
const void *info_data, const void *info_data,

View File

@ -67,7 +67,7 @@ static bool null_renderchain_init_shader(void *data)
} }
static bool null_renderchain_init(void *data, static bool null_renderchain_init(void *data,
const video_info_t *info, const void *info,
void *dev_data, void *dev_data,
const void *final_viewport_data, const void *final_viewport_data,
const void *info_data, const void *info_data,

View File

@ -289,22 +289,22 @@ static bool xdk_renderchain_init_shader(void *data)
} }
static bool xdk_renderchain_init(void *data, static bool xdk_renderchain_init(void *data,
const video_info_t *info, const void *_info,
void *dev_data, void *dev_data,
const void *final_viewport_data, const void *final_viewport_data,
const void *info_data, const void *info_data,
unsigned fmt unsigned fmt
) )
{ {
d3d_video_t *chain = (d3d_video_t*)data; d3d_video_t *chain = (d3d_video_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
const video_info_t *info = (const video_info_t*)_info;
(void)dev_data; (void)dev_data;
(void)final_viewport_data; (void)final_viewport_data;
(void)info_data; (void)info_data;
(void)fmt; (void)fmt;
chain->pixel_size = fmt ? sizeof(uint32_t) : sizeof(uint16_t); chain->pixel_size = fmt ? sizeof(uint32_t) : sizeof(uint16_t);
if (!renderchain_create_first_pass(chain, info)) if (!renderchain_create_first_pass(chain, info))