Commit 8141f893 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

d3d8/tests: Do not test sysmem textures in test_mipmap_upload().

This does not work reliably on Windows. The application in question uses a managed texture.
parent 4e1da07b
...@@ -12129,11 +12129,11 @@ static void test_managed_reset(void) ...@@ -12129,11 +12129,11 @@ static void test_managed_reset(void)
release_test_context(&context); release_test_context(&context);
} }
/* Some applications lock a mipmapped texture at level 0, write every level at /* Some applications (Vivisector, Cryostasis) lock a mipmapped managed texture
* once, and expect it to be uploaded. */ * at level 0, write every level at once, and expect it to be uploaded. */
static void test_mipmap_upload(void) static void test_mipmap_upload(void)
{ {
unsigned int i, j, width, level_count; unsigned int j, width, level_count;
struct d3d8_test_context context; struct d3d8_test_context context;
IDirect3DTexture8 *texture; IDirect3DTexture8 *texture;
D3DLOCKED_RECT locked_rect; D3DLOCKED_RECT locked_rect;
...@@ -12141,22 +12141,12 @@ static void test_mipmap_upload(void) ...@@ -12141,22 +12141,12 @@ static void test_mipmap_upload(void)
unsigned int *mem; unsigned int *mem;
HRESULT hr; HRESULT hr;
static const D3DPOOL pools[] =
{
D3DPOOL_MANAGED,
D3DPOOL_SYSTEMMEM,
};
if (!init_test_context(&context)) if (!init_test_context(&context))
return; return;
device = context.device; device = context.device;
for (i = 0; i < ARRAY_SIZE(pools); ++i)
{
winetest_push_context("pool %#x", pools[i]);
hr = IDirect3DDevice8_CreateTexture(device, 32, 32, 0, 0, hr = IDirect3DDevice8_CreateTexture(device, 32, 32, 0, 0,
D3DFMT_A8R8G8B8, pools[i], &texture); D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture);
ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(hr == S_OK, "Got hr %#lx.\n", hr);
level_count = IDirect3DBaseTexture8_GetLevelCount(texture); level_count = IDirect3DBaseTexture8_GetLevelCount(texture);
...@@ -12189,16 +12179,12 @@ static void test_mipmap_upload(void) ...@@ -12189,16 +12179,12 @@ static void test_mipmap_upload(void)
ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(hr == S_OK, "Got hr %#lx.\n", hr);
draw_textured_quad(&context, texture); draw_textured_quad(&context, texture);
/* AMD Windows drivers don't sample from sysmem textures. */ check_rt_color(context.backbuffer, 0x00111111 * (j + 1));
check_rt_color_broken(context.backbuffer, 0x00111111 * (j + 1), 0x00000000, pools[i] == D3DPOOL_SYSTEMMEM);
winetest_pop_context(); winetest_pop_context();
} }
IDirect3DTexture8_Release(texture); IDirect3DTexture8_Release(texture);
winetest_pop_context();
}
release_test_context(&context); release_test_context(&context);
} }
......
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