(D3D) More refactors

This commit is contained in:
twinaphex 2015-04-05 04:30:50 +02:00
parent 122df894ff
commit 4ba073424c
2 changed files with 11 additions and 11 deletions

View File

@ -60,9 +60,9 @@ void renderchain_free(void *data)
}
bool renderchain_init(void *data, const video_info_t *video_info,
LPDIRECT3DDEVICE dev_,
void *dev_,
void *shader_context,
const D3DVIEWPORT *final_viewport_,
const void *final_viewport_,
const void *info_data, PixelFormat fmt)
{
const LinkInfo *info = (const LinkInfo*)info_data;
@ -72,7 +72,7 @@ bool renderchain_init(void *data, const video_info_t *video_info,
if (!chain)
return false;
chain->dev = dev_;
chain->dev = (LPDIRECT3DDEVICE)dev_;
#ifdef HAVE_CG
chain->cgCtx = cgCtx_;
#endif
@ -128,10 +128,10 @@ void renderchain_clear(void *data)
chain->luts.clear();
}
void renderchain_set_final_viewport(void *data,
const D3DVIEWPORT *final_viewport)
void renderchain_set_final_viewport(void *data, const void *viewport_data)
{
renderchain_t *chain = (renderchain_t*)data;
const D3DVIEWPORT *final_viewport = (const D3DVIEWPORT*)viewport_data;
if (chain)
chain->final_viewport = (D3DVIEWPORT*)final_viewport;
@ -523,9 +523,10 @@ void renderchain_set_vertices(
vp_width, vp_height);
}
void renderchain_set_viewport(void *data, D3DVIEWPORT *vp)
void renderchain_set_viewport(void *data, void *viewport_data)
{
LPDIRECT3DDEVICE d3dr;
D3DVIEWPORT *vp = (D3DVIEWPORT*)viewport_data;
renderchain_t *chain = (renderchain_t*)data;
if (!chain)

View File

@ -105,16 +105,15 @@ typedef struct renderchain
void renderchain_free(void *data);
bool renderchain_init(void *data, const video_info_t *video_info,
LPDIRECT3DDEVICE dev_,
void *dev_,
void *shader_data,
const D3DVIEWPORT *final_viewport_,
const void *final_viewport_,
const void *info_data,
PixelFormat fmt);
void renderchain_clear(void *data);
void renderchain_set_final_viewport(void *data,
const D3DVIEWPORT *final_viewport);
void renderchain_set_final_viewport(void *data, const void *viewport_data);
bool renderchain_set_pass_size(void *data, unsigned pass_index,
unsigned width, unsigned height);
@ -148,7 +147,7 @@ void renderchain_set_vertices(
unsigned vp_width, unsigned vp_height,
unsigned rotation);
void renderchain_set_viewport(void *data, D3DVIEWPORT *vp);
void renderchain_set_viewport(void *data, void *viewport_data);
void renderchain_set_mvp(void *data, void *vertex_program,
unsigned vp_width, unsigned vp_height,