system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

d3d9: Implement d3d9_device_UpdateSurface() on top of wined3d_device_copy_sub_resource_region().

Browse source 
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Riccardo Bortolato 2016-01-27 20:44:40 +01:00 committed by Alexandre Julliard
parent c39c8a367c
commit 39549a54fc
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/d3d9/device.c
View file

@ -1227,16 +1227,32 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface,
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface);
struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface);
struct wined3d_box src_box;
HRESULT hr; HRESULT hr;
TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n",
iface, src_surface, src_rect, dst_surface, dst_point); iface, src_surface, src_rect, dst_surface, dst_point);
if (src_rect)
{
src_box.left = src_rect->left;
src_box.top = src_rect->top;
src_box.right = src_rect->right;
src_box.bottom = src_rect->bottom;
src_box.front = 0;
src_box.back = 1;
}
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_device_update_surface(device->wined3d_device, src->wined3d_surface, src_rect, hr = wined3d_device_copy_sub_resource_region(device->wined3d_device,
dst->wined3d_surface, dst_point); wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0,
dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture),
src->sub_resource_idx, src_rect ? &src_box : NULL);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (FAILED(hr))
return D3DERR_INVALIDCALL;
return hr; return hr;
} }

2
dlls/d3d9/tests/device.c
View file

@ -10163,7 +10163,7 @@ static void test_mipmap_lock(void)
hr = IDirect3DDevice9_UpdateSurface(device, surface, NULL, surface_dst, NULL); hr = IDirect3DDevice9_UpdateSurface(device, surface, NULL, surface_dst, NULL);
ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr);
hr = IDirect3DDevice9_UpdateSurface(device, surface2, NULL, surface_dst2, NULL); hr = IDirect3DDevice9_UpdateSurface(device, surface2, NULL, surface_dst2, NULL);
todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
/* Apparently there's no validation on the container. */ /* Apparently there's no validation on the container. */
hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture, hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture,

2
dlls/wined3d/device.c
View file

@ -4027,7 +4027,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
dst_rect.bottom = dst_y + (src_rect.bottom - src_rect.top); dst_rect.bottom = dst_y + (src_rect.bottom - src_rect.top);
if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT)))
ERR("Failed to blit, hr %#x.\n", hr); WARN("Failed to blit, hr %#x.\n", hr);
return hr; return hr;
} }