[Piglit] [PATCH 1/3] KHR_no_error: set compatibility status for a bunch of glCompressedTex* tests
Timothy Arceri
tarceri at itsqueeze.com
Mon May 15 01:28:07 UTC 2017
---
tests/spec/arb_copy_image/api_errors.c | 1 +
tests/spec/arb_copy_image/format-swizzle.c | 1 +
tests/spec/arb_copy_image/formats.c | 1 +
tests/spec/arb_copy_image/simple.c | 1 +
tests/spec/arb_copy_image/srgb-copy.c | 1 +
tests/spec/arb_copy_image/texview.c | 1 +
tests/spec/arb_get_texture_sub_image/cubemap.c | 1 +
tests/spec/arb_get_texture_sub_image/errors.c | 1 +
tests/spec/arb_get_texture_sub_image/get.c | 1 +
tests/spec/arb_get_texture_sub_image/getcompressed.c | 1 +
tests/spec/ext_texture_array/compressed.c | 1 +
tests/texturing/bptc-float-modes.c | 1 +
tests/texturing/bptc-modes.c | 1 +
tests/texturing/compressedteximage.c | 1 +
14 files changed, 14 insertions(+)
diff --git a/tests/spec/arb_copy_image/api_errors.c b/tests/spec/arb_copy_image/api_errors.c
index e032368..75cd274 100644
--- a/tests/spec/arb_copy_image/api_errors.c
+++ b/tests/spec/arb_copy_image/api_errors.c
@@ -26,20 +26,21 @@
* A simple test of glCopyImageSubData that copies a square from one
* 2D texture to another and back. This test exercises texture to texture,
* texture to renderbuffer, renderbuffer to texture, and renderbuffer to
* renderbuffer copies.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 13;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
#define ARRAY_LENGTH(X) (sizeof(X)/sizeof(*(X)))
void
piglit_init(int argc, char **argv)
{
piglit_require_extension("GL_ARB_copy_image");
piglit_require_extension("GL_EXT_framebuffer_object");
diff --git a/tests/spec/arb_copy_image/format-swizzle.c b/tests/spec/arb_copy_image/format-swizzle.c
index 08ce432..09ba07e 100644
--- a/tests/spec/arb_copy_image/format-swizzle.c
+++ b/tests/spec/arb_copy_image/format-swizzle.c
@@ -32,20 +32,21 @@
* Brian Paul
* 31 August 2015
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 13;
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 bool
test_combination(GLenum intFormat,
GLenum srcFormat, GLenum srcType,
GLenum dstFormat, GLenum dstType)
{
const int width = 16, height = 16;
int i;
diff --git a/tests/spec/arb_copy_image/formats.c b/tests/spec/arb_copy_image/formats.c
index 3af55a7..6bb2fba 100644
--- a/tests/spec/arb_copy_image/formats.c
+++ b/tests/spec/arb_copy_image/formats.c
@@ -34,20 +34,21 @@
#define TEX_SIZE 32
#define DEFAULT_SRC_LEVEL 1
#define DEFAULT_DST_LEVEL 3
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 13;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
struct texture_format {
GLenum internal_format;
const char *name;
GLenum format;
GLenum data_type;
bool can_be_reinterpreted;
GLuint bytes;
diff --git a/tests/spec/arb_copy_image/simple.c b/tests/spec/arb_copy_image/simple.c
index 1138f3f..4e23c9f 100644
--- a/tests/spec/arb_copy_image/simple.c
+++ b/tests/spec/arb_copy_image/simple.c
@@ -29,20 +29,21 @@
* renderbuffer copies. This test also exercises copying from one texture
* or renderbuffer to the same texture or renderbuffer
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 13;
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 const float green[3] = {0.0, 1.0, 0.0};
static const float red[3] = {1.0, 0.0, 0.0};
static const float blue[3] = {0.0, 0.0, 1.0};
int renderbuffers = 0;
void
diff --git a/tests/spec/arb_copy_image/srgb-copy.c b/tests/spec/arb_copy_image/srgb-copy.c
index 87fc54e..fb07b9d 100644
--- a/tests/spec/arb_copy_image/srgb-copy.c
+++ b/tests/spec/arb_copy_image/srgb-copy.c
@@ -33,20 +33,21 @@
* -- Present in : Nvidia GTX 650, driver - 319.32
* -- Fixed in :
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 15;
config.window_visual = PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
#define TEX_WIDTH 32
#define TEX_HEIGHT 32
#define TEX_NUMPIXELS (TEX_WIDTH * TEX_HEIGHT)
#define RED 0xFF0000FF
#define GRAY 0x7F7F7FFF
diff --git a/tests/spec/arb_copy_image/texview.c b/tests/spec/arb_copy_image/texview.c
index 3f77af0..a239e10 100644
--- a/tests/spec/arb_copy_image/texview.c
+++ b/tests/spec/arb_copy_image/texview.c
@@ -24,20 +24,21 @@
/** @file texview.c
*
* A test to make sure that ARB_copy_image respects texture views on
* both the source and destination ends.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 13;
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 const float green[4] = {0.0, 1.0, 0.0, 1.0};
static const float red[4] = {1.0, 0.0, 0.0, 1.0};
static bool
test_2d(void)
{
bool pass = true;
GLuint src, dst;
diff --git a/tests/spec/arb_get_texture_sub_image/cubemap.c b/tests/spec/arb_get_texture_sub_image/cubemap.c
index 957b213..ec94670 100644
--- a/tests/spec/arb_get_texture_sub_image/cubemap.c
+++ b/tests/spec/arb_get_texture_sub_image/cubemap.c
@@ -23,20 +23,21 @@
/**
* Test glGetTextureSubImage with cube maps.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 20;
config.window_visual = PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
static void
memset_series(unsigned *buffer, unsigned baseValue, unsigned size)
{
unsigned i;
for (i = 0; i < size; i++)
buffer[i] = baseValue + i;
}
diff --git a/tests/spec/arb_get_texture_sub_image/errors.c b/tests/spec/arb_get_texture_sub_image/errors.c
index 0a662ee..e6f7972 100644
--- a/tests/spec/arb_get_texture_sub_image/errors.c
+++ b/tests/spec/arb_get_texture_sub_image/errors.c
@@ -23,20 +23,21 @@
/**
* Test glGetTextureSubImage and glGetCompressedTextureSubImage error checking.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 20;
config.window_visual = PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
static bool
test_texture_id(void)
{
GLubyte buffer[8*8*4];
GLuint tex = 42;
bool pass = true;
diff --git a/tests/spec/arb_get_texture_sub_image/get.c b/tests/spec/arb_get_texture_sub_image/get.c
index d76ad89..8aa4c92 100644
--- a/tests/spec/arb_get_texture_sub_image/get.c
+++ b/tests/spec/arb_get_texture_sub_image/get.c
@@ -24,20 +24,21 @@
/**
* Test glGetTextureSubImage() with most texture types.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 20;
config.window_visual = PIGLIT_GL_VISUAL_RGBA |
PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
/* XXX this could potentially be a piglit utility function */
static bool
minify(GLenum target, int level, int width, int height, int depth,
int *mip_width, int *mip_height, int *mip_depth)
{
switch (target) {
case GL_TEXTURE_1D:
diff --git a/tests/spec/arb_get_texture_sub_image/getcompressed.c b/tests/spec/arb_get_texture_sub_image/getcompressed.c
index 1a65607..dba1542 100644
--- a/tests/spec/arb_get_texture_sub_image/getcompressed.c
+++ b/tests/spec/arb_get_texture_sub_image/getcompressed.c
@@ -25,20 +25,21 @@
* Test glGetCompressedTextureSubImage() with 2D, 2D array, cubemap, and
* cubemap array textures.
*/
#include "piglit-util-gl.h"
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 20;
config.window_visual = PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
static bool
test_getsubimage(GLenum target,
GLsizei width, GLsizei height, GLsizei numSlices,
GLenum intFormat)
{
GLubyte *texData;
GLubyte *refData;
diff --git a/tests/spec/ext_texture_array/compressed.c b/tests/spec/ext_texture_array/compressed.c
index 7b87564..5769f37 100644
--- a/tests/spec/ext_texture_array/compressed.c
+++ b/tests/spec/ext_texture_array/compressed.c
@@ -73,20 +73,21 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
#else // PIGLIT_USE_OPENGL_ES3
config.supports_gl_es_version = 30;
#endif
if (config.window_width < 4 * 8 * BLOCK_WIDTH)
config.window_width = 4 * 8 * BLOCK_WIDTH;
if (config.window_height < 8 * BLOCK_HEIGHT)
config.window_height = 8 * BLOCK_HEIGHT;
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 const char vs_text[] =
#ifdef PIGLIT_USE_OPENGL
"#version 120\n"
"#define piglit_in attribute\n"
"#define piglit_out varying\n"
#else // PIGLIT_USE_OPENGL_ES3
"#version 300 es\n"
diff --git a/tests/texturing/bptc-float-modes.c b/tests/texturing/bptc-float-modes.c
index aa01ec2..4a6642d 100644
--- a/tests/texturing/bptc-float-modes.c
+++ b/tests/texturing/bptc-float-modes.c
@@ -32,20 +32,21 @@
* and verified that it has the expected values.
*/
#include "piglit-util-gl.h"
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
#define BLOCK_SIZE 4
#define BLOCK_BYTES 16
#define N_PARTITIONS 32
struct bptc_float_bitfield {
int8_t endpoint;
uint8_t component;
diff --git a/tests/texturing/bptc-modes.c b/tests/texturing/bptc-modes.c
index 73f0750..6a76a5d 100644
--- a/tests/texturing/bptc-modes.c
+++ b/tests/texturing/bptc-modes.c
@@ -33,20 +33,21 @@
* values.
*/
#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 BLOCK_SIZE 4
#define BLOCK_BYTES 16
#define N_PARTITIONS 64
struct bptc_mode {
int n_subsets;
int n_partition_bits;
diff --git a/tests/texturing/compressedteximage.c b/tests/texturing/compressedteximage.c
index 5b8aaad..a4a6ec6 100644
--- a/tests/texturing/compressedteximage.c
+++ b/tests/texturing/compressedteximage.c
@@ -36,20 +36,21 @@
#define SIZE 256
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_width = (SIZE*2)+60;
config.window_height = SIZE+20;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
struct format {
const char *name;
GLenum token;
const char **extension;
};
static struct format *format;
--
2.9.3
More information about the Piglit
mailing list