(D3D9) Cleanups

This commit is contained in:
twinaphex 2018-05-13 18:33:16 +02:00
parent 46f23f9fbd
commit 33d2c2d422
3 changed files with 8 additions and 10 deletions

View File

@ -42,8 +42,8 @@ typedef struct d3d9_renderchain_driver
const struct LinkInfo *info, const struct LinkInfo *info,
bool rgb32); bool rgb32);
void (*set_final_viewport)(d3d9_video_t *d3d, void (*set_final_viewport)(d3d9_video_t *d3d,
void *renderchain_data, const void *viewport_data); void *renderchain_data, const D3DVIEWPORT9 *final_viewport);
bool (*add_pass)(void *data, const void *info_data); bool (*add_pass)(void *data, const struct LinkInfo *info);
bool (*add_lut)(void *data, bool (*add_lut)(void *data,
const char *id, const char *path, const char *id, const char *path,
bool smooth); bool smooth);

View File

@ -1023,10 +1023,9 @@ static void d3d_recompute_pass_sizes(cg_renderchain_t *chain,
static void d3d9_cg_renderchain_set_final_viewport( static void d3d9_cg_renderchain_set_final_viewport(
d3d9_video_t *d3d, d3d9_video_t *d3d,
void *renderchain_data, void *renderchain_data,
const void *viewport_data) const D3DVIEWPORT9 *final_viewport)
{ {
cg_renderchain_t *chain = (cg_renderchain_t*)renderchain_data; cg_renderchain_t *chain = (cg_renderchain_t*)renderchain_data;
const D3DVIEWPORT9 *final_viewport = (const D3DVIEWPORT9*)viewport_data;
if (chain && final_viewport) if (chain && final_viewport)
chain->final_viewport = (D3DVIEWPORT9*)final_viewport; chain->final_viewport = (D3DVIEWPORT9*)final_viewport;
@ -1036,10 +1035,9 @@ static void d3d9_cg_renderchain_set_final_viewport(
static bool d3d9_cg_renderchain_add_pass( static bool d3d9_cg_renderchain_add_pass(
void *data, void *data,
const void *info_data) const struct LinkInfo *info)
{ {
struct Pass pass; struct Pass pass;
const struct LinkInfo *info = (const struct LinkInfo*)info_data;
cg_renderchain_t *chain = (cg_renderchain_t*)data; cg_renderchain_t *chain = (cg_renderchain_t*)data;
pass.info = *info; pass.info = *info;

View File

@ -290,7 +290,7 @@ static bool hlsl_d3d9_renderchain_init(
static void hlsl_d3d9_renderchain_set_final_viewport( static void hlsl_d3d9_renderchain_set_final_viewport(
d3d9_video_t *d3d, d3d9_video_t *d3d,
void *renderchain_data, const void *viewport_data) void *renderchain_data, const D3DVIEWPORT9 *final_viewport)
{ {
} }
@ -303,7 +303,8 @@ static bool hlsl_d3d9_renderchain_render(
unsigned i; unsigned i;
unsigned width, height; unsigned width, height;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
hlsl_d3d9_renderchain_t *chain = (hlsl_d3d9_renderchain_t*)d3d->renderchain_data; hlsl_d3d9_renderchain_t *chain = (hlsl_d3d9_renderchain_t*)
d3d->renderchain_data;
bool video_smooth = settings->bools.video_smooth; bool video_smooth = settings->bools.video_smooth;
chain->frame_count++; chain->frame_count++;
@ -332,10 +333,9 @@ static bool hlsl_d3d9_renderchain_render(
} }
static bool hlsl_d3d9_renderchain_add_pass( static bool hlsl_d3d9_renderchain_add_pass(
void *data, const void *info_data) void *data, const struct LinkInfo *info)
{ {
(void)data; (void)data;
(void)info_data;
/* stub */ /* stub */
return true; return true;