From 683e3cb8db5a57db2ebd364986a399e2b1009e00 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Fri, 8 Jan 2010 23:08:57 -0800
Subject: progs/tests: Silence 'missing initializer' warnings.

---
 progs/tests/interleave.c | 2 +-
 progs/tests/texwrap.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'progs/tests')

diff --git a/progs/tests/interleave.c b/progs/tests/interleave.c
index 47bf9dfbe5..acf67d02c1 100644
--- a/progs/tests/interleave.c
+++ b/progs/tests/interleave.c
@@ -105,7 +105,7 @@ static const unsigned indicies[12] = {
    1, 4, 2
 };
 
-#define NONE  { NULL, 0, 0, 0 }
+#define NONE  { NULL, 0, 0, 0, sizeof( NULL ) }
 #define V2F   { v,    2, 2 * sizeof( GLfloat ), GL_FLOAT, sizeof( v[0] ) }
 #define V3F   { v,    3, 3 * sizeof( GLfloat ), GL_FLOAT, sizeof( v[0] ) }
 #define V4F   { v,    4, 4 * sizeof( GLfloat ), GL_FLOAT, sizeof( v[0] ) }
diff --git a/progs/tests/texwrap.c b/progs/tests/texwrap.c
index 92c8a2f14c..39c55919dd 100644
--- a/progs/tests/texwrap.c
+++ b/progs/tests/texwrap.c
@@ -71,7 +71,7 @@ static struct wrap_mode modes[] = {
    WRAP_EXT ( GL_MIRROR_CLAMP_TO_EDGE_EXT, "GL_ATI_texture_mirror_once",
 	                                   "GL_EXT_texture_mirror_clamp",
 	      999.0 ),
-   { 0 }
+   { 0, NULL, GL_FALSE, 0.0, { NULL, NULL } }
 };
 
 static void
-- 
cgit v1.2.3


From f07e87ffba38524a87613d14d01344a3343ec6fb Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 11 Jan 2010 19:15:54 -0800
Subject: progs/tests: Silence fprintf format warning.

---
 progs/tests/getprocaddress.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'progs/tests')

diff --git a/progs/tests/getprocaddress.c b/progs/tests/getprocaddress.c
index e699baf44b..38ca7000df 100644
--- a/progs/tests/getprocaddress.c
+++ b/progs/tests/getprocaddress.c
@@ -660,8 +660,8 @@ exercise_CompressedTextures(GLenum dimension)
    glGetTexLevelParameteriv(dimension, 0, GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB, 
       &queryCompressedSize);
    if (queryCompressedSize != sizeof(compressedTexture)) {
-      fprintf(stderr, "%s: compressed 3D texture changed size: expected %d, actual %d\n",
-         __FUNCTION__, sizeof(compressedTexture), queryCompressedSize);
+      fprintf(stderr, "%s: compressed 3D texture changed size: expected %lu, actual %d\n",
+         __FUNCTION__, (unsigned long) sizeof(compressedTexture), queryCompressedSize);
       return GL_FALSE;
    }
    (*GetCompressedTexImageARB)(dimension, 0, queryCompressedData);
-- 
cgit v1.2.3


From 6ed607cce69b54e87fcf71d2ac8fa2f6841a7b30 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 11 Jan 2010 19:56:04 -0800
Subject: progs/tests: Add newline to end of printf in vparray.c.

---
 progs/tests/vparray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'progs/tests')

diff --git a/progs/tests/vparray.c b/progs/tests/vparray.c
index fe168c6cd5..15673c875e 100644
--- a/progs/tests/vparray.c
+++ b/progs/tests/vparray.c
@@ -183,7 +183,7 @@ static void init_program(void)
    static const GLfloat bias[4] = {1.0, 1.0, 1.0, 0.0};
 
    if (!glutExtensionSupported("GL_NV_vertex_program")) {
-      printf("Sorry, this program requires GL_NV_vertex_program");
+      printf("Sorry, this program requires GL_NV_vertex_program\n");
       exit(1);
    }
 
-- 
cgit v1.2.3


From ae8ed89f2468373a158e74e6cc692d5519429f2f Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Mon, 11 Jan 2010 19:57:46 -0800
Subject: progs/tests: Remove duplicate included header in vparray.c.

---
 progs/tests/vparray.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'progs/tests')

diff --git a/progs/tests/vparray.c b/progs/tests/vparray.c
index 15673c875e..75160afd46 100644
--- a/progs/tests/vparray.c
+++ b/progs/tests/vparray.c
@@ -8,7 +8,6 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-- 
cgit v1.2.3