mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D renderchains) Cleanups

Browse Source
This commit is contained in:
twinaphex 2018-05-13 18:59:57 +02:00
parent 380fa6fd5e
commit bcedf74fe4
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers_renderchain/d3d9_cg_renderchain.c
View File

@ -118,7 +118,6 @@ typedef struct cg_renderchain
CGprogram vStock; CGprogram vStock;
CGprogram fStock; CGprogram fStock;
LPDIRECT3DDEVICE9 dev; LPDIRECT3DDEVICE9 dev;
const video_info_t *video_info;
D3DVIEWPORT9 *final_viewport; D3DVIEWPORT9 *final_viewport;
struct pass_vector_list *passes; struct pass_vector_list *passes;
struct unsigned_vector_list *bound_tex; struct unsigned_vector_list *bound_tex;
@ -872,12 +871,11 @@ static bool d3d9_cg_renderchain_init(
return false; return false;
if (!d3d9_cg_renderchain_init_shader(d3d, chain)) if (!d3d9_cg_renderchain_init_shader(d3d, chain))
{ {
RARCH_ERR("Failed to initialize shader subsystem.\n"); RARCH_ERR("[D3D9 Cg]: Failed to initialize shader subsystem.\n");
return false; return false;
} }
chain->dev = dev; chain->dev = dev;
chain->video_info = video_info;
chain->state_tracker = NULL; chain->state_tracker = NULL;
chain->final_viewport = (D3DVIEWPORT9*)final_viewport; chain->final_viewport = (D3DVIEWPORT9*)final_viewport;
chain->frame_count = 0; chain->frame_count = 0;

17
gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
View File

@ -41,6 +41,7 @@ typedef struct hlsl_d3d9_renderchain
unsigned tex_w; unsigned tex_w;
unsigned tex_h; unsigned tex_h;
LPDIRECT3DDEVICE9 dev; LPDIRECT3DDEVICE9 dev;
D3DVIEWPORT9 *final_viewport;
LPDIRECT3DTEXTURE9 tex; LPDIRECT3DTEXTURE9 tex;
LPDIRECT3DVERTEXBUFFER9 vertex_buf; LPDIRECT3DVERTEXBUFFER9 vertex_buf;
LPDIRECT3DVERTEXDECLARATION9 vertex_decl; LPDIRECT3DVERTEXDECLARATION9 vertex_decl;
@ -259,19 +260,20 @@ static bool hlsl_d3d9_renderchain_init(
bool rgb32 bool rgb32
) )
{ {
unsigned width, height;
hlsl_d3d9_renderchain_t *chain = (hlsl_d3d9_renderchain_t*) hlsl_d3d9_renderchain_t *chain = (hlsl_d3d9_renderchain_t*)
d3d->renderchain_data; d3d->renderchain_data;
unsigned fmt = (rgb32) unsigned fmt = (rgb32)
? RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565; ? RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565;
struct video_viewport *custom_vp = video_viewport_get_custom();
if (!hlsl_d3d9_renderchain_init_shader(d3d, chain)) if (!hlsl_d3d9_renderchain_init_shader(d3d, chain))
{
RARCH_ERR("[D3D9 HLSL]: Failed to initialize shader subsystem.\n");
return false; return false;
}
video_driver_get_size(&width, &height);
chain->dev = dev; chain->dev = dev;
chain->final_viewport = (D3DVIEWPORT9*)final_viewport;
chain->frame_count = 0;
chain->pixel_size = (fmt == RETRO_PIXEL_FORMAT_RGB565) ? 2 : 4; chain->pixel_size = (fmt == RETRO_PIXEL_FORMAT_RGB565) ? 2 : 4;
chain->tex_w = info->tex_w; chain->tex_w = info->tex_w;
chain->tex_h = info->tex_h; chain->tex_h = info->tex_h;
@ -279,13 +281,6 @@ static bool hlsl_d3d9_renderchain_init(
if (!hlsl_d3d9_renderchain_create_first_pass(d3d, video_info)) if (!hlsl_d3d9_renderchain_create_first_pass(d3d, video_info))
return false; return false;
/* FIXME */
if (custom_vp->width == 0)
custom_vp->width = width;
if (custom_vp->height == 0)
custom_vp->height = height;
return true; return true;
} }