mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D9) Cleanups

Browse Source
This commit is contained in:
twinaphex 2018-05-13 18:36:17 +02:00
parent 33d2c2d422
commit 34149e510e
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/common/d3d9_common.h
View File

@ -50,10 +50,10 @@ typedef struct d3d9_renderchain_driver
void (*add_state_tracker)(void *data, void *tracker_data); void (*add_state_tracker)(void *data, void *tracker_data);
bool (*render)(d3d9_video_t *d3d, const void *frame, bool (*render)(d3d9_video_t *d3d, const void *frame,
unsigned width, unsigned height, unsigned pitch, unsigned rotation); unsigned width, unsigned height, unsigned pitch, unsigned rotation);
void (*convert_geometry)(void *data, const void *info_data, void (*convert_geometry)(void *data, const struct LinkInfo *info,
unsigned *out_width, unsigned *out_height, unsigned *out_width, unsigned *out_height,
unsigned width, unsigned height, unsigned width, unsigned height,
void *final_viewport); D3DVIEWPORT9 *final_viewport);
void (*set_font_rect)(d3d9_video_t *d3d, const void *param_data); 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); bool (*read_viewport)(d3d9_video_t *d3d, uint8_t *buffer, bool is_idle);
const char *ident; const char *ident;

6
gfx/drivers_renderchain/d3d9_cg_renderchain.c
View File

@ -930,16 +930,14 @@ static bool d3d9_cg_renderchain_set_pass_size(
static void d3d9_cg_renderchain_convert_geometry( static void d3d9_cg_renderchain_convert_geometry(
void *data, void *data,
const void *info_data, const struct LinkInfo *info,
unsigned *out_width, unsigned *out_width,
unsigned *out_height, unsigned *out_height,
unsigned width, unsigned width,
unsigned height, unsigned height,
void *final_viewport_data) D3DVIEWPORT9 *final_viewport)
{ {
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;
D3DVIEWPORT9 *final_viewport = (D3DVIEWPORT9*)final_viewport_data;
if (!chain || !info) if (!chain || !info)
return; return;

10
gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
View File

@ -202,7 +202,8 @@ static void hlsl_d3d9_renderchain_blit_to_texture(
0, &d3dlr, NULL, chain->tex_h, D3DLOCK_NOSYSLOCK); 0, &d3dlr, NULL, chain->tex_h, D3DLOCK_NOSYSLOCK);
} }
/* Set the texture to NULL so D3D doesn't complain about it being in use... */ /* Set the texture to NULL so D3D doesn't
* complain about it being in use... */
d3d9_set_texture(chain->dev, 0, NULL); d3d9_set_texture(chain->dev, 0, NULL);
if (d3d9_lock_rectangle(chain->tex, 0, &d3dlr, NULL, 0, 0)) if (d3d9_lock_rectangle(chain->tex, 0, &d3dlr, NULL, 0, 0))
@ -351,19 +352,16 @@ static void hlsl_d3d9_renderchain_add_state_tracker(
} }
static void hlsl_d3d9_renderchain_convert_geometry( static void hlsl_d3d9_renderchain_convert_geometry(
void *data, const void *info_data, void *data, const struct LinkInfo *info,
unsigned *out_width, unsigned *out_height, unsigned *out_width, unsigned *out_height,
unsigned width, unsigned height, unsigned width, unsigned height,
void *final_viewport_data) D3DVIEWPORT9 *final_viewport)
{ {
(void)data; (void)data;
(void)info_data;
(void)out_width; (void)out_width;
(void)out_height; (void)out_height;
(void)width; (void)width;
(void)height; (void)height;
(void)final_viewport_data;
/* stub */ /* stub */
} }