It seems like this test actually tests rather a lot of different things, I wonder if it would be better to use subtests to report each operation?
I have a couple of additional nitpicky comments below you can choose to
ignore if you like.
Dylan
On Thursday, November 20, 2014 02:54:12 PM Laura Ekstrand wrote:
> ---
> tests/all.py | 1 +
> tests/spec/gl-1.0/CMakeLists.gl.txt | 1 +
> tests/spec/gl-1.0/logicop.c | 309
> ++++++++++++++++++++++++++++++++++++
> 3 files changed, 311 insertions(+)
> create mode 100644 tests/spec/gl-1.0/logicop.c
>
> diff --git a/tests/all.py b/tests/all.py
> index fb3080e..3aeaa70 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -801,6 +801,7 @@ add_concurrent_test(gl10, 'gl-1.0-blend-func')
> add_concurrent_test(gl10, 'gl-1.0-fpexceptions')
> add_concurrent_test(gl10, 'gl-1.0-ortho-pos')
> add_concurrent_test(gl10, 'gl-1.0-readpixsanity')
> +add_concurrent_test(gl10, 'gl-1.0-logicop')
>
> gl12 = {}
> spec['!OpenGL 1.2'] = gl12
> diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt
> b/tests/spec/gl-1.0/CMakeLists.gl.txt
> index 11bd581..e2e6642 100644
> --- a/tests/spec/gl-1.0/CMakeLists.gl.txt
> +++ b/tests/spec/gl-1.0/CMakeLists.gl.txt
> @@ -24,5 +24,6 @@ piglit_add_executable (gl-1.0-blend-func blend.c)
> piglit_add_executable (gl-1.0-ortho-pos orthpos.c)
> piglit_add_executable (gl-1.0-fpexceptions fpexceptions.c)
> piglit_add_executable (gl-1.0-readpixsanity readpix.c)
> +piglit_add_executable (gl-1.0-logicop logicop.c)
>
> # vim: ft=cmake:
> diff --git a/tests/spec/gl-1.0/logicop.c b/tests/spec/gl-1.0/logicop.c
> new file mode 100644
> index 0000000..5cb2573
> --- /dev/null
> +++ b/tests/spec/gl-1.0/logicop.c
> @@ -0,0 +1,309 @@
> +// BEGIN_COPYRIGHT -*- glean -*-
I don't think you really need this anymore
> +/*
> + * Copyright (C) 1999 Allen Akin All Rights Reserved.
> + * Copyright 2014 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 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.
> + *
> + * END_COPYRIGHT
this begin/end copyright isn't really done anywhere in piglit but glean,
probably okay to drop it
> + */
> +
> +/**
> + * @file logicop.c
> + *
> + * Test RGBA logic op functions.
> + *
> + * Based on Allen's blendFunc test.
> + * Brian Paul 10 May 2001
> + * Adapted to Piglit by Laura Ekstrand <la...@jlekstrand.net>, November 2014.
> + */
> +
> +#include "piglit-util-gl.h"
> +#include <stdlib.h> /* for rand, srand */
> +
> +#define drawing_size 64
> +#define img_width drawing_size
> +#define img_height drawing_size
> +
> +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
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + srand(0);
> + piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
> +}
> +
> +static GLubyte*
> +random_image_data(void)
> +{
> + int i;
> + GLubyte *img = malloc(4 * img_width * img_height * sizeof(GLubyte));
> + for (i = 0; i < 4 * img_width * img_height; ++i) {
> + img[i] = rand() % 256;
> + }
> + return img;
> +}
> +
> +static GLubyte*
> +color_fill_data(GLubyte r, GLubyte g, GLubyte b, GLubyte a)
> +{
> + int i, j;
> + GLubyte *img = malloc(4*img_width*img_height*sizeof(GLubyte));
> + for (j = 0; j < img_height; ++j) { /* j = vertical, i = horizontal */
> + for (i = 0; i < img_width; ++i) {
> + img[4*(img_width*j + i) + 0] = r;
> + img[4*(img_width*j + i) + 1] = g;
> + img[4*(img_width*j + i) + 2] = b;
> + img[4*(img_width*j + i) + 3] = a;
> + }
> + }
> + return img;
> +}
> +
> +static void
> +apply_logicop(GLenum logicop, GLubyte dst[4], const GLubyte src[4])
> +{
> + switch (logicop) {
> + case GL_CLEAR:
> + dst[0] = dst[1] = dst[2] = dst[3] = 0;
> + break;
> + case GL_SET:
> + dst[0] = dst[1] = dst[2] = dst[3] = ~0;
> + break;
> + case GL_COPY:
> + dst[0] = src[0];
> + dst[1] = src[1];
> + dst[2] = src[2];
> + dst[3] = src[3];
> + break;
> + case GL_COPY_INVERTED:
> + dst[0] = ~src[0];
> + dst[1] = ~src[1];
> + dst[2] = ~src[2];
> + dst[3] = ~src[3];
> + break;
> + case GL_NOOP:
> + break;
> + case GL_INVERT:
> + dst[0] = ~dst[0];
> + dst[1] = ~dst[1];
> + dst[2] = ~dst[2];
> + dst[3] = ~dst[3];
> + break;
> + case GL_AND:
> + dst[0] = src[0] & dst[0];
> + dst[1] = src[1] & dst[1];
> + dst[2] = src[2] & dst[2];
> + dst[3] = src[3] & dst[3];
> + break;
> + case GL_NAND:
> + dst[0] = ~(src[0] & dst[0]);
> + dst[1] = ~(src[1] & dst[1]);
> + dst[2] = ~(src[2] & dst[2]);
> + dst[3] = ~(src[3] & dst[3]);
> + break;
> + case GL_OR:
> + dst[0] = src[0] | dst[0];
> + dst[1] = src[1] | dst[1];
> + dst[2] = src[2] | dst[2];
> + dst[3] = src[3] | dst[3];
> + break;
> + case GL_NOR:
> + dst[0] = ~(src[0] | dst[0]);
> + dst[1] = ~(src[1] | dst[1]);
> + dst[2] = ~(src[2] | dst[2]);
> + dst[3] = ~(src[3] | dst[3]);
> + break;
> + case GL_XOR:
> + dst[0] = src[0] ^ dst[0];
> + dst[1] = src[1] ^ dst[1];
> + dst[2] = src[2] ^ dst[2];
> + dst[3] = src[3] ^ dst[3];
> + break;
> + case GL_EQUIV:
> + dst[0] = ~(src[0] ^ dst[0]);
> + dst[1] = ~(src[1] ^ dst[1]);
> + dst[2] = ~(src[2] ^ dst[2]);
> + dst[3] = ~(src[3] ^ dst[3]);
> + break;
> + case GL_AND_REVERSE:
> + dst[0] = src[0] & ~dst[0];
> + dst[1] = src[1] & ~dst[1];
> + dst[2] = src[2] & ~dst[2];
> + dst[3] = src[3] & ~dst[3];
> + break;
> + case GL_AND_INVERTED:
> + dst[0] = ~src[0] & dst[0];
> + dst[1] = ~src[1] & dst[1];
> + dst[2] = ~src[2] & dst[2];
> + dst[3] = ~src[3] & dst[3];
> + break;
> + case GL_OR_REVERSE:
> + dst[0] = src[0] | ~dst[0];
> + dst[1] = src[1] | ~dst[1];
> + dst[2] = src[2] | ~dst[2];
> + dst[3] = src[3] | ~dst[3];
> + break;
> + case GL_OR_INVERTED:
> + dst[0] = ~src[0] | dst[0];
> + dst[1] = ~src[1] | dst[1];
> + dst[2] = ~src[2] | dst[2];
> + dst[3] = ~src[3] | dst[3];
> + break;
> + default:
> + abort(); /* implementation error */
> + }
> +}
> +
> +static void
> +make_image(GLuint *name, GLubyte *data)
> +{
> + glGenTextures(1, name);
> + glBindTexture(GL_TEXTURE_2D, *name);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, img_width, img_height, 0,
> + GL_RGBA, GL_UNSIGNED_BYTE, data);
> +}
> +
> +static bool
> +test_logicop(GLenum logicop)
> +{
> + bool pass = true;
> + int x, y;
> + GLuint dst_name;
> + GLubyte* dst_data = random_image_data();
> + GLuint src_name;
> + GLubyte* src_data = random_image_data();
> + GLubyte* exp_data = color_fill_data(0, 0, 0, 0);
> +
> + glDisable(GL_DITHER);
> + glClearColor(0.5, 0.5, 0.5, 0.5); /* transparent gray */
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + /* Make our random texture */
> + make_image(&dst_name, dst_data);
> +
> + /* Draw dst to the framebuffer */
> + glDisable(GL_COLOR_LOGIC_OP);
> + glEnable(GL_TEXTURE_2D);
> + glBindTexture(GL_TEXTURE_2D, dst_name);
> + piglit_draw_rect_tex(0, 0, img_width, img_height, 0, 0, 1, 1);
> + pass &= piglit_check_gl_error(GL_NO_ERROR);
> +
> + /*
> + * Read back the contents of the framebuffer, and measure any
> + * difference from what was actually written. We can't tell
> + * whether errors occurred when writing or when reading back,
> + * but at least we can report anything unusual.
> + */
> + pass &= piglit_probe_image_ubyte(0, 0, img_width, img_height, GL_RGBA,
> + dst_data);
> +
> + /*
> + * Now generate random source pixels and apply the logicop
> + * operation to both the framebuffer and a copy in the image
> + * ``expected''. Save the source pixels in the image ``src''
> + * so we can diagnose any problems we find later.
> + *
> + * Note: src_data was generated above.
> + */
> + glLogicOp(logicop);
> + glEnable(GL_COLOR_LOGIC_OP);
> +
> + /* Make src */
> + make_image(&src_name, src_data);
> + glBindTexture(GL_TEXTURE_2D, src_name);
> + piglit_draw_rect_tex(0, 0, img_width, img_height, 0, 0, 1, 1);
> + pass &= piglit_check_gl_error(GL_NO_ERROR);
> +
> + /* Make exp */
> + for (y = 0; y < drawing_size; ++y) {
> + for (x = 0; x < drawing_size; ++x) {
> + int idx = 4*(img_width*y + x);
> +
> + /* Initialize expected with dst data. */
> + exp_data[idx + 0] = dst_data[idx + 0];
> + exp_data[idx + 1] = dst_data[idx + 1];
> + exp_data[idx + 2] = dst_data[idx + 2];
> + exp_data[idx + 3] = dst_data[idx + 3];
> +
> + apply_logicop(logicop, exp_data + idx,
> + src_data + idx);
> + }
> + }
> +
> + /*
> + * Compare the image in the framebuffer to the
> + * computed image (``expected'') to see if any pixels are
> + * outside the expected tolerance range.
> + */
> + pass &= piglit_probe_image_ubyte(0, 0, img_width, img_height, GL_RGBA,
> + exp_data);
> + if (!piglit_automatic)
> + piglit_present_results();
> +
> + return pass;
> +
> +} /* test_logicop */
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + unsigned int op;
> +
> + static GLenum logicop_modes[] = {
> + GL_CLEAR,
> + GL_SET,
> + GL_COPY,
> + GL_COPY_INVERTED,
> + GL_NOOP,
> + GL_INVERT,
> + GL_AND,
> + GL_NAND,
> + GL_OR,
> + GL_NOR,
> + GL_XOR,
> + GL_EQUIV,
> + GL_AND_REVERSE,
> + GL_AND_INVERTED,
> + GL_OR_REVERSE,
> + GL_OR_INVERTED
> + };
> +
> + for (op = 0; op < ARRAY_SIZE(logicop_modes); ++op)
> + {
> + pass &= test_logicop(logicop_modes[op]);
> + }
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> --
> 2.1.0
>
> _______________________________________________
> Piglit mailing list
> Piglit@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit
