Re: [Piglit] [PATCH 2/4] gl-3.2/layered-rendering: set KHR_no_error status

2017-06-05 Thread Samuel Pitoiset

Reviewed-by: Samuel Pitoiset 

On 06/05/2017 02:19 AM, Timothy Arceri wrote:

---
  tests/spec/gl-3.2/layered-rendering/blit.c |  1 +
  tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c|  1 +
  .../layered-rendering/clear-color-mismatched-layer-count.c |  1 +
  tests/spec/gl-3.2/layered-rendering/clear-color.c  |  1 +
  tests/spec/gl-3.2/layered-rendering/clear-depth.c  |  1 +
  .../layered-rendering/framebuffer-layer-attachment-mismatch.c  |  1 +
  .../spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c |  1 +
  .../layered-rendering/framebuffer-layer-count-mismatch.c   |  1 +
  .../gl-3.2/layered-rendering/framebuffer-layered-attachments.c |  1 +
  .../layered-rendering/framebuffertexture-buffer-textures.c | 10 +++---
  .../gl-3.2/layered-rendering/framebuffertexture-defaults.c |  1 +
  tests/spec/gl-3.2/layered-rendering/framebuffertexture.c   |  1 +
  tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c|  1 +
  tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c |  1 +
  tests/spec/gl-3.2/layered-rendering/gl-layer-render-clipped.c  |  1 +
  tests/spec/gl-3.2/layered-rendering/gl-layer-render-storage.c  |  1 +
  tests/spec/gl-3.2/layered-rendering/gl-layer-render.c  |  1 +
  tests/spec/gl-3.2/layered-rendering/gl-layer.c |  1 +
  tests/spec/gl-3.2/layered-rendering/readpixels.c   |  1 +
  19 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/spec/gl-3.2/layered-rendering/blit.c 
b/tests/spec/gl-3.2/layered-rendering/blit.c
index e5d865e..db17124 100644
--- a/tests/spec/gl-3.2/layered-rendering/blit.c
+++ b/tests/spec/gl-3.2/layered-rendering/blit.c
@@ -49,20 +49,21 @@
   *   *---*---*
   */
  
  #include "piglit-util-gl.h"
  
  PIGLIT_GL_TEST_CONFIG_BEGIN
  
  	config.supports_gl_compat_version = 32;

config.supports_gl_core_version = 32;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
  
  PIGLIT_GL_TEST_CONFIG_END
  
  /* Values Set in piglit init */

  static const int texWidth  = 32;
  static const int texHeight = 32;
  static const int texDepth  = 2;
  
  static const float srcColors[2][3] = {

{0.5, 0.4, 0.3}, {0, 1, 0}
diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c 
b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c
index 403bc04..bc1d0fd 100644
--- a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c
+++ b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c
@@ -64,20 +64,21 @@
  
  #define TEX_LEVELS 6

  #define TEX_SIZE (1 << (TEX_LEVELS - 1))
  #define TEX_DEPTH 4
  
  PIGLIT_GL_TEST_CONFIG_BEGIN
  
  	config.supports_gl_compat_version = 32;

config.supports_gl_core_version = 32;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
  
  PIGLIT_GL_TEST_CONFIG_END
  
  
  static GLenum texture_type;

  static int num_layers;
  static int layer_height;
  static GLuint probe_fbo = 0;
  static bool mipmapped;
  static int num_miplevels;
diff --git 
a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c 
b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c
index 63a43f3..d9b2cd5 100644
--- a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c
+++ b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c
@@ -47,20 +47,21 @@
  #include "piglit-util-gl.h"
  #include "piglit-util.h"
  
  #define TEX_SIZE 128
  
  PIGLIT_GL_TEST_CONFIG_BEGIN
  
  	config.supports_gl_compat_version = 32;

config.supports_gl_core_version = 32;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
  
  PIGLIT_GL_TEST_CONFIG_END
  
  
  static void

  check_completeness(const char *when, GLenum target)
  {
GLenum fbstatus = glCheckFramebufferStatus(target);
if (fbstatus != GL_FRAMEBUFFER_COMPLETE) {
printf("Framebuffer incomplete when %s: %s\n", when,
diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color.c 
b/tests/spec/gl-3.2/layered-rendering/clear-color.c
index 31233e3..32572b0 100644
--- a/tests/spec/gl-3.2/layered-rendering/clear-color.c
+++ b/tests/spec/gl-3.2/layered-rendering/clear-color.c
@@ -43,20 +43,21 @@
   */
  
  #include "piglit-util-gl.h"
  
  PIGLIT_GL_TEST_CONFIG_BEGIN
  
  	config.supports_gl_compat_version = 32;

config.supports_gl_core_version = 32;
  
  	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;

+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
  
  PIGLIT_GL_TEST_CONFIG_END
  
  static GLuint fbo[2];

  static GLuint texture[2];
  static const int layers = 3;
  
  bool

  display_layered_texture(int x, int y, int w, 

[Piglit] [PATCH 2/4] gl-3.2/layered-rendering: set KHR_no_error status

2017-06-04 Thread Timothy Arceri
---
 tests/spec/gl-3.2/layered-rendering/blit.c |  1 +
 tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c|  1 +
 .../layered-rendering/clear-color-mismatched-layer-count.c |  1 +
 tests/spec/gl-3.2/layered-rendering/clear-color.c  |  1 +
 tests/spec/gl-3.2/layered-rendering/clear-depth.c  |  1 +
 .../layered-rendering/framebuffer-layer-attachment-mismatch.c  |  1 +
 .../spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c |  1 +
 .../layered-rendering/framebuffer-layer-count-mismatch.c   |  1 +
 .../gl-3.2/layered-rendering/framebuffer-layered-attachments.c |  1 +
 .../layered-rendering/framebuffertexture-buffer-textures.c | 10 +++---
 .../gl-3.2/layered-rendering/framebuffertexture-defaults.c |  1 +
 tests/spec/gl-3.2/layered-rendering/framebuffertexture.c   |  1 +
 tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c|  1 +
 tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c |  1 +
 tests/spec/gl-3.2/layered-rendering/gl-layer-render-clipped.c  |  1 +
 tests/spec/gl-3.2/layered-rendering/gl-layer-render-storage.c  |  1 +
 tests/spec/gl-3.2/layered-rendering/gl-layer-render.c  |  1 +
 tests/spec/gl-3.2/layered-rendering/gl-layer.c |  1 +
 tests/spec/gl-3.2/layered-rendering/readpixels.c   |  1 +
 19 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/spec/gl-3.2/layered-rendering/blit.c 
b/tests/spec/gl-3.2/layered-rendering/blit.c
index e5d865e..db17124 100644
--- a/tests/spec/gl-3.2/layered-rendering/blit.c
+++ b/tests/spec/gl-3.2/layered-rendering/blit.c
@@ -49,20 +49,21 @@
  *   *---*---*
  */
 
 #include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
 /* Values Set in piglit init */
 static const int texWidth  = 32;
 static const int texHeight = 32;
 static const int texDepth  = 2;
 
 static const float srcColors[2][3] = {
{0.5, 0.4, 0.3}, {0, 1, 0}
diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c 
b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c
index 403bc04..bc1d0fd 100644
--- a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c
+++ b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c
@@ -64,20 +64,21 @@
 
 #define TEX_LEVELS 6
 #define TEX_SIZE (1 << (TEX_LEVELS - 1))
 #define TEX_DEPTH 4
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
 
 static GLenum texture_type;
 static int num_layers;
 static int layer_height;
 static GLuint probe_fbo = 0;
 static bool mipmapped;
 static int num_miplevels;
diff --git 
a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c 
b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c
index 63a43f3..d9b2cd5 100644
--- a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c
+++ b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c
@@ -47,20 +47,21 @@
 #include "piglit-util-gl.h"
 #include "piglit-util.h"
 
 #define TEX_SIZE 128
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
 
 static void
 check_completeness(const char *when, GLenum target)
 {
GLenum fbstatus = glCheckFramebufferStatus(target);
if (fbstatus != GL_FRAMEBUFFER_COMPLETE) {
printf("Framebuffer incomplete when %s: %s\n", when,
diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color.c 
b/tests/spec/gl-3.2/layered-rendering/clear-color.c
index 31233e3..32572b0 100644
--- a/tests/spec/gl-3.2/layered-rendering/clear-color.c
+++ b/tests/spec/gl-3.2/layered-rendering/clear-color.c
@@ -43,20 +43,21 @@
  */
 
 #include "piglit-util-gl.h"
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
 
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
 static GLuint fbo[2];
 static GLuint texture[2];
 static const int layers = 3;
 
 bool
 display_layered_texture(int x, int y, int w, int h, int texWidth, int 
texHeight,
GLenum textureType, GLuint texture, int layers) {
diff --git a/tests/spec/gl-3.2/layered-rendering/clear-depth.c