mirror of
https://github.com/libretro/RetroArch
synced 2025-03-17 10:21:26 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
5a66c10863
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user