[Piglit] [PATCH 3/3] arb_texture_barrier: copy existing NV_texture_barrier test
Marek Olšák
maraeo at gmail.com
Tue Aug 12 03:54:21 PDT 2014
NAK. Why would you want to have the same test twice in the tree?
I suggest not testing features of ARB_texture_barrier if they are
covered by NV_texture_barrier tests already.
Marek
On Tue, Aug 12, 2014 at 2:03 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
> tests/all.py | 4 +
> tests/spec/nv_texture_barrier/CMakeLists.gl.txt | 1 +
> .../nv_texture_barrier/blending-in-shader-arb.c | 118 +++++++++++++++++++++
> 3 files changed, 123 insertions(+)
> create mode 100644 tests/spec/nv_texture_barrier/blending-in-shader-arb.c
>
> diff --git a/tests/all.py b/tests/all.py
> index 2d00684..4defb7b 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -3266,6 +3266,10 @@ nv_texture_barrier = {}
> spec['NV_texture_barrier'] = nv_texture_barrier
> add_plain_test(nv_texture_barrier, 'blending-in-shader')
>
> +arb_texture_barrier = {}
> +spec['ARB_texture_barrier'] = arb_texture_barrier
> +add_plain_test(arb_texture_barrier, 'blending-in-shader-arb')
> +
> nv_conditional_render = {}
> spec['NV_conditional_render'] = nv_conditional_render
> nv_conditional_render['begin-while-active'] = concurrent_test('nv_conditional_render-begin-while-active')
> diff --git a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
> index 760a0d7..b35d026 100644
> --- a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
> +++ b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
> @@ -10,5 +10,6 @@ link_libraries (
> )
>
> piglit_add_executable (blending-in-shader blending-in-shader.c)
> +piglit_add_executable (blending-in-shader-arb blending-in-shader-arb.c)
>
> # vim: ft=cmake:
> diff --git a/tests/spec/nv_texture_barrier/blending-in-shader-arb.c b/tests/spec/nv_texture_barrier/blending-in-shader-arb.c
> new file mode 100644
> index 0000000..c0c3db8
> --- /dev/null
> +++ b/tests/spec/nv_texture_barrier/blending-in-shader-arb.c
> @@ -0,0 +1,118 @@
> +/*
> + * Copyright © 2011 Marek Olšák
> + *
> + * 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 blending-in-shader-arb.c
> + *
> + * Test programmable blending with GL_ARB_texture_barrier.
> + */
> +
> +#include "piglit-util-gl.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 10;
> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static GLuint tex, fbo, prog, texloc;
> +static float tex_data[16*16*4], res_data[16*16*4];
> +
> +static const char *fstext = {
> + "uniform sampler2D fb;"
> + "void main() {"
> + " gl_FragColor = sqrt(texture2D(fb, gl_FragCoord.xy / 16.0));"
> + "}"
> +};
> +
> +#define PASSES 3
> +
> +enum piglit_result piglit_display(void)
> +{
> + GLboolean pass = GL_TRUE;
> + int i;
> +
> + glBindTexture(GL_TEXTURE_2D, tex);
> + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 16, 16, 0, GL_RGBA, GL_FLOAT, tex_data);
> + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
> + glViewport(0, 0, 16, 16);
> +
> + glUseProgram(prog);
> + glUniform1i(texloc, 0);
> +
> + for (i = 0; i < PASSES; i++) {
> + if (i != 0)
> + glTextureBarrier();
> + piglit_draw_rect_tex(-1, -1, 2, 2, 0, 0, 1, 1);
> + }
> +
> + pass = piglit_probe_image_rgba(0, 0, 16, 16, res_data);
> +
> + glUseProgram(0);
> + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
> + glViewport(0, 0, piglit_width, piglit_height);
> +
> + piglit_draw_rect_tex(-1, -1, 2, 2, 0, 0, 1, 1);
> +
> + piglit_present_results();
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +void piglit_init(int argc, char **argv)
> +{
> + unsigned int i, j;
> +
> + piglit_require_extension("GL_EXT_framebuffer_object");
> + piglit_require_extension("GL_ARB_texture_barrier");
> + piglit_require_GLSL();
> +
> + srand(0);
> + for (i = 0; i < 16 * 16 * 4; ++i) {
> + tex_data[i] = (rand() % 256) / 255.f;
> + res_data[i] = tex_data[i];
> + for (j = 0; j < PASSES; j++)
> + res_data[i] = sqrt(res_data[i]);
> + }
> +
> + glEnable(GL_TEXTURE_2D);
> + glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
> +
> + glGenTextures(1, &tex);
> + glBindTexture(GL_TEXTURE_2D, tex);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
> + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 16, 16, 0, GL_RGBA, GL_FLOAT, NULL);
> +
> + glGenFramebuffersEXT(1, &fbo);
> + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
> + glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0);
> + assert(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT) == GL_FRAMEBUFFER_COMPLETE_EXT);
> +
> + prog = piglit_build_simple_program(NULL, fstext);
> +
> + texloc = glGetUniformLocation(prog, "fb");
> +}
> --
> 1.8.5.5
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
More information about the Piglit
mailing list