From adb39cc844350ce1f7b6c7a70df9200d7383b28f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 7 Dec 2016 06:26:24 +0100 Subject: [PATCH] Turn last param of d3d_set_texture into void * --- gfx/common/d3d_common.cpp | 3 ++- gfx/common/d3d_common.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gfx/common/d3d_common.cpp b/gfx/common/d3d_common.cpp index 1ce01ad47d..4477b28766 100644 --- a/gfx/common/d3d_common.cpp +++ b/gfx/common/d3d_common.cpp @@ -367,8 +367,9 @@ void d3d_set_viewports(LPDIRECT3DDEVICE dev, D3DVIEWPORT *vp) } void d3d_set_texture(LPDIRECT3DDEVICE dev, unsigned sampler, - LPDIRECT3DTEXTURE tex) + void *tex_data) { + LPDIRECT3DTEXTURE tex = (LPDIRECT3DTEXTURE)tex_data; #if defined(_XBOX1) D3DDevice_SetTexture(sampler, tex); #elif defined(_XBOX360) diff --git a/gfx/common/d3d_common.h b/gfx/common/d3d_common.h index b0a09bd60a..a06e3c0c1d 100644 --- a/gfx/common/d3d_common.h +++ b/gfx/common/d3d_common.h @@ -81,7 +81,7 @@ void d3d_lock_rectangle_clear(LPDIRECT3DTEXTURE tex, void d3d_unlock_rectangle(LPDIRECT3DTEXTURE tex); void d3d_set_texture(LPDIRECT3DDEVICE dev, unsigned sampler, - LPDIRECT3DTEXTURE tex); + void *tex_data); HRESULT d3d_set_vertex_shader(LPDIRECT3DDEVICE dev, unsigned index, void *data);