[Piglit] [PATCH] genmipmap-errors, gl-3.0-texture-integer: delete some unsupported formats

[Sandra Koroniewska]

This fixes
spec/genmipmap-errors and spec/gl-3.0-texture-integer on Intel driver which does not support these formats (they are not in the tables 8.11-8.14 mentioned on page 184 of the OpenGL 4.4 spec).
---
 tests/spec/gl-3.0/api/genmipmap-errors.c | 16 ----------------
 tests/spec/gl-3.0/texture-integer.c      | 28 ----------------------------
 2 files changed, 44 deletions(-)

diff --git a/tests/spec/gl-3.0/api/genmipmap-errors.c b/tests/spec/gl-3.0/api/genmipmap-errors.c
index 0b48cc1f1..214942afb 100644
--- a/tests/spec/gl-3.0/api/genmipmap-errors.c
+++ b/tests/spec/gl-3.0/api/genmipmap-errors.c
@@ -66,14 +66,6 @@ test_genmipmap_errors(void)
 		{"GL_EXT_texture_integer", "GL_ARB_texture_rg"} },
 		{ GL_R32I, GL_RGBA_INTEGER, GL_INT,
 		{"GL_EXT_texture_integer", "GL_ARB_texture_rg"} },
-		{ GL_ALPHA8I_EXT, GL_RGBA_INTEGER, GL_INT,
-		{"GL_EXT_texture_integer", NULL} },
-		{ GL_LUMINANCE8I_EXT, GL_RGBA_INTEGER, GL_INT,
-		{"GL_EXT_texture_integer", NULL} },
-		{ GL_INTENSITY8I_EXT, GL_RGBA_INTEGER, GL_INT,
-		{"GL_EXT_texture_integer", NULL} },
-		{ GL_LUMINANCE_ALPHA8I_EXT, GL_RGBA_INTEGER, GL_INT,
-		{"GL_EXT_texture_integer", NULL} },
 
 		{ GL_RGBA8UI_EXT, GL_RGBA_INTEGER, GL_INT,
 		{"GL_EXT_texture_integer", NULL} },
@@ -91,14 +83,6 @@ test_genmipmap_errors(void)
 		{"GL_EXT_texture_integer", "GL_ARB_texture_rg"} },
 		{ GL_R32UI, GL_RGBA_INTEGER, GL_INT,
 		{"GL_EXT_texture_integer", "GL_ARB_texture_rg"} },
-		{ GL_ALPHA8UI_EXT, GL_RGBA_INTEGER, GL_INT,
-		{"GL_EXT_texture_integer", NULL} },
-		{ GL_LUMINANCE8UI_EXT, GL_RGBA_INTEGER, GL_INT,
-		{"GL_EXT_texture_integer", NULL} },
-		{ GL_INTENSITY8UI_EXT, GL_RGBA_INTEGER, GL_INT,
-		{"GL_EXT_texture_integer", NULL} },
-		{ GL_LUMINANCE_ALPHA8UI_EXT, GL_RGBA_INTEGER, GL_INT,
-		{"GL_EXT_texture_integer", NULL} },
 
 		/* Packed depth / stencil formats */
 		{ GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8,
diff --git a/tests/spec/gl-3.0/texture-integer.c b/tests/spec/gl-3.0/texture-integer.c
index 5fe90aa33..716c994bc 100644
--- a/tests/spec/gl-3.0/texture-integer.c
+++ b/tests/spec/gl-3.0/texture-integer.c
@@ -64,34 +64,6 @@ static const struct format_info Formats[] = {
 	{ "GL_RGB16UI_EXT", GL_RGB16UI_EXT, GL_RGB_INTEGER_EXT, 16, GL_FALSE },
 	{ "GL_RGB32I_EXT",  GL_RGB32I_EXT,  GL_RGB_INTEGER_EXT, 32, GL_TRUE  },
 	{ "GL_RGB32UI_EXT", GL_RGB32UI_EXT, GL_RGB_INTEGER_EXT, 32, GL_FALSE },
-
-	{ "GL_ALPHA8I_EXT",   GL_ALPHA8I_EXT,   GL_ALPHA_INTEGER_EXT, 8,  GL_TRUE  },
-	{ "GL_ALPHA8UI_EXT",  GL_ALPHA8UI_EXT,  GL_ALPHA_INTEGER_EXT, 8,  GL_FALSE },
-	{ "GL_ALPHA16I_EXT",  GL_ALPHA16I_EXT,  GL_ALPHA_INTEGER_EXT, 16, GL_TRUE  },
-	{ "GL_ALPHA16UI_EXT", GL_ALPHA16UI_EXT, GL_ALPHA_INTEGER_EXT, 16, GL_FALSE },
-	{ "GL_ALPHA32I_EXT",  GL_ALPHA32I_EXT,  GL_ALPHA_INTEGER_EXT, 32, GL_TRUE  },
-	{ "GL_ALPHA32UI_EXT", GL_ALPHA32UI_EXT, GL_ALPHA_INTEGER_EXT, 32, GL_FALSE },
-
-	{ "GL_LUMINANCE8I_EXT",   GL_LUMINANCE8I_EXT,   GL_LUMINANCE_INTEGER_EXT, 8,  GL_TRUE  },
-	{ "GL_LUMINANCE8UI_EXT",  GL_LUMINANCE8UI_EXT,  GL_LUMINANCE_INTEGER_EXT, 8,  GL_FALSE },
-	{ "GL_LUMINANCE16I_EXT",  GL_LUMINANCE16I_EXT,  GL_LUMINANCE_INTEGER_EXT, 16, GL_TRUE  },
-	{ "GL_LUMINANCE16UI_EXT", GL_LUMINANCE16UI_EXT, GL_LUMINANCE_INTEGER_EXT, 16, GL_FALSE },
-	{ "GL_LUMINANCE32I_EXT",  GL_LUMINANCE32I_EXT,  GL_LUMINANCE_INTEGER_EXT, 32, GL_TRUE  },
-	{ "GL_LUMINANCE32UI_EXT", GL_LUMINANCE32UI_EXT, GL_LUMINANCE_INTEGER_EXT, 32, GL_FALSE },
-
-	{ "GL_LUMINANCE_ALPHA8I_EXT",   GL_LUMINANCE_ALPHA8I_EXT,   GL_LUMINANCE_ALPHA_INTEGER_EXT, 8,  GL_TRUE  },
-	{ "GL_LUMINANCE_ALPHA8UI_EXT",  GL_LUMINANCE_ALPHA8UI_EXT,  GL_LUMINANCE_ALPHA_INTEGER_EXT, 8,  GL_FALSE },
-	{ "GL_LUMINANCE_ALPHA16I_EXT",  GL_LUMINANCE_ALPHA16I_EXT,  GL_LUMINANCE_ALPHA_INTEGER_EXT, 16, GL_TRUE  },
-	{ "GL_LUMINANCE_ALPHA16UI_EXT", GL_LUMINANCE_ALPHA16UI_EXT, GL_LUMINANCE_ALPHA_INTEGER_EXT, 16, GL_FALSE },
-	{ "GL_LUMINANCE_ALPHA32I_EXT",  GL_LUMINANCE_ALPHA32I_EXT,  GL_LUMINANCE_ALPHA_INTEGER_EXT, 32, GL_TRUE  },
-	{ "GL_LUMINANCE_ALPHA32UI_EXT", GL_LUMINANCE_ALPHA32UI_EXT, GL_LUMINANCE_ALPHA_INTEGER_EXT, 32, GL_FALSE },
-
-	{ "GL_INTENSITY8I_EXT",   GL_INTENSITY8I_EXT,   GL_RED_INTEGER_EXT, 8,  GL_TRUE  },
-	{ "GL_INTENSITY8UI_EXT",  GL_INTENSITY8UI_EXT,  GL_RED_INTEGER_EXT, 8,  GL_FALSE },
-	{ "GL_INTENSITY16I_EXT",  GL_INTENSITY16I_EXT,  GL_RED_INTEGER_EXT, 16, GL_TRUE  },
-	{ "GL_INTENSITY16UI_EXT", GL_INTENSITY16UI_EXT, GL_RED_INTEGER_EXT, 16, GL_FALSE },
-	{ "GL_INTENSITY32I_EXT",  GL_INTENSITY32I_EXT,  GL_RED_INTEGER_EXT, 32, GL_TRUE  },
-	{ "GL_INTENSITY32UI_EXT", GL_INTENSITY32UI_EXT, GL_RED_INTEGER_EXT, 32, GL_FALSE },
 };
 
 
-- 
2.11.0.windows.1