[Piglit] [PATCH] arb_texture_buffer_object: set KHR_no_error support

2017-07-05 Thread Timothy Arceri
Here we also move some of the config setup to the top of the
file as this is the layout of piglit tests everywhere else in
piglit.
---
 tests/spec/arb_texture_buffer_object/bufferstorage.c| 11 ++-
 tests/spec/arb_texture_buffer_object/data-sync.c|  1 +
 tests/spec/arb_texture_buffer_object/dlist.c|  1 +
 tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c | 13 +++--
 tests/spec/arb_texture_buffer_object/formats.c  |  1 +
 tests/spec/arb_texture_buffer_object/get.c  |  1 +
 tests/spec/arb_texture_buffer_object/max-size.c | 11 ++-
 tests/spec/arb_texture_buffer_object/minmax.c   |  1 +
 tests/spec/arb_texture_buffer_object/negative-bad-bo.c  |  1 +
 tests/spec/arb_texture_buffer_object/negative-bad-format.c  |  1 +
 tests/spec/arb_texture_buffer_object/negative-bad-target.c  |  1 +
 tests/spec/arb_texture_buffer_object/negative-unsupported.c |  1 +
 tests/spec/arb_texture_buffer_object/render-no-bo.c | 13 +++--
 tests/spec/arb_texture_buffer_object/subdata-sync.c |  1 +
 tests/spec/arb_texture_buffer_object/unused-name.c  |  1 +
 15 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/tests/spec/arb_texture_buffer_object/bufferstorage.c 
b/tests/spec/arb_texture_buffer_object/bufferstorage.c
index c46c70d..16e4dcd 100644
--- a/tests/spec/arb_texture_buffer_object/bufferstorage.c
+++ b/tests/spec/arb_texture_buffer_object/bufferstorage.c
@@ -27,6 +27,12 @@
 
 #include "piglit-util-gl.h"
 
+PIGLIT_GL_TEST_CONFIG_BEGIN
+   config.supports_gl_core_version = 31;
+   config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
+PIGLIT_GL_TEST_CONFIG_END
+
 static const float green[4] = {0, 1, 0, 0};
 static const float red[4] = {1, 0, 0, 0};
 static float *map;
@@ -138,8 +144,3 @@ piglit_init(int argc, char **argv)
  GL_FALSE, 0, NULL);
glEnableVertexAttribArray(vertex_location);
 }
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-   config.supports_gl_core_version = 31;
-   config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
-PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/arb_texture_buffer_object/data-sync.c 
b/tests/spec/arb_texture_buffer_object/data-sync.c
index 5542734..511690d 100644
--- a/tests/spec/arb_texture_buffer_object/data-sync.c
+++ b/tests/spec/arb_texture_buffer_object/data-sync.c
@@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 31;
 
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 PIGLIT_GL_TEST_CONFIG_END
 
 enum piglit_result
diff --git a/tests/spec/arb_texture_buffer_object/dlist.c 
b/tests/spec/arb_texture_buffer_object/dlist.c
index ea15f61..565dc24 100644
--- a/tests/spec/arb_texture_buffer_object/dlist.c
+++ b/tests/spec/arb_texture_buffer_object/dlist.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
 
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c 
b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c
index c9aa6c4..c0e3976 100644
--- a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c
+++ b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c
@@ -39,6 +39,13 @@
 
 #include "piglit-util-gl.h"
 
+PIGLIT_GL_TEST_CONFIG_BEGIN
+   config.supports_gl_compat_version = 10;
+   config.supports_gl_core_version = 31;
+   config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
+PIGLIT_GL_TEST_CONFIG_END
+
 enum piglit_result
 piglit_display(void)
 {
@@ -113,9 +120,3 @@ piglit_init(int argc, char **argv)
if (piglit_get_gl_version() < 31)
piglit_require_extension("GL_ARB_texture_buffer_object");
 }
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-   config.supports_gl_compat_version = 10;
-   config.supports_gl_core_version = 31;
-   config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
-PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/arb_texture_buffer_object/formats.c 
b/tests/spec/arb_texture_buffer_object/formats.c
index fad657d..f2960cd 100644
--- a/tests/spec/arb_texture_buffer_object/formats.c
+++ b/tests/spec/arb_texture_buffer_object/formats.c
@@ -719,4 +719,5 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_width = 200;
config.window_height = 500;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/arb_texture_buffer_object/get.c 

[Piglit] [PATCH 8/8] ext_transform_feedback: set KHR_no_error status

2017-07-05 Thread Timothy Arceri
---
 tests/spec/ext_transform_feedback/alignment.c  | 1 +
 tests/spec/ext_transform_feedback/api-errors.c | 1 +
 tests/spec/ext_transform_feedback/buffer-usage.c   | 1 +
 tests/spec/ext_transform_feedback/builtin-varyings.c   | 1 +
 tests/spec/ext_transform_feedback/change-size.c| 1 +
 tests/spec/ext_transform_feedback/discard-api.c| 1 +
 tests/spec/ext_transform_feedback/discard-bitmap.c | 1 +
 tests/spec/ext_transform_feedback/discard-clear.c  | 1 +
 tests/spec/ext_transform_feedback/discard-copypixels.c | 1 +
 tests/spec/ext_transform_feedback/discard-drawpixels.c | 1 +
 tests/spec/ext_transform_feedback/generatemipmap.c | 1 +
 tests/spec/ext_transform_feedback/geometry-shaders-basic.c | 1 +
 tests/spec/ext_transform_feedback/get-buffer-state.c   | 1 +
 tests/spec/ext_transform_feedback/immediate-reuse-index-buffer.c   | 1 +
 tests/spec/ext_transform_feedback/immediate-reuse-uniform-buffer.c | 1 +
 tests/spec/ext_transform_feedback/immediate-reuse.c| 1 +
 tests/spec/ext_transform_feedback/intervening-read.c   | 1 +
 tests/spec/ext_transform_feedback/max-varyings.c   | 1 +
 tests/spec/ext_transform_feedback/negative-prims.c | 1 +
 tests/spec/ext_transform_feedback/nonflat-integral.c   | 1 +
 tests/spec/ext_transform_feedback/order.c  | 1 +
 tests/spec/ext_transform_feedback/overflow-edge-cases.c| 1 +
 tests/spec/ext_transform_feedback/pipeline-basic-primgen.c | 1 +
 tests/spec/ext_transform_feedback/primgen.c| 1 +
 tests/spec/ext_transform_feedback/structs.c| 1 +
 tests/spec/ext_transform_feedback/tessellation.c   | 1 +
 26 files changed, 26 insertions(+)

diff --git a/tests/spec/ext_transform_feedback/alignment.c 
b/tests/spec/ext_transform_feedback/alignment.c
index 6cf9e0e..0f03990 100644
--- a/tests/spec/ext_transform_feedback/alignment.c
+++ b/tests/spec/ext_transform_feedback/alignment.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_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/ext_transform_feedback/api-errors.c 
b/tests/spec/ext_transform_feedback/api-errors.c
index 3f277c9..0bbcd66 100644
--- a/tests/spec/ext_transform_feedback/api-errors.c
+++ b/tests/spec/ext_transform_feedback/api-errors.c
@@ -54,6 +54,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+   config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/ext_transform_feedback/buffer-usage.c 
b/tests/spec/ext_transform_feedback/buffer-usage.c
index 2596f29..d7fbe62 100644
--- a/tests/spec/ext_transform_feedback/buffer-usage.c
+++ b/tests/spec/ext_transform_feedback/buffer-usage.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
 
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/ext_transform_feedback/builtin-varyings.c 
b/tests/spec/ext_transform_feedback/builtin-varyings.c
index 026d557..34b091b 100644
--- a/tests/spec/ext_transform_feedback/builtin-varyings.c
+++ b/tests/spec/ext_transform_feedback/builtin-varyings.c
@@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
 
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/ext_transform_feedback/change-size.c 
b/tests/spec/ext_transform_feedback/change-size.c
index 7378e5b..05682c7 100644
--- a/tests/spec/ext_transform_feedback/change-size.c
+++ b/tests/spec/ext_transform_feedback/change-size.c
@@ -83,6 +83,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
 
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/ext_transform_feedback/discard-api.c 
b/tests/spec/ext_transform_feedback/discard-api.c
index 5334c40..6a32bde 100644
--- a/tests/spec/ext_transform_feedback/discard-api.c
+++ b/tests/spec/ext_transform_feedback/discard-api.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
 
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   

[Piglit] [PATCH 7/8] texturing: set KHR_no_error status

2017-07-05 Thread Timothy Arceri
---
 tests/texturing/1-1-linear-texture.c|  1 +
 tests/texturing/array-depth-roundtrip.c |  1 +
 tests/texturing/array-texture.c |  1 +
 tests/texturing/copyteximage-border.c   |  1 +
 tests/texturing/copyteximage-clipping.c |  1 +
 tests/texturing/copytexsubimage.c   |  1 +
 tests/texturing/crossbar.c  |  1 +
 tests/texturing/cubemap-getteximage-pbo.c   |  1 +
 tests/texturing/cubemap-mismatch.c  |  1 +
 tests/texturing/cubemap-shader.c|  1 +
 tests/texturing/cubemap.c   |  1 +
 tests/texturing/depth-level-clamp.c |  1 +
 tests/texturing/depth-tex-compare.c |  1 +
 tests/texturing/depth-tex-modes-glsl.c  |  1 +
 tests/texturing/depth-tex-modes-rg.c|  1 +
 tests/texturing/depth-tex-modes.c   |  1 +
 tests/texturing/fragment-and-vertex-texturing.c |  1 +
 tests/texturing/fxt1-teximage.c |  1 +
 tests/texturing/gen-compressed-teximage.c   |  1 +
 tests/texturing/gen-nonzero-unit.c  |  1 +
 tests/texturing/gen-teximage.c  |  1 +
 tests/texturing/gen-texsubimage.c   |  1 +
 tests/texturing/generatemipmap-base-change.c|  1 +
 tests/texturing/generatemipmap-cubemap.c|  1 +
 tests/texturing/getteximage-depth.c |  1 +
 tests/texturing/getteximage-formats.c   |  1 +
 tests/texturing/getteximage-luminance.c |  1 +
 tests/texturing/getteximage-simple.c|  1 +
 tests/texturing/getteximage-targets.c   |  1 +
 tests/texturing/incomplete-cubemap.c|  1 +
 tests/texturing/incomplete-texture.c|  1 +
 tests/texturing/levelclamp.c|  1 +
 tests/texturing/lodbias.c   |  1 +
 tests/texturing/lodclamp-between-max.c  |  1 +
 tests/texturing/lodclamp-between.c  |  1 +
 tests/texturing/lodclamp.c  |  1 +
 tests/texturing/max-samplers.c  |  1 +
 tests/texturing/max-texture-size-level.c| 53 +
 tests/texturing/mipmap-setup.c  |  1 +
 tests/texturing/proxy-texture.c | 49 ---
 tests/texturing/rg-draw-pixels.c|  1 +
 tests/texturing/rg-teximage-01.c|  1 +
 tests/texturing/rg-teximage-02.c|  1 +
 tests/texturing/rgtc-teximage-01.c  |  1 +
 tests/texturing/rgtc-teximage-02.c  |  1 +
 tests/texturing/s3tc-errors.c   |  1 +
 tests/texturing/s3tc-targeted.c |  1 +
 tests/texturing/s3tc-teximage.c |  1 +
 tests/texturing/s3tc-texsubimage.c  |  1 +
 tests/texturing/sampler-cube-shadow.c   |  1 +
 tests/texturing/sized-texture-format-channels.c |  1 +
 tests/texturing/streaming-texture-leak.c|  1 +
 tests/texturing/tex-border-1.c  |  1 +
 tests/texturing/tex-miplevel-selection.c|  1 +
 tests/texturing/tex-srgb.c  |  1 +
 tests/texturing/tex3d-npot.c|  1 +
 tests/texturing/tex3d.c |  1 +
 tests/texturing/texdepth.c  |  1 +
 tests/texturing/texrect-many.c  |  1 +
 tests/texturing/texredefine.c   |  1 +
 tests/texturing/texsubimage-depth-formats.c |  1 +
 tests/texturing/texsubimage-unpack.c|  1 +
 tests/texturing/texture-al.c|  1 +
 tests/texturing/texture-packed-formats.c|  1 +
 tests/texturing/texture-rg.c|  1 +
 tests/texturing/texwrap.c   |  1 +
 tests/texturing/zero-tex-coord.c|  1 +
 67 files changed, 119 insertions(+), 48 deletions(-)

diff --git a/tests/texturing/1-1-linear-texture.c 
b/tests/texturing/1-1-linear-texture.c
index acaa818..498945d 100644
--- a/tests/texturing/1-1-linear-texture.c
+++ b/tests/texturing/1-1-linear-texture.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
 
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/texturing/array-depth-roundtrip.c 
b/tests/texturing/array-depth-roundtrip.c
index e40c880..0118b25 100644
--- a/tests/texturing/array-depth-roundtrip.c
+++ b/tests/texturing/array-depth-roundtrip.c
@@ -59,6 +59,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_width = TEX_WIDTH*NUM_TILES_ACROSS;
config.window_height = TEX_HEIGHT*NUM_TILES_DOWN;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/texturing/array-texture.c b/tests/texturing/array-texture.c
index f84116b..17b2504 100644
--- 

[Piglit] [PATCH 2/8] arb_shader_texture_lod: set KHR_no_error status

2017-07-05 Thread Timothy Arceri
---
 tests/spec/arb_shader_texture_lod/execution/texgrad.c | 1 +
 tests/spec/arb_shader_texture_lod/execution/texgradcube.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/spec/arb_shader_texture_lod/execution/texgrad.c 
b/tests/spec/arb_shader_texture_lod/execution/texgrad.c
index 99f8e65..f8ba284 100644
--- a/tests/spec/arb_shader_texture_lod/execution/texgrad.c
+++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_width = 512;
config.window_height = 256;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_shader_texture_lod/execution/texgradcube.c 
b/tests/spec/arb_shader_texture_lod/execution/texgradcube.c
index f3e2089..d0ed36e 100644
--- a/tests/spec/arb_shader_texture_lod/execution/texgradcube.c
+++ b/tests/spec/arb_shader_texture_lod/execution/texgradcube.c
@@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_width = 512;
config.window_height = 256;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
-- 
2.9.4

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


[Piglit] [PATCH 6/8] texturing: remove empty test

2017-07-05 Thread Timothy Arceri
Cc: Ian Romanick 
---
 tests/texturing/rg-teximage-03.c | 35 ---
 1 file changed, 35 deletions(-)
 delete mode 100644 tests/texturing/rg-teximage-03.c

diff --git a/tests/texturing/rg-teximage-03.c b/tests/texturing/rg-teximage-03.c
deleted file mode 100644
index 9c73478..000
--- a/tests/texturing/rg-teximage-03.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright © 2010 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 rg-teximage-03.c
- * Probe various error cases.
- *
- * Verify that all of the sized and unsized RED and RG formats can be used as
- * internal formats for \c glTexImage1D, \c glTexImage2D, and \c glTexImage3D.
- *
- * Do \b not probe integer, float, or half-float formats in this test.  These
- * formats rely on other extensions.  The should be tested in other tests.
- *
- * \author Ian Romanick 
- */
-- 
2.9.4

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


[Piglit] [PATCH 4/8] arb_texture_multisample: set KHR_no_error status

2017-07-05 Thread Timothy Arceri
---
 tests/spec/arb_texture_multisample/clear.c   |  1 +
 tests/spec/arb_texture_multisample/errors.c  |  1 +
 tests/spec/arb_texture_multisample/fb-completeness.c |  1 +
 tests/spec/arb_texture_multisample/minmax.c  |  1 +
 tests/spec/arb_texture_multisample/negative-max-samples.c|  1 +
 tests/spec/arb_texture_multisample/sample-depth.c|  1 +
 tests/spec/arb_texture_multisample/sample-mask-execution.c   |  1 +
 tests/spec/arb_texture_multisample/sample-mask-value.c   | 11 +++
 tests/spec/arb_texture_multisample/sample-mask.c |  1 +
 tests/spec/arb_texture_multisample/sample-position.c |  1 +
 tests/spec/arb_texture_multisample/stencil-clear.c   |  1 +
 tests/spec/arb_texture_multisample/texelfetch.c  |  1 +
 tests/spec/arb_texture_multisample/teximage-2d-multisample.c | 11 +++
 tests/spec/arb_texture_multisample/teximage-3d-multisample.c | 11 +++
 tests/spec/arb_texture_multisample/texstate.c|  1 +
 15 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/tests/spec/arb_texture_multisample/clear.c 
b/tests/spec/arb_texture_multisample/clear.c
index f7ec826..1ef7907 100644
--- a/tests/spec/arb_texture_multisample/clear.c
+++ b/tests/spec/arb_texture_multisample/clear.c
@@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 21;
 
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/errors.c 
b/tests/spec/arb_texture_multisample/errors.c
index ba9f1e6..42cc2c1 100644
--- a/tests/spec/arb_texture_multisample/errors.c
+++ b/tests/spec/arb_texture_multisample/errors.c
@@ -27,6 +27,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 config.supports_gl_compat_version = 30;
 
 config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/fb-completeness.c 
b/tests/spec/arb_texture_multisample/fb-completeness.c
index 302b43d..1cb03a8 100644
--- a/tests/spec/arb_texture_multisample/fb-completeness.c
+++ b/tests/spec/arb_texture_multisample/fb-completeness.c
@@ -26,6 +26,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 config.supports_gl_compat_version = 30;
 config.window_visual = PIGLIT_GL_VISUAL_RGB;
+config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/minmax.c 
b/tests/spec/arb_texture_multisample/minmax.c
index 9d54e72..9729e9e 100644
--- a/tests/spec/arb_texture_multisample/minmax.c
+++ b/tests/spec/arb_texture_multisample/minmax.c
@@ -28,6 +28,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 config.supports_gl_compat_version = 10;
 config.supports_gl_core_version = 31;
 config.window_visual = PIGLIT_GL_VISUAL_RGB;
+config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/negative-max-samples.c 
b/tests/spec/arb_texture_multisample/negative-max-samples.c
index 1f9a3ce..b5f0441 100644
--- a/tests/spec/arb_texture_multisample/negative-max-samples.c
+++ b/tests/spec/arb_texture_multisample/negative-max-samples.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 config.supports_gl_compat_version = 10;
 
 config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/sample-depth.c 
b/tests/spec/arb_texture_multisample/sample-depth.c
index d6f5313..ef2be19 100644
--- a/tests/spec/arb_texture_multisample/sample-depth.c
+++ b/tests/spec/arb_texture_multisample/sample-depth.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 config.supports_gl_compat_version = 30;
 config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/sample-mask-execution.c 
b/tests/spec/arb_texture_multisample/sample-mask-execution.c
index 4605465..22775b7 100644
--- a/tests/spec/arb_texture_multisample/sample-mask-execution.c
+++ b/tests/spec/arb_texture_multisample/sample-mask-execution.c
@@ -27,6 +27,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 config.supports_gl_compat_version = 30;
 
 config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/sample-mask-value.c 
b/tests/spec/arb_texture_multisample/sample-mask-value.c
index eefa48b..0465fe1 100644
--- a/tests/spec/arb_texture_multisample/sample-mask-value.c
+++ b/tests/spec/arb_texture_multisample/sample-mask-value.c
@@ -26,6 

[Piglit] [PATCH 3/8] arb_texture_barrier: set KHR_no_error status

2017-07-05 Thread Timothy Arceri
---
 tests/spec/arb_texture_barrier/blending-in-shader-arb.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/spec/arb_texture_barrier/blending-in-shader-arb.c 
b/tests/spec/arb_texture_barrier/blending-in-shader-arb.c
index 2b10791..0ec28ee 100644
--- a/tests/spec/arb_texture_barrier/blending-in-shader-arb.c
+++ b/tests/spec/arb_texture_barrier/blending-in-shader-arb.c
@@ -53,6 +53,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 config.supports_gl_compat_version = 31;
 config.supports_gl_core_version = 31;
 config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
-- 
2.9.4

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


[Piglit] [PATCH 5/8] texelFetch: set KHR_no_error status

2017-07-05 Thread Timothy Arceri
---
 tests/texturing/shaders/texelFetch.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/texturing/shaders/texelFetch.c 
b/tests/texturing/shaders/texelFetch.c
index 2e1d223..1e3a0dc 100644
--- a/tests/texturing/shaders/texelFetch.c
+++ b/tests/texturing/shaders/texelFetch.c
@@ -87,6 +87,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_width = 900;
config.window_height = 600;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
piglit_gl_process_args(, argv, );
 
-- 
2.9.4

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


Re: [Piglit] [PATCH] es3: add tests for verifying overloading behavior

2017-07-05 Thread Timothy Arceri

Thanks!

Reviewed-by: Timothy Arceri 

On 06/07/17 10:05, Ilia Mirkin wrote:

An existing bug in mesa made it so that overloads of any functions that
might be builtins in any language version or extension would not be
overridable in ESSL 3.00 shaders. This adds tests to ensure that
builtins available in ESSL 3.00 are rejected properly, but builtins from
future versions or non-enabled (or available) extensions are allowed to
be specified.

Signed-off-by: Ilia Mirkin 
---
  tests/spec/glsl-es-3.00/compiler/overload-builtin.frag| 14 ++
  .../glsl-es-3.00/compiler/overload-future-builtin.frag| 15 +++
  2 files changed, 29 insertions(+)
  create mode 100644 tests/spec/glsl-es-3.00/compiler/overload-builtin.frag
  create mode 100644 
tests/spec/glsl-es-3.00/compiler/overload-future-builtin.frag

diff --git a/tests/spec/glsl-es-3.00/compiler/overload-builtin.frag 
b/tests/spec/glsl-es-3.00/compiler/overload-builtin.frag
new file mode 100644
index 0..8ed837655
--- /dev/null
+++ b/tests/spec/glsl-es-3.00/compiler/overload-builtin.frag
@@ -0,0 +1,14 @@
+// [config]
+// expect_result: fail
+// glsl_version: 3.00
+// [end config]
+//
+// Check that builtins may not be overloaded, even with different parameters.
+//
+// From GLSL ES 3.0 spec, chapter 6.1 "Function Definitions", page 71:
+//
+// "A shader cannot redefine or overload built-in functions."
+//
+#version 300 es
+
+int sqrt(int x) { return x; }
diff --git a/tests/spec/glsl-es-3.00/compiler/overload-future-builtin.frag 
b/tests/spec/glsl-es-3.00/compiler/overload-future-builtin.frag
new file mode 100644
index 0..a3b3ae1cf
--- /dev/null
+++ b/tests/spec/glsl-es-3.00/compiler/overload-future-builtin.frag
@@ -0,0 +1,15 @@
+// [config]
+// expect_result: pass
+// glsl_version: 3.00
+// [end config]
+//
+// Check that builtins that are not available in ESSL 3.00 may be defined
+// or overloaded as needed.
+//
+#version 300 es
+precision highp float;
+
+int bitfieldExtract(int x) { return x; }
+int imageAtomicAdd(int x) { return x; }
+void barrier() { }
+uint packUnorm4x8(vec4 v) { return uint(v.x); }


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


[Piglit] [PATCH] es3: add tests for verifying overloading behavior

2017-07-05 Thread Ilia Mirkin
An existing bug in mesa made it so that overloads of any functions that
might be builtins in any language version or extension would not be
overridable in ESSL 3.00 shaders. This adds tests to ensure that
builtins available in ESSL 3.00 are rejected properly, but builtins from
future versions or non-enabled (or available) extensions are allowed to
be specified.

Signed-off-by: Ilia Mirkin 
---
 tests/spec/glsl-es-3.00/compiler/overload-builtin.frag| 14 ++
 .../glsl-es-3.00/compiler/overload-future-builtin.frag| 15 +++
 2 files changed, 29 insertions(+)
 create mode 100644 tests/spec/glsl-es-3.00/compiler/overload-builtin.frag
 create mode 100644 
tests/spec/glsl-es-3.00/compiler/overload-future-builtin.frag

diff --git a/tests/spec/glsl-es-3.00/compiler/overload-builtin.frag 
b/tests/spec/glsl-es-3.00/compiler/overload-builtin.frag
new file mode 100644
index 0..8ed837655
--- /dev/null
+++ b/tests/spec/glsl-es-3.00/compiler/overload-builtin.frag
@@ -0,0 +1,14 @@
+// [config]
+// expect_result: fail
+// glsl_version: 3.00
+// [end config]
+//
+// Check that builtins may not be overloaded, even with different parameters.
+//
+// From GLSL ES 3.0 spec, chapter 6.1 "Function Definitions", page 71:
+//
+// "A shader cannot redefine or overload built-in functions."
+//
+#version 300 es
+
+int sqrt(int x) { return x; }
diff --git a/tests/spec/glsl-es-3.00/compiler/overload-future-builtin.frag 
b/tests/spec/glsl-es-3.00/compiler/overload-future-builtin.frag
new file mode 100644
index 0..a3b3ae1cf
--- /dev/null
+++ b/tests/spec/glsl-es-3.00/compiler/overload-future-builtin.frag
@@ -0,0 +1,15 @@
+// [config]
+// expect_result: pass
+// glsl_version: 3.00
+// [end config]
+//
+// Check that builtins that are not available in ESSL 3.00 may be defined
+// or overloaded as needed.
+//
+#version 300 es
+precision highp float;
+
+int bitfieldExtract(int x) { return x; }
+int imageAtomicAdd(int x) { return x; }
+void barrier() { }
+uint packUnorm4x8(vec4 v) { return uint(v.x); }
-- 
2.13.0

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


Re: [Piglit] [PATCH 01/10] arb_shader_atomic_counters: fix KHR_no_error support for buffer binding test

2017-07-05 Thread Samuel Pitoiset

For the series:

Reviewed-by: Samuel Pitoiset 

On 07/05/2017 07:23 AM, Timothy Arceri wrote:

---
  tests/spec/arb_shader_atomic_counters/buffer-binding.c | 10 ++
  1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/spec/arb_shader_atomic_counters/buffer-binding.c 
b/tests/spec/arb_shader_atomic_counters/buffer-binding.c
index 7eeaae9..de4e9d1 100644
--- a/tests/spec/arb_shader_atomic_counters/buffer-binding.c
+++ b/tests/spec/arb_shader_atomic_counters/buffer-binding.c
@@ -141,10 +141,12 @@ piglit_init(int argc, char **argv)
  "implementation limit",
  run_test_bind_at, ls.bindings - 1);
  
-atomic_counters_subtest(, GL_NONE,

-"Atomic buffer binding above the "
-"implementation limit",
-!run_test_bind_at, ls.bindings);
+if (!piglit_khr_no_error) {
+atomic_counters_subtest(, GL_NONE,
+"Atomic buffer binding above the "
+"implementation limit",
+!run_test_bind_at, ls.bindings);
+}
  
  atomic_counters_subtest(, GL_NONE,

  "Atomic buffer range binding",


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


[Piglit] [PATCH] gl-3.1-buffer-bindings: new test of GL buffer binding points

2017-07-05 Thread Brian Paul
The GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_UNIFORM_BUFFER, etc.
binding points can be interpreted as hints about how buffer data may
be used, but it's not a guarantee.  This test exercises setting up a
VBO with various buffer targets (and DSA) before rendering with that
buffer.

Exposes an issue with VMware's driver.

Addition tests may be added to use the targetted buffer for uniforms,
PBO transfers, etc.
---
 tests/all.py|   1 +
 tests/spec/gl-3.1/CMakeLists.gl.txt |   1 +
 tests/spec/gl-3.1/buffer-bindings.c | 188 
 3 files changed, 190 insertions(+)
 create mode 100644 tests/spec/gl-3.1/buffer-bindings.c

diff --git a/tests/all.py b/tests/all.py
index 4d19da1..d4d66b1 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1193,6 +1193,7 @@ with profile.test_list.group_manager(
 with profile.test_list.group_manager(
 PiglitGLTest,
 grouptools.join('spec', '!opengl 3.1')) as g:
+g(['gl-3.1-buffer-bindings'], 'buffer-bindings')
 g(['gl-3.1-default-vao'], 'default-vao')
 g(['gl-3.1-draw-buffers-errors'], 'draw-buffers-errors')
 g(['gl-3.1-enable-vertex-array'])
diff --git a/tests/spec/gl-3.1/CMakeLists.gl.txt 
b/tests/spec/gl-3.1/CMakeLists.gl.txt
index 4302936..d6b13d4 100644
--- a/tests/spec/gl-3.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.1/CMakeLists.gl.txt
@@ -8,6 +8,7 @@ link_libraries (
${OPENGL_gl_LIBRARY}
 )
 
+piglit_add_executable (gl-3.1-buffer-bindings buffer-bindings.c)
 piglit_add_executable (gl-3.1-default-vao default-vao.c)
 piglit_add_executable (gl-3.1-draw-buffers-errors draw-buffers-errors.c)
 piglit_add_executable (gl-3.1-enable-vertex-array enable-vertex-array.c)
diff --git a/tests/spec/gl-3.1/buffer-bindings.c 
b/tests/spec/gl-3.1/buffer-bindings.c
new file mode 100644
index 000..65b7140
--- /dev/null
+++ b/tests/spec/gl-3.1/buffer-bindings.c
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2017 VMware, Inc.
+ *
+ * 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 buffer-bindings.c
+ *
+ * Test glBindBuffer, glBufferSubData, etc. with various binding points.
+ * The buffer  parameter passed to many buffer object functions
+ * can be seen as a hint about what kind of data will be stored in the
+ * buffer, but it can't be relied upon.
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+   config.supports_gl_core_version = 31;
+   config.supports_gl_compat_version = 31;
+   config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
+PIGLIT_GL_TEST_CONFIG_END
+
+
+static const GLfloat green[4] = {0, 1, 0, 1};
+static GLint vertex_attrib;
+static bool have_dsa;
+
+static const GLenum buffer_targets[] = {
+   GL_ARRAY_BUFFER,
+   GL_ELEMENT_ARRAY_BUFFER_ARB,
+   GL_PIXEL_PACK_BUFFER_EXT,
+   GL_PIXEL_UNPACK_BUFFER_EXT,
+   GL_COPY_READ_BUFFER,
+   GL_COPY_WRITE_BUFFER,
+   GL_TRANSFORM_FEEDBACK_BUFFER,
+   GL_TEXTURE_BUFFER,
+   GL_UNIFORM_BUFFER,
+   GL_NONE   // To exercise DSA functions
+};
+
+
+static GLuint
+create_vbo(GLenum target)
+{
+   static const GLfloat v[4][2] = {
+   { -1, -1 },
+   { -1,  1 },
+   {  1, -1 },
+   {  1,  1 }
+   };
+   GLuint buf;
+
+   if (target == GL_NONE) {
+   glCreateBuffers(1, );
+   glNamedBufferData(buf, sizeof(v), v, GL_STATIC_DRAW);
+   }
+   else {
+   glGenBuffers(1, );
+   glBindBuffer(target, buf);
+   glBufferData(target, sizeof(v), v, GL_STATIC_DRAW);
+   glBindBuffer(target, 0);
+   }
+
+   return buf;
+}
+
+
+static bool
+test_buffer(GLenum target)
+{
+   GLuint b = create_vbo(target);
+   GLuint vao;
+   bool p;
+
+   glViewport(0, 0, piglit_width, piglit_height);
+
+