mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Cleanups pt. 2

Browse Source
This commit is contained in:
twinaphex 2015-04-05 00:09:39 +02:00
parent 94fa13512c
commit 880a7813a1
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/d3d/d3d_wrapper.cpp
View File

@ -131,14 +131,10 @@ void d3d_vertex_buffer_unlock(LPDIRECT3DVERTEXBUFFER vertbuf)
void *d3d_vertex_buffer_lock(LPDIRECT3DVERTEXBUFFER vertbuf) void *d3d_vertex_buffer_lock(LPDIRECT3DVERTEXBUFFER vertbuf)
{ {
#ifdef _XBOX1
BYTE *buf;
#else
void *buf; void *buf;
#endif
#if defined(_XBOX1) #if defined(_XBOX1)
buf = D3DVertexBuffer_Lock2(vertbuf, 0); buf = (void*)D3DVertexBuffer_Lock2(vertbuf, 0);
#elif defined(_XBOX360) #elif defined(_XBOX360)
buf = D3DVertexBuffer_Lock(vertbuf, 0, 0, 0); buf = D3DVertexBuffer_Lock(vertbuf, 0, 0, 0);
#else #else
@ -264,7 +260,7 @@ void d3d_lockrectangle_clear(void *data,
D3DTexture_LockRect(tex, level, lock_rect, rect, flags); D3DTexture_LockRect(tex, level, lock_rect, rect, flags);
memset(lock_rect->pBits, 0, chain->tex_h * lock_rect->Pitch); memset(lock_rect->pBits, 0, chain->tex_h * lock_rect->Pitch);
#else #else
Pass *pass = (Pass*)data; Pass *pass = (Pass*)data;
if (SUCCEEDED(tex->LockRect(level, lock_rect, rect, flags))) if (SUCCEEDED(tex->LockRect(level, lock_rect, rect, flags)))
{ {
memset(lock_rect->pBits, level, pass->info.tex_h * lock_rect->Pitch); memset(lock_rect->pBits, level, pass->info.tex_h * lock_rect->Pitch);
@ -326,8 +322,6 @@ void d3d_texture_blit(void *data, void *renderchain_data,
unsigned y; unsigned y;
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
(void)data;
(void)d3d;
(void)y; (void)y;
if (!d3d) if (!d3d)