Commit b14d7f2f authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

d3d9/tests: Fix skipping ATI2N in test_resource_access.

parent 7bbf2964
......@@ -13584,6 +13584,7 @@ static void test_resource_access(void)
D3DADAPTER_IDENTIFIER9 identifier;
struct device_desc device_desc;
D3DSURFACE_DESC surface_desc;
BOOL skip_ati2n_once = FALSE;
IDirect3DDevice9 *device;
unsigned int i, j;
IDirect3D9 *d3d;
......@@ -13735,7 +13736,11 @@ static void test_resource_access(void)
if (tests[j].format == FORMAT_ATI2 && FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, format)))
{
skip("ATI2N texture not supported.\n");
if (!skip_ati2n_once)
{
skip("ATI2N texture not supported.\n");
skip_ati2n_once = TRUE;
}
continue;
}
......@@ -13893,6 +13898,17 @@ static void test_resource_access(void)
else
format = colour_format;
if (tests[i].format == FORMAT_ATI2 && FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, format)))
{
if (!skip_ati2n_once)
{
skip("ATI2N texture not supported.\n");
skip_ati2n_once = TRUE;
}
continue;
}
hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1,
tests[i].usage, format, tests[i].pool, &texture, NULL);
ok((hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment