mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XDK D3D) Refactor LPDIRECT3D member to g_pD3D

Browse Source
This commit is contained in:
twinaphex 2014-03-05 06:11:39 +01:00
parent 1e37515e2f
commit 4cd603197b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/context/xdk_ctx.c
View File

@ -366,8 +366,8 @@ static bool gfx_ctx_xdk_init(void)
{ {
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;
d3d->d3d_device = direct3d_create_ctx(D3D_SDK_VERSION); d3d->g_pD3D = direct3d_create_ctx(D3D_SDK_VERSION);
if (!d3d->d3d_device) if (!d3d->g_pD3D)
{ {
RARCH_ERR("Could not create Direct3D context.\n"); RARCH_ERR("Could not create Direct3D context.\n");
free(d3d); free(d3d);
@ -394,9 +394,9 @@ static void gfx_ctx_xdk_destroy(void)
d3d->dev->Release(); d3d->dev->Release();
d3d->dev = 0; d3d->dev = 0;
if (d3d->d3d_device) if (d3d->g_pD3D)
d3d->d3d_device->Release(); d3d->g_pD3D->Release();
d3d->d3d_device = 0; d3d->g_pD3D = 0;
} }
static void gfx_ctx_xdk_input_driver(const input_driver_t **input, void **input_data) static void gfx_ctx_xdk_input_driver(const input_driver_t **input, void **input_data)

2
xdk/xdk_d3d.cpp
View File

@ -422,7 +422,7 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu
D3DPRESENT_PARAMETERS d3dpp; D3DPRESENT_PARAMETERS d3dpp;
xdk_d3d_generate_pp(&d3dpp, video); xdk_d3d_generate_pp(&d3dpp, video);
ret = d3d->d3d_device->CreateDevice(0, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, ret = d3d->g_pD3D->CreateDevice(0, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING,
&d3dpp, &d3d->dev); &d3dpp, &d3d->dev);
if (ret != S_OK) if (ret != S_OK)

2
xdk/xdk_d3d.h
View File

@ -56,7 +56,7 @@ typedef struct xdk_d3d_video
unsigned win_width; unsigned win_width;
unsigned win_height; unsigned win_height;
unsigned tex_w, tex_h; unsigned tex_w, tex_h;
LPDIRECT3D d3d_device; LPDIRECT3D g_pD3D;
LPDIRECT3DDEVICE dev; LPDIRECT3DDEVICE dev;
LPDIRECT3DVERTEXBUFFER vertex_buf; LPDIRECT3DVERTEXBUFFER vertex_buf;
LPDIRECT3DTEXTURE lpTexture; LPDIRECT3DTEXTURE lpTexture;