From 72059175602977625d2774a4f5716f24aaee4d68 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 17 Nov 2015 13:44:14 +0100 Subject: [PATCH] Revert "(D3D) Buildfix" This reverts commit 3c02410841f12f0f17a9ec7aa37ec3a0e3ed9f81. --- gfx/d3d/d3d_wrapper.cpp | 6 +++--- gfx/d3d/d3d_wrapper.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gfx/d3d/d3d_wrapper.cpp b/gfx/d3d/d3d_wrapper.cpp index 68a500ff4a..7f3badd941 100644 --- a/gfx/d3d/d3d_wrapper.cpp +++ b/gfx/d3d/d3d_wrapper.cpp @@ -33,7 +33,7 @@ static bool d3d_restore_device(LPDIRECT3DDEVICE dev) } bool d3d_create_device(unsigned monitor_id, D3DPRESENT_PARAMETERS *d3dpp, - LPDIRECT3D adapter, LPDIRECT3DDEVICE *dev, HWND window) + LPDIRECT3D adapter, LPDIRECT3DDEVICE dev, HWND window) { HRESULT err; @@ -43,7 +43,7 @@ bool d3d_create_device(unsigned monitor_id, D3DPRESENT_PARAMETERS *d3dpp, window, D3DCREATE_HARDWARE_VERTEXPROCESSING, d3dpp, - (D3DDevice**)&dev))) + dev))) { RARCH_WARN("[D3D]: Failed to init device with hardware vertex processing (code: 0x%x). Trying to fall back to software vertex processing.\n", (unsigned)err); @@ -54,7 +54,7 @@ bool d3d_create_device(unsigned monitor_id, D3DPRESENT_PARAMETERS *d3dpp, window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, d3dpp, - (D3DDevice**)&dev))) + dev))) { RARCH_ERR("Failed to initialize device.\n"); return false; diff --git a/gfx/d3d/d3d_wrapper.h b/gfx/d3d/d3d_wrapper.h index f96258fac3..b5e2a0815d 100644 --- a/gfx/d3d/d3d_wrapper.h +++ b/gfx/d3d/d3d_wrapper.h @@ -113,7 +113,7 @@ void d3d_set_render_state(void *data, D3DRENDERSTATETYPE state, DWORD value); bool d3d_reset(LPDIRECT3DDEVICE dev, D3DPRESENT_PARAMETERS *d3dpp); bool d3d_create_device(unsigned monitor_id, D3DPRESENT_PARAMETERS *d3dpp, - LPDIRECT3D adapter, LPDIRECT3DDEVICE *dev, HWND window); + LPDIRECT3D adapter, LPDIRECT3DDEVICE dev, HWND window); #ifdef __cplusplus }