[Piglit] [PATCH 2/2] arb_direct_state_access: Verify the side-effect-free operation of glGenerateTextureMipmap
Ian Romanick
idr at freedesktop.org
Thu Sep 10 13:40:08 PDT 2015
On 09/10/2015 08:35 AM, Brian Paul wrote:
> On 09/09/2015 03:26 PM, Ian Romanick wrote:
>> From: Ian Romanick <ian.d.romanick at intel.com>
>>
>> After calling glGenerateTextureMipmap, there are 3 things that
>
> that what? :) Same thing in the .c file.
Oops. "...need to be verified."
> Otherwise, for both, Reviewed-by: Brian Paul <brianp at vmware.com>
>
>> 1. The texture bindings have not been modified.
>>
>> 2. Textures not passed to glGenerateTextureMipmap have not had their data
>> modified.
>>
>> 3. The texture that was passed to glGenerateTextureMipmap has the correct
>> data in its mipmaps.
>>
>> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91847
>> ---
>> tests/all.py | 1 +
>> .../spec/arb_direct_state_access/CMakeLists.gl.txt | 1 +
>> .../generatetexturemipmap.c | 166
>> +++++++++++++++++++++
>> 3 files changed, 168 insertions(+)
>> create mode 100644
>> tests/spec/arb_direct_state_access/generatetexturemipmap.c
>>
>> diff --git a/tests/all.py b/tests/all.py
>> index a1eba91..0f42015 100644
>> --- a/tests/all.py
>> +++ b/tests/all.py
>> @@ -4371,6 +4371,7 @@ with profile.group_manager(
>> g(['arb_direct_state_access-create-programpipelines'],
>> 'create-programpipelines')
>> g(['arb_direct_state_access-create-queries'], 'create-queries')
>> + g(['arb_direct_state_access-generatetexturemipmap'],
>> 'generatetexturemipmap')
>>
>> with profile.group_manager(
>> PiglitGLTest,
>> diff --git a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
>> b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
>> index 4add16d..d078aa0 100644
>> --- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
>> +++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
>> @@ -19,6 +19,7 @@ piglit_add_executable
>> (arb_direct_state_access-create-samplers create-samplers.c
>> piglit_add_executable (arb_direct_state_access-create-textures
>> create-textures.c)
>> piglit_add_executable
>> (arb_direct_state_access-create-transformfeedbacks
>> create-transformfeedbacks.c)
>> piglit_add_executable (arb_direct_state_access-dsa-textures
>> dsa-textures.c dsa-utils.c)
>> +piglit_add_executable (arb_direct_state_access-generatetexturemipmap
>> generatetexturemipmap.c dsa-utils.c)
>> piglit_add_executable
>> (arb_direct_state_access-getcompressedtextureimage
>> getcompressedtextureimage.c dsa-utils.c)
>> piglit_add_executable
>> (arb_direct_state_access-gettextureimage-formats
>> gettextureimage-formats.c dsa-utils.c)
>> piglit_add_executable
>> (arb_direct_state_access-gettextureimage-luminance
>> gettextureimage-luminance.c)
>> diff --git
>> a/tests/spec/arb_direct_state_access/generatetexturemipmap.c
>> b/tests/spec/arb_direct_state_access/generatetexturemipmap.c
>> new file mode 100644
>> index 0000000..5a0cba8
>> --- /dev/null
>> +++ b/tests/spec/arb_direct_state_access/generatetexturemipmap.c
>> @@ -0,0 +1,166 @@
>> +/*
>> + * 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 generatetexturemipmaps.c
>> + * Verify the side-effect-free operation of glGenerateTextureMipmap
>> + *
>> + * After calling glGenerateTextureMipmap, there are 3 things that
>> + *
>> + * 1. The texture bindings have not been modified.
>> + *
>> + * 2. Textures not passed to glGenerateTextureMipmap have not had
>> their data
>> + * modified.
>> + *
>> + * 3. The texture that was passed to glGenerateTextureMipmap has the
>> correct
>> + * data in its mipmaps.
>> + */
>> +
>> +#include "piglit-util-gl.h"
>> +
>> +PIGLIT_GL_TEST_CONFIG_BEGIN
>> +
>> + config.supports_gl_core_version = 31;
>> + config.supports_gl_compat_version = 20;
>> +
>> + config.window_visual = PIGLIT_GL_VISUAL_RGBA |
>> + PIGLIT_GL_VISUAL_DOUBLE;
>> +
>> +PIGLIT_GL_TEST_CONFIG_END
>> +
>> +/* 2x2 block of red pixels. */
>> +static const float red[2 * 2 * 4] = {
>> + 1.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0,
>> + 1.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0
>> +};
>> +
>> +/* 4x4 block of green pixels. */
>> +static const float green[4 * 4 * 4] = {
>> + 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0,
>> + 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0,
>> + 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0,
>> + 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0,
>> + 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0,
>> + 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0,
>> + 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0,
>> + 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0
>> +};
>> +
>> +/* 4x4 block of blue pixels. */
>> +static const float blue[4 * 4 * 4] = {
>> + 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0,
>> + 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0,
>> + 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0,
>> + 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0,
>> + 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0,
>> + 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0,
>> + 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0,
>> + 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 1.0
>> +};
>> +
>> +void
>> +piglit_init(int argc, char **argv)
>> +{
>> + GLuint tex[2];
>> + GLuint bound;
>> + bool pass = true;
>> + unsigned i;
>> +
>> + piglit_require_extension("GL_ARB_direct_state_access");
>> +glGenerateTextureMipmap
>> + /* Create two textures. Populate both with full mipmap stacks.
>> + * Ensure that the data for levels > 0 is not the data that would be
>> + * generated by glGenerateMipmap or glGenerateTextureMipmap.
>> + */
>> + glGenTextures(2, tex);
>> +
>> + for (i = 0; i <= 1; i++) {
>> + const float *const base_color = (i == 0) ? blue : green;
>> +
>> + glActiveTexture(GL_TEXTURE0 + i);
>> + glBindTexture(GL_TEXTURE_2D, tex[i]);
>> + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 4, 0, GL_RGBA,
>> + GL_FLOAT, base_color);
>> + glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 2, 2, 0, GL_RGBA,
>> + GL_FLOAT, red);
>> + glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA8, 1, 1, 0, GL_RGBA,
>> + GL_FLOAT, red);
>> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
>> + }
>> +
>> + /* Generate the mipmap stack for the texture that is not currently
>> + * bound to unit 0 while unit 0 is the active unit.
>> + */
>> + glActiveTexture(GL_TEXTURE0);
>> + glGenerateTextureMipmap(tex[1]);
>> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
>> +
>> + /* Verify that the correct textures are still bound to the correct
>> + * texture units.
>> + */
>> + for (i = 0; i <= 1; i++) {
>> + glActiveTexture(GL_TEXTURE0 + i);
>> + glGetIntegerv(GL_TEXTURE_BINDING_2D, (GLint *) &bound);
>> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
>> +
>> + if (bound != tex[i]) {
>> + fprintf(stderr,
>> + "Wrong texture bound to unit %u. Got %d, "
>> + "but expected %d (other texture is %d).\n",
>> + i, bound, tex[i], tex[1 - i]);
>> + pass = false;
>> + }
>> + }
>> +
>> + /* Verify that each texture has the correct data in levels > 0.
>> + *
>> + * For the texture bound to unit 0 (which was not passed to
>> + * glGenerateTextureMipmap), this should be the original red color.
>> + *
>> + * For the texture bound to unit 1 (which was passed to
>> + * glGenerateTextureMipmap), this should be green generated from the
>> + * base level.
>> + */
>> + for (i = 0; i <= 1; i++) {
>> + const float *const level_color = (i == 0) ? red : green;
>> +
>> + glActiveTexture(GL_TEXTURE0 + i);
>> + printf("Check level 1 of texture %u...\n", i);
>> + pass = piglit_probe_texel_rect_rgba(GL_TEXTURE_2D, 1,
>> + 0, 0, 2, 2,
>> + level_color) && pass;
>> + printf("Check level 2 of texture %u...\n", i);
>> + pass = piglit_probe_texel_rect_rgba(GL_TEXTURE_2D, 2,
>> + 0, 0, 1, 1,
>> + level_color) && pass;
>> + }
>> +
>> + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
>> +}
>> +
>> +enum piglit_result
>> +piglit_display(void)
>> +{
>> + return PIGLIT_FAIL;
>> +}
>> +
>>
>
More information about the Piglit
mailing list