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

d3d9/tests: Use a separate device for volume_dxt5_test().

Browse Source
This commit is contained in:
Henri Verbeet 2014-03-14 10:25:01 +01:00 committed by Alexandre Julliard
parent c2148f9e2a
commit c868f2d3a7
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dlls/d3d9/tests/visual.c
View File

@ -14748,14 +14748,18 @@ static void volume_srgb_test(IDirect3DDevice9 *device)
ok(SUCCEEDED(hr), "Failed to set srgb state, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to set srgb state, hr %#x.\n", hr);
} }
static void volume_dxt5_test(IDirect3DDevice9 *device) static void volume_dxt5_test(void)
{ {
HRESULT hr;
IDirect3D9 *d3d9;
IDirect3DVolumeTexture9 *texture; IDirect3DVolumeTexture9 *texture;
IDirect3DDevice9 *device;
D3DLOCKED_BOX box; D3DLOCKED_BOX box;
IDirect3D9 *d3d;
unsigned int i; unsigned int i;
ULONG refcount;
DWORD color; DWORD color;
HWND window;
HRESULT hr;
static const char texture_data[] = static const char texture_data[] =
{ {
/* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */
@ -14772,26 +14776,31 @@ static void volume_dxt5_test(IDirect3DDevice9 *device)
quads[] = quads[] =
{ {
{{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}},
{{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}},
{{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}},
{{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}},
{{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}},
{{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}},
{{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}},
{{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}},
{{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}},
{{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}},
}; };
static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff};
hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); 0, 0, 640, 480, NULL, NULL, NULL, NULL);
hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, d3d = Direct3DCreate9(D3D_SDK_VERSION);
D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5); ok(!!d3d, "Failed to create a D3D object.\n");
IDirect3D9_Release(d3d9); if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
if (FAILED(hr)) D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5)))
{ {
skip("Volume dxt5 textures are not supported, skipping test.\n"); skip("DXT5 volume textures are not supported, skipping test.\n");
return; goto done;
}
if (!(device = create_device(d3d, window, window, TRUE)))
{
skip("Failed to create a D3D device, skipping tests.\n");
goto done;
} }
hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5,
@ -14817,7 +14826,7 @@ static void volume_dxt5_test(IDirect3DDevice9 *device)
hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr);
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0);
ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
hr = IDirect3DDevice9_BeginScene(device); hr = IDirect3DDevice9_BeginScene(device);
ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
@ -14837,11 +14846,12 @@ static void volume_dxt5_test(IDirect3DDevice9 *device)
"Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i);
} }
hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE);
ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr);
hr = IDirect3DDevice9_SetTexture(device, 0, NULL);
ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr);
IDirect3DVolumeTexture9_Release(texture); IDirect3DVolumeTexture9_Release(texture);
refcount = IDirect3DDevice9_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
done:
IDirect3D9_Release(d3d);
DestroyWindow(window);
} }
static void volume_v16u16_test(IDirect3DDevice9 *device) static void volume_v16u16_test(IDirect3DDevice9 *device)
@ -15501,11 +15511,11 @@ START_TEST(visual)
zenable_test(device_ptr); zenable_test(device_ptr);
fog_special_test(device_ptr); fog_special_test(device_ptr);
volume_srgb_test(device_ptr); volume_srgb_test(device_ptr);
volume_dxt5_test(device_ptr);
cleanup_device(device_ptr); cleanup_device(device_ptr);
device_ptr = NULL; device_ptr = NULL;
volume_dxt5_test();
add_dirty_rect_test(); add_dirty_rect_test();
multisampled_depth_buffer_test(); multisampled_depth_buffer_test();
resz_test(); resz_test();