get rid of unused span->start field

[mesa.git] / progs / xdemos / pbutil.c

diff --git a/progs/xdemos/pbutil.c b/progs/xdemos/pbutil.c
index c9df5b3a05bece7a5a4f1b8c1d0a2b69c288318e..d0bbd1b0fce56a9df74a0df29eaa1a18d0969508 100644 (file)
--- a/progs/xdemos/pbutil.c
+++ b/progs/xdemos/pbutil.c
@@ -9,7 +9,6 @@
  * to the GLX_SGIX_fbconfig/pbuffer extensions.
  */
 
-
 #include <stdio.h>
 #include <string.h>
 #include "pbutil.h"
@@ -26,7 +25,6 @@
 int
 QueryPbuffers(Display *dpy, int screen)
 {
-   return 1;
 #if defined(GLX_VERSION_1_3)
    {
       /* GLX 1.3 supports pbuffers */
@@ -90,13 +88,10 @@ GetAllFBConfigs(Display *dpy, int screen, int *nConfigs)
 #endif
 #if defined(GLX_SGIX_fbconfig) && defined(GLX_SGIX_pbuffer)
    if (pbSupport == 2) {
-      /* this *seems* to work, but may not be perfect */
-      static int fbAttribs[] = {
-         GLX_RENDER_TYPE, 0,
-         GLX_DRAWABLE_TYPE, 0,
-         None
-      };
-      return glXChooseFBConfigSGIX(dpy, screen, fbAttribs, nConfigs);
+      /* The GLX_SGIX_fbconfig extensions says to pass NULL to get list
+       * of all available configurations.
+       */
+      return glXChooseFBConfigSGIX(dpy, screen, NULL, nConfigs);
    }
 #endif
    return NULL;
@@ -297,6 +292,43 @@ PrintFBConfigInfo(Display *dpy, int screen, FBCONFIG config, Bool horizFormat)
 
 
 
+GLXContext
+CreateContext(Display *dpy, int screen, FBCONFIG config)
+{
+   int pbSupport = QueryPbuffers(dpy, screen);
+#if defined(GLX_VERSION_1_3)
+   if (pbSupport == 1) {
+      /* GLX 1.3 */
+      GLXContext c;
+      c = glXCreateNewContext(dpy, config, GLX_RGBA_TYPE, NULL, True);
+      if (!c) {
+         /* try indirect */
+         c = glXCreateNewContext(dpy, config, GLX_RGBA_TYPE, NULL, False);
+      }
+      return c;
+   }
+#endif
+#if defined(GLX_SGIX_fbconfig) && defined(GLX_SGIX_pbuffer)
+   if (pbSupport == 2) {
+      GLXContext c;
+      c = glXCreateContextWithConfigSGIX(dpy, config, GLX_RGBA_TYPE_SGIX, NULL, True);
+      if (!c) {
+         c = glXCreateContextWithConfigSGIX(dpy, config, GLX_RGBA_TYPE_SGIX, NULL, False);
+      }
+      return c;
+   }
+#endif
+   return 0;
+}
+
+
+void
+DestroyContext(Display *dpy, GLXContext ctx)
+{
+   glXDestroyContext(dpy, ctx);
+}
+
+
 /* This is only used by CreatePbuffer() */
 static int XErrorFlag = 0;
 static int HandleXError(Display *dpy, XErrorEvent *event)