move osmesa demos to their own directory

4 files changed, 0 insertions, 936 deletions

diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 75e2f5878c..4bd72d8a5c 100644
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -36,7 +36,6 @@ PROGS = \
 	morph3d \
 	multiarb \
 	occlude \
-	osdemo \
 	paltex \
 	pixeltex \
 	pointblast \
@@ -110,20 +109,6 @@ shadowtex: shadowtex.o showbuffer.o
 shadowtex.o: shadowtex.c showbuffer.h
 	$(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
 
-# special case: need the -lOSMesa library:
-osdemo: osdemo.c
-	$(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
-
-# another special case: need the -lOSMesa16 library:
-osdemo16: osdemo16.c
-	$(CC) -I$(INCDIR) $(CFLAGS) osdemo16.c $(OSMESA16_LIBS) -o $@
-
-# another special case: need the -lOSMesa32 library:
-osdemo32: osdemo32.c
-	$(CC) -I$(INCDIR) $(CFLAGS) osdemo32.c $(OSMESA32_LIBS) -o $@
-
-
-
 clean:
 	-rm -f $(PROGS)
 	-rm -f *.o *~
diff --git a/progs/demos/osdemo.c b/progs/demos/osdemo.c
deleted file mode 100644
index cdb3c72423..0000000000
--- a/progs/demos/osdemo.c
+++ /dev/null
@@ -1,322 +0,0 @@
-
-/*
- * Demo of off-screen Mesa rendering
- *
- * See Mesa/include/GL/osmesa.h for documentation of the OSMesa functions.
- *
- * If you want to render BIG images you'll probably have to increase
- * MAX_WIDTH and MAX_HEIGHT in src/config.h.
- *
- * This program is in the public domain.
- *
- * Brian Paul
- *
- * PPM output provided by Joerg Schmalzl.
- * ASCII PPM output added by Brian Paul.
- *
- * Usage: osdemo [-perf] [filename]
- *
- * -perf: Redraws the image 1000 times, displaying the FPS every 5 secs.
- * filename: file to store the TGA or PPM output
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "GL/osmesa.h"
-#include "GL/glut.h"
-
-
-#define SAVE_TARGA
-
-
-#define WIDTH 400
-#define HEIGHT 400
-
-static GLint T0 = 0;
-static GLint Frames = 0;
-static int perf = 0;
-
-static void render_image( void )
-{
-   GLfloat light_ambient[] = { 0.0, 0.0, 0.0, 1.0 };
-   GLfloat light_diffuse[] = { 1.0, 1.0, 1.0, 1.0 };
-   GLfloat light_specular[] = { 1.0, 1.0, 1.0, 1.0 };
-   GLfloat light_position[] = { 1.0, 1.0, 1.0, 0.0 };
-   GLfloat red_mat[]   = { 1.0, 0.2, 0.2, 1.0 };
-   GLfloat green_mat[] = { 0.2, 1.0, 0.2, 1.0 };
-   GLfloat blue_mat[]  = { 0.2, 0.2, 1.0, 1.0 };
-
-
-   glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
-   glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
-   glLightfv(GL_LIGHT0, GL_SPECULAR, light_specular);
-   glLightfv(GL_LIGHT0, GL_POSITION, light_position);
-    
-   glEnable(GL_LIGHTING);
-   glEnable(GL_LIGHT0);
-   glEnable(GL_DEPTH_TEST);
-
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glOrtho(-2.5, 2.5, -2.5, 2.5, -10.0, 10.0);
-   glMatrixMode(GL_MODELVIEW);
-
-   glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-
-   glPushMatrix();
-   glRotatef(20.0, 1.0, 0.0, 0.0);
-
-   glPushMatrix();
-   glTranslatef(-0.75, 0.5, 0.0); 
-   glRotatef(90.0, 1.0, 0.0, 0.0);
-   glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, red_mat );
-   glutSolidTorus(0.275, 0.85, 20, 20);
-   glPopMatrix();
-
-   glPushMatrix();
-   glTranslatef(-0.75, -0.5, 0.0); 
-   glRotatef(270.0, 1.0, 0.0, 0.0);
-   glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, green_mat );
-   glutSolidCone(1.0, 2.0, 16, 1);
-   glPopMatrix();
-
-#ifdef GL_HP_occlusion_test
-   if (perf == 0) {
-      GLboolean bRet;
-      glDepthMask(GL_FALSE);
-      glColorMask(GL_FALSE,GL_FALSE,GL_FALSE,GL_FALSE);
-      glEnable(GL_OCCLUSION_TEST_HP);
-      glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP,&bRet);
-
-      glPushMatrix();
-      glTranslatef(0.75, 0.0, -1.0);
-      glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
-      glutSolidSphere(1.0, 20, 20);
-      glPopMatrix();
-
-      glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP,&bRet);
-      printf("Occlusion test 1 (result should be 1): %d\n",bRet);
-
-      glDepthMask(GL_TRUE);
-      glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE);
-      glDisable(GL_OCCLUSION_TEST_HP);
-   }
-#endif
-
-   glPushMatrix();
-   glTranslatef(0.75, 0.0, -1.0); 
-   glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
-   glutSolidSphere(1.0, 20, 20);
-   glPopMatrix();
-
-#ifdef GL_HP_occlusion_test
-   if (perf == 0){
-      GLboolean bRet;
-
-      glDepthMask(GL_FALSE);
-      glColorMask(GL_FALSE,GL_FALSE,GL_FALSE,GL_FALSE);
-      glEnable(GL_OCCLUSION_TEST_HP);
-      glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP,&bRet);
-
-      /* draw a sphere inside the previous sphere */
-      glPushMatrix();
-      glTranslatef(0.75, 0.0, -1.0);
-      glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
-      glutSolidSphere(0.5, 20, 20);
-      glPopMatrix();
-
-      glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP,&bRet);
-      printf("Occlusion test 2 (result should be 0): %d\n",bRet);
-
-      glDepthMask(GL_TRUE);
-      glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE);
-      glDisable(GL_OCCLUSION_TEST_HP);
-   }
-#endif
-
-   glPopMatrix();
-
-   /* This is very important!!!
-    * Make sure buffered commands are finished!!!
-    */
-   glFinish();
-
-   Frames++;
-   if (perf) {
-     GLint t = glutGet(GLUT_ELAPSED_TIME);
-     if (t - T0 >= 5000) {
-        GLfloat seconds = (t - T0) / 1000.0;
-        GLfloat fps = Frames / seconds;
-        printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps);
-        T0 = t;
-        Frames = 0;
-     }
-   }
-}
-
-
-#ifdef SAVE_TARGA
-
-static void
-write_targa(const char *filename, const GLubyte *buffer, int width, int height)
-{
-   FILE *f = fopen( filename, "w" );
-   if (f) {
-      int i, x, y;
-      const GLubyte *ptr = buffer;
-      printf ("osdemo, writing tga file \n");
-      fputc (0x00, f);	/* ID Length, 0 => No ID	*/
-      fputc (0x00, f);	/* Color Map Type, 0 => No color map included	*/
-      fputc (0x02, f);	/* Image Type, 2 => Uncompressed, True-color Image */
-      fputc (0x00, f);	/* Next five bytes are about the color map entries */
-      fputc (0x00, f);	/* 2 bytes Index, 2 bytes length, 1 byte size */
-      fputc (0x00, f);
-      fputc (0x00, f);
-      fputc (0x00, f);
-      fputc (0x00, f);	/* X-origin of Image	*/
-      fputc (0x00, f);
-      fputc (0x00, f);	/* Y-origin of Image	*/
-      fputc (0x00, f);
-      fputc (WIDTH & 0xff, f);      /* Image Width	*/
-      fputc ((WIDTH>>8) & 0xff, f);
-      fputc (HEIGHT & 0xff, f);     /* Image Height	*/
-      fputc ((HEIGHT>>8) & 0xff, f);
-      fputc (0x18, f);		/* Pixel Depth, 0x18 => 24 Bits	*/
-      fputc (0x20, f);		/* Image Descriptor	*/
-      fclose(f);
-      f = fopen( filename, "ab" );  /* reopen in binary append mode */
-      for (y=height-1; y>=0; y--) {
-         for (x=0; x<width; x++) {
-            i = (y*width + x) * 4;
-            fputc(ptr[i+2], f); /* write blue */
-            fputc(ptr[i+1], f); /* write green */
-            fputc(ptr[i], f);   /* write red */
-         }
-      }
-   }
-}
-
-#else
-
-static void
-write_ppm(const char *filename, const GLubyte *buffer, int width, int height)
-{
-   const int binary = 0;
-   FILE *f = fopen( filename, "w" );
-   if (f) {
-      int i, x, y;
-      const GLubyte *ptr = buffer;
-      if (binary) {
-         fprintf(f,"P6\n");
-         fprintf(f,"# ppm-file created by osdemo.c\n");
-         fprintf(f,"%i %i\n", width,height);
-         fprintf(f,"255\n");
-         fclose(f);
-         f = fopen( filename, "ab" );  /* reopen in binary append mode */
-         for (y=height-1; y>=0; y--) {
-            for (x=0; x<width; x++) {
-               i = (y*width + x) * 4;
-               fputc(ptr[i], f);   /* write red */
-               fputc(ptr[i+1], f); /* write green */
-               fputc(ptr[i+2], f); /* write blue */
-            }
-         }
-      }
-      else {
-         /*ASCII*/
-         int counter = 0;
-         fprintf(f,"P3\n");
-         fprintf(f,"# ascii ppm file created by osdemo.c\n");
-         fprintf(f,"%i %i\n", width, height);
-         fprintf(f,"255\n");
-         for (y=height-1; y>=0; y--) {
-            for (x=0; x<width; x++) {
-               i = (y*width + x) * 4;
-               fprintf(f, " %3d %3d %3d", ptr[i], ptr[i+1], ptr[i+2]);
-               counter++;
-               if (counter % 5 == 0)
-                  fprintf(f, "\n");
-            }
-         }
-      }
-      fclose(f);
-   }
-}
-
-#endif
-
-
-
-int main( int argc, char *argv[] )
-{
-   void *buffer;
-   int i;
-   char *filename = NULL;
-
-   /* Create an RGBA-mode context */
-#if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
-   /* specify Z, stencil, accum sizes */
-   OSMesaContext ctx = OSMesaCreateContextExt( OSMESA_RGBA, 16, 0, 0, NULL );
-#else
-   OSMesaContext ctx = OSMesaCreateContext( OSMESA_RGBA, NULL );
-#endif
-   if (!ctx) {
-      printf("OSMesaCreateContext failed!\n");
-      return 0;
-   }
-
-   for ( i=1; i<argc; i++ ) {
-      if (argv[i][0] != '-') filename = argv[i];
-      if (strcmp(argv[i], "-perf")==0) perf = 1;
-   }
-
-   /* Allocate the image buffer */
-   buffer = malloc( WIDTH * HEIGHT * 4 * sizeof(GLubyte) );
-   if (!buffer) {
-      printf("Alloc image buffer failed!\n");
-      return 0;
-   }
-
-   /* Bind the buffer to the context and make it current */
-   if (!OSMesaMakeCurrent( ctx, buffer, GL_UNSIGNED_BYTE, WIDTH, HEIGHT )) {
-      printf("OSMesaMakeCurrent failed!\n");
-      return 0;
-   }
-     
-
-   {
-      int z, s, a;
-      glGetIntegerv(GL_DEPTH_BITS, &z);
-      glGetIntegerv(GL_STENCIL_BITS, &s);
-      glGetIntegerv(GL_ACCUM_RED_BITS, &a);
-      printf("Depth=%d Stencil=%d Accum=%d\n", z, s, a);
-   }
-
-   render_image();
-   if (perf)
-      for(i=0; i< 1000; i++)
-         render_image();
-
-   if (filename != NULL) {
-#ifdef SAVE_TARGA
-      write_targa(filename, buffer, WIDTH, HEIGHT);
-#else
-      write_ppm(filename, buffer, WIDTH, HEIGHT);
-#endif
-   }
-   else {
-      printf("Specify a filename if you want to make an image file\n");
-   }
-
-   printf("all done\n");
-
-   /* free the image buffer */
-   free( buffer );
-
-   /* destroy the context */
-   OSMesaDestroyContext( ctx );
-
-   return 0;
-}
diff --git a/progs/demos/osdemo16.c b/progs/demos/osdemo16.c
deleted file mode 100644
index 10ed695d7a..0000000000
--- a/progs/demos/osdemo16.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Demo of off-screen Mesa rendering with 16-bit color channels.
- * This requires the libOSMesa16.so library.
- *
- * Compile with something like this:
- *
- * gcc osdemo16.c -I../../include -L../../lib -lglut -lGLU -lOSMesa16 -lm -o osdemo16
- */
-
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "GL/osmesa.h"
-#include "GL/glut.h"
-
-
-#define SAVE_TARGA
-
-
-#define WIDTH 400
-#define HEIGHT 400
-
-
-
-static void render_image( void )
-{
-   GLfloat light_ambient[] = { 0.0, 0.0, 0.0, 1.0 };
-   GLfloat light_diffuse[] = { 1.0, 1.0, 1.0, 1.0 };
-   GLfloat light_specular[] = { 1.0, 1.0, 1.0, 1.0 };
-   GLfloat light_position[] = { 1.0, 1.0, 1.0, 0.0 };
-   GLfloat red_mat[]   = { 1.0, 0.2, 0.2, 1.0 };
-   GLfloat green_mat[] = { 0.2, 1.0, 0.2, 0.5 };
-   GLfloat blue_mat[]  = { 0.2, 0.2, 1.0, 1.0 };
-   GLfloat white_mat[]  = { 1.0, 1.0, 1.0, 1.0 };
-   GLfloat purple_mat[] = { 1.0, 0.2, 1.0, 1.0 };
-   GLUquadricObj *qobj = gluNewQuadric();
-
-   glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
-   glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
-   glLightfv(GL_LIGHT0, GL_SPECULAR, light_specular);
-   glLightfv(GL_LIGHT0, GL_POSITION, light_position);
-    
-   glEnable(GL_LIGHTING);
-   glEnable(GL_LIGHT0);
-   glEnable(GL_DEPTH_TEST);
-
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glOrtho(-2.5, 2.5, -2.5, 2.5, -10.0, 10.0);
-   glMatrixMode(GL_MODELVIEW);
-
-   glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-
-   glPushMatrix();
-   glRotatef(20.0, 1.0, 0.0, 0.0);
-
-#if 0
-   glPushMatrix();
-   glTranslatef(-0.75, 0.5, 0.0); 
-   glRotatef(90.0, 1.0, 0.0, 0.0);
-   glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, red_mat );
-   glutSolidTorus(0.275, 0.85, 20, 20);
-   glPopMatrix();
-#endif
-
-   /* red square */
-   glPushMatrix();
-   glTranslatef(0.0, -0.5, 0.0); 
-   glRotatef(90, 1, 0.5, 0);
-   glScalef(3, 3, 3);
-   glDisable(GL_LIGHTING);
-   glColor4f(1, 0, 0, 0.5);
-   glBegin(GL_POLYGON);
-   glVertex2f(-1, -1);
-   glVertex2f( 1, -1);
-   glVertex2f( 1,  1);
-   glVertex2f(-1,  1);
-   glEnd();
-   glEnable(GL_LIGHTING);
-   glPopMatrix();
-
-#if 0
-   /* green square */
-   glPushMatrix();
-   glTranslatef(0.0, 0.5, 0.1); 
-   glDisable(GL_LIGHTING);
-   glColor3f(0, 1, 0);
-   glBegin(GL_POLYGON);
-   glVertex2f(-1, -1);
-   glVertex2f( 1, -1);
-   glVertex2f( 1,  1);
-   glVertex2f(-1,  1);
-   glEnd();
-   glEnable(GL_LIGHTING);
-   glPopMatrix();
-
-   /* blue square */
-   glPushMatrix();
-   glTranslatef(0.75, 0.5, 0.3); 
-   glDisable(GL_LIGHTING);
-   glColor3f(0, 0, 0.5);
-   glBegin(GL_POLYGON);
-   glVertex2f(-1, -1);
-   glVertex2f( 1, -1);
-   glVertex2f( 1,  1);
-   glVertex2f(-1,  1);
-   glEnd();
-   glEnable(GL_LIGHTING);
-   glPopMatrix();
-#endif
-   glPushMatrix();
-   glTranslatef(-0.75, -0.5, 0.0); 
-   glRotatef(270.0, 1.0, 0.0, 0.0);
-   glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, green_mat );
-   glColor4f(0,1,0,0.5);
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-   gluCylinder(qobj, 1.0, 0.0, 2.0, 16, 1);
-   glDisable(GL_BLEND);
-   glPopMatrix();
-
-   glPushMatrix();
-   glTranslatef(0.75, 1.0, 1.0); 
-   glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
-   gluSphere(qobj, 1.0, 20, 20);
-   glPopMatrix();
-
-   glPopMatrix();
-
-   /* This is very important!!!
-    * Make sure buffered commands are finished!!!
-    */
-   glFinish();
-
-   gluDeleteQuadric(qobj);
-
-   {
-      GLint r, g, b, a;
-      glGetIntegerv(GL_RED_BITS, &r);
-      glGetIntegerv(GL_GREEN_BITS, &g);
-      glGetIntegerv(GL_BLUE_BITS, &b);
-      glGetIntegerv(GL_ALPHA_BITS, &a);
-      printf("channel sizes: %d %d %d %d\n", r, g, b, a);
-   }
-}
-
-
-
-static void
-write_targa(const char *filename, const GLushort *buffer, int width, int height)
-{
-   FILE *f = fopen( filename, "w" );
-   if (f) {
-      int i, x, y;
-      const GLushort *ptr = buffer;
-      printf ("osdemo, writing tga file \n");
-      fputc (0x00, f);	/* ID Length, 0 => No ID	*/
-      fputc (0x00, f);	/* Color Map Type, 0 => No color map included	*/
-      fputc (0x02, f);	/* Image Type, 2 => Uncompressed, True-color Image */
-      fputc (0x00, f);	/* Next five bytes are about the color map entries */
-      fputc (0x00, f);	/* 2 bytes Index, 2 bytes length, 1 byte size */
-      fputc (0x00, f);
-      fputc (0x00, f);
-      fputc (0x00, f);
-      fputc (0x00, f);	/* X-origin of Image	*/
-      fputc (0x00, f);
-      fputc (0x00, f);	/* Y-origin of Image	*/
-      fputc (0x00, f);
-      fputc (WIDTH & 0xff, f);      /* Image Width	*/
-      fputc ((WIDTH>>8) & 0xff, f);
-      fputc (HEIGHT & 0xff, f);     /* Image Height	*/
-      fputc ((HEIGHT>>8) & 0xff, f);
-      fputc (0x18, f);		/* Pixel Depth, 0x18 => 24 Bits	*/
-      fputc (0x20, f);		/* Image Descriptor	*/
-      fclose(f);
-      f = fopen( filename, "ab" );  /* reopen in binary append mode */
-      for (y=height-1; y>=0; y--) {
-         for (x=0; x<width; x++) {
-            i = (y*width + x) * 4;
-            /* just write 8 high bits */
-            fputc(ptr[i+2] >> 8, f); /* write blue */
-            fputc(ptr[i+1] >> 8, f); /* write green */
-            fputc(ptr[i] >> 8, f);   /* write red */
-         }
-      }
-   }
-}
-
-
-static void
-write_ppm(const char *filename, const GLushort *buffer, int width, int height)
-{
-   const int binary = 0;
-   FILE *f = fopen( filename, "w" );
-   if (f) {
-      int i, x, y;
-      const GLushort *ptr = buffer;
-      if (binary) {
-         fprintf(f,"P6\n");
-         fprintf(f,"# ppm-file created by osdemo.c\n");
-         fprintf(f,"%i %i\n", width,height);
-         fprintf(f,"255\n");
-         fclose(f);
-         f = fopen( filename, "ab" );  /* reopen in binary append mode */
-         for (y=height-1; y>=0; y--) {
-            for (x=0; x<width; x++) {
-               i = (y*width + x) * 4;
-               /* just write 8 high bits */
-               fputc(ptr[i] >> 8, f);   /* write red */
-               fputc(ptr[i+1] >> 8, f); /* write green */
-               fputc(ptr[i+2] >> 8, f); /* write blue */
-            }
-         }
-      }
-      else {
-         /*ASCII*/
-         int counter = 0;
-         fprintf(f,"P3\n");
-         fprintf(f,"# ascii ppm file created by osdemo.c\n");
-         fprintf(f,"%i %i\n", width, height);
-         fprintf(f,"255\n");
-         for (y=height-1; y>=0; y--) {
-            for (x=0; x<width; x++) {
-               i = (y*width + x) * 4;
-               /* just write 8 high bits */
-               fprintf(f, " %3d %3d %3d", ptr[i] >> 8, ptr[i+1] >> 8, ptr[i+2] >> 8);
-               counter++;
-               if (counter % 5 == 0)
-                  fprintf(f, "\n");
-            }
-         }
-      }
-      fclose(f);
-   }
-}
-
-
-
-int main( int argc, char *argv[] )
-{
-   GLushort *buffer;
-
-   /* Create an RGBA-mode context */
-#if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
-   /* specify Z, stencil, accum sizes */
-   OSMesaContext ctx = OSMesaCreateContextExt( GL_RGBA, 16, 0, 0, NULL );
-#else
-   OSMesaContext ctx = OSMesaCreateContext( GL_RGBA, NULL );
-#endif
-   if (!ctx) {
-      printf("OSMesaCreateContext failed!\n");
-      return 0;
-   }
-
-   /* Allocate the image buffer */
-   buffer = (GLushort *) malloc( WIDTH * HEIGHT * 4 * sizeof(GLushort));
-   if (!buffer) {
-      printf("Alloc image buffer failed!\n");
-      return 0;
-   }
-
-   /* Bind the buffer to the context and make it current */
-   if (!OSMesaMakeCurrent( ctx, buffer, GL_UNSIGNED_SHORT, WIDTH, HEIGHT )) {
-      printf("OSMesaMakeCurrent failed!\n");
-      return 0;
-   }
-     
-   render_image();
-
-   if (argc>1) {
-#ifdef SAVE_TARGA
-      write_targa(argv[1], buffer, WIDTH, HEIGHT);
-#else
-      write_ppm(argv[1], buffer, WIDTH, HEIGHT);
-#endif
-   }
-   else {
-      printf("Specify a filename if you want to make an image file\n");
-   }
-
-   printf("all done\n");
-
-   /* free the image buffer */
-   free( buffer );
-
-   /* destroy the context */
-   OSMesaDestroyContext( ctx );
-
-   return 0;
-}
diff --git a/progs/demos/osdemo32.c b/progs/demos/osdemo32.c
deleted file mode 100644
index 7295b46a83..0000000000
--- a/progs/demos/osdemo32.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Demo of off-screen Mesa rendering with 32-bit float color channels.
- * This requires the libOSMesa32.so library.
- *
- * Compile with something like this:
- *
- * gcc osdemo32.c -I../../include -L../../lib -lglut -lGLU -lOSMesa32 -lm -o osdemo32
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "GL/osmesa.h"
-#include "GL/glut.h"
-
-
-#define SAVE_TARGA
-
-
-#define WIDTH 400
-#define HEIGHT 400
-
-
-
-static void render_image( void )
-{
-   GLfloat light_ambient[] = { 0.0, 0.0, 0.0, 1.0 };
-   GLfloat light_diffuse[] = { 1.0, 1.0, 1.0, 1.0 };
-   GLfloat light_specular[] = { 1.0, 1.0, 1.0, 1.0 };
-   GLfloat light_position[] = { 1.0, 1.0, 1.0, 0.0 };
-   GLfloat red_mat[]   = { 1.0, 0.2, 0.2, 1.0 };
-   GLfloat green_mat[] = { 0.2, 1.0, 0.2, 0.5 };
-   GLfloat blue_mat[]  = { 0.2, 0.2, 1.0, 1.0 };
-   GLfloat white_mat[]  = { 1.0, 1.0, 1.0, 1.0 };
-   GLfloat purple_mat[] = { 1.0, 0.2, 1.0, 1.0 };
-   GLUquadricObj *qobj = gluNewQuadric();
-
-   glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
-   glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
-   glLightfv(GL_LIGHT0, GL_SPECULAR, light_specular);
-   glLightfv(GL_LIGHT0, GL_POSITION, light_position);
-    
-   glEnable(GL_LIGHTING);
-   glEnable(GL_LIGHT0);
-   glEnable(GL_DEPTH_TEST);
-
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glOrtho(-2.5, 2.5, -2.5, 2.5, -10.0, 10.0);
-   glMatrixMode(GL_MODELVIEW);
-
-   glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-
-   glPushMatrix();
-   glRotatef(20.0, 1.0, 0.0, 0.0);
-
-#if 0
-   glPushMatrix();
-   glTranslatef(-0.75, 0.5, 0.0); 
-   glRotatef(90.0, 1.0, 0.0, 0.0);
-   glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, red_mat );
-   glutSolidTorus(0.275, 0.85, 20, 20);
-   glPopMatrix();
-#endif
-
-   /* red square */
-   glPushMatrix();
-   glTranslatef(0.0, -0.5, 0.0); 
-   glRotatef(90, 1, 0.5, 0);
-   glScalef(3, 3, 3);
-   glDisable(GL_LIGHTING);
-   glColor4f(1, 0, 0, 0.5);
-   glBegin(GL_POLYGON);
-   glVertex2f(-1, -1);
-   glVertex2f( 1, -1);
-   glVertex2f( 1,  1);
-   glVertex2f(-1,  1);
-   glEnd();
-   glEnable(GL_LIGHTING);
-   glPopMatrix();
-
-#if 0
-   /* green square */
-   glPushMatrix();
-   glTranslatef(0.0, 0.5, 0.1); 
-   glDisable(GL_LIGHTING);
-   glColor3f(0, 1, 0);
-   glBegin(GL_POLYGON);
-   glVertex2f(-1, -1);
-   glVertex2f( 1, -1);
-   glVertex2f( 1,  1);
-   glVertex2f(-1,  1);
-   glEnd();
-   glEnable(GL_LIGHTING);
-   glPopMatrix();
-
-   /* blue square */
-   glPushMatrix();
-   glTranslatef(0.75, 0.5, 0.3); 
-   glDisable(GL_LIGHTING);
-   glColor3f(0, 0, 0.5);
-   glBegin(GL_POLYGON);
-   glVertex2f(-1, -1);
-   glVertex2f( 1, -1);
-   glVertex2f( 1,  1);
-   glVertex2f(-1,  1);
-   glEnd();
-   glEnable(GL_LIGHTING);
-   glPopMatrix();
-#endif
-   glPushMatrix();
-   glTranslatef(-0.75, -0.5, 0.0); 
-   glRotatef(270.0, 1.0, 0.0, 0.0);
-   glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, green_mat );
-   glColor4f(0,1,0,0.5);
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-   gluCylinder(qobj, 1.0, 0.0, 2.0, 16, 1);
-   glDisable(GL_BLEND);
-   glPopMatrix();
-
-   glPushMatrix();
-   glTranslatef(0.75, 1.0, 1.0); 
-   glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
-   gluSphere(qobj, 1.0, 20, 20);
-   glPopMatrix();
-
-   glPopMatrix();
-
-   /* This is very important!!!
-    * Make sure buffered commands are finished!!!
-    */
-   glFinish();
-
-   gluDeleteQuadric(qobj);
-
-   {
-      GLint r, g, b, a;
-      glGetIntegerv(GL_RED_BITS, &r);
-      glGetIntegerv(GL_GREEN_BITS, &g);
-      glGetIntegerv(GL_BLUE_BITS, &b);
-      glGetIntegerv(GL_ALPHA_BITS, &a);
-      printf("channel sizes: %d %d %d %d\n", r, g, b, a);
-   }
-}
-
-
-
-static void
-write_targa(const char *filename, const GLfloat *buffer, int width, int height)
-{
-   FILE *f = fopen( filename, "w" );
-   if (f) {
-      int i, x, y;
-      const GLfloat *ptr = buffer;
-      printf ("osdemo, writing tga file \n");
-      fputc (0x00, f);	/* ID Length, 0 => No ID	*/
-      fputc (0x00, f);	/* Color Map Type, 0 => No color map included	*/
-      fputc (0x02, f);	/* Image Type, 2 => Uncompressed, True-color Image */
-      fputc (0x00, f);	/* Next five bytes are about the color map entries */
-      fputc (0x00, f);	/* 2 bytes Index, 2 bytes length, 1 byte size */
-      fputc (0x00, f);
-      fputc (0x00, f);
-      fputc (0x00, f);
-      fputc (0x00, f);	/* X-origin of Image	*/
-      fputc (0x00, f);
-      fputc (0x00, f);	/* Y-origin of Image	*/
-      fputc (0x00, f);
-      fputc (WIDTH & 0xff, f);      /* Image Width	*/
-      fputc ((WIDTH>>8) & 0xff, f);
-      fputc (HEIGHT & 0xff, f);     /* Image Height	*/
-      fputc ((HEIGHT>>8) & 0xff, f);
-      fputc (0x18, f);		/* Pixel Depth, 0x18 => 24 Bits	*/
-      fputc (0x20, f);		/* Image Descriptor	*/
-      fclose(f);
-      f = fopen( filename, "ab" );  /* reopen in binary append mode */
-      for (y=height-1; y>=0; y--) {
-         for (x=0; x<width; x++) {
-            int r, g, b;
-            i = (y*width + x) * 4;
-            r = (int) (ptr[i+0] * 255.0);
-            g = (int) (ptr[i+1] * 255.0);
-            b = (int) (ptr[i+2] * 255.0);
-            if (r > 255) r = 255;
-            if (g > 255) g = 255;
-            if (b > 255) b = 255;
-            fputc(b, f); /* write blue */
-            fputc(g, f); /* write green */
-            fputc(r, f); /* write red */
-         }
-      }
-   }
-}
-
-
-static void
-write_ppm(const char *filename, const GLfloat *buffer, int width, int height)
-{
-   const int binary = 0;
-   FILE *f = fopen( filename, "w" );
-   if (f) {
-      int i, x, y;
-      const GLfloat *ptr = buffer;
-      if (binary) {
-         fprintf(f,"P6\n");
-         fprintf(f,"# ppm-file created by osdemo.c\n");
-         fprintf(f,"%i %i\n", width,height);
-         fprintf(f,"255\n");
-         fclose(f);
-         f = fopen( filename, "ab" );  /* reopen in binary append mode */
-         for (y=height-1; y>=0; y--) {
-            for (x=0; x<width; x++) {
-               int r, g, b;
-               i = (y*width + x) * 4;
-               r = (int) (ptr[i+0] * 255.0);
-               g = (int) (ptr[i+1] * 255.0);
-               b = (int) (ptr[i+2] * 255.0);
-               if (r > 255) r = 255;
-               if (g > 255) g = 255;
-               if (b > 255) b = 255;
-               fputc(r, f);   /* write red */
-               fputc(g, f); /* write green */
-               fputc(b, f); /* write blue */
-            }
-         }
-      }
-      else {
-         /*ASCII*/
-         int counter = 0;
-         fprintf(f,"P3\n");
-         fprintf(f,"# ascii ppm file created by osdemo.c\n");
-         fprintf(f,"%i %i\n", width, height);
-         fprintf(f,"255\n");
-         for (y=height-1; y>=0; y--) {
-            for (x=0; x<width; x++) {
-               int r, g, b;
-               i = (y*width + x) * 4;
-               r = (int) (ptr[i+0] * 255.0);
-               g = (int) (ptr[i+1] * 255.0);
-               b = (int) (ptr[i+2] * 255.0);
-               if (r > 255) r = 255;
-               if (g > 255) g = 255;
-               if (b > 255) b = 255;
-               fprintf(f, " %3d %3d %3d", r, g, b);
-               counter++;
-               if (counter % 5 == 0)
-                  fprintf(f, "\n");
-            }
-         }
-      }
-      fclose(f);
-   }
-}
-
-
-
-int main( int argc, char *argv[] )
-{
-   GLfloat *buffer;
-
-   /* Create an RGBA-mode context */
-#if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
-   /* specify Z, stencil, accum sizes */
-   OSMesaContext ctx = OSMesaCreateContextExt( GL_RGBA, 16, 0, 0, NULL );
-#else
-   OSMesaContext ctx = OSMesaCreateContext( GL_RGBA, NULL );
-#endif
-   if (!ctx) {
-      printf("OSMesaCreateContext failed!\n");
-      return 0;
-   }
-
-   /* Allocate the image buffer */
-   buffer = (GLfloat *) malloc( WIDTH * HEIGHT * 4 * sizeof(GLfloat));
-   if (!buffer) {
-      printf("Alloc image buffer failed!\n");
-      return 0;
-   }
-
-   /* Bind the buffer to the context and make it current */
-   if (!OSMesaMakeCurrent( ctx, buffer, GL_FLOAT, WIDTH, HEIGHT )) {
-      printf("OSMesaMakeCurrent failed!\n");
-      return 0;
-   }
-     
-   render_image();
-
-   if (argc>1) {
-#ifdef SAVE_TARGA
-      write_targa(argv[1], buffer, WIDTH, HEIGHT);
-#else
-      write_ppm(argv[1], buffer, WIDTH, HEIGHT);
-#endif
-   }
-   else {
-      printf("Specify a filename if you want to make an image file\n");
-   }
-
-   printf("all done\n");
-
-   /* free the image buffer */
-   free( buffer );
-
-   /* destroy the context */
-   OSMesaDestroyContext( ctx );
-
-   return 0;
-}