From 4b3cbecb3a87374a292a7e454cd959e8c1eac322 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Wed, 7 Oct 2009 07:54:31 -0600
Subject: progs/test: Fix MSVC build.

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

(limited to 'progs')

diff --git a/progs/tests/random.c b/progs/tests/random.c
index 4023674c05..604b4d4088 100644
--- a/progs/tests/random.c
+++ b/progs/tests/random.c
@@ -257,11 +257,11 @@ RandomPrimitive(void)
    Vcount++;
 
    for (i = 0; i < len; i++) {
+      int k = RandomInt(9);
       Vbuffer[Vcount].v[0] = RandomFloat(-3, 3);
       Vbuffer[Vcount].v[1] = RandomFloat(-3, 3);
       Vbuffer[Vcount].v[2] = RandomFloat(-3, 3);
       Vbuffer[Vcount].v[3] = RandomFloat(-3, 3);
-      int k = RandomInt(9);
       switch (k) {
       case 0:
          glVertex2fv(Vbuffer[Vcount].v);
-- 
cgit v1.2.3


From 846a6b069589d5f7b7a8a65f99a0f43cb8fed20b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 7 Oct 2009 09:10:48 -0600
Subject: progs/xdemos: fix swapped parameters to CreatePbuffer()

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

(limited to 'progs')

diff --git a/progs/xdemos/pbdemo.c b/progs/xdemos/pbdemo.c
index 7db0017b33..425b3bbe9f 100644
--- a/progs/xdemos/pbdemo.c
+++ b/progs/xdemos/pbdemo.c
@@ -143,7 +143,7 @@ MakePbuffer( Display *dpy, int screen, int width, int height )
 
       /* Create the pbuffer using first fbConfig in the list that works. */
       for (i=0;i<nConfigs;i++) {
-         pBuffer = CreatePbuffer(dpy, screen, fbConfigs[i], width, height, preserve, largest);
+         pBuffer = CreatePbuffer(dpy, screen, fbConfigs[i], width, height, largest, preserve);
          if (pBuffer) {
             gFBconfig = fbConfigs[i];
             gWidth = width;
-- 
cgit v1.2.3


From f36425b569953de862ecd8f42ecd54831ad9c4a6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 7 Oct 2009 09:11:23 -0600
Subject: progs/xdemos: test glXQueryDrawable()

---
 progs/xdemos/pbdemo.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'progs')

diff --git a/progs/xdemos/pbdemo.c b/progs/xdemos/pbdemo.c
index 425b3bbe9f..2573209336 100644
--- a/progs/xdemos/pbdemo.c
+++ b/progs/xdemos/pbdemo.c
@@ -210,6 +210,21 @@ Setup(int width, int height)
       return 0;
    }
 
+   /* Test drawable queries */
+   {
+      unsigned int v;
+      glXQueryDrawable( gDpy, gPBuffer, GLX_WIDTH, &v);
+      printf("GLX_WIDTH = %u\n", v);
+      glXQueryDrawable( gDpy, gPBuffer, GLX_HEIGHT, &v);
+      printf("GLX_HEIGHT = %u\n", v);
+      glXQueryDrawable( gDpy, gPBuffer, GLX_PRESERVED_CONTENTS, &v);
+      printf("GLX_PRESERVED_CONTENTS = %u\n", v);
+      glXQueryDrawable( gDpy, gPBuffer, GLX_LARGEST_PBUFFER, &v);
+      printf("GLX_LARGEST_PBUFFER = %u\n", v);
+      glXQueryDrawable( gDpy, gPBuffer, GLX_FBCONFIG_ID, &v);
+      printf("GLX_FBCONFIG_ID = %u\n", v);
+   }
+
    /* Get corresponding XVisualInfo */
    visInfo = GetVisualFromFBConfig(gDpy, gScreen, gFBconfig);
    if (!visInfo) {
-- 
cgit v1.2.3