mesa: Branch 'master' - 3 commits

[Brian Paul]

 progs/tests/sharedtex.c              |   22 ++++++++++++----------
 progs/tools/trace/gltrace_support.cc |    3 ++-
 2 files changed, 14 insertions(+), 11 deletions(-)

New commits:
diff-tree d592eaeb8321d1e408050fe07bff2bf234615b4c (from 887d3c67cbe1f09ec5a816eca859936addb3d3ec)
Author: Brian <brian at yutani.localnet.net>
Date:   Thu Mar 1 07:56:11 2007 -0700

    fix clipping, display name, warnings

diff --git a/progs/tests/sharedtex.c b/progs/tests/sharedtex.c
index ebe73f1..7be90d6 100644
--- a/progs/tests/sharedtex.c
+++ b/progs/tests/sharedtex.c
@@ -368,7 +368,7 @@ Resize(const struct window *h, unsigned 
    glFrustum(-1, 1, -1, 1, 2, 10);
    glMatrixMode(GL_MODELVIEW);
    glLoadIdentity();
-   glTranslatef(0, 0, -3.5);
+   glTranslatef(0, 0, -4.5);
 }
 
 
@@ -408,28 +408,30 @@ EventLoop(void)
 }
 
 
-
+#if 0
 static void
 PrintInfo(const struct window *h)
 {
    printf("Name: %s\n", h->DisplayName);
-   printf("  Display:     0x%x\n", h->Dpy);
-   printf("  Window:      0x%x\n", h->Win);
-   printf("  Context:     0x%x\n", h->Context);
+   printf("  Display:     %p\n", (void *) h->Dpy);
+   printf("  Window:      0x%x\n", (int) h->Win);
+   printf("  Context:     0x%x\n", (int) h->Context);
 }
+#endif
 
 
 int
 main(int argc, char *argv[])
 {
-   int i;
+   const char *dpyName = XDisplayName(NULL);
+
    struct window *h0, *h1, *h2, *h3;
 
    /* four windows and contexts sharing display lists and texture objects */
-   h0 = AddWindow(":0",  10,  10, NULL);
-   h1 = AddWindow(":0", 330,  10, h0);
-   h2 = AddWindow(":0",  10, 350, h0);
-   h3 = AddWindow(":0", 330, 350, h0);
+   h0 = AddWindow(dpyName,  10,  10, NULL);
+   h1 = AddWindow(dpyName, 330,  10, h0);
+   h2 = AddWindow(dpyName,  10, 350, h0);
+   h3 = AddWindow(dpyName, 330, 350, h0);
 
    InitGLstuff(h0);
 
diff-tree 887d3c67cbe1f09ec5a816eca859936addb3d3ec (from 03b9e16507627e3163cfdf3d119af14e5fb1cd65)
Author: Brian <brian at yutani.localnet.net>
Date:   Thu Mar 1 07:42:42 2007 -0700

    s/unsigned int/size_t/ (bug 10135)

diff --git a/progs/tools/trace/gltrace_support.cc b/progs/tools/trace/gltrace_support.cc
index a557cb3..b188e73 100644
--- a/progs/tools/trace/gltrace_support.cc
+++ b/progs/tools/trace/gltrace_support.cc
@@ -35,7 +35,7 @@ namespace {
   {
     static char buf[4096];
     int status;
-    unsigned int length = sizeof(buf)-1;
+    size_t length = sizeof(buf)-1;
     
     memset (buf, 0, sizeof(buf));
     
diff-tree 03b9e16507627e3163cfdf3d119af14e5fb1cd65 (from 38a88db1fc69b774ded3b7a44126e0b0f61e886b)
Author: Brian <brian at yutani.localnet.net>
Date:   Thu Mar 1 07:39:27 2007 -0700

    include assert.h

diff --git a/progs/tools/trace/gltrace_support.cc b/progs/tools/trace/gltrace_support.cc
index fb0404c..a557cb3 100644
--- a/progs/tools/trace/gltrace_support.cc
+++ b/progs/tools/trace/gltrace_support.cc
@@ -20,6 +20,7 @@
  */
 
 #include "gltrace_support.h"
+#include <assert.h>
 #include <sstream>
 #include <fstream>
 #include <iomanip>