ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8/tests: Use a separate device for multisample_copy_rects_test().

This commit is contained in:
Henri Verbeet 2014-04-16 08:55:25 +02:00 committed by Alexandre Julliard
parent 36f5debb88
commit b2d8573848
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/d3d8/tests/visual.c
View File

@ -3350,25 +3350,35 @@ static void shadow_test(IDirect3DDevice8 *device)
IDirect3D8_Release(d3d8); IDirect3D8_Release(d3d8);
} }
static void multisample_copy_rects_test(IDirect3DDevice8 *device) static void multisample_copy_rects_test(void)
{ {
IDirect3DSurface8 *original_ds, *original_rt, *ds, *ds_plain, *rt, *readback; IDirect3DSurface8 *ds, *ds_plain, *rt, *readback;
RECT src_rect = {64, 64, 128, 128}; RECT src_rect = {64, 64, 128, 128};
POINT dst_point = {96, 96}; POINT dst_point = {96, 96};
D3DLOCKED_RECT locked_rect; D3DLOCKED_RECT locked_rect;
IDirect3D8 *d3d8; IDirect3DDevice8 *device;
IDirect3D8 *d3d;
D3DCOLOR color; D3DCOLOR color;
ULONG refcount;
HWND window;
HRESULT hr; HRESULT hr;
hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); 0, 0, 640, 480, NULL, NULL, NULL, NULL);
hr = IDirect3D8_CheckDeviceMultiSampleType(d3d8, D3DADAPTER_DEFAULT, d3d = Direct3DCreate8(D3D_SDK_VERSION);
D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES); ok(!!d3d, "Failed to create a D3D object.\n");
IDirect3D8_Release(d3d8); if (!(device = create_device(d3d, window, window, TRUE)))
if (FAILED(hr)) {
skip("Failed to create a D3D device, skipping tests.\n");
goto done;
}
if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES)))
{ {
skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled CopyRects test.\n"); skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled CopyRects test.\n");
return; IDirect3DDevice8_Release(device);
goto done;
} }
hr = IDirect3DDevice8_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, hr = IDirect3DDevice8_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8,
@ -3383,11 +3393,6 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device)
hr = IDirect3DDevice8_CreateImageSurface(device, 256, 256, D3DFMT_A8R8G8B8, &readback); hr = IDirect3DDevice8_CreateImageSurface(device, 256, 256, D3DFMT_A8R8G8B8, &readback);
ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr);
hr = IDirect3DDevice8_GetRenderTarget(device, &original_rt);
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
hr = IDirect3DDevice8_GetDepthStencilSurface(device, &original_ds);
ok(SUCCEEDED(hr), "Failed to get depth/stencil, hr %#x.\n", hr);
hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds);
ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr);
@ -3418,15 +3423,15 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device)
hr = IDirect3DSurface8_UnlockRect(readback); hr = IDirect3DSurface8_UnlockRect(readback);
ok(SUCCEEDED(hr), "Failed to unlock readback surface, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to unlock readback surface, hr %#x.\n", hr);
hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, original_ds);
ok(SUCCEEDED(hr), "Failed to restore original render target, hr %#x.\n", hr);
IDirect3DSurface8_Release(original_ds);
IDirect3DSurface8_Release(original_rt);
IDirect3DSurface8_Release(readback); IDirect3DSurface8_Release(readback);
IDirect3DSurface8_Release(ds_plain); IDirect3DSurface8_Release(ds_plain);
IDirect3DSurface8_Release(ds); IDirect3DSurface8_Release(ds);
IDirect3DSurface8_Release(rt); IDirect3DSurface8_Release(rt);
refcount = IDirect3DDevice8_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
done:
IDirect3D8_Release(d3d);
DestroyWindow(window);
} }
static void resz_test(void) static void resz_test(void)
@ -4812,7 +4817,6 @@ START_TEST(visual)
depth_buffer2_test(device_ptr); depth_buffer2_test(device_ptr);
intz_test(device_ptr); intz_test(device_ptr);
shadow_test(device_ptr); shadow_test(device_ptr);
multisample_copy_rects_test(device_ptr);
refcount = IDirect3DDevice8_Release(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr);
ok(!refcount, "Device has %u references left.\n", refcount); ok(!refcount, "Device has %u references left.\n", refcount);
@ -4820,6 +4824,7 @@ cleanup:
IDirect3D8_Release(d3d); IDirect3D8_Release(d3d);
DestroyWindow(window); DestroyWindow(window);
multisample_copy_rects_test();
zenable_test(); zenable_test();
resz_test(); resz_test();
fog_special_test(); fog_special_test();