[Piglit] [PATCH 2/3] arb_framebuffer_object: set KHR_no_error compatibility
Timothy Arceri
tarceri at itsqueeze.com
Mon May 15 01:28:08 UTC 2017
---
.../spec/arb_framebuffer_object/GenerateMipmap-versus-READ_FRAMEBUFFER.c | 1 +
tests/spec/arb_framebuffer_object/attachments-blit-scaled-linear.cpp | 1 +
tests/spec/arb_framebuffer_object/blit-scaled-linear.cpp | 1 +
tests/spec/arb_framebuffer_object/depth-stencil-blit.c | 1 +
tests/spec/arb_framebuffer_object/fbo-drawbuffers-none.c | 1 +
tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c | 1 +
tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c | 1 +
tests/spec/arb_framebuffer_object/mixed-buffer-sizes.c | 1 +
tests/spec/arb_framebuffer_object/negative-readpixels-no-rb.c | 1 +
...me-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c | 1 +
.../same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c | 1 +
11 files changed, 11 insertions(+)
diff --git a/tests/spec/arb_framebuffer_object/GenerateMipmap-versus-READ_FRAMEBUFFER.c b/tests/spec/arb_framebuffer_object/GenerateMipmap-versus-READ_FRAMEBUFFER.c
index c46f323..cc24d17 100644
--- a/tests/spec/arb_framebuffer_object/GenerateMipmap-versus-READ_FRAMEBUFFER.c
+++ b/tests/spec/arb_framebuffer_object/GenerateMipmap-versus-READ_FRAMEBUFFER.c
@@ -29,20 +29,21 @@
* bindings were the same. As a result, one of them was incorrect after
* returning from _mesa_meta_GenerateMipmap.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_RGB;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
static const GLuint texels[16] = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0
};
diff --git a/tests/spec/arb_framebuffer_object/attachments-blit-scaled-linear.cpp b/tests/spec/arb_framebuffer_object/attachments-blit-scaled-linear.cpp
index 0772faa..23e1f60 100644
--- a/tests/spec/arb_framebuffer_object/attachments-blit-scaled-linear.cpp
+++ b/tests/spec/arb_framebuffer_object/attachments-blit-scaled-linear.cpp
@@ -38,20 +38,21 @@ using namespace piglit_util_test_pattern;
const int pattern_width = 258; const int pattern_height = 258;
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_width = pattern_width * 2;
config.window_height = pattern_height;
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 TestPattern *test_pattern;
const int srcX0 = 6, srcY0 = 7, dstX0 = 0, dstY0 = 0;
const int srcX1 = pattern_width / 2, srcY1 = pattern_height / 2;
static Fbo fbo_tex, fbo_rb;
void
piglit_init(int argc, char **argv)
diff --git a/tests/spec/arb_framebuffer_object/blit-scaled-linear.cpp b/tests/spec/arb_framebuffer_object/blit-scaled-linear.cpp
index 336a962..bdc6cd8 100644
--- a/tests/spec/arb_framebuffer_object/blit-scaled-linear.cpp
+++ b/tests/spec/arb_framebuffer_object/blit-scaled-linear.cpp
@@ -36,20 +36,21 @@ using namespace piglit_util_fbo;
using namespace piglit_util_test_pattern;
const int pattern_width = 258; const int pattern_height = 258;
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 20;
config.window_width = pattern_width * 2;
config.window_height = pattern_height;
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 TestPattern *test_pattern;
static unsigned prog, vao, vertex_buf;
const int srcX0 = 0, srcY0 = 0, dstX0 = 0, dstY0 = 0;
const int srcX1 = pattern_width / 2, srcY1 = pattern_height / 2;
static Fbo fbo_tex, fbo_rb;
void
diff --git a/tests/spec/arb_framebuffer_object/depth-stencil-blit.c b/tests/spec/arb_framebuffer_object/depth-stencil-blit.c
index 7197d2b..0f5e3fc 100644
--- a/tests/spec/arb_framebuffer_object/depth-stencil-blit.c
+++ b/tests/spec/arb_framebuffer_object/depth-stencil-blit.c
@@ -31,20 +31,21 @@
#define BUF_SIZE 241
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 14;
config.window_width = BUF_SIZE;
config.window_height = BUF_SIZE;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
GLuint mask;
GLint stencil_size;
GLenum ds_format = GL_NONE;
bool depth = false, stencil = false;
#define F(name) #name, name
diff --git a/tests/spec/arb_framebuffer_object/fbo-drawbuffers-none.c b/tests/spec/arb_framebuffer_object/fbo-drawbuffers-none.c
index 591edbc..f6a8a20 100644
--- a/tests/spec/arb_framebuffer_object/fbo-drawbuffers-none.c
+++ b/tests/spec/arb_framebuffer_object/fbo-drawbuffers-none.c
@@ -39,20 +39,21 @@
*
* \author Marek Olšák <marek.olsak at amd.com>
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
#define FB_SIZE 32
static const GLenum drawbuf_config[][4] = {
/* All 4 color attachments are used */
{GL_COLOR_ATTACHMENT3, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT0},
/* NONE appears once */
{GL_NONE, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT2},
diff --git a/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c b/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c
index 92b36e9..9c7c768 100644
--- a/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c
+++ b/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c
@@ -52,20 +52,21 @@
* test texture).
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_RGB;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
enum {
TEST_MODE_DRAW,
TEST_MODE_READ,
} test_mode;
GLuint test_framebuffer;
GLuint aux_framebuffer;
diff --git a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c
index e08c1bd..2b6e4d4 100644
--- a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c
+++ b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c
@@ -30,20 +30,21 @@
#include <stdio.h>
#include "piglit-util-gl.h"
#include "../../fbo/fbo-formats.h"
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
enum piglit_result
piglit_display()
{
/* Unreached. */
return PIGLIT_FAIL;
}
diff --git a/tests/spec/arb_framebuffer_object/mixed-buffer-sizes.c b/tests/spec/arb_framebuffer_object/mixed-buffer-sizes.c
index dcdf8f1..4a47f09 100644
--- a/tests/spec/arb_framebuffer_object/mixed-buffer-sizes.c
+++ b/tests/spec/arb_framebuffer_object/mixed-buffer-sizes.c
@@ -27,20 +27,21 @@
* the rendering in the intersection area should be valid.
*
* \author Brian Paul
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
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 GLubyte *RefImage = NULL;
static void
display_image(int w, int h, const GLubyte *testImage)
{
diff --git a/tests/spec/arb_framebuffer_object/negative-readpixels-no-rb.c b/tests/spec/arb_framebuffer_object/negative-readpixels-no-rb.c
index 19df7f8..5f93936 100644
--- a/tests/spec/arb_framebuffer_object/negative-readpixels-no-rb.c
+++ b/tests/spec/arb_framebuffer_object/negative-readpixels-no-rb.c
@@ -29,20 +29,21 @@
#include <stdio.h>
#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_RGB;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
enum piglit_result
piglit_display()
{
/* UNREACHED */
return PIGLIT_FAIL;
}
diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c
index baccbe8..a385baf 100644
--- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c
+++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c
@@ -31,20 +31,21 @@
#include <stdio.h>
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_width = 200;
config.window_height = 200;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
const char*
get_attachment_string(GLint attach)
{
switch (attach) {
case GL_DEPTH_ATTACHMENT: return "GL_DEPTH_ATTACHMENT";
case GL_STENCIL_ATTACHMENT: return "GL_STENCIL_ATTACHMENT";
case GL_DEPTH_STENCIL_ATTACHMENT: return "GL_DEPTH_STENICL";
diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c
index 78f8cb6..389f92c 100644
--- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c
+++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c
@@ -32,20 +32,21 @@
#include <stdio.h>
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_width = 200;
config.window_height = 200;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
const char*
get_cube_map_face_string(GLenum face)
{
switch (face) {
case GL_TEXTURE_CUBE_MAP_POSITIVE_Y: return "GL_TEXTURE_CUBE_MAP_POSITIVE_Y";
case GL_TEXTURE_CUBE_MAP_POSITIVE_X: return "GL_TEXTURE_CUBE_MAP_POSITIVE_X";
case GL_TEXTURE_CUBE_MAP_POSITIVE_Z: return "GL_TEXTURE_CUBE_MAP_POSITIVE_Z";
--
2.9.3
More information about the Piglit
mailing list