diff options
| author | Gert Wollny <gert.wollny@collabora.com> | 2019-10-09 16:27:27 +0200 |
|---|---|---|
| committer | Gert Wollny <gert.wollny@collabora.com> | 2019-10-10 18:13:27 +0200 |
| commit | 306262c4847cb98ed913ed8227627009abbcacb9 (patch) | |
| tree | 358b84d7fcdb18d43229e32ea589b1eb7873abc8 /tests | |
| parent | 164d7587adc437dcc1cc9bdf843640ae450a96ff (diff) | |
tests: Fix cubemap tests to take care that width == high for tests that should pass
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_virgl_resource.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/test_virgl_resource.c b/tests/test_virgl_resource.c index 050185f..9b3bfef 100644 --- a/tests/test_virgl_resource.c +++ b/tests/test_virgl_resource.c @@ -223,27 +223,27 @@ static struct res_test testlist[] = { TEST_MIP(1, PIPE_TEXTURE_3D, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 1, 1, 0, 4, 0), /* CUBE texture with array size == 6 - PASS */ - TEST(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 1, 6, 0, 0), - /* CUBE texture with array size != 6 - FAIL */ - TEST(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 1, 1, 0, EINVAL), - /* CUBE texture with height - PASS */ TEST(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 50, 1, 6, 0, 0), + /* CUBE texture with array size != 6 - FAIL */ + TEST(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 50, 1, 1, 0, EINVAL), /* CUBE texture with depth - FAIL */ - TEST(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 5, 6, 0, EINVAL), + TEST(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 50, 5, 6, 0, EINVAL), /* CUBE texture with samples - FAIL */ - TEST(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 1, 6, 4, EINVAL), + TEST(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 50, 1, 6, 4, EINVAL), /* CUBE texture with miplevels - PASS */ - TEST_MIP(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 1, 6, 0, 4, 0), + TEST(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 1, 6, 0, EINVAL), + /* CUBE texture with miplevels - PASS */ + TEST_MIP(1, PIPE_TEXTURE_CUBE, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 50, 1, 6, 0, 4, 0), }; /* separate since these may fail on a GL that doesn't support cube map arrays */ static struct res_test cubemaparray_testlist[] = { /* CUBE array with array size = 6 - PASS */ - TEST(1, PIPE_TEXTURE_CUBE_ARRAY, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 1, 6, 0, 0), + TEST(1, PIPE_TEXTURE_CUBE_ARRAY, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 50, 1, 6, 0, 0), /* CUBE array with array size = 12 - PASS */ - TEST(1, PIPE_TEXTURE_CUBE_ARRAY, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 1, 12, 0, 0), + TEST(1, PIPE_TEXTURE_CUBE_ARRAY, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 50, 1, 12, 0, 0), /* CUBE array with array size = 10 - FAIL */ - TEST(1, PIPE_TEXTURE_CUBE_ARRAY, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 1, 1, 10, 0, EINVAL), + TEST(1, PIPE_TEXTURE_CUBE_ARRAY, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 50, 1, 10, 0, EINVAL), /* CUBE array with array size = 12 and height - PASS */ TEST(1, PIPE_TEXTURE_CUBE_ARRAY, PIPE_FORMAT_B8G8R8X8_UNORM, PIPE_BIND_SAMPLER_VIEW, 50, 50, 1, 12, 0, 0), /* CUBE array with array size = 12 and depth - FAIL */ |