[PATCH 2/3] d3d9/tests: Skip unsupported resources in test_resource_type.
Stefan Dösinger
stefan at codeweavers.com
Wed Oct 22 14:56:37 CDT 2014
---
dlls/d3d9/tests/device.c | 144 ++++++++++++++++++++++++++---------------------
1 file changed, 79 insertions(+), 65 deletions(-)
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 9690d41..2b7edd7 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -8893,6 +8893,7 @@ static void test_resource_type(void)
ULONG refcount;
HWND window;
HRESULT hr;
+ D3DCAPS9 caps;
window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW,
0, 0, 640, 480, NULL, NULL, NULL, NULL);
@@ -8906,6 +8907,9 @@ static void test_resource_type(void)
return;
}
+ hr = IDirect3DDevice9_GetDeviceCaps(device, &caps);
+ ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);
+
hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_X8R8G8B8,
D3DPOOL_SYSTEMMEM, &surface, NULL);
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
@@ -8966,71 +8970,81 @@ static void test_resource_type(void)
IDirect3DSurface9_Release(surface);
IDirect3DTexture9_Release(texture);
- hr = IDirect3DDevice9_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8,
- D3DPOOL_SYSTEMMEM, &cube_texture, NULL);
- ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr);
- type = IDirect3DCubeTexture9_GetType(cube_texture);
- ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type);
-
- hr = IDirect3DCubeTexture9_GetCubeMapSurface(cube_texture,
- D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface);
- ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr);
- type = IDirect3DSurface9_GetType(surface);
- ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type);
- hr = IDirect3DSurface9_GetDesc(surface, &surface_desc);
- ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr);
- ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n",
- surface_desc.Type);
- hr = IDirect3DCubeTexture9_GetLevelDesc(cube_texture, 0, &surface_desc);
- ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr);
- ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n",
- surface_desc.Type);
- IDirect3DSurface9_Release(surface);
- IDirect3DCubeTexture9_Release(cube_texture);
-
- hr = IDirect3DDevice9_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8,
- D3DPOOL_SYSTEMMEM, &volume_texture, NULL);
- type = IDirect3DVolumeTexture9_GetType(volume_texture);
- ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type);
-
- hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 0, &volume);
- ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr);
- /* IDirect3DVolume9 is not an IDirect3DResource9 and has no GetType method. */
- hr = IDirect3DVolume9_GetDesc(volume, &volume_desc);
- ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr);
- ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n",
- volume_desc.Type);
- ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width);
- ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height);
- ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth);
- hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc);
- ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr);
- ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n",
- volume_desc.Type);
- ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width);
- ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height);
- ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth);
- IDirect3DVolume9_Release(volume);
-
- hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 2, &volume);
- ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr);
- /* IDirect3DVolume9 is not an IDirect3DResource9 and has no GetType method. */
- hr = IDirect3DVolume9_GetDesc(volume, &volume_desc);
- ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr);
- ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n",
- volume_desc.Type);
- ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width);
- ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height);
- ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth);
- hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 2, &volume_desc);
- ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr);
- ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n",
- volume_desc.Type);
- ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width);
- ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height);
- ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth);
- IDirect3DVolume9_Release(volume);
- IDirect3DVolumeTexture9_Release(volume_texture);
+ if (caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)
+ {
+ hr = IDirect3DDevice9_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8,
+ D3DPOOL_SYSTEMMEM, &cube_texture, NULL);
+ ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr);
+ type = IDirect3DCubeTexture9_GetType(cube_texture);
+ ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type);
+
+ hr = IDirect3DCubeTexture9_GetCubeMapSurface(cube_texture,
+ D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface);
+ ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr);
+ type = IDirect3DSurface9_GetType(surface);
+ ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type);
+ hr = IDirect3DSurface9_GetDesc(surface, &surface_desc);
+ ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr);
+ ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n",
+ surface_desc.Type);
+ hr = IDirect3DCubeTexture9_GetLevelDesc(cube_texture, 0, &surface_desc);
+ ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr);
+ ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n",
+ surface_desc.Type);
+ IDirect3DSurface9_Release(surface);
+ IDirect3DCubeTexture9_Release(cube_texture);
+ }
+ else
+ skip("Cube maps not supported.\n");
+
+ if (caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP)
+ {
+ hr = IDirect3DDevice9_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8,
+ D3DPOOL_SYSTEMMEM, &volume_texture, NULL);
+ type = IDirect3DVolumeTexture9_GetType(volume_texture);
+ ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type);
+
+ hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 0, &volume);
+ ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr);
+ /* IDirect3DVolume9 is not an IDirect3DResource9 and has no GetType method. */
+ hr = IDirect3DVolume9_GetDesc(volume, &volume_desc);
+ ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr);
+ ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n",
+ volume_desc.Type);
+ ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width);
+ ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height);
+ ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth);
+ hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc);
+ ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr);
+ ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n",
+ volume_desc.Type);
+ ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width);
+ ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height);
+ ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth);
+ IDirect3DVolume9_Release(volume);
+
+ hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 2, &volume);
+ ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr);
+ /* IDirect3DVolume9 is not an IDirect3DResource9 and has no GetType method. */
+ hr = IDirect3DVolume9_GetDesc(volume, &volume_desc);
+ ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr);
+ ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n",
+ volume_desc.Type);
+ ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width);
+ ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height);
+ ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth);
+ hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 2, &volume_desc);
+ ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr);
+ ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n",
+ volume_desc.Type);
+ ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width);
+ ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height);
+ ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth);
+ IDirect3DVolume9_Release(volume);
+ IDirect3DVolumeTexture9_Release(volume_texture);
+ }
+ else
+ skip("Mipmapped volume maps not supported.\n");
refcount = IDirect3DDevice9_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
--
2.0.4
More information about the wine-patches
mailing list