mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 00:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove viewport_info callback from D3D9 renderchain interface

Browse Source
This commit is contained in:
twinaphex 2018-05-13 06:29:17 +02:00
parent 27170674a5
commit 41295ef7b9
4 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/common/d3d9_common.h
View File

@ -56,7 +56,6 @@ typedef struct d3d9_renderchain_driver
void *final_viewport);
void (*set_font_rect)(d3d9_video_t *d3d, const void *param_data);
bool (*read_viewport)(d3d9_video_t *d3d, uint8_t *buffer, bool is_idle);
void (*viewport_info)(d3d9_video_t *d3d, struct video_viewport *vp);
const char *ident;
} d3d9_renderchain_driver_t;

17
gfx/drivers/d3d9.c
View File

@ -395,12 +395,21 @@ static bool d3d9_process_shader(d3d9_video_t *d3d)
static void d3d9_viewport_info(void *data, struct video_viewport *vp)
{
unsigned width, height;
d3d9_video_t *d3d = (d3d9_video_t*)data;
if ( d3d &&
d3d->renderchain_driver &&
d3d->renderchain_driver->viewport_info)
d3d->renderchain_driver->viewport_info(d3d, vp);
if (!vp)
return;
video_driver_get_size(&width, &height);
vp->x = d3d->final_viewport.x;
vp->y = d3d->final_viewport.y;
vp->width = d3d->final_viewport.width;
vp->height = d3d->final_viewport.height;
vp->full_width = width;
vp->full_height = height;
}
static void d3d9_set_mvp(void *data,

21
gfx/drivers_renderchain/d3d9_cg_renderchain.c
View File

@ -1674,26 +1674,6 @@ end:
return ret;
}
static void d3d9_cg_renderchain_viewport_info(
d3d9_video_t *d3d,
struct video_viewport *vp)
{
unsigned width, height;
if (!vp)
return;
video_driver_get_size(&width, &height);
vp->x = d3d->final_viewport.x;
vp->y = d3d->final_viewport.y;
vp->width = d3d->final_viewport.width;
vp->height = d3d->final_viewport.height;
vp->full_width = width;
vp->full_height = height;
}
d3d9_renderchain_driver_t cg_d3d9_renderchain = {
d3d9_cg_renderchain_free,
d3d9_cg_renderchain_new,
@ -1706,6 +1686,5 @@ d3d9_renderchain_driver_t cg_d3d9_renderchain = {
d3d9_cg_renderchain_convert_geometry,
d3d9_cg_renderchain_set_font_rect,
d3d9_cg_renderchain_read_viewport,
d3d9_cg_renderchain_viewport_info,
"cg_d3d9",
};

24
gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
View File

@ -124,8 +124,8 @@ static void hlsl_d3d9_renderchain_set_vertices(
{
unsigned i;
Vertex vert[4];
float tex_w = 0.0f;
float tex_h = 0.0f;
float tex_w = 0.0f;
float tex_h = 0.0f;
void *verts = NULL;
chain->last_width = vert_width;
@ -371,25 +371,6 @@ static void hlsl_d3d9_renderchain_convert_geometry(
/* stub */
}
static void hlsl_d3d9_renderchain_viewport_info(
d3d9_video_t *d3d, struct video_viewport *vp)
{
unsigned width, height;
if (!vp)
return;
video_driver_get_size(&width, &height);
vp->x = d3d->final_viewport.x;
vp->y = d3d->final_viewport.y;
vp->width = d3d->final_viewport.width;
vp->height = d3d->final_viewport.height;
vp->full_width = width;
vp->full_height = height;
}
d3d9_renderchain_driver_t hlsl_d3d9_renderchain = {
hlsl_d3d9_renderchain_free,
hlsl_d3d9_renderchain_new,
@ -402,6 +383,5 @@ d3d9_renderchain_driver_t hlsl_d3d9_renderchain = {
hlsl_d3d9_renderchain_convert_geometry,
NULL,
NULL,
hlsl_d3d9_renderchain_viewport_info,
"hlsl_d3d9",
};