Re: [Piglit] [PATCH] util: Avoid asking GL to transpose the ortho_uniform matrix.

2017-06-26 Thread Brian Paul

On 06/26/2017 05:51 PM, Eric Anholt wrote:

 From the GLES2 spec:

 If the transpose parameter to any of the UniformMatrix* commands
 is not FALSE, an INVALID_VALUE error is generated, and no uniform
 values are changed.

Fixes spurious failures in draw-vertices-half-float_gles2.
---
  tests/util/piglit-util-gl.c | 10 +-
  1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/util/piglit-util-gl.c b/tests/util/piglit-util-gl.c
index 5ff13fedcf6e..5dc1bbc7d2fe 100644
--- a/tests/util/piglit-util-gl.c
+++ b/tests/util/piglit-util-gl.c
@@ -603,12 +603,12 @@ piglit_gen_ortho_uniform(GLint location, double l, double 
r, double b,
 double t, double n, double f)
  {
const GLfloat values[4][4] = {
-   { 2/(r-l),0,0,-(r+l)/(r-l) },
-   {0,2/(t-b), 0,-(t+b)/(t-b) },
-   {0,   0,-2/(f-n), -(f+n)/(f-n) },
-   {0,   0,0,  1  }
+   { 2/(r-l),  0,0,0 },
+   {0, 2/(t-b),  0,0 },
+   {0, 0,-2/(f-n), 0 },
+   { -(r+l)/(r-l), -(t+b)/(t-b), -(f+n)/(f-n), 1 }
};
-   glUniformMatrix4fv(location, 1, GL_TRUE, (const GLfloat *)values);
+   glUniformMatrix4fv(location, 1, GL_FALSE, (const GLfloat *)values);
  }





Reviewed-by: Brian Paul 

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit


Re: [Piglit] [PATCH] fbo: set KHR_no_error compatibility for remaining fbo tests

2017-06-26 Thread Timothy Arceri

On 26/06/17 19:04, Samuel Pitoiset wrote:


Looks like you forgot to update fbo-storage-formats.c.


It's updated. Did you mean something else?



With that fixed, patch is:

Reviewed-by: Samuel Pitoiset 

Thanks!

On 06/26/2017 08:00 AM, Timothy Arceri wrote:

---
  tests/fbo/fbo-1d.c |  1 +
  tests/fbo/fbo-3d.c |  1 +
  tests/fbo/fbo-alpha.c  |  1 +
  tests/fbo/fbo-alphatest-formats.c  |  1 +
  tests/fbo/fbo-alphatest-nocolor-ff.c   |  1 +
  tests/fbo/fbo-alphatest-nocolor.c  |  1 +
  tests/fbo/fbo-array.c  |  1 +
  tests/fbo/fbo-bind-renderbuffer.c  |  9 --
  tests/fbo/fbo-blending-formats.c   |  1 +
  tests/fbo/fbo-blit-d24s8.c |  1 +
  tests/fbo/fbo-blit-stretch.cpp |  1 +
  tests/fbo/fbo-blit.c   |  1 +
  tests/fbo/fbo-clear-formats.c  |  1 +
  tests/fbo/fbo-clearmipmap.c|  1 +
  tests/fbo/fbo-colormask-formats.c  |  1 +
  tests/fbo/fbo-copypix.c|  1 +
  tests/fbo/fbo-copyteximage-simple.c|  1 +
  tests/fbo/fbo-copyteximage.c   |  1 +
  tests/fbo/fbo-cubemap.c|  1 +
  tests/fbo/fbo-depth-array.c|  1 +
  tests/fbo/fbo-depth-tex1d.c|  1 +
  tests/fbo/fbo-depth.c  |  1 +
  tests/fbo/fbo-depthtex.c   |  1 +
  tests/fbo/fbo-deriv.c  |  1 +
  tests/fbo/fbo-draw-buffers-blend.c |  1 +
  tests/fbo/fbo-drawbuffers-arbfp.c  |  1 +
  tests/fbo/fbo-drawbuffers-blend-add.c  |  1 +
  tests/fbo/fbo-drawbuffers-fragcolor.c  |  1 +
  tests/fbo/fbo-drawbuffers-maxtargets.c |  1 +
  tests/fbo/fbo-drawbuffers.c|  1 +
  tests/fbo/fbo-drawbuffers2-blend.c |  1 +
  tests/fbo/fbo-drawbuffers2-colormask.c |  1 +
  tests/fbo/fbo-finish-deleted.c |  1 +
  tests/fbo/fbo-flushing-2.c |  1 +
  tests/fbo/fbo-flushing.c   |  1 +
  tests/fbo/fbo-fragcoord.c  |  1 +
  tests/fbo/fbo-fragcoord2.c |  1 +
  tests/fbo/fbo-generatemipmap-filtering.c   |  1 +
  tests/fbo/fbo-generatemipmap-formats.c |  1 +
  tests/fbo/fbo-generatemipmap-noimage.c |  1 +
  tests/fbo/fbo-generatemipmap-nonsquare.c   |  1 +
  tests/fbo/fbo-generatemipmap-npot.c|  1 +
  tests/fbo/fbo-generatemipmap-scissor.c |  1 +
  tests/fbo/fbo-generatemipmap-swizzle.c |  1 +
  tests/fbo/fbo-generatemipmap-viewport.c|  1 +
  tests/fbo/fbo-generatemipmap.c |  1 +
  .../fbo/fbo-getframebufferattachmentparameter-01.c | 36 
+-

  tests/fbo/fbo-gl_pointcoord.c  |  1 +
  tests/fbo/fbo-incomplete-invalid-texture.c |  1 +
  tests/fbo/fbo-incomplete-texture-01.c  |  1 +
  tests/fbo/fbo-incomplete-texture-02.c  |  1 +
  tests/fbo/fbo-incomplete-texture-03.c  |  1 +
  tests/fbo/fbo-incomplete-texture-04.c  |  1 +
  tests/fbo/fbo-incomplete.cpp   |  1 +
  tests/fbo/fbo-integer.c|  1 +
  tests/fbo/fbo-luminance-alpha.c|  1 +
  tests/fbo/fbo-maxsize.c|  1 +
  tests/fbo/fbo-mipmap-copypix.c |  1 +
  tests/fbo/fbo-mrt-alphatest.c  |  1 +
  tests/fbo/fbo-mrt-new-bind.c   |  1 +
  tests/fbo/fbo-nodepth-test.c   |  1 +
  tests/fbo/fbo-nostencil-test.c |  1 +
  tests/fbo/fbo-pbo-readpixels-small.c   |  1 +
  tests/fbo/fbo-readdrawpix.c|  1 +
  tests/fbo/fbo-readpixels-depth-formats.c   |  1 +
  tests/fbo/fbo-readpixels.c |  1 +
  tests/fbo/fbo-rg.c |  1 +
  tests/fbo/fbo-scissor-bitmap.c |  1 +
  tests/fbo/fbo-scissor-blit.c   |  1 +
  tests/fbo/fbo-srgb.c   |  1 +
  tests/fbo/fbo-stencil.c|  1 +
  tests/fbo/fbo-storage-completeness.c   |  5 +--
  tests/fbo/fbo-storage-formats.c|  5 +--
  tests/fbo/fbo-sys-blit.c   |  1 +
  tests/fbo/fbo-sys-sub-blit.c   |  1 +
  tests/fbo/fbo-viewport.c   |  1 +
  76 files changed, 105 insertions(+), 22 deletions(-)

diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c

[Piglit] [PATCH] util: Avoid asking GL to transpose the ortho_uniform matrix.

2017-06-26 Thread Eric Anholt
From the GLES2 spec:

If the transpose parameter to any of the UniformMatrix* commands
is not FALSE, an INVALID_VALUE error is generated, and no uniform
values are changed.

Fixes spurious failures in draw-vertices-half-float_gles2.
---
 tests/util/piglit-util-gl.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/util/piglit-util-gl.c b/tests/util/piglit-util-gl.c
index 5ff13fedcf6e..5dc1bbc7d2fe 100644
--- a/tests/util/piglit-util-gl.c
+++ b/tests/util/piglit-util-gl.c
@@ -603,12 +603,12 @@ piglit_gen_ortho_uniform(GLint location, double l, double 
r, double b,
 double t, double n, double f)
 {
const GLfloat values[4][4] = {
-   { 2/(r-l),0,0,-(r+l)/(r-l) },
-   {0,2/(t-b), 0,-(t+b)/(t-b) },
-   {0,   0,-2/(f-n), -(f+n)/(f-n) },
-   {0,   0,0,  1  }
+   { 2/(r-l),  0,0,0 },
+   {0, 2/(t-b),  0,0 },
+   {0, 0,-2/(f-n), 0 },
+   { -(r+l)/(r-l), -(t+b)/(t-b), -(f+n)/(f-n), 1 }
};
-   glUniformMatrix4fv(location, 1, GL_TRUE, (const GLfloat *)values);
+   glUniformMatrix4fv(location, 1, GL_FALSE, (const GLfloat *)values);
 }
 
 
-- 
2.11.0

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit


Re: [Piglit] [PATCH v6] pbo: Change the value expected from GetPixelMap.

2017-06-26 Thread Ian Romanick
On 06/22/2017 05:17 AM, Sandra Koroniewska wrote:
> This fixes tests/spec/gl-2.1/pbo on Windows Intel driver.

I'm assuming this fixes the test because GL_MAX_PIXEL_MAP_TABLE is not
256.  What is that value?  I'll add that information to the commit
message when I push the patch for you.

Reviewed-by: Ian Romanick 

> ---
>  tests/spec/gl-2.1/pbo.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/spec/gl-2.1/pbo.c b/tests/spec/gl-2.1/pbo.c
> index bb4c0352c..5020eeb07 100644
> --- a/tests/spec/gl-2.1/pbo.c
> +++ b/tests/spec/gl-2.1/pbo.c
> @@ -353,7 +353,7 @@ test_pixel_map(void)
>   }
>  
>   for (i = 0; i < max; i++) {
> - if (pbo_mem[i] != (255 - i)) {
> + if (pbo_mem[i] != max - i - 1) {
>   REPORT_FAILURE("get PixelMap failed");
>   return PIGLIT_FAIL;
>   }
> 

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit


Re: [Piglit] [PATCH 1/1] cmake: bump gbm dependency to 17.1

2017-06-26 Thread Marek Olšák
Reviewed-by: Marek Olšák 

On Jun 22, 2017 3:52 PM, "Jan Vesely"  wrote:

> c6e1dc5247 switched to use gbm_bo_get_offset and
> gbm_bo_get_stride_for_plane.
> These symbols were added in mesa 17.1. Since there is no alternative to
> using them, bump the gbm requirement to 17.1.
>
> Fixes: c6e1dc5247 "piglit_drm_dma_buf: fix GPU offsets and strides"
> Signed-off-by: Jan Vesely 
> ---
>  CMakeLists.txt | 10 --
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index b4dfe4f..90d056b 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -137,16 +137,14 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
> add_definitions(-DPIGLIT_HAS_GLX)
> endif()
>
> -   pkg_check_modules(GBM QUIET gbm)
> +   pkg_check_modules(GBM QUIET gbm>=17.1)
> if(GBM_FOUND)
> set(PIGLIT_HAS_GBM True)
> add_definitions(-DPIGLIT_HAS_GBM)
> set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
> ${GBM_LIBRARIES})
> -   if (GBM_VERSION VERSION_EQUAL "12.1" OR GBM_VERSION
> VERSION_GREATER "12.1")
> -   CHECK_FUNCTION_EXISTS(gbm_bo_map
> PIGLIT_HAS_GBM_BO_MAP)
> -   if (PIGLIT_HAS_GBM_BO_MAP)
> -   add_definitions(-DPIGLIT_HAS_GBM_BO_MAP)
> -   endif()
> +   CHECK_FUNCTION_EXISTS(gbm_bo_map PIGLIT_HAS_GBM_BO_MAP)
> +   if (PIGLIT_HAS_GBM_BO_MAP)
> +   add_definitions(-DPIGLIT_HAS_GBM_BO_MAP)
> endif()
> endif(GBM_FOUND)
>
> --
> 2.9.4
>
>
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit


Re: [Piglit] [PATCH] fbo: set KHR_no_error compatibility for remaining fbo tests

2017-06-26 Thread Samuel Pitoiset

Looks like you forgot to update fbo-storage-formats.c.

With that fixed, patch is:

Reviewed-by: Samuel Pitoiset 

Thanks!

On 06/26/2017 08:00 AM, Timothy Arceri wrote:

---
  tests/fbo/fbo-1d.c |  1 +
  tests/fbo/fbo-3d.c |  1 +
  tests/fbo/fbo-alpha.c  |  1 +
  tests/fbo/fbo-alphatest-formats.c  |  1 +
  tests/fbo/fbo-alphatest-nocolor-ff.c   |  1 +
  tests/fbo/fbo-alphatest-nocolor.c  |  1 +
  tests/fbo/fbo-array.c  |  1 +
  tests/fbo/fbo-bind-renderbuffer.c  |  9 --
  tests/fbo/fbo-blending-formats.c   |  1 +
  tests/fbo/fbo-blit-d24s8.c |  1 +
  tests/fbo/fbo-blit-stretch.cpp |  1 +
  tests/fbo/fbo-blit.c   |  1 +
  tests/fbo/fbo-clear-formats.c  |  1 +
  tests/fbo/fbo-clearmipmap.c|  1 +
  tests/fbo/fbo-colormask-formats.c  |  1 +
  tests/fbo/fbo-copypix.c|  1 +
  tests/fbo/fbo-copyteximage-simple.c|  1 +
  tests/fbo/fbo-copyteximage.c   |  1 +
  tests/fbo/fbo-cubemap.c|  1 +
  tests/fbo/fbo-depth-array.c|  1 +
  tests/fbo/fbo-depth-tex1d.c|  1 +
  tests/fbo/fbo-depth.c  |  1 +
  tests/fbo/fbo-depthtex.c   |  1 +
  tests/fbo/fbo-deriv.c  |  1 +
  tests/fbo/fbo-draw-buffers-blend.c |  1 +
  tests/fbo/fbo-drawbuffers-arbfp.c  |  1 +
  tests/fbo/fbo-drawbuffers-blend-add.c  |  1 +
  tests/fbo/fbo-drawbuffers-fragcolor.c  |  1 +
  tests/fbo/fbo-drawbuffers-maxtargets.c |  1 +
  tests/fbo/fbo-drawbuffers.c|  1 +
  tests/fbo/fbo-drawbuffers2-blend.c |  1 +
  tests/fbo/fbo-drawbuffers2-colormask.c |  1 +
  tests/fbo/fbo-finish-deleted.c |  1 +
  tests/fbo/fbo-flushing-2.c |  1 +
  tests/fbo/fbo-flushing.c   |  1 +
  tests/fbo/fbo-fragcoord.c  |  1 +
  tests/fbo/fbo-fragcoord2.c |  1 +
  tests/fbo/fbo-generatemipmap-filtering.c   |  1 +
  tests/fbo/fbo-generatemipmap-formats.c |  1 +
  tests/fbo/fbo-generatemipmap-noimage.c |  1 +
  tests/fbo/fbo-generatemipmap-nonsquare.c   |  1 +
  tests/fbo/fbo-generatemipmap-npot.c|  1 +
  tests/fbo/fbo-generatemipmap-scissor.c |  1 +
  tests/fbo/fbo-generatemipmap-swizzle.c |  1 +
  tests/fbo/fbo-generatemipmap-viewport.c|  1 +
  tests/fbo/fbo-generatemipmap.c |  1 +
  .../fbo/fbo-getframebufferattachmentparameter-01.c | 36 +-
  tests/fbo/fbo-gl_pointcoord.c  |  1 +
  tests/fbo/fbo-incomplete-invalid-texture.c |  1 +
  tests/fbo/fbo-incomplete-texture-01.c  |  1 +
  tests/fbo/fbo-incomplete-texture-02.c  |  1 +
  tests/fbo/fbo-incomplete-texture-03.c  |  1 +
  tests/fbo/fbo-incomplete-texture-04.c  |  1 +
  tests/fbo/fbo-incomplete.cpp   |  1 +
  tests/fbo/fbo-integer.c|  1 +
  tests/fbo/fbo-luminance-alpha.c|  1 +
  tests/fbo/fbo-maxsize.c|  1 +
  tests/fbo/fbo-mipmap-copypix.c |  1 +
  tests/fbo/fbo-mrt-alphatest.c  |  1 +
  tests/fbo/fbo-mrt-new-bind.c   |  1 +
  tests/fbo/fbo-nodepth-test.c   |  1 +
  tests/fbo/fbo-nostencil-test.c |  1 +
  tests/fbo/fbo-pbo-readpixels-small.c   |  1 +
  tests/fbo/fbo-readdrawpix.c|  1 +
  tests/fbo/fbo-readpixels-depth-formats.c   |  1 +
  tests/fbo/fbo-readpixels.c |  1 +
  tests/fbo/fbo-rg.c |  1 +
  tests/fbo/fbo-scissor-bitmap.c |  1 +
  tests/fbo/fbo-scissor-blit.c   |  1 +
  tests/fbo/fbo-srgb.c   |  1 +
  tests/fbo/fbo-stencil.c|  1 +
  tests/fbo/fbo-storage-completeness.c   |  5 +--
  tests/fbo/fbo-storage-formats.c|  5 +--
  tests/fbo/fbo-sys-blit.c   |  1 +
  tests/fbo/fbo-sys-sub-blit.c   |  1 +
  tests/fbo/fbo-viewport.c   |  1 +
  76 files changed, 105 insertions(+), 22 deletions(-)

diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c
index 63f36be..dfb9567 100644
--- a/tests/fbo/fbo-1d.c
+++ b/tests/fbo/fbo-1d.c
@@ -40,6 +40,7 

[Piglit] [PATCH] fbo: set KHR_no_error compatibility for remaining fbo tests

2017-06-26 Thread Timothy Arceri
---
 tests/fbo/fbo-1d.c |  1 +
 tests/fbo/fbo-3d.c |  1 +
 tests/fbo/fbo-alpha.c  |  1 +
 tests/fbo/fbo-alphatest-formats.c  |  1 +
 tests/fbo/fbo-alphatest-nocolor-ff.c   |  1 +
 tests/fbo/fbo-alphatest-nocolor.c  |  1 +
 tests/fbo/fbo-array.c  |  1 +
 tests/fbo/fbo-bind-renderbuffer.c  |  9 --
 tests/fbo/fbo-blending-formats.c   |  1 +
 tests/fbo/fbo-blit-d24s8.c |  1 +
 tests/fbo/fbo-blit-stretch.cpp |  1 +
 tests/fbo/fbo-blit.c   |  1 +
 tests/fbo/fbo-clear-formats.c  |  1 +
 tests/fbo/fbo-clearmipmap.c|  1 +
 tests/fbo/fbo-colormask-formats.c  |  1 +
 tests/fbo/fbo-copypix.c|  1 +
 tests/fbo/fbo-copyteximage-simple.c|  1 +
 tests/fbo/fbo-copyteximage.c   |  1 +
 tests/fbo/fbo-cubemap.c|  1 +
 tests/fbo/fbo-depth-array.c|  1 +
 tests/fbo/fbo-depth-tex1d.c|  1 +
 tests/fbo/fbo-depth.c  |  1 +
 tests/fbo/fbo-depthtex.c   |  1 +
 tests/fbo/fbo-deriv.c  |  1 +
 tests/fbo/fbo-draw-buffers-blend.c |  1 +
 tests/fbo/fbo-drawbuffers-arbfp.c  |  1 +
 tests/fbo/fbo-drawbuffers-blend-add.c  |  1 +
 tests/fbo/fbo-drawbuffers-fragcolor.c  |  1 +
 tests/fbo/fbo-drawbuffers-maxtargets.c |  1 +
 tests/fbo/fbo-drawbuffers.c|  1 +
 tests/fbo/fbo-drawbuffers2-blend.c |  1 +
 tests/fbo/fbo-drawbuffers2-colormask.c |  1 +
 tests/fbo/fbo-finish-deleted.c |  1 +
 tests/fbo/fbo-flushing-2.c |  1 +
 tests/fbo/fbo-flushing.c   |  1 +
 tests/fbo/fbo-fragcoord.c  |  1 +
 tests/fbo/fbo-fragcoord2.c |  1 +
 tests/fbo/fbo-generatemipmap-filtering.c   |  1 +
 tests/fbo/fbo-generatemipmap-formats.c |  1 +
 tests/fbo/fbo-generatemipmap-noimage.c |  1 +
 tests/fbo/fbo-generatemipmap-nonsquare.c   |  1 +
 tests/fbo/fbo-generatemipmap-npot.c|  1 +
 tests/fbo/fbo-generatemipmap-scissor.c |  1 +
 tests/fbo/fbo-generatemipmap-swizzle.c |  1 +
 tests/fbo/fbo-generatemipmap-viewport.c|  1 +
 tests/fbo/fbo-generatemipmap.c |  1 +
 .../fbo/fbo-getframebufferattachmentparameter-01.c | 36 +-
 tests/fbo/fbo-gl_pointcoord.c  |  1 +
 tests/fbo/fbo-incomplete-invalid-texture.c |  1 +
 tests/fbo/fbo-incomplete-texture-01.c  |  1 +
 tests/fbo/fbo-incomplete-texture-02.c  |  1 +
 tests/fbo/fbo-incomplete-texture-03.c  |  1 +
 tests/fbo/fbo-incomplete-texture-04.c  |  1 +
 tests/fbo/fbo-incomplete.cpp   |  1 +
 tests/fbo/fbo-integer.c|  1 +
 tests/fbo/fbo-luminance-alpha.c|  1 +
 tests/fbo/fbo-maxsize.c|  1 +
 tests/fbo/fbo-mipmap-copypix.c |  1 +
 tests/fbo/fbo-mrt-alphatest.c  |  1 +
 tests/fbo/fbo-mrt-new-bind.c   |  1 +
 tests/fbo/fbo-nodepth-test.c   |  1 +
 tests/fbo/fbo-nostencil-test.c |  1 +
 tests/fbo/fbo-pbo-readpixels-small.c   |  1 +
 tests/fbo/fbo-readdrawpix.c|  1 +
 tests/fbo/fbo-readpixels-depth-formats.c   |  1 +
 tests/fbo/fbo-readpixels.c |  1 +
 tests/fbo/fbo-rg.c |  1 +
 tests/fbo/fbo-scissor-bitmap.c |  1 +
 tests/fbo/fbo-scissor-blit.c   |  1 +
 tests/fbo/fbo-srgb.c   |  1 +
 tests/fbo/fbo-stencil.c|  1 +
 tests/fbo/fbo-storage-completeness.c   |  5 +--
 tests/fbo/fbo-storage-formats.c|  5 +--
 tests/fbo/fbo-sys-blit.c   |  1 +
 tests/fbo/fbo-sys-sub-blit.c   |  1 +
 tests/fbo/fbo-viewport.c   |  1 +
 76 files changed, 105 insertions(+), 22 deletions(-)

diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c
index 63f36be..dfb9567 100644
--- a/tests/fbo/fbo-1d.c
+++ b/tests/fbo/fbo-1d.c
@@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
 
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git