d3d9/tests: Test DXT1 and DXT3 as well in volume_dxt5_test().
Signed-off-by: Connor McAdams <conmanx360@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Connor McAdams
Alexandre Julliard
parent
3d4001f4fc
commit
7e6e935fde
|
|
@ -17741,26 +17741,74 @@ done:
|
|||
DestroyWindow(window);
|
||||
}
|
||||
|
||||
static void volume_dxt5_test(void)
|
||||
static void volume_dxtn_test(void)
|
||||
{
|
||||
IDirect3DVolumeTexture9 *texture;
|
||||
struct surface_readback rb;
|
||||
IDirect3DDevice9 *device;
|
||||
IDirect3DSurface9 *rt;
|
||||
D3DLOCKED_BOX box;
|
||||
unsigned int i, j;
|
||||
IDirect3D9 *d3d;
|
||||
unsigned int i;
|
||||
ULONG refcount;
|
||||
DWORD color;
|
||||
DWORD colour;
|
||||
HWND window;
|
||||
HRESULT hr;
|
||||
|
||||
static const char texture_data[] =
|
||||
static const BYTE dxt1_data[] =
|
||||
{
|
||||
/* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */
|
||||
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0xf8, 0x00, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0,
|
||||
0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00,
|
||||
0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
static const BYTE dxt3_data[] =
|
||||
{
|
||||
0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00,
|
||||
0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00,
|
||||
0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
static const BYTE dxt5_data[] =
|
||||
{
|
||||
/* A 8x4x2 texture consisting of 4 4x4 blocks. The colours of the
|
||||
* blocks are red, green, blue and white. */
|
||||
0xff, 0xff, 0x80, 0x0d, 0xd8, 0x80, 0x0d, 0xd8, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00,
|
||||
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00,
|
||||
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
static const DWORD dxt1_expected_colours[] =
|
||||
{
|
||||
0xffff0000, 0x00000000, 0xff00ff00, 0xff00ff00,
|
||||
0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff,
|
||||
};
|
||||
static const DWORD dxt3_expected_colours[] =
|
||||
{
|
||||
0xffff0000, 0xeeff0000, 0xff00ff00, 0xdd00ff00,
|
||||
0xff0000ff, 0xcc0000ff, 0xffffffff, 0xbbffffff,
|
||||
};
|
||||
static const DWORD dxt5_expected_colours[] =
|
||||
{
|
||||
0xffff0000, 0x00ff0000, 0xff00ff00, 0xff00ff00,
|
||||
0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff
|
||||
};
|
||||
|
||||
static const struct
|
||||
{
|
||||
const char *name;
|
||||
D3DFORMAT format;
|
||||
const BYTE *data;
|
||||
DWORD data_size;
|
||||
const DWORD *expected_colours;
|
||||
}
|
||||
tests[] =
|
||||
{
|
||||
{"DXT1", D3DFMT_DXT1, dxt1_data, sizeof(dxt1_data), dxt1_expected_colours},
|
||||
{"DXT3", D3DFMT_DXT3, dxt3_data, sizeof(dxt3_data), dxt3_expected_colours},
|
||||
{"DXT5", D3DFMT_DXT5, dxt5_data, sizeof(dxt5_data), dxt5_expected_colours},
|
||||
};
|
||||
|
||||
static const struct
|
||||
{
|
||||
struct vec3 position;
|
||||
|
|
@ -17778,67 +17826,77 @@ static void volume_dxt5_test(void)
|
|||
{{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}},
|
||||
{{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}},
|
||||
};
|
||||
static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff};
|
||||
|
||||
window = create_window();
|
||||
d3d = Direct3DCreate9(D3D_SDK_VERSION);
|
||||
ok(!!d3d, "Failed to create a D3D object.\n");
|
||||
if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
|
||||
D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5)))
|
||||
{
|
||||
skip("DXT5 volume textures are not supported, skipping test.\n");
|
||||
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,
|
||||
D3DPOOL_MANAGED, &texture, NULL);
|
||||
ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt);
|
||||
ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
|
||||
|
||||
hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0);
|
||||
ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr);
|
||||
memcpy(box.pBits, texture_data, sizeof(texture_data));
|
||||
hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0);
|
||||
ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr);
|
||||
|
||||
hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0));
|
||||
ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture);
|
||||
ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
|
||||
ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
|
||||
ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE);
|
||||
ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
|
||||
ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr);
|
||||
|
||||
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0);
|
||||
ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_BeginScene(device);
|
||||
ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads));
|
||||
ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads));
|
||||
ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_EndScene(device);
|
||||
ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
|
||||
|
||||
for (i = 0; i < 4; i++)
|
||||
for (i = 0; i < ARRAY_SIZE(tests); ++i)
|
||||
{
|
||||
color = getPixelColor(device, 80 + 160 * i, 240);
|
||||
ok (color_match(color, expected_colors[i], 1),
|
||||
"Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i);
|
||||
if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
|
||||
D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, tests[i].format)))
|
||||
{
|
||||
skip("%s volume textures are not supported, skipping test.\n", tests[i].name);
|
||||
continue;
|
||||
}
|
||||
hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0,
|
||||
tests[i].format, D3DPOOL_MANAGED, &texture, NULL);
|
||||
ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr);
|
||||
|
||||
hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0);
|
||||
ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr);
|
||||
memcpy(box.pBits, tests[i].data, tests[i].data_size);
|
||||
hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0);
|
||||
ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr);
|
||||
|
||||
hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0));
|
||||
ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture);
|
||||
ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
|
||||
ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
|
||||
ok(SUCCEEDED(hr), "Failed to set colour arg, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE);
|
||||
ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);
|
||||
ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr);
|
||||
|
||||
hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0);
|
||||
ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_BeginScene(device);
|
||||
ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads));
|
||||
ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads));
|
||||
ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
|
||||
hr = IDirect3DDevice9_EndScene(device);
|
||||
ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
|
||||
|
||||
get_rt_readback(rt, &rb);
|
||||
for (j = 0; j < ARRAY_SIZE(dxt1_expected_colours); ++j)
|
||||
{
|
||||
colour = get_readback_color(&rb, 40 + 80 * j, 240);
|
||||
ok(color_match(colour, tests[i].expected_colours[j], 1),
|
||||
"Expected colour 0x%08x, got 0x%08x, case %u.\n", tests[i].expected_colours[j], colour, j);
|
||||
}
|
||||
release_surface_readback(&rb);
|
||||
|
||||
hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
|
||||
ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
|
||||
IDirect3DVolumeTexture9_Release(texture);
|
||||
}
|
||||
|
||||
hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
|
||||
ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
|
||||
IDirect3DVolumeTexture9_Release(texture);
|
||||
IDirect3DSurface9_Release(rt);
|
||||
refcount = IDirect3DDevice9_Release(device);
|
||||
ok(!refcount, "Device has %u references left.\n", refcount);
|
||||
done:
|
||||
|
|
@ -24131,7 +24189,7 @@ START_TEST(visual)
|
|||
zenable_test();
|
||||
fog_special_test();
|
||||
volume_srgb_test();
|
||||
volume_dxt5_test();
|
||||
volume_dxtn_test();
|
||||
add_dirty_rect_test();
|
||||
multisampled_depth_buffer_test();
|
||||
resz_test();
|
||||
|
|
|
|||
Loading…
Reference in New Issue