[Piglit] [PATCH] arb_copy_image: test for texture view interactions
Ilia Mirkin
imirkin at alum.mit.edu
Thu Nov 5 08:12:08 PST 2015
On Thu, Nov 5, 2015 at 11:10 AM, Brian Paul <brianp at vmware.com> wrote:
> On 11/04/2015 09:40 PM, Ilia Mirkin wrote:
>>
>> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
>> ---
>>
>> This fails on at least gallium, I think it's an overall problem though.
>>
>> tests/all.py | 1 +
>> tests/spec/arb_copy_image/CMakeLists.gl.txt | 1 +
>> tests/spec/arb_copy_image/texview.c | 203
>> ++++++++++++++++++++++++++++
>> 3 files changed, 205 insertions(+)
>> create mode 100644 tests/spec/arb_copy_image/texview.c
>>
>> diff --git a/tests/all.py b/tests/all.py
>> index 9637134..4fa6f75 100644
>> --- a/tests/all.py
>> +++ b/tests/all.py
>> @@ -3927,6 +3927,7 @@ with profile.group_manager(
>> g(['arb_copy_image-formats', '--samples=4'])
>> g(['arb_copy_image-formats', '--samples=8'])
>> g(['arb_copy_image-format-swizzle'])
>> + g(['arb_copy_image-texview'])
>>
>> with profile.group_manager(
>> PiglitGLTest, grouptools.join('spec', 'arb_cull_distance')) as
>> g:
>> diff --git a/tests/spec/arb_copy_image/CMakeLists.gl.txt
>> b/tests/spec/arb_copy_image/CMakeLists.gl.txt
>> index 3b36b45..304148c 100644
>> --- a/tests/spec/arb_copy_image/CMakeLists.gl.txt
>> +++ b/tests/spec/arb_copy_image/CMakeLists.gl.txt
>> @@ -14,5 +14,6 @@ piglit_add_executable (arb_copy_image-formats formats.c)
>> piglit_add_executable (arb_copy_image-simple simple.c)
>> piglit_add_executable (arb_copy_image-srgb-copy srgb-copy.c)
>> piglit_add_executable (arb_copy_image-targets targets.c)
>> +piglit_add_executable (arb_copy_image-texview texview.c)
>>
>> # vim: ft=cmake:
>> diff --git a/tests/spec/arb_copy_image/texview.c
>> b/tests/spec/arb_copy_image/texview.c
>> new file mode 100644
>> index 0000000..a8d8cb7
>> --- /dev/null
>> +++ b/tests/spec/arb_copy_image/texview.c
>> @@ -0,0 +1,203 @@
>> +/*
>> + * Copyright 2015 Ilia Mirkin
>> + *
>> + * 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 texview.c
>> + *
>> + * A test to make sure that ARB_copy_image respects texture views on
>> + * both the source and destination ends.
>> + */
>> +#include "piglit-util-gl.h"
>> +
>> +PIGLIT_GL_TEST_CONFIG_BEGIN
>> + config.supports_gl_compat_version = 13;
>> + config.window_visual = PIGLIT_GL_VISUAL_RGB |
>> PIGLIT_GL_VISUAL_DOUBLE;
>> +PIGLIT_GL_TEST_CONFIG_END
>> +
>> +static const float green[4] = {0.0, 1.0, 0.0, 1.0};
>> +static const float red[4] = {1.0, 0.0, 0.0, 1.0};
>> +
>> +static bool
>> +test_2d(void)
>> +{
>> + bool pass = true;
>> + GLuint src, dst;
>> + float red4[16];
>> + float green4[16];
>> + int i, j;
>> +
>> + memcpy(&red4[0], red, sizeof(red));
>> + memcpy(&red4[4], red, sizeof(red));
>> + memcpy(&red4[8], red, sizeof(red));
>> + memcpy(&red4[12], red, sizeof(red));
>> +
>> + memcpy(&green4[0], green, sizeof(green));
>> + memcpy(&green4[4], green, sizeof(green));
>> + memcpy(&green4[8], green, sizeof(green));
>> + memcpy(&green4[12], green, sizeof(green));
>> +
>> + glGenTextures(1, &src);
>> + glGenTextures(1, &dst);
>> +
>> + glBindTexture(GL_TEXTURE_2D, dst);
>> + glTexStorage2D(GL_TEXTURE_2D, 2, GL_RGBA8, 2, 2);
>> +
>> + glBindTexture(GL_TEXTURE_2D, src);
>> + glTexStorage2D(GL_TEXTURE_2D, 2, GL_RGBA8, 2, 2);
>> +
>> + for (i = 0; i < 2; i++) {
>> + for (j = 0; j < 2; j++) {
>> + GLuint views[2];
>> + float pixels[16];
>> +
>> +
>> + /* reset src to red, but make one pixel green */
>> + glBindTexture(GL_TEXTURE_2D, src);
>> + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2,
>> + GL_RGBA, GL_FLOAT, red4);
>> + glTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, 1, 1,
>> + GL_RGBA, GL_FLOAT, red);
>> + glTexSubImage2D(GL_TEXTURE_2D, i, 0, 0, 1, 1,
>> + GL_RGBA, GL_FLOAT, green);
>> +
>> + glBindTexture(GL_TEXTURE_2D, dst);
>> + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2,
>> + GL_RGBA, GL_FLOAT, red4);
>> + glTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, 1, 1,
>> + GL_RGBA, GL_FLOAT, red);
>> +
>> + /* create views of the source/dest levels */
>> + glGenTextures(2, views);
>> + glTextureView(views[0], GL_TEXTURE_2D, src,
>> + GL_RGBA8, i, 1, 0, 1);
>> + glTextureView(views[1], GL_TEXTURE_2D, dst,
>> + GL_RGBA8, j, 1, 0, 1);
>> +
>> + /* copy one pixel of src to destination */
>> + glCopyImageSubData(views[0], GL_TEXTURE_2D, 0, 0,
>> 0, 0,
>> + views[1], GL_TEXTURE_2D, 0, 0,
>> 0, 0,
>> + 1, 1, 1);
>> +
>> + glGetTexImage(GL_TEXTURE_2D, j, GL_RGBA, GL_FLOAT,
>> pixels);
>> + if (memcmp(pixels, green, sizeof(green))) {
>> + pass = false;
>> + printf("failed copying from level %d to
>> level %d\n", i, j);
>> + }
>> + glDeleteTextures(2, views);
>> + }
>> + }
>> +
>> + glDeleteTextures(1, &src);
>> + glDeleteTextures(1, &dst);
>> + return pass;
>> +}
>> +
>> +static bool
>> +test_2d_array(void)
>> +{
>> + bool pass = true;
>> + GLuint src, dst;
>> + float red2[8];
>> + float green2[8];
>> + int i, j;
>> +
>> + memcpy(&red2[0], red, sizeof(red));
>> + memcpy(&red2[4], red, sizeof(red));
>> +
>> + memcpy(&green2[0], green, sizeof(green));
>> + memcpy(&green2[4], green, sizeof(green));
>> +
>> + glGenTextures(1, &src);
>> + glGenTextures(1, &dst);
>> +
>> + glBindTexture(GL_TEXTURE_2D_ARRAY, src);
>> + glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_RGBA8, 1, 1, 2);
>> +
>> + glBindTexture(GL_TEXTURE_2D_ARRAY, dst);
>> + glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_RGBA8, 1, 1, 2);
>> +
>> + for (i = 0; i < 2; i++) {
>> + for (j = 0; j < 2; j++) {
>> + GLuint views[2];
>> + float pixels[8];
>> +
>> + /* reset src to red, but make one pixel green */
>> + glBindTexture(GL_TEXTURE_2D_ARRAY, src);
>> + glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0,
>> + 1, 1, 2,
>> + GL_RGBA, GL_FLOAT, red2);
>> + glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, i,
>> + 1, 1, 1,
>> + GL_RGBA, GL_FLOAT, green);
>> +
>> + glBindTexture(GL_TEXTURE_2D_ARRAY, dst);
>> + glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0,
>> + 1, 1, 2,
>> + GL_RGBA, GL_FLOAT, red2);
>> +
>> + /* create views of the source/dest levels */
>> + glGenTextures(2, views);
>> + glTextureView(views[0], GL_TEXTURE_2D_ARRAY, src,
>> + GL_RGBA8, 0, 1, i, 1);
>> + glTextureView(views[1], GL_TEXTURE_2D_ARRAY, dst,
>> + GL_RGBA8, 0, 1, j, 1);
>> +
>> + /* copy one pixel of src to destination */
>> + glCopyImageSubData(views[0], GL_TEXTURE_2D_ARRAY,
>> + 0, 0, 0, 0,
>> + views[1], GL_TEXTURE_2D_ARRAY,
>> + 0, 0, 0, 0,
>> + 1, 1, 1);
>> +
>> + glGetTexImage(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA,
>> GL_FLOAT, pixels);
>> + if (memcmp(&pixels[j*4], green, sizeof(green))) {
>> + pass = false;
>> + printf("failed copying from layer %d to
>> layer %d\n", i, j);
>> + }
>> + glDeleteTextures(2, views);
>> + }
>> + }
>> +
>> + glDeleteTextures(1, &src);
>> + glDeleteTextures(1, &dst);
>> + return pass;
>> +}
>> +
>> +void
>> +piglit_init(int argc, char **argv)
>> +{
>> + bool pass = true;
>> + piglit_require_extension("GL_ARB_copy_image");
>> + piglit_require_extension("GL_ARB_texture_view");
>
>
> I think you also need GL_ARB_texture_storage
That one's implied by GL_ARB_texture_view (won't work without it), but
happy to drop it in.
>
>
>> +
>> + pass &= test_2d();
>> + if (piglit_is_extension_supported("GL_EXT_texture_array"))
>> + pass &= test_2d_array();
>> +
>> + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
>> +}
>> +
>> +enum piglit_result
>> +piglit_display(void)
>> +{
>> + return PIGLIT_FAIL;
>> +}
>>
>
> Looks OK otherwise after a quick reading. Passes with nvidia's driver.
>
> Reviewed-by: Brian Paul <brianp at vmware.com>
Thanks!
More information about the Piglit
mailing list