From c558b48ff5c2aaa2e01c3dcbd0cfd9b14702a43c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 13 Sep 2014 19:11:36 +0200 Subject: [PATCH] (D3D) Move D3DTexture_LockRect to d3d_texture_blit --- gfx/d3d9/d3d_wrapper.c | 3 +++ gfx/d3d9/render_chain_xdk.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gfx/d3d9/d3d_wrapper.c b/gfx/d3d9/d3d_wrapper.c index 76651bac69..95f2791823 100644 --- a/gfx/d3d9/d3d_wrapper.c +++ b/gfx/d3d9/d3d_wrapper.c @@ -269,6 +269,8 @@ void d3d_texture_blit(void *data, void *renderchain_data, if (!d3d) return; +#ifdef _XBOX + D3DTexture_LockRect(tex, 0, &lr, NULL, D3DLOCK_NOSYSLOCK); #if defined(_XBOX360) D3DSURFACE_DESC desc; tex->GetLevelDesc(0, &desc); @@ -281,6 +283,7 @@ void d3d_texture_blit(void *data, void *renderchain_data, uint8_t *out = (uint8_t*)lr->pBits + y * lr->Pitch; memcpy(out, in, width * d3d->pixel_size); } +#endif #else renderchain_t *chain = (renderchain_t*)renderchain_data; diff --git a/gfx/d3d9/render_chain_xdk.h b/gfx/d3d9/render_chain_xdk.h index 35fa12f09b..f36ca847b9 100644 --- a/gfx/d3d9/render_chain_xdk.h +++ b/gfx/d3d9/render_chain_xdk.h @@ -262,6 +262,6 @@ static void renderchain_blit_to_texture(void *data, const void *frame, 0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK); } - D3DTexture_LockRect(d3d->tex, 0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK); - d3d_texture_blit(d3d, NULL, d3d->tex, &d3dlr, frame, width, height, pitch); + d3d_texture_blit(driver.video_data, NULL, d3d->tex, + &d3dlr, frame, width, height, pitch); }