[Piglit] [PATCH 2/2] arb_direct_state_access: New test for glGetTextureImage.
Ian Romanick
idr at freedesktop.org
Tue Feb 17 13:39:08 PST 2015
This test is pretty similar to the GetCompressedTextureImage test you
posted... which is a good thing. I have pretty much the same set of
feedback for this test as for that test.
There is one other side note at the bottom.
On 02/16/2015 12:38 PM, Laura Ekstrand wrote:
> ---
> .../gettextureimage-targets.c | 215 +++++++++++++++++++++
> 1 file changed, 215 insertions(+)
> create mode 100644 tests/spec/arb_direct_state_access/gettextureimage-targets.c
>
> diff --git a/tests/spec/arb_direct_state_access/gettextureimage-targets.c b/tests/spec/arb_direct_state_access/gettextureimage-targets.c
> new file mode 100644
> index 0000000..01de938
> --- /dev/null
> +++ b/tests/spec/arb_direct_state_access/gettextureimage-targets.c
> @@ -0,0 +1,215 @@
> +/*
> + * Copyright 2015 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> + * DEALINGS IN THE SOFTWARE.
> + */
> +
> +/** @file gettextureimage-targets.c
> + *
> + * Tests to make sure that glGetTextureImage works correctly.
> + * The basic idea is to create some data, upload it to the
> + * driver with the traditional commands, download it with DSA, and compare.
> + * Of course, this assumes that the traditional commands are correct, which
> + * may not actually be the case.
> + */
> +
> +#include "piglit-util-gl.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 10;
> +
> + config.window_visual = PIGLIT_GL_VISUAL_RGBA |
> + PIGLIT_GL_VISUAL_DOUBLE;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +#define WIDTH 32
> +#define HEIGHT 32
> +#define IMAGE_SIZE (WIDTH * HEIGHT * 4)
> +#define CHAR_LIMIT 100
> +
> +static GLubyte *expected;
> +static GLboolean pass = GL_TRUE;
> +
> +static void
> +subtest(GLboolean local_result, const char *test_name)
> +{
> + pass = local_result && pass;
> + piglit_report_subtest_result(local_result ? PIGLIT_PASS : PIGLIT_FAIL,
> + test_name);
> +}
> +
> +static void
> +init_random_data(void)
> +{
> + int i;
> +
> + expected = malloc(18 * IMAGE_SIZE);
> + for (i = 0; i < 18 * IMAGE_SIZE; ++i) {
> + expected[i] = (GLubyte) rand();
> + }
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + piglit_require_extension("GL_ARB_direct_state_access");
> + piglit_require_extension("GL_ARB_texture_storage");
> + srand(0);
> + init_random_data();
> +}
> +
> +static bool
> +compare_to_expected(const GLubyte *data, int num_layers)
> +{
> + return memcmp(expected, data, num_layers * IMAGE_SIZE) == 0;
> +}
> +
> +static void
> +upload_subtest(GLenum target, bool use_pbo)
> +{
> + GLuint tex, pbo;
> + int num_layers;
> + char test_name [CHAR_LIMIT];
> + int i;
> +
> + /* Prepare to read data from expected */
> + GLubyte *data = expected;
> + if (use_pbo) {
> + glGenBuffers(1, &pbo);
> + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo);
> + glBufferData(GL_PIXEL_UNPACK_BUFFER, 18 * IMAGE_SIZE,
> + expected, GL_STATIC_DRAW);
> + data = NULL;
> + piglit_check_gl_error(GL_NO_ERROR);
> + }
> +
> + /* Upload it using traditional path */
> + glGenTextures(1, &tex);
> + glBindTexture(target, tex);
> +
> + switch (target) {
> +
> + case GL_TEXTURE_1D:
> + num_layers = 1;
> + glTexStorage1D(target, 1, GL_RGBA8, WIDTH * HEIGHT);
> + glTexSubImage1D(target, 0, 0, WIDTH * HEIGHT, GL_RGBA,
> + GL_UNSIGNED_BYTE, data);
> + break;
> + case GL_TEXTURE_1D_ARRAY: /* FALLTHROUGH */
> + case GL_TEXTURE_RECTANGLE: /* FALLTHROUGH */
> + case GL_TEXTURE_2D:
> + num_layers = 1;
> + glTexStorage2D(target, 1, GL_RGBA8, WIDTH, HEIGHT);
> + glTexSubImage2D(target, 0, 0, 0, WIDTH, HEIGHT,
> + GL_RGBA, GL_UNSIGNED_BYTE, data);
> + break;
> + case GL_TEXTURE_3D: /* FALLTHROUGH */
> + case GL_TEXTURE_2D_ARRAY:
> + num_layers = 3;
> + glTexStorage3D(target, 1, GL_RGBA8, WIDTH, HEIGHT,
> + num_layers);
> + glTexSubImage3D(target, 0, 0, 0, 0, WIDTH, HEIGHT,
> + num_layers, GL_RGBA, GL_UNSIGNED_BYTE, data);
> + break;
> + case GL_TEXTURE_CUBE_MAP:
> + num_layers = 6;
> + glTexStorage2D(target, 1, GL_RGBA8, WIDTH, HEIGHT);
> + for (i = 0; i < num_layers; ++i) {
> + glTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i,
> + 0, 0, 0, WIDTH, HEIGHT, GL_RGBA,
> + GL_UNSIGNED_BYTE,
> + data + i * IMAGE_SIZE);
> + }
> + break;
> + case GL_TEXTURE_CUBE_MAP_ARRAY:
> + num_layers = 18;
> + glTexStorage3D(target, 1, GL_RGBA8, WIDTH, HEIGHT,
> + num_layers);
> + glTexSubImage3D(target, 0, 0, 0, 0, WIDTH, HEIGHT,
> + num_layers, GL_RGBA, GL_UNSIGNED_BYTE, data);
> + break;
> + default:
> + printf("Bad texture target.\n");
> + piglit_report_result(PIGLIT_FAIL);
> +
> + }
> + piglit_check_gl_error(GL_NO_ERROR);
> +
> + /* Prepare to download into data. */
> + if (use_pbo) {
> + GLubyte *junk = malloc(18 * IMAGE_SIZE);
> + memset(junk, 123, 18 * IMAGE_SIZE);
> + glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo);
> + glBufferData(GL_PIXEL_PACK_BUFFER, 18 * IMAGE_SIZE,
> + junk, GL_STATIC_READ);
> + free(junk);
> + piglit_check_gl_error(GL_NO_ERROR);
> + /* data = NULL from above */
> + }
> + else
> + data = malloc(18 * IMAGE_SIZE);
> +
> + /* Download it using DSA */
> + glBindTexture(target, 0);
> + glGetTextureImage(tex, 0, GL_RGBA, GL_UNSIGNED_BYTE,
> + num_layers * IMAGE_SIZE, data);
> + piglit_check_gl_error(GL_NO_ERROR);
> +
> + if (use_pbo)
> + data = glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY);
> +
> + /* Perform comparison and report the results. */
> + snprintf(test_name, CHAR_LIMIT, "upload %s%s",
> + piglit_get_gl_enum_name(target), use_pbo ? " PBO" : "");
> + subtest(compare_to_expected(data, num_layers), test_name);
> +
> + /* Clean up */
> + if (use_pbo)
> + glDeleteBuffers(1, &pbo);
> + else
> + free(data);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + int i;
> +
> + for (i = 0; i < 2; ++i) {
> + upload_subtest(GL_TEXTURE_1D, (bool) i);
> + upload_subtest(GL_TEXTURE_1D_ARRAY, (bool) i);
> + upload_subtest(GL_TEXTURE_2D, (bool) i);
> + upload_subtest(GL_TEXTURE_3D, (bool) i);
> + if (piglit_is_extension_supported("GL_ARB_texture_rectangle"))
> + upload_subtest(GL_TEXTURE_RECTANGLE, (bool) i);
> + if (piglit_is_extension_supported("GL_EXT_texture_array"))
> + upload_subtest(GL_TEXTURE_2D_ARRAY, (bool) i);
> + if (piglit_is_extension_supported("GL_ARB_texture_cube_map"))
> + upload_subtest(GL_TEXTURE_CUBE_MAP, (bool) i);
Note that if the minimum GL version is bumped to 2.0, the check for
GL_ARB_texture_cube_map can be dropped.
> + if (piglit_is_extension_supported(
> + "GL_ARB_texture_cube_map_array"))
> + upload_subtest(GL_TEXTURE_CUBE_MAP_ARRAY, (bool) i);
> + }
> +
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
>
More information about the Piglit
mailing list