[Piglit] [PATCH 25/31] ARB_texture_view: Remove GLenum stringification macros.

[Fabian Bieler]

The "name" field was unused.
---
 tests/spec/arb_texture_view/lifetime_format.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/spec/arb_texture_view/lifetime_format.c 
b/tests/spec/arb_texture_view/lifetime_format.c
index 62f3dd085..62a685589 100644
--- a/tests/spec/arb_texture_view/lifetime_format.c
+++ b/tests/spec/arb_texture_view/lifetime_format.c
@@ -44,7 +44,6 @@ PIGLIT_GL_TEST_CONFIG_END
 
 /* Texture formats. The format_list variable has these fields: */
 struct format_desc {
-       const char  *name;
        GLenum      internalfmt;
        GLenum      storagefmt;
        GLenum      imagefmt;
@@ -54,26 +53,24 @@ struct format_desc {
        int         red, green, blue, alpha;
 };
 
-#define FORMAT(f) #f, f
 static const struct format_desc format_list[] = {
-       {FORMAT(GL_RGBA8UI), GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE,
+       {GL_RGBA8UI, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE,
                GL_RGBA_INTEGER, GL_UNSIGNED_BYTE, 8, 8, 8, 8},
-       {FORMAT(GL_RGBA8I), GL_RGBA8I, GL_RGBA, GL_UNSIGNED_BYTE,
+       {GL_RGBA8I, GL_RGBA8I, GL_RGBA, GL_UNSIGNED_BYTE,
                GL_RGBA_INTEGER, GL_BYTE, 8, 8, 8, 8},
-       {FORMAT(GL_RGB16F), GL_RGB16F, GL_RGB, GL_UNSIGNED_BYTE, GL_RGB,
+       {GL_RGB16F, GL_RGB16F, GL_RGB, GL_UNSIGNED_BYTE, GL_RGB,
                GL_HALF_FLOAT, 16, 16, 16, 0},
-       {FORMAT(GL_RGB16I), GL_RGB16, GL_RGB, GL_UNSIGNED_BYTE,
+       {GL_RGB16I, GL_RGB16, GL_RGB, GL_UNSIGNED_BYTE,
                GL_RGB_INTEGER, GL_SHORT, 16, 16, 16, 0},
-       {FORMAT(GL_R16UI), GL_R16, GL_RED, GL_UNSIGNED_BYTE,
+       {GL_R16UI, GL_R16, GL_RED, GL_UNSIGNED_BYTE,
                GL_RED_INTEGER, GL_UNSIGNED_SHORT, 16, 0, 0, 0},
-       {FORMAT(GL_R16F), GL_R16, GL_RED, GL_UNSIGNED_BYTE,
+       {GL_R16F, GL_R16, GL_RED, GL_UNSIGNED_BYTE,
                GL_RED, GL_HALF_FLOAT, 16, 0, 0, 0},
-       {FORMAT(GL_RGBA16UI), GL_RGBA16, GL_RGBA, GL_UNSIGNED_BYTE,
+       {GL_RGBA16UI, GL_RGBA16, GL_RGBA, GL_UNSIGNED_BYTE,
                GL_RGBA_INTEGER, GL_UNSIGNED_SHORT, 16, 16, 16, 16},
-       {FORMAT(GL_RGBA16F), GL_RGBA16, GL_RGBA, GL_UNSIGNED_BYTE,
+       {GL_RGBA16F, GL_RGBA16, GL_RGBA, GL_UNSIGNED_BYTE,
                GL_RGBA, GL_HALF_FLOAT, 16, 16, 16, 16},
 };
-#undef FORMAT
 
 
 static bool
-- 
2.15.1

_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit