[Piglit] [PATCH V2] arb_clear_buffer_object: fix various deprecated formats

[Chris Forbes]

- Some float formats were using GL_LUMINANCE_INTEGER as the pixel format.
- Most GL_INTENSITY* internalformats were trying to use
  GL_INTENSITY as the pixel format, which has never been valid in any
  spec version.

Fixes this test against a compatibility context -- core never hits these
cases since the formats have been removed.

V2: Fix commit message; in V1 it bogusly mentioned GL_RED_INTEGER, but
the test was actually using GL_LUMINANCE_INTEGER for float luminance
formats. Oops.

Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
---
 tests/spec/arb_clear_buffer_object/formats.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/spec/arb_clear_buffer_object/formats.c b/tests/spec/arb_clear_buffer_object/formats.c
index c13767a..c56ff9a 100644
--- a/tests/spec/arb_clear_buffer_object/formats.c
+++ b/tests/spec/arb_clear_buffer_object/formats.c
@@ -56,22 +56,22 @@ static const struct {
 	{GL_LUMINANCE16,		GL_LUMINANCE,			GL_UNSIGNED_SHORT,	2,	false,	{NULL,	NULL,	NULL}},
 	{GL_LUMINANCE8_ALPHA8,		GL_LUMINANCE_ALPHA,		GL_UNSIGNED_BYTE,	2,	false,	{NULL,	NULL,	NULL}},
 	{GL_LUMINANCE16_ALPHA16,	GL_LUMINANCE_ALPHA,		GL_UNSIGNED_SHORT,	4,	false,	{NULL,	NULL,	NULL}},
-	{GL_INTENSITY8,			GL_INTENSITY,			GL_UNSIGNED_BYTE,	1,	false,	{NULL,	NULL,	NULL}},
-	{GL_INTENSITY16,		GL_INTENSITY,			GL_UNSIGNED_SHORT,	2,	false,	{NULL,	NULL,	NULL}},
+	{GL_INTENSITY8,			GL_RED,				GL_UNSIGNED_BYTE,	1,	false,	{NULL,	NULL,	NULL}},
+	{GL_INTENSITY16,		GL_RED,				GL_UNSIGNED_SHORT,	2,	false,	{NULL,	NULL,	NULL}},
 	{GL_RGBA8,			GL_RGBA,			GL_UNSIGNED_BYTE,	4,	true,	{NULL,	NULL,	NULL}},
 	{GL_RGBA16,			GL_RGBA,			GL_UNSIGNED_SHORT,	8,	true,	{NULL,	NULL,	NULL}},
 /* texture_float */
 	{GL_ALPHA32F_ARB,		GL_ALPHA,			GL_FLOAT,		4,	false,	{NULL,	"GL_ARB_texture_float",	NULL}},
-	{GL_LUMINANCE32F_ARB,		GL_LUMINANCE_INTEGER_EXT,	GL_FLOAT,		4,	false,	{NULL,	"GL_ARB_texture_float",	NULL}},
+	{GL_LUMINANCE32F_ARB,		GL_LUMINANCE,			GL_FLOAT,		4,	false,	{NULL,	"GL_ARB_texture_float",	NULL}},
 	{GL_LUMINANCE_ALPHA32F_ARB,	GL_LUMINANCE_ALPHA,		GL_FLOAT,		8,	false,	{NULL,	"GL_ARB_texture_float",	NULL}},
-	{GL_INTENSITY32F_ARB,		GL_INTENSITY,			GL_FLOAT,		4,	false,	{NULL,	"GL_ARB_texture_float",	NULL}},
+	{GL_INTENSITY32F_ARB,		GL_RED,				GL_FLOAT,		4,	false,	{NULL,	"GL_ARB_texture_float",	NULL}},
 	{GL_RGB32F,			GL_RGB,				GL_FLOAT,		12,	true,	{NULL,	"GL_ARB_texture_float",	"ARB_texture_buffer_object_rgb32"}},
 	{GL_RGBA32F_ARB,		GL_RGBA,			GL_FLOAT,		16,	true,	{NULL,	"GL_ARB_texture_float",	NULL}},
 /* texture_half_float */
 	{GL_ALPHA16F_ARB,		GL_ALPHA,			GL_HALF_FLOAT,		2,	false,	{NULL,	"GL_ARB_texture_float",	"GL_ARB_half_float_pixel"}},
-	{GL_LUMINANCE16F_ARB,		GL_LUMINANCE_INTEGER_EXT,	GL_HALF_FLOAT,		2,	false,	{NULL,	"GL_ARB_texture_float",	"GL_ARB_half_float_pixel"}},
+	{GL_LUMINANCE16F_ARB,		GL_LUMINANCE,			GL_HALF_FLOAT,		2,	false,	{NULL,	"GL_ARB_texture_float",	"GL_ARB_half_float_pixel"}},
 	{GL_LUMINANCE_ALPHA16F_ARB,	GL_LUMINANCE_ALPHA,		GL_HALF_FLOAT,		4,	false,	{NULL,	"GL_ARB_texture_float",	"GL_ARB_half_float_pixel"}},
-	{GL_INTENSITY16F_ARB,		GL_INTENSITY,			GL_HALF_FLOAT,		2,	false,	{NULL,	"GL_ARB_texture_float",	"GL_ARB_half_float_pixel"}},
+	{GL_INTENSITY16F_ARB,		GL_RED,				GL_HALF_FLOAT,		2,	false,	{NULL,	"GL_ARB_texture_float",	"GL_ARB_half_float_pixel"}},
 	{GL_RGBA16F_ARB,		GL_RGBA,			GL_HALF_FLOAT,		8,	true,	{NULL,	"GL_ARB_texture_float",	"GL_ARB_half_float_pixel"}},
 /* texture_integer */
 	{GL_ALPHA8I_EXT,		GL_ALPHA_INTEGER,		GL_BYTE,		1,	false,	{NULL,	"GL_EXT_texture_integer",	NULL}},
-- 
1.9.1