From d3ecc62291d6664a5f2943ed1c5ec8049cb8f253 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 Apr 2015 19:15:03 +0200 Subject: [PATCH 1/2] (d3d.h) Cleanups --- gfx/d3d/d3d.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h index b9252e5030..18d7768809 100644 --- a/gfx/d3d/d3d.h +++ b/gfx/d3d/d3d.h @@ -117,11 +117,6 @@ typedef struct d3d_video HWND hWnd; LPDIRECT3D g_pD3D; LPDIRECT3DDEVICE dev; -#if defined(HAVE_D3D9) && defined(_XBOX) - LPDIRECT3DSURFACE lpSurface; - LPDIRECT3DTEXTURE lpTexture_ot_as16srgb; - LPDIRECT3DTEXTURE lpTexture_ot; -#endif HRESULT d3d_err; unsigned cur_mon_id; From 36a062bcf3b2011a64ec31ba48d414050beceb41 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 Apr 2015 19:17:24 +0200 Subject: [PATCH 2/2] Update signature for d3d_lockrectangle_clear --- gfx/d3d/d3d_wrapper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/d3d/d3d_wrapper.h b/gfx/d3d/d3d_wrapper.h index 86f76fc3c4..5468e94dc6 100644 --- a/gfx/d3d/d3d_wrapper.h +++ b/gfx/d3d/d3d_wrapper.h @@ -69,7 +69,7 @@ void d3d_clear(LPDIRECT3DDEVICE dev, void d3d_lockrectangle_clear(void *data, LPDIRECT3DTEXTURE tex, unsigned level, D3DLOCKED_RECT *lock_rect, RECT *rect, - unsigned flags); + unsigned rectangle_height, unsigned flags); void d3d_set_texture(LPDIRECT3DDEVICE dev, unsigned sampler, LPDIRECT3DTEXTURE tex);