CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-16 23:37:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUildfix for D3D enum

Browse Source
This commit is contained in:
twinaphex 2018-01-23 04:25:37 +01:00
parent d3c2d90a2c
commit 4b6c4e5a6a
6 changed files with 248 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

414
gfx/common/d3d_common.c
View File

File diff suppressed because it is too large Load Diff

10
gfx/common/d3d_common.h
View File

@ -20,16 +20,10 @@
#include <retro_common_api.h>
#include "../../defines/d3d_defines.h"
#include "../video_driver.h"
RETRO_BEGIN_DECLS
enum d3d_comm_api
{
D3D_COMM_NONE = 0,
D3D_COMM_D3D8,
D3D_COMM_D3D9
};
typedef struct d3d_texture
{
LPDIRECT3DTEXTURE data;
@ -213,7 +207,7 @@ void d3d_device_free(LPDIRECT3DDEVICE dev, LPDIRECT3D pd3d);
void *d3d_create(void);
bool d3d_initialize_symbols(enum d3d_comm_api api);
bool d3d_initialize_symbols(enum gfx_ctx_api api);
void d3d_deinitialize_symbols(void);

4
gfx/drivers/d3d8.c
View File

@ -121,7 +121,7 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
link_info.tex_h = video_info->input_scale * RARCH_SCALE_BASE;
link_info.pass = &d3d->shader.pass[0];
if (!renderchain_d3d_init_first(D3D_COMM_D3D8,
if (!renderchain_d3d_init_first(GFX_CTX_DIRECT3D8_API,
&d3d->renderchain_driver,
&d3d->renderchain_data))
{
@ -1112,7 +1112,7 @@ static void *d3d_init(const video_info_t *info,
d3d_video_t *d3d = NULL;
const gfx_ctx_driver_t *ctx_driver = NULL;
if (!d3d_initialize_symbols(D3D_COMM_D3D8))
if (!d3d_initialize_symbols(GFX_CTX_DIRECT3D8_API))
return NULL;
d3d = (d3d_video_t*)calloc(1, sizeof(*d3d));

4
gfx/drivers/d3d9.c
View File

@ -121,7 +121,7 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
link_info.tex_h = video_info->input_scale * RARCH_SCALE_BASE;
link_info.pass = &d3d->shader.pass[0];
if (!renderchain_d3d_init_first(D3D_COMM_D3D9,
if (!renderchain_d3d_init_first(GFX_CTX_DIRECT3D9_API,
&d3d->renderchain_driver,
&d3d->renderchain_data))
{
@ -1136,7 +1136,7 @@ static void *d3d_init(const video_info_t *info,
d3d_video_t *d3d = NULL;
const gfx_ctx_driver_t *ctx_driver = NULL;
if (!d3d_initialize_symbols(D3D_COMM_D3D9))
if (!d3d_initialize_symbols(GFX_CTX_DIRECT3D9_API))
return NULL;
d3d = (d3d_video_t*)calloc(1, sizeof(*d3d));

13
gfx/video_driver.c
View File

@ -3426,14 +3426,13 @@ void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp)
}
bool renderchain_d3d_init_first(
unsigned api,
enum gfx_ctx_api api,
const d3d_renderchain_driver_t **renderchain_driver,
void **renderchain_handle)
{
#ifdef HAVE_D3D
switch ((enum d3d_comm_api)api)
switch (api)
{
case D3D_COMM_D3D9:
case GFX_CTX_DIRECT3D9_API:
#ifdef HAVE_D3D9
{
static const d3d_renderchain_driver_t *renderchain_d3d_drivers[] = {
@ -3462,7 +3461,7 @@ bool renderchain_d3d_init_first(
}
#endif
break;
case D3D_COMM_D3D8:
case GFX_CTX_DIRECT3D8_API:
{
#ifdef HAVE_D3D8
void *data = d3d8_d3d_renderchain.chain_new();
@ -3476,10 +3475,10 @@ bool renderchain_d3d_init_first(
#endif
}
break;
case D3D_COMM_NONE:
case GFX_CTX_NONE:
default:
break;
}
#endif
return false;
}

2
gfx/video_driver.h
View File

@ -1317,7 +1317,7 @@ bool video_shader_driver_compile_program(struct shader_program_info *program_inf
bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap);
bool renderchain_d3d_init_first(
unsigned api,
enum gfx_ctx_api,
const d3d_renderchain_driver_t **renderchain_driver,
void **renderchain_handle);