marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d9: Reject blits on CPU accessible resources. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Józef Kucia 2018-02-22 16:43:11 +01:00 committed by Alexandre Julliard
parent a49153cfa0
commit 514ffe8ac9
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/d3d9/device.c
View File

@ -1612,6 +1612,17 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect
src_rect = &s;
}
if (dst_desc.access & WINED3D_RESOURCE_ACCESS_CPU)
{
WARN("Destination resource is not in DEFAULT pool.\n");
goto done;
}
if (src_desc.access & WINED3D_RESOURCE_ACCESS_CPU)
{
WARN("Source resource is not in DEFAULT pool.\n");
goto done;
}
if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL)
{
if (device->in_scene)

13
dlls/d3d9/tests/device.c
View File

@ -12342,7 +12342,7 @@ static void test_stretch_rect(void)
IDirect3DTexture9_Release(dst_texture);
hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst, NULL, D3DTEXF_NONE);
todo_wine
todo_wine_if(src_pool == D3DPOOL_DEFAULT && dst_pool == D3DPOOL_DEFAULT)
ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n",
hr, src_format, dst_format, src_pool, dst_pool);
@ -12352,11 +12352,10 @@ static void test_stretch_rect(void)
else
expected_hr = D3DERR_INVALIDCALL;
hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst_rt, NULL, D3DTEXF_NONE);
todo_wine_if(expected_hr != D3D_OK)
ok(hr == expected_hr, "Got hr %#x, expected hr %#x (formats %#x/%#x, pool %#x).\n",
hr, expected_hr, src_format, dst_format, src_pool);
hr = IDirect3DDevice9_StretchRect(device, src_rt, NULL, dst, NULL, D3DTEXF_NONE);
todo_wine
todo_wine_if(dst_pool == D3DPOOL_DEFAULT)
ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pool %#x).\n",
hr, src_format, dst_format, dst_pool);
@ -12380,28 +12379,26 @@ static void test_stretch_rect(void)
ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr);
hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst_surface, NULL, D3DTEXF_NONE);
todo_wine_if(expected_hr != D3D_OK)
ok(hr == expected_hr, "Got hr %#x, expected %#x (formats %#x/%#x, pools %#x/%#x).\n",
hr, expected_hr, src_format, dst_format, src_pool, dst_pool);
/* offscreen plain <-> texture */
hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst_surface, NULL, D3DTEXF_NONE);
todo_wine
todo_wine_if(src_pool == D3DPOOL_DEFAULT && dst_pool == D3DPOOL_DEFAULT)
ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n",
hr, src_format, dst_format, src_pool, dst_pool);
hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst, NULL, D3DTEXF_NONE);
todo_wine
todo_wine_if(src_pool == D3DPOOL_DEFAULT && dst_pool == D3DPOOL_DEFAULT)
ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pools %#x/%#x).\n",
hr, src_format, dst_format, src_pool, dst_pool);
/* offscreen plain <-> render target */
expected_hr = src_pool == D3DPOOL_DEFAULT ? D3D_OK : D3DERR_INVALIDCALL;
hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, dst_rt, NULL, D3DTEXF_NONE);
todo_wine_if(expected_hr != D3D_OK)
ok(hr == expected_hr, "Got hr %#x, expected hr %#x (formats %#x/%#x, pool %#x).\n",
hr, expected_hr, src_format, dst_format, src_pool);
hr = IDirect3DDevice9_StretchRect(device, src_rt, NULL, dst_surface, NULL, D3DTEXF_NONE);
todo_wine
todo_wine_if(dst_pool == D3DPOOL_DEFAULT)
ok(hr == D3DERR_INVALIDCALL, "Got hr %#x (formats %#x/%#x, pool %#x).\n",
hr, src_format, dst_format, dst_pool);