From 27d260b41038e0c19c8f24b8bdb2c004c1eb7aa2 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 24 Feb 2010 11:20:14 +0800 Subject: glapi: Move src/mesa/main/dispatch.c to glapi and rename. main/dispatch.c is a glapi source file. It is part of GLAPI_SOURCES in sources.mak and part of glapi_sources in SConscript. This commit moves it to glapi/ and renames it to glapi_dispatch.c. --- docs/devinfo.html | 2 +- docs/dispatch.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/devinfo.html b/docs/devinfo.html index 0fb816749e..df0e726524 100644 --- a/docs/devinfo.html +++ b/docs/devinfo.html @@ -107,7 +107,7 @@ Global variables are not allowed. Function name examples: 

-	glFooBar()       - a public GL entry point (in dispatch.c)
+	glFooBar()       - a public GL entry point (in glapi_dispatch.c)
 	_mesa_FooBar()   - the internal immediate mode function
 	save_FooBar()    - retained mode (display list) function in dlist.c
 	foo_bar()        - a static (private) function
diff --git a/docs/dispatch.html b/docs/dispatch.html
index bcab74c707..0c54a84675 100644
--- a/docs/dispatch.html
+++ b/docs/dispatch.html
@@ -244,8 +244,8 @@ isn't a significant problem.

 system.  There are two steps to this.  The file must first be added to
 src/mesa/sources.  That gets the file built and linked.  The second
 step is to add the correct #ifdef magic to
-src/mesa/main/dispatch.c to prevent the C version of the dispatch
-functions from being built.

+src/mesa/glapi/glapi_dispatch.c to prevent the C version of the
+dispatch functions from being built.

 
 
 
3.4. Fixed-Length Dispatch Stubs

-- 
cgit v1.2.3


From 8ae701cbc9fc8d2e0e710aea7ef3b0fa68dcec73 Mon Sep 17 00:00:00 2001
From: Brian Paul 
Date: Thu, 25 Feb 2010 08:36:31 -0700
Subject: docs: remove demos.html page which contained one dead link

---
 docs/contents.html |  1 -
 docs/demos.html    | 18 ------------------
 2 files changed, 19 deletions(-)
 delete mode 100644 docs/demos.html

(limited to 'docs')

diff --git a/docs/contents.html b/docs/contents.html
index f0646ffb40..cca20ecaae 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -92,7 +92,6 @@ a:visited {
 
  • Modeling and Rendering
 
  • Science and Technical
 
  • Utilities
-
  • Demos / other
 
 
 Hosted by:
diff --git a/docs/demos.html b/docs/demos.html
deleted file mode 100644
index b4a2cc5e36..0000000000
--- a/docs/demos.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-Demos
-
-
-
-
-
-
    Demos
    
-
-
-
-
-
-
-
\ No newline at end of file
-- 
cgit v1.2.3


From b43cfa9c5eac505c0a5e82b6f3b6d57d54860045 Mon Sep 17 00:00:00 2001
From: Eric Anholt 
Date: Tue, 23 Feb 2010 11:18:25 -0800
Subject: docs: addition of ARB_fcc to i965.

---
 docs/relnotes-7.8.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html
index 177d11e57a..e94cb7e696 100644
--- a/docs/relnotes-7.8.html
+++ b/docs/relnotes-7.8.html
@@ -36,7 +36,7 @@ tbd
 
      
 
    • GL_NV_conditional_render extension (swrast driver only)
 
    • GL_EXT_draw_buffers2 extension (swrast and i965 driver only)
-
    • GL_ARB_fragment_coord_conventions extension (for swrast and Gallium drivers)
+
    • GL_ARB_fragment_coord_conventions extension (for swrast, i965, and Gallium drivers)
 
    • Much improved support for EGL in Mesa
 
    • New state trackers for OpenGL ES 1.1 and 2.0
 
    • Dedicated documentation for Gallium
-- 
cgit v1.2.3


From 4387580e50f49d642160982208c807da858cd1ab Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg 
Date: Thu, 25 Feb 2010 15:49:18 -0500
Subject: Remove directfb support

---
 Makefile                                     |    8 +-
 configs/linux-directfb                       |   38 -
 configure.ac                                 |    2 +-
 docs/README.directfb                         |   29 -
 include/GL/directfbgl.h                      |   89 ---
 progs/directfb/.gitignore                    |    4 -
 progs/directfb/Makefile                      |   38 -
 progs/directfb/df_gears.c                    |  480 ------------
 progs/directfb/df_morph3d.c                  | 1013 --------------------------
 progs/directfb/df_reflect.c                  |  489 -------------
 progs/directfb/multi_window.c                |  240 ------
 src/glut/directfb/Makefile                   |   87 ---
 src/glut/directfb/NOTES                      |    9 -
 src/glut/directfb/callback.c                 |  300 --------
 src/glut/directfb/color.c                    |   39 -
 src/glut/directfb/cursor.c                   |  175 -----
 src/glut/directfb/cursors.h                  |  306 --------
 src/glut/directfb/events.c                   |  492 -------------
 src/glut/directfb/ext.c                      |  202 -----
 src/glut/directfb/font.c                     |  213 ------
 src/glut/directfb/font.h                     |   58 --
 src/glut/directfb/game.c                     |  153 ----
 src/glut/directfb/globals.c                  |   63 --
 src/glut/directfb/init.c                     |  128 ----
 src/glut/directfb/internal.h                 |  188 -----
 src/glut/directfb/menu.c                     |   87 ---
 src/glut/directfb/models.c                   |  599 ---------------
 src/glut/directfb/overlay.c                  |   62 --
 src/glut/directfb/state.c                    |  219 ------
 src/glut/directfb/teapot.c                   |  212 ------
 src/glut/directfb/window.c                   |  597 ---------------
 src/mesa/drivers/directfb/Makefile           |   67 --
 src/mesa/drivers/directfb/idirectfbgl_mesa.c |  982 -------------------------
 33 files changed, 2 insertions(+), 7666 deletions(-)
 delete mode 100644 configs/linux-directfb
 delete mode 100644 docs/README.directfb
 delete mode 100644 include/GL/directfbgl.h
 delete mode 100644 progs/directfb/.gitignore
 delete mode 100644 progs/directfb/Makefile
 delete mode 100644 progs/directfb/df_gears.c
 delete mode 100644 progs/directfb/df_morph3d.c
 delete mode 100644 progs/directfb/df_reflect.c
 delete mode 100644 progs/directfb/multi_window.c
 delete mode 100644 src/glut/directfb/Makefile
 delete mode 100644 src/glut/directfb/NOTES
 delete mode 100644 src/glut/directfb/callback.c
 delete mode 100644 src/glut/directfb/color.c
 delete mode 100644 src/glut/directfb/cursor.c
 delete mode 100644 src/glut/directfb/cursors.h
 delete mode 100644 src/glut/directfb/events.c
 delete mode 100644 src/glut/directfb/ext.c
 delete mode 100644 src/glut/directfb/font.c
 delete mode 100644 src/glut/directfb/font.h
 delete mode 100644 src/glut/directfb/game.c
 delete mode 100644 src/glut/directfb/globals.c
 delete mode 100644 src/glut/directfb/init.c
 delete mode 100644 src/glut/directfb/internal.h
 delete mode 100644 src/glut/directfb/menu.c
 delete mode 100644 src/glut/directfb/models.c
 delete mode 100644 src/glut/directfb/overlay.c
 delete mode 100644 src/glut/directfb/state.c
 delete mode 100644 src/glut/directfb/teapot.c
 delete mode 100644 src/glut/directfb/window.c
 delete mode 100644 src/mesa/drivers/directfb/Makefile
 delete mode 100644 src/mesa/drivers/directfb/idirectfbgl_mesa.c

(limited to 'docs')

diff --git a/Makefile b/Makefile
index 3e92e1312e..0527fa0d82 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ install:
 	done
 
 
-.PHONY: default doxygen clean realclean distclean install linux-directfb-install
+.PHONY: default doxygen clean realclean distclean install
 
 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -109,7 +109,6 @@ linux-alpha-static \
 linux-cell \
 linux-cell-debug \
 linux-debug \
-linux-directfb \
 linux-dri \
 linux-dri-debug \
 linux-dri-x86 \
@@ -271,8 +270,6 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
-	$(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/directfb/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
@@ -483,9 +480,6 @@ GLUT_FILES = \
 	$(DIRECTORY)/src/glut/fbdev/*[ch]		\
 	$(DIRECTORY)/src/glut/mini/*[ch]		\
 	$(DIRECTORY)/src/glut/mini/glut.pc.in		\
-	$(DIRECTORY)/src/glut/directfb/Makefile		\
-	$(DIRECTORY)/src/glut/directfb/NOTES		\
-	$(DIRECTORY)/src/glut/directfb/*[ch]
 
 DEPEND_FILES = \
 	$(TOP)/src/mesa/depend		\
diff --git a/configs/linux-directfb b/configs/linux-directfb
deleted file mode 100644
index 9ae3de96d1..0000000000
--- a/configs/linux-directfb
+++ /dev/null
@@ -1,38 +0,0 @@
-# Configuration for DirectFB
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-directfb
-
-# Compiler and flags
-CC  = gcc
-CXX = g++
-
-CFLAGS   = -Wall -O3 -ffast-math -fPIC -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE -D_SVID_SOURCE \
-         -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DPTHREADS
-
-CXXFLAGS = -Wall -O3 -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE   
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes)
-ifeq ($(HAVE_X86), yes)
-     CFLAGS   += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-     CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-     MESA_ASM_SOURCES = $(X86_SOURCES)
-     GLAPI_ASM_SOURCES = $(X86_API)
-endif
-
-# Directories
-SRC_DIRS     = gallium mesa glu glut/directfb glew
-GLU_DIRS     = sgi
-DRIVER_DIRS  = directfb
-PROGRAM_DIRS = demos directfb
-
-# Library/program dependencies
-GL_LIB_DEPS   = -lm -lpthread
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB)
-APP_LIB_DEPS  = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB) -l$(GLUT_LIB)
-
diff --git a/configure.ac b/configure.ac
index 485836a428..b4561000d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,7 @@ fi
 
 dnl
 dnl Driver configuration. Options are xlib, dri and osmesa right now.
-dnl More later: directfb, fbdev, ...
+dnl More later: fbdev, ...
 dnl
 default_driver="xlib"
 
diff --git a/docs/README.directfb b/docs/README.directfb
deleted file mode 100644
index d66ca8d3ca..0000000000
--- a/docs/README.directfb
+++ /dev/null
@@ -1,29 +0,0 @@
-                         
-                         Mesa DirectFB Information
-
-
-Requirements
-============
-
-  To build Mesa with DirectFB (DirectFBGL) support you need:
-     - DirectFB at least 1.0.0 (http://directfb.org)
-     - pkg-config at least 0.9 (http://pkgconfig.sf.net)
-
-
-Installation
-============
-  Run
-     
-     make linux-directfb
-
-  to build Mesa and DirectFBGL module,
-
-     make install
-
-  to install OpenGL libraries and
-
-     cd src/mesa/drivers/directfb ; make install
-
-  to install DirectFBGL module in the proper location.
-  Actually, that last command may not be needed.  Please provide feedback.
-
diff --git a/include/GL/directfbgl.h b/include/GL/directfbgl.h
deleted file mode 100644
index 984c4b1427..0000000000
--- a/include/GL/directfbgl.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-   (c) Copyright 2001  convergence integrated media GmbH.
-   All rights reserved.
-
-   Written by Denis Oliver Kropp  and
-              Andreas Hundt .
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __DIRECTFBGL_H__
-#define __DIRECTFBGL_H__
-
-#include 
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-typedef struct {
-     int        buffer_size;
-     int        depth_size;
-     int        stencil_size;
-     int        aux_buffers;
-    
-     int        red_size;
-     int        green_size;
-     int        blue_size;
-     int        alpha_size;
-
-     int        accum_red_size;
-     int        accum_green_size;
-     int        accum_blue_size;
-     int        accum_alpha_size;
-
-     DFBBoolean double_buffer;
-     DFBBoolean stereo;
-} DFBGLAttributes;
-
-
-DEFINE_INTERFACE(   IDirectFBGL,
-
-   /** Context handling **/
-
-     /*
-      * Acquire the hardware lock.
-      */
-     DFBResult (*Lock) (
-          IDirectFBGL              *thiz
-     );
-
-     /*
-      * Release the lock.
-      */
-     DFBResult (*Unlock) (
-          IDirectFBGL              *thiz
-     );
-
-     /*
-      * Query the OpenGL attributes.
-      */
-     DFBResult (*GetAttributes) (
-          IDirectFBGL              *thiz,
-          DFBGLAttributes          *attributes
-     );
-)
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/progs/directfb/.gitignore b/progs/directfb/.gitignore
deleted file mode 100644
index 55d65fb5b0..0000000000
--- a/progs/directfb/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-df_gears
-df_morph3d
-df_reflect
-multi_window
diff --git a/progs/directfb/Makefile b/progs/directfb/Makefile
deleted file mode 100644
index 93c2a7df14..0000000000
--- a/progs/directfb/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# progs/directfb/Makefile
-
-TOP = ../..
-include $(TOP)/configs/current
-
-
-INCDIR = $(TOP)/include -I$(TOP)/progs
-
-LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
-
-CFLAGS += $(shell pkg-config --cflags directfb)
-APP_LIB_DEPS += $(shell pkg-config --libs directfb)
-
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-
-PROGS = df_gears \
-	   df_reflect \
-	   df_morph3d \
-	   multi_window
-
-##### RULES #####
-
-.SUFFIXES:
-.SUFFIXES: .c
-
-.c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
-
-
-##### TARGETS #####
-
-default: $(PROGS)
-
-
-clean:
-	-rm -f $(PROGS)
-	-rm -f *.o *~
-
diff --git a/progs/directfb/df_gears.c b/progs/directfb/df_gears.c
deleted file mode 100644
index c480767bd3..0000000000
--- a/progs/directfb/df_gears.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
-   (c) Copyright 2001  convergence integrated media GmbH.
-   All rights reserved.
-
-   Written by Denis Oliver Kropp  and
-              Andreas Hundt .
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-
-
-/* the super interface */
-IDirectFB *dfb;
-
-/* the primary surface (surface of primary layer) */
-IDirectFBSurface *primary;
-
-/* the GL context */
-IDirectFBGL *primary_gl;
-
-/* our font */
-IDirectFBFont *font;
-
-/* event buffer */
-IDirectFBEventBuffer *events;
-
-/* macro for a safe call to DirectFB functions */
-#define DFBCHECK(x...) \
-        {                                                                      \
-           err = x;                                                            \
-           if (err != DFB_OK) {                                                \
-              fprintf( stderr, "%s <%d>:\n\t", __FILE__, __LINE__ );           \
-              DirectFBErrorFatal( #x, err );                                   \
-           }                                                                   \
-        }
-
-static int screen_width, screen_height;
-
-static unsigned long T0 = 0;
-static GLint Frames = 0;
-static GLfloat fps = 0;
-
-static inline unsigned long get_millis()
-{
-  struct timeval tv;
-
-  gettimeofday (&tv, NULL);
-  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
-}
-
-
-#ifndef M_PI
-#define M_PI 3.14159265
-#endif
-
-/**
-
-  Draw a gear wheel.  You'll probably want to call this function when
-  building a display list since we do a lot of trig here.
-
-  Input:  inner_radius - radius of hole at center
-          outer_radius - radius at center of teeth
-          width - width of gear
-          teeth - number of teeth
-          tooth_depth - depth of tooth
-
- **/
-
-static void
-gear(GLfloat inner_radius, GLfloat outer_radius, GLfloat width,
-  GLint teeth, GLfloat tooth_depth)
-{
-  GLint i;
-  GLfloat r0, r1, r2;
-  GLfloat angle, da;
-  GLfloat u, v, len;
-
-  r0 = inner_radius;
-  r1 = outer_radius - tooth_depth / 2.0;
-  r2 = outer_radius + tooth_depth / 2.0;
-
-  da = 2.0 * M_PI / teeth / 4.0;
-
-  glShadeModel(GL_FLAT);
-
-  glNormal3f(0.0, 0.0, 1.0);
-
-  /* draw front face */
-  glBegin(GL_QUAD_STRIP);
-  for (i = 0; i <= teeth; i++) {
-    angle = i * 2.0 * M_PI / teeth;
-    glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5);
-    glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5);
-    if (i < teeth) {
-      glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5);
-      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), width * 0.5);
-    }
-  }
-  glEnd();
-
-  /* draw front sides of teeth */
-  glBegin(GL_QUADS);
-  da = 2.0 * M_PI / teeth / 4.0;
-  for (i = 0; i < teeth; i++) {
-    angle = i * 2.0 * M_PI / teeth;
-
-    glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5);
-    glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5);
-    glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da), width * 0.5);
-    glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), width * 0.5);
-  }
-  glEnd();
-
-  glNormal3f(0.0, 0.0, -1.0);
-
-  /* draw back face */
-  glBegin(GL_QUAD_STRIP);
-  for (i = 0; i <= teeth; i++) {
-    angle = i * 2.0 * M_PI / teeth;
-    glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5);
-    glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5);
-    if (i < teeth) {
-      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), -width * 0.5);
-      glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5);
-    }
-  }
-  glEnd();
-
-  /* draw back sides of teeth */
-  glBegin(GL_QUADS);
-  da = 2.0 * M_PI / teeth / 4.0;
-  for (i = 0; i < teeth; i++) {
-    angle = i * 2.0 * M_PI / teeth;
-
-    glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), -width * 0.5);
-    glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da), -width * 0.5);
-    glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5);
-    glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5);
-  }
-  glEnd();
-
-  /* draw outward faces of teeth */
-  glBegin(GL_QUAD_STRIP);
-  for (i = 0; i < teeth; i++) {
-    angle = i * 2.0 * M_PI / teeth;
-
-    glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5);
-    glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5);
-    u = r2 * cos(angle + da) - r1 * cos(angle);
-    v = r2 * sin(angle + da) - r1 * sin(angle);
-    len = sqrt(u * u + v * v);
-    u /= len;
-    v /= len;
-    glNormal3f(v, -u, 0.0);
-    glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5);
-    glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5);
-    glNormal3f(cos(angle), sin(angle), 0.0);
-    glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da), width * 0.5);
-    glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da), -width * 0.5);
-    u = r1 * cos(angle + 3 * da) - r2 * cos(angle + 2 * da);
-    v = r1 * sin(angle + 3 * da) - r2 * sin(angle + 2 * da);
-    glNormal3f(v, -u, 0.0);
-    glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), width * 0.5);
-    glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), -width * 0.5);
-    glNormal3f(cos(angle), sin(angle), 0.0);
-  }
-
-  glVertex3f(r1 * cos(0), r1 * sin(0), width * 0.5);
-  glVertex3f(r1 * cos(0), r1 * sin(0), -width * 0.5);
-
-  glEnd();
-
-  glShadeModel(GL_SMOOTH);
-
-  /* draw inside radius cylinder */
-  glBegin(GL_QUAD_STRIP);
-  for (i = 0; i <= teeth; i++) {
-    angle = i * 2.0 * M_PI / teeth;
-    glNormal3f(-cos(angle), -sin(angle), 0.0);
-    glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5);
-    glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5);
-  }
-  glEnd();
-
-}
-
-static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
-static GLfloat inc_rotx = 0, inc_roty = 0, inc_rotz = 0;
-static GLint gear1, gear2, gear3;
-static GLfloat angle = 0.0;
-
-static void
-draw(void)
-{
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-  glPushMatrix();
-    glRotatef(view_rotx, 1.0, 0.0, 0.0);
-    glRotatef(view_roty, 0.0, 1.0, 0.0);
-    glRotatef(view_rotz, 0.0, 0.0, 1.0);
-
-    glPushMatrix();
-      glTranslatef(-3.0, -2.0, 0.0);
-      glRotatef(angle, 0.0, 0.0, 1.0);
-      glCallList(gear1);
-    glPopMatrix();
-
-    glPushMatrix();
-      glTranslatef(3.1, -2.0, 0.0);
-      glRotatef(-2.0 * angle - 9.0, 0.0, 0.0, 1.0);
-      glCallList(gear2);
-    glPopMatrix();
-
-    glPushMatrix();
-      glTranslatef(-3.1, 4.2, 0.0);
-      glRotatef(-2.0 * angle - 25.0, 0.0, 0.0, 1.0);
-      glCallList(gear3);
-    glPopMatrix();
-
-  glPopMatrix();
-}
-
-/* new window size or exposure */
-static void
-reshape(int width, int height)
-{
-  GLfloat h = (GLfloat) height / (GLfloat) width;
-
-  glViewport(0, 0, (GLint) width, (GLint) height);
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  glFrustum(-1.0, 1.0, -h, h, 5.0, 60.0);
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  glTranslatef(0.0, 0.0, -40.0);
-}
-
-static void
-init(int argc, char *argv[])
-{
-  static GLfloat pos[4] = {5.0, 5.0, 10.0, 0.0};
-  static GLfloat red[4] = {0.8, 0.1, 0.0, 1.0};
-  static GLfloat green[4] = {0.0, 0.8, 0.2, 1.0};
-  static GLfloat blue[4] = {0.2, 0.2, 1.0, 1.0};
-  GLint i;
-
-  glLightfv(GL_LIGHT0, GL_POSITION, pos);
-  glEnable(GL_CULL_FACE);
-  glEnable(GL_LIGHTING);
-  glEnable(GL_LIGHT0);
-  glEnable(GL_DEPTH_TEST);
-
-  /* make the gears */
-  gear1 = glGenLists(1);
-  glNewList(gear1, GL_COMPILE);
-  glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, red);
-  gear(1.0, 4.0, 1.0, 20, 0.7);
-  glEndList();
-
-  gear2 = glGenLists(1);
-  glNewList(gear2, GL_COMPILE);
-  glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, green);
-  gear(0.5, 2.0, 2.0, 10, 0.7);
-  glEndList();
-
-  gear3 = glGenLists(1);
-  glNewList(gear3, GL_COMPILE);
-  glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, blue);
-  gear(1.3, 2.0, 0.5, 10, 0.7);
-  glEndList();
-
-  glEnable(GL_NORMALIZE);
-
-  for ( i=1; iCreateInputEventBuffer( dfb, DICAPS_KEYS | DICAPS_AXES,
-                                           DFB_FALSE, &events ));
-
-     /* set our cooperative level to DFSCL_FULLSCREEN
-        for exclusive access to the primary layer */
-     dfb->SetCooperativeLevel( dfb, DFSCL_FULLSCREEN );
-
-     /* get the primary surface, i.e. the surface of the
-        primary layer we have exclusive access to */
-     dsc.flags = DSDESC_CAPS;
-     dsc.caps  = DSCAPS_PRIMARY | DSCAPS_DOUBLE;
-
-     DFBCHECK(dfb->CreateSurface( dfb, &dsc, &primary ));
-
-     /* get the size of the surface and fill it */
-     DFBCHECK(primary->GetSize( primary, &screen_width, &screen_height ));
-     DFBCHECK(primary->FillRectangle( primary, 0, 0,
-                                      screen_width, screen_height ));
-     primary->Flip( primary, NULL, 0 );
-
-     /* create the default font and set it */
-     DFBCHECK(dfb->CreateFont( dfb, NULL, NULL, &font ));
-     DFBCHECK(primary->SetFont( primary, font ));
-
-     /* get the GL context */
-     DFBCHECK(primary->GetGL( primary, &primary_gl ));
-
-     DFBCHECK(primary_gl->Lock( primary_gl ));
-     
-     init(argc, argv);
-     reshape(screen_width, screen_height);
-
-     DFBCHECK(primary_gl->Unlock( primary_gl ));
-     
-     T0 = get_millis();
-
-     while (!quit) {
-          DFBInputEvent evt;
-          unsigned long t;
-
-          DFBCHECK(primary_gl->Lock( primary_gl ));
-
-          draw();
-          
-          DFBCHECK(primary_gl->Unlock( primary_gl ));
-
-          if (fps) {
-               char buf[64];
-
-               snprintf(buf, 64, "%4.1f FPS\n", fps);
-
-               primary->SetColor( primary, 0xff, 0, 0, 0xff );
-               primary->DrawString( primary, buf, -1, screen_width - 5, 5, DSTF_TOPRIGHT );
-          }
-          
-          primary->Flip( primary, NULL, 0 );
-          Frames++;
-
-
-          t = get_millis();
-          if (t - T0 >= 2000) {
-               GLfloat seconds = (t - T0) / 1000.0;
-
-               fps = Frames / seconds;
-
-               T0 = t;
-               Frames = 0;
-          }
-
-
-          while (events->GetEvent( events, DFB_EVENT(&evt) ) == DFB_OK) {
-               switch (evt.type) {
-                    case DIET_KEYPRESS:
-                         switch (evt.key_symbol) {
-                              case DIKS_ESCAPE:
-                                   quit = 1;
-                                   break;
-                              case DIKS_CURSOR_UP:
-                                   inc_rotx = 5.0;
-                                   break;
-                              case DIKS_CURSOR_DOWN:
-                                   inc_rotx = -5.0;
-                                   break;
-                              case DIKS_CURSOR_LEFT:
-                                   inc_roty = 5.0;
-                                   break;
-                              case DIKS_CURSOR_RIGHT:
-                                   inc_roty = -5.0;
-                                   break;
-                              case DIKS_PAGE_UP:
-                                   inc_rotz = 5.0;
-                                   break;
-                              case DIKS_PAGE_DOWN:
-                                   inc_rotz = -5.0;
-                                   break;
-                              default:
-                                   ;
-                         }
-                         break;
-                    case DIET_KEYRELEASE:
-                         switch (evt.key_symbol) {
-                              case DIKS_CURSOR_UP:
-                                   inc_rotx = 0;
-                                   break;
-                              case DIKS_CURSOR_DOWN:
-                                   inc_rotx = 0;
-                                   break;
-                              case DIKS_CURSOR_LEFT:
-                                   inc_roty = 0;
-                                   break;
-                              case DIKS_CURSOR_RIGHT:
-                                   inc_roty = 0;
-                                   break;
-                              case DIKS_PAGE_UP:
-                                   inc_rotz = 0;
-                                   break;
-                              case DIKS_PAGE_DOWN:
-                                   inc_rotz = 0;
-                                   break;
-                              default:
-                                   ;
-                         }
-                         break;
-                    case DIET_AXISMOTION:
-                         if (evt.flags & DIEF_AXISREL) {
-                              switch (evt.axis) {
-                                   case DIAI_X:
-                                        view_roty += evt.axisrel / 2.0;
-                                        break;
-                                   case DIAI_Y:
-                                        view_rotx += evt.axisrel / 2.0;
-                                        break;
-                                   case DIAI_Z:
-                                        view_rotz += evt.axisrel / 2.0;
-                                        break;
-                                   default:
-                                        ;
-                              }
-                         }
-                         break;
-                    default:
-                         ;
-               }
-          }
-
-          angle += 2.0;
-
-          view_rotx += inc_rotx;
-          view_roty += inc_roty;
-          view_rotz += inc_rotz;
-     }
-
-     /* release our interfaces to shutdown DirectFB */
-     primary_gl->Release( primary_gl );
-     primary->Release( primary );
-     font->Release( font );
-     events->Release( events );
-     dfb->Release( dfb );
-
-     return 0;
-}
-
diff --git a/progs/directfb/df_morph3d.c b/progs/directfb/df_morph3d.c
deleted file mode 100644
index 2730fa6156..0000000000
--- a/progs/directfb/df_morph3d.c
+++ /dev/null
@@ -1,1013 +0,0 @@
-/*
-   (c) Copyright 2001  convergence integrated media GmbH.
-   All rights reserved.
-
-   Written by Denis Oliver Kropp  and
-              Andreas Hundt .
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-/*-
- * morph3d.c - Shows 3D morphing objects
- *
- * Converted to GLUT by brianp on 1/1/98
- *
- * This program was inspired on a WindowsNT(R)'s screen saver. It was written
- * from scratch and it was not based on any other source code.
- *
- * Porting it to xlock (the final objective of this code since the moment I
- * decided to create it) was possible by comparing the original Mesa's gear
- * demo with it's ported version, so thanks for Danny Sung for his indirect
- * help (look at gear.c in xlock source tree). NOTE: At the moment this code
- * was sent to Brian Paul for package inclusion, the XLock Version was not
- * available. In fact, I'll wait it to appear on the next Mesa release (If you
- * are reading this, it means THIS release) to send it for xlock package
- * inclusion). It will probably there be a GLUT version too.
- *
- * Thanks goes also to Brian Paul for making it possible and inexpensive
- * to use OpenGL at home.
- *
- * Since I'm not a native english speaker, my apologies for any gramatical
- * mistake.
- *
- * My e-mail addresses are
- *
- * vianna@cat.cbpf.br
- *         and
- * marcelo@venus.rdc.puc-rio.br
- *
- * Marcelo F. Vianna (Feb-13-1997)
- */
-
-/*
-This document is VERY incomplete, but tries to describe the mathematics used
-in the program. At this moment it just describes how the polyhedra are
-generated. On futhurer versions, this document will be probabbly improved.
-
-Since I'm not a native english speaker, my apologies for any gramatical
-mistake.
-
-Marcelo Fernandes Vianna
-- Undergraduate in Computer Engeneering at Catholic Pontifical University
-- of Rio de Janeiro (PUC-Rio) Brasil.
-- e-mail: vianna@cat.cbpf.br or marcelo@venus.rdc.puc-rio.br
-- Feb-13-1997
-
-POLYHEDRA GENERATION
-
-For the purpose of this program it's not sufficient to know the polyhedra
-vertexes coordinates. Since the morphing algorithm applies a nonlinear
-transformation over the surfaces (faces) of the polyhedron, each face has
-to be divided into smaller ones. The morphing algorithm needs to transform
-each vertex of these smaller faces individually. It's a very time consoming
-task.
-
-In order to reduce calculation overload, and since all the macro faces of
-the polyhedron are transformed by the same way, the generation is made by
-creating only one face of the polyhedron, morphing it and then rotating it
-around the polyhedron center.
-
-What we need to know is the face radius of the polyhedron (the radius of
-the inscribed sphere) and the angle between the center of two adjacent
-faces using the center of the sphere as the angle's vertex.
-
-The face radius of the regular polyhedra are known values which I decided
-to not waste my time calculating. Following is a table of face radius for
-the regular polyhedra with edge length = 1:
-
-    TETRAHEDRON  : 1/(2*sqrt(2))/sqrt(3)
-    CUBE     : 1/2
-    OCTAHEDRON   : 1/sqrt(6)
-    DODECAHEDRON : T^2 * sqrt((T+2)/5) / 2     -> where T=(sqrt(5)+1)/2
-    ICOSAHEDRON  : (3*sqrt(3)+sqrt(15))/12
-
-I've not found any reference about the mentioned angles, so I needed to
-calculate them, not a trivial task until I figured out how :)
-Curiously these angles are the same for the tetrahedron and octahedron.
-A way to obtain this value is inscribing the tetrahedron inside the cube
-by matching their vertexes. So you'll notice that the remaining unmatched
-vertexes are in the same straight line starting in the cube/tetrahedron
-center and crossing the center of each tetrahedron's face. At this point
-it's easy to obtain the bigger angle of the isosceles triangle formed by
-the center of the cube and two opposite vertexes on the same cube face.
-The edges of this triangle have the following lenghts: sqrt(2) for the base
-and sqrt(3)/2 for the other two other edges. So the angle we want is:
-     +-----------------------------------------------------------+
-     | 2*ARCSIN(sqrt(2)/sqrt(3)) = 109.47122063449069174 degrees |
-     +-----------------------------------------------------------+
-For the cube this angle is obvious, but just for formality it can be
-easily obtained because we also know it's isosceles edge lenghts:
-sqrt(2)/2 for the base and 1/2 for the other two edges. So the angle we
-want is:
-     +-----------------------------------------------------------+
-     | 2*ARCSIN((sqrt(2)/2)/1)   = 90.000000000000000000 degrees |
-     +-----------------------------------------------------------+
-For the octahedron we use the same idea used for the tetrahedron, but now
-we inscribe the cube inside the octahedron so that all cubes's vertexes
-matches excatly the center of each octahedron's face. It's now clear that
-this angle is the same of the thetrahedron one:
-     +-----------------------------------------------------------+
-     | 2*ARCSIN(sqrt(2)/sqrt(3)) = 109.47122063449069174 degrees |
-     +-----------------------------------------------------------+
-For the dodecahedron it's a little bit harder because it's only relationship
-with the cube is useless to us. So we need to solve the problem by another
-way. The concept of Face radius also exists on 2D polygons with the name
-Edge radius:
-  Edge Radius For Pentagon (ERp)
-  ERp = (1/2)/TAN(36 degrees) * VRp = 0.6881909602355867905
-  (VRp is the pentagon's vertex radio).
-  Face Radius For Dodecahedron
-  FRd = T^2 * sqrt((T+2)/5) / 2 = 1.1135163644116068404
-Why we need ERp? Well, ERp and FRd segments forms a 90 degrees angle,
-completing this triangle, the lesser angle is a half of the angle we are
-looking for, so this angle is:
-     +-----------------------------------------------------------+
-     | 2*ARCTAN(ERp/FRd)     = 63.434948822922009981 degrees |
-     +-----------------------------------------------------------+
-For the icosahedron we can use the same method used for dodecahedron (well
-the method used for dodecahedron may be used for all regular polyhedra)
-  Edge Radius For Triangle (this one is well known: 1/3 of the triangle height)
-  ERt = sin(60)/3 = sqrt(3)/6 = 0.2886751345948128655
-  Face Radius For Icosahedron
-  FRi= (3*sqrt(3)+sqrt(15))/12 = 0.7557613140761707538
-So the angle is:
-     +-----------------------------------------------------------+
-     | 2*ARCTAN(ERt/FRi)     = 41.810314895778596167 degrees |
-     +-----------------------------------------------------------+
-
-*/
-
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-
-
-/* the super interface */
-IDirectFB *dfb;
-
-/* the primary surface (surface of primary layer) */
-IDirectFBSurface *primary;
-
-/* the GL context */
-IDirectFBGL *primary_gl;
-
-/* our font */
-IDirectFBFont *font;
-
-/* event buffer */
-IDirectFBEventBuffer *events;
-
-/* macro for a safe call to DirectFB functions */
-#define DFBCHECK(x...) \
-        {                                                                      \
-           err = x;                                                            \
-           if (err != DFB_OK) {                                                \
-              fprintf( stderr, "%s <%d>:\n\t", __FILE__, __LINE__ );           \
-              DirectFBErrorFatal( #x, err );                                   \
-           }                                                                   \
-        }
-
-static int screen_width, screen_height;
-
-static unsigned long T0 = 0;
-static GLint Frames = 0;
-static GLfloat fps = 0;
-
-static inline unsigned long get_millis()
-{
-  struct timeval tv;
-
-  gettimeofday (&tv, NULL);
-  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
-}
-
-
-
-#define Scale                      0.3
-
-#define VectMul(X1,Y1,Z1,X2,Y2,Z2) (Y1)*(Z2)-(Z1)*(Y2),(Z1)*(X2)-(X1)*(Z2),(X1)*(Y2)-(Y1)*(X2)
-#define sqr(A)                     ((A)*(A))
-
-/* Increasing this values produces better image quality, the price is speed. */
-/* Very low values produces erroneous/incorrect plotting */
-#define tetradivisions             23
-#define cubedivisions              20
-#define octadivisions              21
-#define dodecadivisions            10
-#define icodivisions               15
-
-#define tetraangle                 109.47122063449069174
-#define cubeangle                  90.000000000000000000
-#define octaangle                  109.47122063449069174
-#define dodecaangle                63.434948822922009981
-#define icoangle                   41.810314895778596167
-
-#ifndef Pi
-#define Pi                         3.1415926535897932385
-#endif
-#define SQRT2                      1.4142135623730951455
-#define SQRT3                      1.7320508075688771932
-#define SQRT5                      2.2360679774997898051
-#define SQRT6                      2.4494897427831778813
-#define SQRT15                     3.8729833462074170214
-#define cossec36_2                 0.8506508083520399322
-#define cos72                      0.3090169943749474241
-#define sin72                      0.9510565162951535721
-#define cos36                      0.8090169943749474241
-#define sin36                      0.5877852522924731292
-
-/*************************************************************************/
-
-static int       mono=0;
-static int       smooth=1;
-static GLint     WindH, WindW;
-static GLfloat   step=0;
-static GLfloat   seno;
-static int       object;
-static int       edgedivisions;
-static void      (*draw_object)( void );
-static float     Magnitude;
-static float     *MaterialColor[20];
-
-static float front_shininess[] =   {60.0};
-static float front_specular[]  =   { 0.7, 0.7, 0.7, 1.0 };
-static float ambient[]         =   { 0.0, 0.0, 0.0, 1.0 };
-static float diffuse[]         =   { 1.0, 1.0, 1.0, 1.0 };
-static float position0[]       =   { 1.0, 1.0, 1.0, 0.0 };
-static float position1[]       =   {-1.0,-1.0, 1.0, 0.0 };
-static float lmodel_ambient[]  =   { 0.5, 0.5, 0.5, 1.0 };
-static float lmodel_twoside[]  =   {GL_TRUE};
-
-static float MaterialRed[]     =   { 0.7, 0.0, 0.0, 1.0 };
-static float MaterialGreen[]   =   { 0.1, 0.5, 0.2, 1.0 };
-static float MaterialBlue[]    =   { 0.0, 0.0, 0.7, 1.0 };
-static float MaterialCyan[]    =   { 0.2, 0.5, 0.7, 1.0 };
-static float MaterialYellow[]  =   { 0.7, 0.7, 0.0, 1.0 };
-static float MaterialMagenta[] =   { 0.6, 0.2, 0.5, 1.0 };
-static float MaterialWhite[]   =   { 0.7, 0.7, 0.7, 1.0 };
-static float MaterialGray[]    =   { 0.2, 0.2, 0.2, 1.0 };
-
-#define TRIANGLE(Edge, Amp, Divisions, Z)                                                                        \
-{                                                                                                                \
-  GLfloat   Xf,Yf,Xa,Yb,Xf2,Yf2;                                                                                 \
-  GLfloat   Factor,Factor1,Factor2;                                                                              \
-  GLfloat   VertX,VertY,VertZ,NeiAX,NeiAY,NeiAZ,NeiBX,NeiBY,NeiBZ;                                               \
-  GLfloat   Ax,Ay,Bx;                                                                                            \
-  int       Ri,Ti;                                                                                               \
-  GLfloat   Vr=(Edge)*SQRT3/3;                                                                                   \
-  GLfloat   AmpVr2=(Amp)/sqr(Vr);                                                                                \
-  GLfloat   Zf=(Edge)*(Z);                                                                                       \
-                                                                                                                 \
-  Ax=(Edge)*(+0.5/(Divisions)), Ay=(Edge)*(-SQRT3/(2*Divisions));                                                \
-  Bx=(Edge)*(-0.5/(Divisions));                                                                                  \
-                                                                                                                 \
-  for (Ri=1; Ri<=(Divisions); Ri++) {                                                                            \
-    glBegin(GL_TRIANGLE_STRIP);                                                                                  \
-    for (Ti=0; TiFlip( primary, NULL, 0 );
-
-  glLightfv(GL_LIGHT0, GL_AMBIENT, ambient);
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse);
-  glLightfv(GL_LIGHT0, GL_POSITION, position0);
-  glLightfv(GL_LIGHT1, GL_AMBIENT, ambient);
-  glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse);
-  glLightfv(GL_LIGHT1, GL_POSITION, position1);
-  glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
-  glLightModelfv(GL_LIGHT_MODEL_TWO_SIDE, lmodel_twoside);
-  glEnable(GL_LIGHTING);
-  glEnable(GL_LIGHT0);
-  glEnable(GL_LIGHT1);
-  glEnable(GL_DEPTH_TEST);
-  glEnable(GL_NORMALIZE);
-
-  glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, front_shininess);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, front_specular);
-
-  glHint(GL_FOG_HINT, GL_FASTEST);
-  glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-  glHint(GL_POLYGON_SMOOTH_HINT, GL_FASTEST);
-
-  pinit();
-}
-
-int main( int argc, char *argv[] )
-{
-     int quit = 0;
-     DFBResult err;
-     DFBSurfaceDescription dsc;
-
-     DFBCHECK(DirectFBInit( &argc, &argv ));
-
-     /* create the super interface */
-     DFBCHECK(DirectFBCreate( &dfb ));
-
-     /* create an event buffer for all devices with these caps */
-     DFBCHECK(dfb->CreateInputEventBuffer( dfb, DICAPS_KEYS, DFB_FALSE, &events ));
-
-     /* set our cooperative level to DFSCL_FULLSCREEN
-        for exclusive access to the primary layer */
-     dfb->SetCooperativeLevel( dfb, DFSCL_FULLSCREEN );
-
-     /* get the primary surface, i.e. the surface of the
-        primary layer we have exclusive access to */
-     dsc.flags = DSDESC_CAPS;
-     dsc.caps  = DSCAPS_PRIMARY | DSCAPS_DOUBLE;
-
-     DFBCHECK(dfb->CreateSurface( dfb, &dsc, &primary ));
-
-     /* get the size of the surface and fill it */
-     DFBCHECK(primary->GetSize( primary, &screen_width, &screen_height ));
-     DFBCHECK(primary->FillRectangle( primary, 0, 0,
-                                      screen_width, screen_height ));
-
-     /* create the default font and set it */
-     DFBCHECK(dfb->CreateFont( dfb, NULL, NULL, &font ));
-     DFBCHECK(primary->SetFont( primary, font ));
-
-     /* get the GL context */
-     DFBCHECK(primary->GetGL( primary, &primary_gl ));
-
-     DFBCHECK(primary_gl->Lock( primary_gl ));
-     
-     init();
-     reshape(screen_width, screen_height);
-
-     DFBCHECK(primary_gl->Unlock( primary_gl ));
-     
-     T0 = get_millis();
-
-     while (!quit) {
-          DFBInputEvent evt;
-          unsigned long t;
-
-          primary->Clear( primary, 0, 0, 0, 0 );
-          
-          DFBCHECK(primary_gl->Lock( primary_gl ));
-          
-          draw();
-
-          DFBCHECK(primary_gl->Unlock( primary_gl ));
-          
-          if (fps) {
-               char buf[64];
-
-               sprintf(buf, "%4.1f FPS\n", fps);
-               primary->SetColor( primary, 0xff, 0, 0, 0xff );
-               primary->DrawString( primary, buf, -1, screen_width - 5, 5, DSTF_TOPRIGHT );
-          }
-
-          primary->Flip( primary, NULL, 0 );
-          Frames++;
-
-
-          t = get_millis();
-          if (t - T0 >= 1000) {
-               GLfloat seconds = (t - T0) / 1000.0;
-
-               fps = Frames / seconds;
-
-               T0 = t;
-               Frames = 0;
-          }
-
-
-          while (events->GetEvent( events, DFB_EVENT(&evt) ) == DFB_OK) {
-               switch (evt.type) {
-                    case DIET_KEYPRESS:
-                         switch (evt.key_symbol) {
-                              case DIKS_ESCAPE:
-                                   quit = 1;
-                                   break;
-                              case DIKS_1: object=1; break;
-                              case DIKS_2: object=2; break;
-                              case DIKS_3: object=3; break;
-                              case DIKS_4: object=4; break;
-                              case DIKS_5: object=5; break;
-                              case DIKS_SPACE: mono^=1; break;
-                              case DIKS_ENTER: smooth^=1; break;
-                              default:
-                                   ;
-                         }
-                         pinit();
-                         break;
-                    default:
-                         ;
-               }
-          }
-     }
-
-     /* release our interfaces to shutdown DirectFB */
-     primary_gl->Release( primary_gl );
-     primary->Release( primary );
-     font->Release( font );
-     events->Release( events );
-     dfb->Release( dfb );
-
-     return 0;
-}
-
diff --git a/progs/directfb/df_reflect.c b/progs/directfb/df_reflect.c
deleted file mode 100644
index a0e789c387..0000000000
--- a/progs/directfb/df_reflect.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
-   (c) Copyright 2001  convergence integrated media GmbH.
-   All rights reserved.
-
-   Written by Denis Oliver Kropp  and
-              Andreas Hundt .
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-
-#include "util/showbuffer.c"
-#include "util/readtex.c"
-
-
-/* the super interface */
-IDirectFB *dfb;
-
-/* the primary surface (surface of primary layer) */
-IDirectFBSurface *primary;
-
-/* the GL context */
-IDirectFBGL *primary_gl;
-
-/* our font */
-IDirectFBFont *font;
-
-/* event buffer */
-IDirectFBEventBuffer *events;
-
-/* macro for a safe call to DirectFB functions */
-#define DFBCHECK(x...) \
-        {                                                                      \
-           err = x;                                                            \
-           if (err != DFB_OK) {                                                \
-              fprintf( stderr, "%s <%d>:\n\t", __FILE__, __LINE__ );           \
-              DirectFBErrorFatal( #x, err );                                   \
-           }                                                                   \
-        }
-
-static int screen_width, screen_height;
-
-static unsigned long T0 = 0;
-static GLint Frames = 0;
-static GLfloat fps = 0;
-
-static inline unsigned long get_millis()
-{
-  struct timeval tv;
-
-  gettimeofday (&tv, NULL);
-  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
-}
-
-/*******************************/
-
-#define DEG2RAD (3.14159/180.0)
-
-#define TABLE_TEXTURE "../images/tile.rgb"
-
-static GLint ImgWidth, ImgHeight;
-static GLenum ImgFormat;
-static GLubyte *Image = NULL;
-
-#define MAX_OBJECTS 2
-static GLint table_list;
-static GLint objects_list[MAX_OBJECTS];
-
-static GLfloat xrot, yrot;
-static GLfloat spin;
-
-static GLint Width = 400, Height = 300;
-static GLenum ShowBuffer = GL_NONE;
-
-
-static void make_table( void )
-{
-   static GLfloat table_mat[] = { 1.0, 1.0, 1.0, 0.6 };
-   static GLfloat gray[] = { 0.4, 0.4, 0.4, 1.0 };
-
-   table_list = glGenLists(1);
-   glNewList( table_list, GL_COMPILE );
-
-   /* load table's texture */
-   glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, table_mat );
-/*   glMaterialfv( GL_FRONT, GL_EMISSION, gray );*/
-   glMaterialfv( GL_FRONT, GL_DIFFUSE, table_mat );
-   glMaterialfv( GL_FRONT, GL_AMBIENT, gray );
-
-   /* draw textured square for the table */
-   glPushMatrix();
-   glScalef( 4.0, 4.0, 4.0 );
-   glBegin( GL_POLYGON );
-   glNormal3f( 0.0, 1.0, 0.0 );
-   glTexCoord2f( 0.0, 0.0 );   glVertex3f( -1.0, 0.0,  1.0 );
-   glTexCoord2f( 1.0, 0.0 );   glVertex3f(  1.0, 0.0,  1.0 );
-   glTexCoord2f( 1.0, 1.0 );   glVertex3f(  1.0, 0.0, -1.0 );
-   glTexCoord2f( 0.0, 1.0 );   glVertex3f( -1.0, 0.0, -1.0 );
-   glEnd();
-   glPopMatrix();
-
-   glDisable( GL_TEXTURE_2D );
-
-   glEndList();
-}
-
-
-static void make_objects( void )
-{
-   GLUquadricObj *q;
-
-   static GLfloat cyan[] = { 0.0, 1.0, 1.0, 1.0 };
-   static GLfloat green[] = { 0.2, 1.0, 0.2, 1.0 };
-   static GLfloat black[] = { 0.0, 0.0, 0.0, 0.0 };
-
-   q = gluNewQuadric();
-   gluQuadricDrawStyle( q, GLU_FILL );
-   gluQuadricNormals( q, GLU_SMOOTH );
-
-   objects_list[0] = glGenLists(1);
-   glNewList( objects_list[0], GL_COMPILE );
-   glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, cyan );
-   glMaterialfv( GL_FRONT, GL_EMISSION, black );
-   gluCylinder( q, 0.5, 0.5,  1.0, 15, 1 );
-   glEndList();
-
-   objects_list[1] = glGenLists(1);
-   glNewList( objects_list[1], GL_COMPILE );
-   glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, green );
-   glMaterialfv( GL_FRONT, GL_EMISSION, black );
-   gluCylinder( q, 1.5, 0.0,  2.5, 15, 1 );
-   glEndList();
-}
-
-
-static void init( void )
-{
-   make_table();
-   make_objects();
-
-   Image = LoadRGBImage( TABLE_TEXTURE, &ImgWidth, &ImgHeight, &ImgFormat );
-   if (!Image) {
-      printf("Couldn't read %s\n", TABLE_TEXTURE);
-      exit(0);
-   }
-
-   gluBuild2DMipmaps(GL_TEXTURE_2D, 3, ImgWidth, ImgHeight,
-                     ImgFormat, GL_UNSIGNED_BYTE, Image);
-
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
-
-   xrot = 30.0;
-   yrot = 50.0;
-   spin = 0.0;
-
-   glShadeModel( GL_FLAT );
-
-   glEnable( GL_LIGHT0 );
-   glEnable( GL_LIGHTING );
-
-   glClearColor( 0.5, 0.5, 0.9, 0.0 );
-
-   glEnable( GL_NORMALIZE );
-}
-
-
-
-static void reshape(int w, int h)
-{
-   GLfloat yAspect = 2.5;
-   GLfloat xAspect = yAspect * (float) w / (float) h;
-   Width = w;
-   Height = h;
-   glViewport(0, 0, w, h);
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glFrustum( -xAspect, xAspect, -yAspect, yAspect, 10.0, 30.0 );
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-}
-
-
-
-static void draw_objects( GLfloat eyex, GLfloat eyey, GLfloat eyez )
-{
-   (void) eyex;
-   (void) eyey;
-   (void) eyez;
-#ifndef USE_ZBUFFER
-   if (eyex<0.5) {
-#endif
-       glPushMatrix();
-       glTranslatef( 1.0, 1.5, 0.0 );
-       glRotatef( spin, 1.0, 0.5, 0.0 );
-       glRotatef( 0.5*spin, 0.0, 0.5, 1.0 );
-       glCallList( objects_list[0] );
-       glPopMatrix();
-    
-       glPushMatrix();
-       glTranslatef( -1.0, 0.85+3.0*fabs( cos(0.01*spin) ), 0.0 );
-       glRotatef( 0.5*spin, 0.0, 0.5, 1.0 );
-       glRotatef( spin, 1.0, 0.5, 0.0 );
-       glScalef( 0.5, 0.5, 0.5 );
-       glCallList( objects_list[1] );
-       glPopMatrix();
-#ifndef USE_ZBUFFER
-   }
-   else {   
-       glPushMatrix();
-       glTranslatef( -1.0, 0.85+3.0*fabs( cos(0.01*spin) ), 0.0 );
-       glRotatef( 0.5*spin, 0.0, 0.5, 1.0 );
-       glRotatef( spin, 1.0, 0.5, 0.0 );
-       glScalef( 0.5, 0.5, 0.5 );
-       glCallList( objects_list[1] );
-       glPopMatrix();
-
-       glPushMatrix();
-       glTranslatef( 1.0, 1.5, 0.0 );
-       glRotatef( spin, 1.0, 0.5, 0.0 );
-       glRotatef( 0.5*spin, 0.0, 0.5, 1.0 );
-       glCallList( objects_list[0] );
-       glPopMatrix();
-   }
-#endif
-}
-
-
-
-static void draw_table( void )
-{
-   glCallList( table_list );
-}
-
-
-
-static void draw( void )
-{
-   static GLfloat light_pos[] = { 0.0, 20.0, 0.0, 1.0 };
-   GLfloat dist = 20.0;
-   GLfloat eyex, eyey, eyez;
-
-   glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-
-
-   eyex = dist * cos(yrot*DEG2RAD) * cos(xrot*DEG2RAD);
-   eyez = dist * sin(yrot*DEG2RAD) * cos(xrot*DEG2RAD);
-   eyey = dist * sin(xrot*DEG2RAD);
-
-   /* view from top */
-   glPushMatrix();
-   gluLookAt( eyex, eyey, eyez, 0.0, 0.0, 0.0,  0.0, 1.0, 0.0 );
-
-   glLightfv( GL_LIGHT0, GL_POSITION, light_pos );
-
-   /* draw table into stencil planes */
-   glDisable( GL_DEPTH_TEST );
-   glEnable( GL_STENCIL_TEST );
-   glStencilFunc( GL_ALWAYS, 1, 0xffffffff );
-   glStencilOp( GL_REPLACE, GL_REPLACE, GL_REPLACE );
-   glColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
-   draw_table();
-   glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
-
-   glEnable( GL_DEPTH_TEST );
-
-   /* render view from below (reflected viewport) */
-   /* only draw where stencil==1 */
-   if (eyey>0.0) {
-      glPushMatrix();
-
-      glStencilFunc( GL_EQUAL, 1, 0xffffffff );  /* draw if ==1 */
-      glStencilOp( GL_KEEP, GL_KEEP, GL_KEEP );
-      glScalef( 1.0, -1.0, 1.0 );
-
-      /* Reposition light in reflected space. */
-      glLightfv(GL_LIGHT0, GL_POSITION, light_pos);
-
-      draw_objects(eyex, eyey, eyez);
-      glPopMatrix();
-
-      /* Restore light's original unreflected position. */
-      glLightfv(GL_LIGHT0, GL_POSITION, light_pos);
-   }
-
-   glDisable( GL_STENCIL_TEST );
-
-   glEnable( GL_BLEND );
-   glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-
-   glEnable( GL_TEXTURE_2D );
-   draw_table();
-   glDisable( GL_TEXTURE_2D );
-   glDisable( GL_BLEND );
-
-   /* view from top */
-   glPushMatrix();
-
-   draw_objects(eyex, eyey, eyez);
-
-   glPopMatrix();
-
-   glPopMatrix();
-
-   if (ShowBuffer == GL_DEPTH) {
-      ShowDepthBuffer(Width, Height, 1.0, 0.0);
-   }
-   else if (ShowBuffer == GL_STENCIL) {
-      ShowStencilBuffer(Width, Height, 255.0, 0.0);
-   }
-   else if (ShowBuffer == GL_ALPHA) {
-      ShowAlphaBuffer(Width, Height);
-   }
-}
-
-/*******************************/
-
-int main( int argc, char *argv[] )
-{
-     int quit = 0;
-     DFBResult err;
-     DFBSurfaceDescription dsc;
-
-     DFBCHECK(DirectFBInit( &argc, &argv ));
-
-     /* create the super interface */
-     DFBCHECK(DirectFBCreate( &dfb ));
-
-     /* create an event buffer for all devices with these caps */
-     DFBCHECK(dfb->CreateInputEventBuffer( dfb, DICAPS_ALL, DFB_FALSE, &events ));
-
-     /* set our cooperative level to DFSCL_FULLSCREEN
-        for exclusive access to the primary layer */
-     dfb->SetCooperativeLevel( dfb, DFSCL_FULLSCREEN );
-
-     /* get the primary surface, i.e. the surface of the
-        primary layer we have exclusive access to */
-     dsc.flags = DSDESC_CAPS;
-     dsc.caps  = (DFBSurfaceCapabilities)(DSCAPS_PRIMARY | DSCAPS_DOUBLE);
-
-     DFBCHECK(dfb->CreateSurface( dfb, &dsc, &primary ));
-
-     /* get the size of the surface and fill it */
-     DFBCHECK(primary->GetSize( primary, &screen_width, &screen_height ));
-     DFBCHECK(primary->FillRectangle( primary, 0, 0,
-                                      screen_width, screen_height ));
-
-     /* create the default font and set it */
-     DFBCHECK(dfb->CreateFont( dfb, NULL, NULL, &font ));
-     DFBCHECK(primary->SetFont( primary, font ));
-
-     /* get the GL context */
-     DFBCHECK(primary->GetGL( primary, &primary_gl ));
-
-     DFBCHECK(primary_gl->Lock( primary_gl ));
-     
-     init();
-     reshape(screen_width, screen_height);
-
-     DFBCHECK(primary_gl->Unlock( primary_gl ));
-     
-     T0 = get_millis();
-
-     while (!quit) {
-          DFBInputEvent evt;
-          unsigned long t;
-
-          DFBCHECK(primary_gl->Lock( primary_gl ));
-          
-          draw();
-
-          DFBCHECK(primary_gl->Unlock( primary_gl ));
-          
-          if (fps) {
-               char buf[64];
-
-               sprintf(buf, "%4.1f FPS\n", fps);
-               primary->SetColor( primary, 0xff, 0, 0, 0xff );
-               primary->DrawString( primary, buf, -1, screen_width - 5, 5, DSTF_TOPRIGHT );
-          }
-
-          primary->Flip( primary, NULL, (DFBSurfaceFlipFlags)0 );
-          Frames++;
-
-
-          t = get_millis();
-          if (t - T0 >= 1000) {
-               GLfloat seconds = (t - T0) / 1000.0;
-
-               fps = Frames / seconds;
-
-               T0 = t;
-               Frames = 0;
-          }
-
-
-          while (events->GetEvent( events, DFB_EVENT(&evt) ) == DFB_OK) {
-               switch (evt.type) {
-                    case DIET_KEYPRESS:
-                         switch (DFB_LOWER_CASE(evt.key_symbol)) {
-                              case DIKS_ESCAPE:
-                                   quit = 1;
-                                   break;
-                              case DIKS_CURSOR_UP:
-                                   xrot += 3.0;
-                                   if ( xrot > 85 )
-                                      xrot = 85;
-                                   break;
-                              case DIKS_CURSOR_DOWN:
-                                   xrot -= 3.0;
-                                   if ( xrot < 5 )
-                                      xrot = 5;
-                                   break;
-                              case DIKS_CURSOR_LEFT:
-                                   yrot += 3.0;
-                                   break;
-                              case DIKS_CURSOR_RIGHT:
-                                   yrot -= 3.0;
-                                   break;
-                              case DIKS_SMALL_D:
-                                   ShowBuffer = GL_DEPTH;
-                                   break;
-                              case DIKS_SMALL_S:
-                                   ShowBuffer = GL_STENCIL;
-                                   break;
-                              case DIKS_SMALL_A:
-                                   ShowBuffer = GL_ALPHA;
-                                   break;
-                              default:
-                                   ShowBuffer = GL_NONE;
-                         }
-                         break;
-                    case DIET_AXISMOTION:
-                         if (evt.flags & DIEF_AXISREL) {
-                              switch (evt.axis) {
-                                   case DIAI_X:
-                                        yrot += evt.axisrel / 2.0;
-                                        break;
-                                   case DIAI_Y:
-                                        xrot += evt.axisrel / 2.0;
-                                        break;
-                                   default:
-                                        ;
-                              }
-                         }
-                         break;
-                    default:
-                         ;
-               }
-          }
-
-          spin += 2.0;
-          yrot += 3.0;
-     }
-
-     /* release our interfaces to shutdown DirectFB */
-     primary_gl->Release( primary_gl );
-     primary->Release( primary );
-     font->Release( font );
-     events->Release( events );
-     dfb->Release( dfb );
-
-     return 0;
-}
-
diff --git a/progs/directfb/multi_window.c b/progs/directfb/multi_window.c
deleted file mode 100644
index 9bb0e4be8e..0000000000
--- a/progs/directfb/multi_window.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-   (c) Copyright 2001  convergence integrated media GmbH.
-   All rights reserved.
-
-   Written by Denis Oliver Kropp  and
-              Andreas Hundt .
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-
-
-typedef struct {
-     IDirectFBWindow  *window;
-     IDirectFBSurface *surface;
-     IDirectFBGL      *gl;
-
-     int               width;
-     int               height;
-     
-     unsigned long     last_time;
-     int               frames;
-     float             fps;
-} Context;
-
-static const GLfloat blue[4] = {0.2, 0.2, 1.0, 1.0};
-
-static IDirectFB             *dfb;
-static IDirectFBDisplayLayer *layer;
-static IDirectFBFont         *font;
-static IDirectFBEventBuffer  *events = NULL;
-
-/* macro for a safe call to DirectFB functions */
-#define DFBCHECK(x...) \
-        do {                                                                   \
-           ret = x;                                                            \
-           if (ret != DFB_OK) {                                                \
-              fprintf( stderr, "%s <%d>:\n\t", __FILE__, __LINE__ );           \
-              DirectFBErrorFatal( #x, ret );                                   \
-           }                                                                   \
-        } while (0)
-
-
-static inline unsigned long get_millis()
-{
-  struct timeval tv;
-
-  gettimeofday (&tv, NULL);
-  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
-}
-
-
-static void
-setup( Context *context )
-{
-     GLfloat pos[4] = {5.0, 5.0, 10.0, 0.0};
-
-     context->surface->GetSize( context->surface,
-                                &context->width, &context->height );
-
-     context->gl->Lock( context->gl );
-
-     glLightfv(GL_LIGHT0, GL_POSITION, pos);
-     glEnable(GL_CULL_FACE);
-     glEnable(GL_LIGHTING);
-     glEnable(GL_LIGHT0);
-     glEnable(GL_DEPTH_TEST);
-     
-     glViewport(0, 0, context->width, context->height);
-     
-     glMatrixMode(GL_PROJECTION);
-     glLoadIdentity();
-     gluPerspective(70.0, context->width / (float) context->height, 1.0, 80.0);
-     
-     glMatrixMode(GL_MODELVIEW);
-     glLoadIdentity();
-     glTranslatef(0.0, 0.0, -40.0);
-     
-     context->gl->Unlock( context->gl );
-}
-
-static void
-update( Context *context )
-{
-     unsigned long     t;
-     IDirectFBSurface *surface = context->surface;
-     static __u8  r = 0, g = 0, b = 0;
-    
-     
-     context->gl->Lock( context->gl );
-
-     glClearColor( r++/255.0, g++/255.0, b++/255.0, 1.0 );
-     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-     
-     context->gl->Unlock( context->gl );
-     
-     if (context->fps) {
-          char buf[16];
-
-          snprintf(buf, sizeof(buf), "%.1f FPS\n", context->fps);
-
-          surface->SetColor( surface, 0xff, 0x00, 0x00, 0xff );
-          surface->DrawString( surface, buf, -1,
-                               context->width - 5, 5, DSTF_TOPRIGHT );
-     }
-     
-     surface->Flip( surface, NULL, 0 );
-
-     context->frames++;
-
-     t = get_millis();
-     if (t - context->last_time >= 2000) {
-          float seconds = (t - context->last_time) / 1000.0f;
-
-          context->fps = context->frames / seconds;
-
-          context->last_time = t;
-          context->frames    = 0;
-     }
-}
-
-int
-main( int argc, char *argv[] )
-{
-     DFBResult ret;
-     int       i;
-     int       quit = 0;
-     const int num = 2;
-     Context   contexts[num];
-
-     DFBCHECK(DirectFBInit( &argc, &argv ));
-
-     /* create the super interface */
-     DFBCHECK(DirectFBCreate( &dfb ));
-
-     DFBCHECK(dfb->GetDisplayLayer( dfb, DLID_PRIMARY, &layer ));
-
-     /* create the default font */
-     DFBCHECK(dfb->CreateFont( dfb, NULL, NULL, &font ));
-
-     for (i=0; iCreateWindow( layer, &desc, &window ));
-          DFBCHECK(window->GetSurface( window, &surface ));
-          DFBCHECK(surface->GetGL( surface, &gl ));
-
-          contexts[i].window    = window;
-          contexts[i].surface   = surface;
-          contexts[i].gl        = gl;
-
-          contexts[i].last_time = get_millis();
-          contexts[i].frames    = 0;
-          contexts[i].fps       = 0;
-
-          setup( &contexts[i] );
-
-          if (events)
-               DFBCHECK(window->AttachEventBuffer( window, events ));
-          else
-               DFBCHECK(window->CreateEventBuffer( window, &events ));
-          
-          DFBCHECK(surface->SetFont( surface, font ));
-
-          window->SetOpacity( window, 0xff );
-     }
-     
-     while (!quit) {
-          DFBWindowEvent evt;
-
-          for (i=0; iGetEvent( events, DFB_EVENT(&evt) ) == DFB_OK) {
-               switch (evt.type) {
-                    case DWET_KEYDOWN:
-                         switch (evt.key_symbol) {
-                              case DIKS_ESCAPE:
-                                   quit = 1;
-                                   break;
-
-                              default:
-                                   break;
-                         }
-                         break;
-
-                    default:
-                         break;
-               }
-          }
-     }
-
-     events->Release( events );
-
-     for (i=0; iRelease( contexts[i].gl );
-          contexts[i].surface->Release( contexts[i].surface );
-          contexts[i].window->Release( contexts[i].window );
-     }
-
-     font->Release( font );
-     layer->Release( layer );
-     dfb->Release( dfb );
-
-     return 0;
-}
-
diff --git a/src/glut/directfb/Makefile b/src/glut/directfb/Makefile
deleted file mode 100644
index bf93d63e30..0000000000
--- a/src/glut/directfb/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# subset glut
-
-TOP = ../../..
-include $(TOP)/configs/current
-
-MARK = $(TOP)/src/glut/glx
-
-GLUT_MAJOR = 3
-GLUT_MINOR = 7
-GLUT_TINY = 1
-
-INCLUDES = -I$(TOP)/include -I$(MARK) $(shell pkg-config --cflags directfb)
-
-GLUT_LIB_DEPS += $(shell pkg-config --libs directfb)
-
-CORE_SOURCES = \
-	callback.c \
-	color.c \
-	cursor.c \
-	ext.c \
-	events.c \
-	font.c \
-	game.c \
-	globals.c \
-	init.c \
-	menu.c \
-	models.c \
-	overlay.c \
-	state.c \
-	teapot.c \
-	window.c \
-
-
-MARK_SOURCES = \
-	$(MARK)/glut_8x13.c \
-	$(MARK)/glut_9x15.c \
-	$(MARK)/glut_hel10.c \
-	$(MARK)/glut_hel12.c \
-	$(MARK)/glut_hel18.c \
-	$(MARK)/glut_tr10.c \
-	$(MARK)/glut_tr24.c
-
-SOURCES = $(CORE_SOURCES)  $(MARK_SOURCES)
-
-OBJECTS =  $(SOURCES:.c=.o)
-
-
-##### RULES #####
-
-.c.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-default: depend $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
-
-
-# Make the library
-$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-	$(MKLIB) -o $(GLUT_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
-		$(GLUT_LIB_DEPS) -install $(TOP)/$(LIB_DIR) \
-		$(MKLIB_OPTIONS) $(OBJECTS)
-
-
-# Run 'make -f Makefile.solo dep' to update the dependencies if you change
-# what's included by any source file.
-depend: $(SOURCES) 
-	rm -f depend
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
-
-# Emacs tags
-tags:
-	etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean: depend
-	-rm -f depend depend.bak
-	-rm -f *.o *~ *.o *~ *.so libglut.so.3.7
-
-include depend
diff --git a/src/glut/directfb/NOTES b/src/glut/directfb/NOTES
deleted file mode 100644
index af917c6667..0000000000
--- a/src/glut/directfb/NOTES
+++ /dev/null
@@ -1,9 +0,0 @@
-DirectFB GLUT Implementation NOTES
-----------------------------------
-
-* To have high performance rendering, it's really important to
-  use glutEnterGameMode() instead of glutCreateWindow()/glutFullScreen().
-  You can also force a windowed application to game mode by setting
-  the environment variable "__GLUT_GAME_MODE".
-
-
diff --git a/src/glut/directfb/callback.c b/src/glut/directfb/callback.c
deleted file mode 100644
index 7c9768aac0..0000000000
--- a/src/glut/directfb/callback.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include 
-#include 
-#include 
-#include 
-
-#include "internal.h"
-
-
-typedef void (GLUTCALLBACK *__GlutTimerCallback) ( int value );
-
-typedef struct __GlutTimer_s {
-     struct timeval        interval;
-     struct timeval        expire;
-     
-     __GlutTimerCallback   func;
-     int                   value;
-     
-     struct __GlutTimer_s *next;
-} __GlutTimer;
-
-/*****************************************************************************/
-
-static __GlutTimer *g_timers = NULL;
-
-/*****************************************************************************/
-
-
-void GLUTAPIENTRY 
-glutDisplayFunc( void (GLUTCALLBACK *func) (void) )
-{
-     display_func = func;
-}
-
-
-void GLUTAPIENTRY 
-glutReshapeFunc( void (GLUTCALLBACK *func) (int width, int height) )
-{
-     reshape_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutKeyboardFunc( void (GLUTCALLBACK *func) (unsigned char key, int x, int y) )
-{
-     keyboard_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutMouseFunc( void (GLUTCALLBACK *func) (int button, int state, int x, int y) )
-{
-     mouse_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutMotionFunc( void (GLUTCALLBACK *func) (int x, int y) )
-{
-     motion_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutPassiveMotionFunc( void (GLUTCALLBACK *func) (int x, int y) )
-{
-     passive_motion_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutEntryFunc( void (GLUTCALLBACK *func) (int state) )
-{
-     entry_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutVisibilityFunc( void (GLUTCALLBACK *func) (int state) )
-{
-     visibility_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutMenuStateFunc( void (GLUTCALLBACK *func) (int state) )
-{
-     menu_state_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutSpecialFunc( void (GLUTCALLBACK *func) (int key, int x, int y) )
-{
-     special_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutSpaceballMotionFunc( void (GLUTCALLBACK *func) (int x, int y, int z) )
-{
-}
-
-
-void GLUTAPIENTRY 
-glutSpaceballRotateFunc( void (GLUTCALLBACK *func) (int x, int y, int z) )
-{
-}
-
-
-void GLUTAPIENTRY
-glutSpaceballButtonFunc( void (GLUTCALLBACK *func) (int button, int state) )
-{
-}
-
-
-void GLUTAPIENTRY
-glutButtonBoxFunc( void (GLUTCALLBACK *func) (int button, int state) )
-{
-}
-
-
-void GLUTAPIENTRY
-glutDialsFunc( void (GLUTCALLBACK *func) (int dial, int value) )
-{
-}
-
-
-void GLUTAPIENTRY
-glutTabletMotionFunc( void (GLUTCALLBACK *func) (int x, int y) )
-{
-}
-
-
-void GLUTAPIENTRY
-glutTabletButtonFunc( void (GLUTCALLBACK *func) (int button, int state, int x, int y) )
-{
-}
-
-
-void GLUTAPIENTRY
-glutMenuStatusFunc( void (GLUTCALLBACK *func) (int status, int x, int y) )
-{
-}
-
-
-void GLUTAPIENTRY
-glutOverlayDisplayFunc( void (GLUTCALLBACK *func) (void) )
-{
-}
-
-
-void GLUTAPIENTRY
-glutWindowStatusFunc( void (GLUTCALLBACK *func) (int state) )
-{
-}
-
-
-void GLUTAPIENTRY
-glutKeyboardUpFunc( void (GLUTCALLBACK *func) (unsigned char key, int x, int y) )
-{
-     keyboard_up_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutSpecialUpFunc( void (GLUTCALLBACK *func) (int key, int x, int y) )
-{
-     special_up_func = func;
-}
-
-
-void GLUTAPIENTRY 
-glutJoystickFunc( void (GLUTCALLBACK *func)(unsigned int buttons, int x, int y, int z), int pollInterval )
-{
-     joystick_func = func;
-     /* FIXME: take care of pollInterval */
-}
-
-
-void GLUTAPIENTRY
-glutIdleFunc( void (GLUTCALLBACK *func) (void) )
-{
-     idle_func = func;
-}
-
-
-void GLUTAPIENTRY
-glutTimerFunc( unsigned int msec, void (GLUTCALLBACK *func) (int value), int value )
-{
-     __GlutTimer *timer;
-     
-     if (!func)
-          return;
-          
-     timer = calloc( 1, sizeof(__GlutTimer) );
-     if (!timer)
-          __glutFatalError( "out of memory" );
-     
-     timer->interval.tv_sec  = msec / 1000;
-     timer->interval.tv_usec = (msec % 1000) * 1000;
-
-     gettimeofday( &timer->expire, NULL );
-     timer->expire.tv_usec += timer->interval.tv_usec;
-     timer->expire.tv_sec  += timer->interval.tv_sec + timer->expire.tv_usec/1000000;
-     timer->expire.tv_usec %= 1000000;
-     
-     timer->func  = func;
-     timer->value = value;
-     
-     timer->next = g_timers;
-     g_timers    = timer;
-}
-
-
-void
-__glutHandleTimers( void )
-{
-     __GlutTimer    *cur;
-     struct timeval  now;
-          
-     for (cur = g_timers; cur; cur = cur->next ) {
-          gettimeofday( &now, NULL );
-          
-          if (cur->expire.tv_sec > now.tv_sec ||
-             (cur->expire.tv_sec == now.tv_sec && 
-              cur->expire.tv_usec >= now.tv_usec))
-          {
-               g_idle = GL_FALSE;
-               
-               cur->func( cur->value );
-              
-               cur->expire.tv_usec += cur->interval.tv_usec;
-               cur->expire.tv_sec  += cur->interval.tv_sec + cur->expire.tv_usec/1000000;
-               cur->expire.tv_usec %= 1000000;
-          }
-     }
-}
-
-
-GLboolean
-__glutGetTimeout( int *ret_msec )
-{
-     __GlutTimer    *cur;
-     struct timeval *time = NULL;
-     struct timeval  now;
-     
-     for (cur = g_timers; cur; cur = cur->next) {
-          if (time == NULL ||
-              time->tv_sec > cur->expire.tv_sec ||
-             (time->tv_sec == cur->expire.tv_sec && 
-              time->tv_usec > cur->expire.tv_usec)) {
-               time = &cur->expire;
-          }
-     }
-     
-     if (time == NULL)
-          return GL_FALSE;
-          
-     gettimeofday( &now, NULL );
-     
-     *ret_msec = (time->tv_sec  - now.tv_sec) * 1000 +
-                 (time->tv_usec - now.tv_usec + 999) / 1000;
-                 
-     return GL_TRUE;
-}
-     
-          
-void 
-__glutFreeTimers( void )
-{
-     __GlutTimer *cur = g_timers;
-     
-     while (cur) {
-          __GlutTimer *next = cur->next;
-          free( cur );
-          cur = next;
-     }
-     
-     g_timers = NULL;
-}
-
diff --git a/src/glut/directfb/color.c b/src/glut/directfb/color.c
deleted file mode 100644
index 26c514c6d5..0000000000
--- a/src/glut/directfb/color.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include "internal.h"
-
-
-void GLUTAPIENTRY 
-glutSetColor( int index, GLfloat red, GLfloat green, GLfloat blue )
-{
-}
-
-
-GLfloat GLUTAPIENTRY 
-glutGetColor( int index, int component )
-{
-     return 0.0;
-}
-
-
-void GLUTAPIENTRY
-glutCopyColormap( int win )
-{
-}
diff --git a/src/glut/directfb/cursor.c b/src/glut/directfb/cursor.c
deleted file mode 100644
index aca3fcc921..0000000000
--- a/src/glut/directfb/cursor.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include 
-#include 
-#include 
-
-#include "internal.h"
-
-#include "cursors.h"
-
-
-void GLUTAPIENTRY
-glutSetCursor( int type )
-{
-     const unsigned char   *cursor;
-     DFBSurfaceDescription  dsc;
-     IDirectFBSurface      *shape;
-     
-     if (!g_current || !g_current->window)
-          return;
-
-     if (g_current->cursor == type)
-          return;
-          
-     switch (type) {
-          case GLUT_CURSOR_RIGHT_ARROW:
-               cursor = &cur_right_arrow[0];
-               break;
-          case GLUT_CURSOR_LEFT_ARROW:
-               cursor = &cur_left_arrow[0];
-               break;
-          case GLUT_CURSOR_INFO:
-               cursor = &cur_info[0];
-               break;
-          case GLUT_CURSOR_DESTROY:
-               cursor = &cur_destroy[0];
-               break;
-          case GLUT_CURSOR_HELP:
-               cursor = &cur_help[0];
-               break;
-          case GLUT_CURSOR_CYCLE:
-               cursor = &cur_cycle[0];
-               break;
-          case GLUT_CURSOR_SPRAY:
-               cursor = &cur_spray[0];
-               break;
-          case GLUT_CURSOR_WAIT:
-               cursor = &cur_wait[0];
-               break;
-          case GLUT_CURSOR_TEXT:
-               cursor = &cur_text[0];
-               break;
-          case GLUT_CURSOR_CROSSHAIR:
-               cursor = &cur_crosshair[0];
-               break;
-          case GLUT_CURSOR_UP_DOWN:
-               cursor = &cur_up_down[0];
-               break;
-          case GLUT_CURSOR_LEFT_RIGHT:
-               cursor = &cur_left_right[0];
-               break;
-          case GLUT_CURSOR_TOP_SIDE:
-               cursor = &cur_top_side[0];
-               break;
-          case GLUT_CURSOR_BOTTOM_SIDE:
-               cursor = &cur_bottom_side[0];
-               break;
-          case GLUT_CURSOR_LEFT_SIDE:
-               cursor = &cur_left_side[0];
-               break;
-          case GLUT_CURSOR_RIGHT_SIDE:
-               cursor = &cur_right_side[0];
-               break;
-          case GLUT_CURSOR_TOP_LEFT_CORNER:
-               cursor = &cur_top_left[0];
-               break;
-          case GLUT_CURSOR_TOP_RIGHT_CORNER:
-               cursor = &cur_top_right[0];
-               break;
-          case GLUT_CURSOR_BOTTOM_RIGHT_CORNER:
-               cursor = &cur_bottom_right[0];
-               break;
-          case GLUT_CURSOR_BOTTOM_LEFT_CORNER:
-               cursor = &cur_bottom_left[0];
-               break;
-          case GLUT_CURSOR_NONE:
-               cursor = NULL;
-               break;
-          default:
-               cursor = &cur_right_arrow[0];
-               break;
-     }
-
-     dsc.flags       = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
-     dsc.width       =
-     dsc.height      = cursor ? cursor[0] : 8;
-     dsc.pixelformat = DSPF_ARGB;
-         
-     if (dfb->CreateSurface( dfb, &dsc, &shape ))
-          return;
- 
-     if (cursor) {
-          __u8 *src = (__u8*) &cursor[3];
-          __u8 *msk = src + cursor[0]*cursor[0]/8;
-          void *dst;
-          int   pitch;
-          int   x, y;
-
-          if (shape->Lock( shape, DSLF_WRITE, &dst, &pitch )) {
-               shape->Release( shape );
-               return;
-          }
-          
-          for (y = 0; y < cursor[0]; y++) {
-               for (x = 0; x < cursor[0]; x++) {
-                    ((__u32*)dst)[x] = 
-                              ((src[x>>3] & (0x80 >> (x&7))) ? 0 : 0x00ffffff) |
-                              ((msk[x>>3] & (0x80 >> (x&7))) ? 0xff000000 : 0);
-               }
-               
-               dst += pitch;
-               src += cursor[0]/8;
-               msk += cursor[0]/8;
-          }
-
-          shape->Unlock( shape );
-     }
-     else {
-          /* Invisible cursor */
-          shape->Clear( shape, 0, 0, 0, 0 );
-     }
-               
-     g_current->window->SetCursorShape( g_current->window, shape,
-                                        cursor ? cursor[1] : 0,
-                                        cursor ? cursor[2] : 0 );          
-     g_current->cursor = type;
-     
-     shape->Release( shape );           
-}
-
-
-void GLUTAPIENTRY
-glutWarpPointer( int x, int y )
-{
-     if (g_current) {
-          if (!g_game) {
-               int wx, wy;
-               g_current->window->GetPosition( g_current->window, &wx, &wy );
-               primary->WarpCursor( primary, wx+x, wy+y );
-          }
-          else {
-               g_current->cx = x;
-               g_current->cy = y;
-          }
-     }
-}
-
-
diff --git a/src/glut/directfb/cursors.h b/src/glut/directfb/cursors.h
deleted file mode 100644
index 30ab7c348e..0000000000
--- a/src/glut/directfb/cursors.h
+++ /dev/null
@@ -1,306 +0,0 @@
-#ifndef __GLUT_CURSORS_H__
-#define __GLUT_CURSORS_H__
-
-
-static const unsigned char cur_right_arrow[] = {
-     16, /* size */
-     1, 2, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x60, 0x00, 0x78, 0x00, 0x3e, 0x00, 
-     0x3f, 0x80, 0x1f, 0xe0, 0x1f, 0xf8, 0x0f, 0x80, 
-     0x0f, 0xc0, 0x06, 0xe0, 0x06, 0x70, 0x02, 0x38, 
-     0x02, 0x1c, 0x00, 0x0e, 0x00, 0x04, 0x00, 0x00, 
-     /* mask */
-     0xe0, 0x00, 0xf8, 0x00, 0xfe, 0x00, 0x7f, 0x80, 
-     0x7f, 0xe0, 0x3f, 0xf8, 0x3f, 0xfc, 0x1f, 0xfc, 
-     0x1f, 0xe0, 0x0f, 0xf0, 0x0f, 0xf8, 0x07, 0x7c, 
-     0x07, 0x3e, 0x02, 0x1f, 0x00, 0x0e, 0x00, 0x04, 
-};
-
-static const unsigned char cur_left_arrow[] = {
-     16, /* size */
-     1, 15, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x80, 0x06, 0x00, 0x1e, 0x00, 0x7c, 
-     0x01, 0xfc, 0x07, 0xf8, 0x1f, 0xf8, 0x01, 0xf0, 
-     0x01, 0xf0, 0x02, 0x60, 0x04, 0x60, 0x08, 0x40, 
-     0x10, 0x40, 0x20, 0x00, 0x40, 0x00, 0x00, 0x00, 
-     /* mask */
-     0x00, 0x07, 0x00, 0x1f, 0x00, 0x7f, 0x01, 0xfe, 
-     0x07, 0xfe, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xf8, 
-     0x03, 0xf8, 0x07, 0xf0, 0x0e, 0xf0, 0x1c, 0xe0, 
-     0x38, 0xe0, 0x70, 0xe0, 0xe0, 0x00, 0xc0, 0x00, 
-};
-
-static const unsigned char cur_info[] = {
-     16, /* size */
-     0, 2, /* hotspot */
-     /* data */
-     0x30, 0x00, 0x3c, 0x00, 0x0f, 0x00, 0x07, 0x80, 
-     0x03, 0xc0, 0x07, 0xe0, 0x0f, 0xf0, 0x07, 0xf4, 
-     0x0f, 0xfe, 0x0f, 0xfa, 0x07, 0xe0, 0x03, 0xe0, 
-     0x00, 0x52, 0x00, 0x46, 0x00, 0x2c, 0x00, 0x18, 
-     /* mask */
-     0xb8, 0x00, 0x3e, 0x00, 0x1f, 0x80, 0x0f, 0xc0, 
-     0x07, 0xe0, 0x0f, 0xf0, 0x1f, 0xfc, 0x1f, 0xfe, 
-     0x1f, 0xfe, 0x1f, 0xfe, 0x0f, 0xfe, 0x07, 0xfe, 
-     0x03, 0xfe, 0x00, 0xfe, 0x00, 0x7e, 0x00, 0x3c, 
-};
-
-static const unsigned char cur_destroy[] = {
-     16, /* size */
-     12, 8, /* hotspot */
-     /* data */
-     0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0c, 0xcc, 
-     0x0c, 0xcc, 0x07, 0xf8, 0x03, 0xf0, 0x01, 0xe0, 
-     0x21, 0xe1, 0x61, 0xe1, 0x10, 0xc2, 0x0e, 0x1c, 
-     0x01, 0xe0, 0x47, 0xf8, 0x7c, 0x0f, 0x20, 0x01, 
-     /* mask */
-     0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f, 0xfe, 
-     0x1f, 0xfe, 0x0f, 0xfc, 0x07, 0xf8, 0x83, 0xf1, 
-     0xe3, 0xf1, 0xf3, 0xf3, 0x39, 0xef, 0x1e, 0x1e, 
-     0x01, 0xe0, 0xc7, 0xfe, 0xff, 0xff, 0x7c, 0x0f, 
-};
-
-static const unsigned char cur_help[] = {
-     16, /* size */
-     7, 8, /* hotspot */
-     /* data */
-     0x83, 0xe0, 0x07, 0xf0, 0x0e, 0x38, 0x0c, 0x18, 
-     0x0c, 0x38, 0x0e, 0x30, 0x07, 0x00, 0x03, 0xc0, 
-     0x01, 0xc0, 0x01, 0x40, 0x01, 0x40, 0x07, 0x70, 
-     0x03, 0x60, 0x01, 0xc0, 0x00, 0x80, 0x00, 0x00, 
-     /* mask */
-     0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf8, 0x1f, 0xfc, 
-     0x1e, 0x3c, 0x1e, 0x7c, 0x1f, 0x78, 0x0f, 0xf0, 
-     0x07, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x07, 0xf0, 
-     0x0f, 0xf8, 0x07, 0xf0, 0x03, 0xe0, 0x01, 0xc0, 
-};
-
-static const unsigned char cur_cycle[] = {
-     16, /* size */
-     7, 9, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x07, 0xe2, 0x0f, 0xf6, 0x18, 0x3e, 
-     0x10, 0x12, 0x00, 0x32, 0x00, 0x7e, 0x00, 0x00, 
-     0x00, 0x00, 0x7e, 0x00, 0x4c, 0x00, 0x48, 0x08, 
-     0x7c, 0x18, 0x6f, 0xf0, 0x47, 0xe0, 0x00, 0x00, 
-     /* mask */
-     0x07, 0xe3, 0x0f, 0xf7, 0x1f, 0xff, 0x3f, 0xff, 
-     0x38, 0x3f, 0x30, 0xff, 0x00, 0xff, 0x00, 0xff, 
-     0xff, 0x00, 0xff, 0x00, 0xfe, 0x0c, 0xfc, 0x1c, 
-     0xff, 0xfc, 0xff, 0xf8, 0xef, 0xf0, 0xc7, 0xe0, 
-};
-
-static const unsigned char cur_spray[] = {
-     16, /* size */
-     2, 4, /* hotspot */
-     /* data */
-     0x98, 0x00, 0x02, 0x00, 0x18, 0xb0, 0x02, 0x78, 
-     0x18, 0x58, 0x00, 0xfc, 0x00, 0x84, 0x00, 0x9c, 
-     0x00, 0x94, 0x00, 0x9c, 0x00, 0x94, 0x00, 0x9c, 
-     0x00, 0x9c, 0x00, 0x84, 0x00, 0x84, 0x00, 0xfc, 
-     /* mask */
-     0x30, 0x00, 0x34, 0x60, 0x35, 0xf0, 0x35, 0xf0, 
-     0x35, 0xf8, 0x03, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 
-     0x03, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 
-     0x03, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 
-};
-
-static const unsigned char cur_wait[] = {
-     16, /* size */
-     9, 1, /* hotspot */
-     /* data */
-     0x07, 0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x0f, 0xfc, 
-     0x18, 0x86, 0x30, 0x83, 0xe0, 0x81, 0xe1, 0xc1, 
-     0xe1, 0xc1, 0xe0, 0x21, 0x30, 0x13, 0x18, 0x06, 
-     0x0f, 0xfc, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0xf8, 
-     /* mask */
-     0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x1f, 0xfe, 
-     0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 
-     0x1f, 0xfe, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 
-};
-
-static const unsigned char cur_text[] = {
-     16, /* size */
-     8, 8, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x0f, 0x70, 0x09, 0xc0, 0x00, 0x80, 
-     0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 
-     0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 
-     0x00, 0x80, 0x01, 0xc0, 0x07, 0x70, 0x00, 0x00, 
-     /* mask */
-     0x0f, 0x78, 0x0f, 0xf8, 0x0f, 0xf8, 0x03, 0xe0, 
-     0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 
-     0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 
-     0x03, 0xe0, 0x0f, 0xf8, 0x0f, 0xf8, 0x0f, 0x78, 
-};
-
-static const unsigned char cur_crosshair[] = {
-     16, /* size */
-     7, 9, /* hotspot */
-     /* data */
-     0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 
-     0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0xff, 0x7f, 
-     0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 
-     0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 
-     /* mask */
-     0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 
-     0x01, 0xc0, 0x01, 0xc0, 0xff, 0xff, 0xff, 0xff, 
-     0xff, 0xff, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 
-     0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 
-};
-
-static const unsigned char cur_up_down[] = {
-     16, /* size */
-     7, 8, /* hotspot */
-     /* data */
-     0x00, 0x80, 0x09, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 
-     0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 
-     0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x07, 0xf0, 
-     0x03, 0xe0, 0x01, 0xc0, 0x00, 0x80, 0x00, 0x00, 
-     /* mask */
-     0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf8, 
-     0x0f, 0xf8, 0x03, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 
-     0x03, 0xe0, 0x03, 0xe0, 0x0f, 0xf8, 0x0f, 0xf8, 
-     0x07, 0xf0, 0x03, 0xe0, 0x01, 0xc0, 0x00, 0x00, 
-};
-
-static const unsigned char cur_left_right[] = {
-     16, /* size */
-     7, 8, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-     0x08, 0x08, 0x18, 0x0c, 0x3f, 0xfe, 0x78, 0x0f, 
-     0x3f, 0xfe, 0x18, 0x0c, 0x08, 0x08, 0x00, 0x00, 
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-     /* mask */
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x18, 
-     0x1c, 0x1c, 0x3f, 0xfe, 0x7f, 0xff, 0x7f, 0xff, 
-     0x7f, 0xff, 0x3f, 0xfe, 0x1c, 0x1c, 0x0c, 0x18, 
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static const unsigned char cur_top_side[] = {
-     16, /* size */
-     1, 8, /* hotspot */
-     /* data */
-     0x00, 0x00, 0xff, 0xfe, 0x3f, 0xfe, 0x00, 0x00, 
-     0x00, 0x80, 0x01, 0xc0, 0x02, 0xa0, 0x04, 0x90, 
-     0x08, 0x88, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 
-     0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 
-     /* mask */
-     0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 
-     0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf8, 
-     0x1d, 0xdc, 0x19, 0xcc, 0x01, 0xc0, 0x01, 0xc0, 
-     0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 
-};
-
-static const unsigned char cur_bottom_side[] = {
-     16, /* size */
-     14, 8, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 
-     0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x08, 0x88, 
-     0x04, 0x90, 0x02, 0xa0, 0x01, 0xc0, 0x00, 0x80, 
-     0x00, 0x00, 0x3f, 0xfe, 0x3f, 0xfe, 0x00, 0x00, 
-     /* mask */
-     0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 
-     0x01, 0xc0, 0x01, 0xc0, 0x19, 0xcc, 0x1d, 0xdc, 
-     0x0f, 0xf8, 0x07, 0xf0, 0x03, 0xe0, 0x01, 0xc0, 
-     0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 
-};
-
-static const unsigned char cur_left_side[] = {
-     16, /* size */
-     7, 15, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x01, 0x06, 
-     0x00, 0x86, 0x00, 0x46, 0x00, 0x26, 0x7f, 0xf6, 
-     0x00, 0x26, 0x00, 0x46, 0x00, 0x86, 0x01, 0x06, 
-     0x00, 0x06, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 
-     /* mask */
-     0x00, 0x0f, 0x00, 0x0f, 0x03, 0x0f, 0x03, 0x8f, 
-     0x01, 0xcf, 0x00, 0xef, 0xff, 0xff, 0xff, 0xff, 
-     0xff, 0xff, 0x00, 0xef, 0x01, 0xcf, 0x03, 0x8f, 
-     0x03, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x00, 
-};
-
-static const unsigned char cur_right_side[] = {
-     16, /* size */
-     7, 2, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x80, 
-     0x61, 0x00, 0x62, 0x00, 0x64, 0x00, 0x6f, 0xfe, 
-     0x64, 0x00, 0x62, 0x00, 0x61, 0x00, 0x60, 0x80, 
-     0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-     /* mask */
-     0xf0, 0x00, 0xf0, 0x00, 0xf0, 0xc0, 0xf1, 0xc0, 
-     0xf3, 0x80, 0xf7, 0x00, 0xff, 0xff, 0xff, 0xff, 
-     0xff, 0xff, 0xf7, 0x00, 0xf3, 0x80, 0xf1, 0xc0, 
-     0xf0, 0xc0, 0xf0, 0x00, 0xf0, 0x00, 0x00, 0x00, 
-};
-
-static const unsigned char cur_top_left[] = {
-     16, /* size */
-     1, 15, /* hotspot */
-     /* data */
-     0x00, 0x00, 0xff, 0xfe, 0x7f, 0xfe, 0x00, 0x06, 
-     0x00, 0x06, 0x00, 0x06, 0x1f, 0xc6, 0x00, 0xc6, 
-     0x01, 0x46, 0x02, 0x46, 0x04, 0x46, 0x08, 0x46, 
-     0x10, 0x46, 0x00, 0x06, 0x00, 0x06, 0x00, 0x00, 
-     /* mask */
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-     0x00, 0x0f, 0x3f, 0xef, 0x3f, 0xef, 0x3f, 0xef, 
-     0x03, 0xef, 0x07, 0xef, 0x0e, 0xef, 0x1c, 0xef, 
-     0x38, 0xef, 0x30, 0xef, 0x00, 0x0f, 0x00, 0x0f, 
-};
-
-static const unsigned char cur_top_right[] = {
-     16, /* size */
-     1, 2, /* hotspot */
-     /* data */
-     0x00, 0x00, 0xff, 0xfe, 0x7f, 0xfe, 0x60, 0x00, 
-     0x60, 0x00, 0x60, 0x00, 0x63, 0xf8, 0x63, 0x00, 
-     0x62, 0x80, 0x62, 0x40, 0x62, 0x20, 0x62, 0x10, 
-     0x62, 0x08, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-     /* mask */
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-     0xf0, 0x00, 0xf7, 0xfc, 0xf7, 0xfc, 0xf7, 0xfc, 
-     0xf7, 0xc0, 0xf7, 0xe0, 0xf7, 0x70, 0xf7, 0x38, 
-     0xf7, 0x1c, 0xf7, 0x0c, 0xf0, 0x00, 0xf0, 0x00, 
-};
-
-static const unsigned char cur_bottom_right[] = {
-     16, /* size */
-     14, 2, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x62, 0x08, 
-     0x62, 0x10, 0x62, 0x20, 0x62, 0x40, 0x62, 0x80, 
-     0x63, 0x00, 0x63, 0xf8, 0x60, 0x00, 0x60, 0x00, 
-     0x60, 0x00, 0x7f, 0xfe, 0x7f, 0xfe, 0x00, 0x00, 
-     /* mask */
-     0xf0, 0x00, 0xf0, 0x00, 0xf7, 0x0c, 0xf7, 0x1c, 
-     0xf7, 0x38, 0xf7, 0x70, 0xf7, 0xe0, 0xf7, 0xc0, 
-     0xf7, 0xfc, 0xf7, 0xfc, 0xf7, 0xfc, 0xf0, 0x00, 
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-};
-
-static const unsigned char cur_bottom_left[] = {
-     16, /* size */
-     14, 15, /* hotspot */
-     /* data */
-     0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x10, 0x46, 
-     0x08, 0x46, 0x04, 0x46, 0x02, 0x46, 0x01, 0x46, 
-     0x00, 0xc6, 0x1f, 0xc6, 0x00, 0x06, 0x00, 0x06, 
-     0x00, 0x06, 0x7f, 0xfe, 0x7f, 0xfe, 0x00, 0x00, 
-     /* mask */
-     0x00, 0x0f, 0x00, 0x0f, 0x30, 0xef, 0x38, 0xef, 
-     0x1c, 0xef, 0x0e, 0xef, 0x07, 0xef, 0x03, 0xef, 
-     0x3f, 0xef, 0x3f, 0xef, 0x3f, 0xef, 0x00, 0x0f, 
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-};
-
-
-#endif /* __GLUT_CURSORS_H__ */
diff --git a/src/glut/directfb/events.c b/src/glut/directfb/events.c
deleted file mode 100644
index 6ebdd166ac..0000000000
--- a/src/glut/directfb/events.c
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include 
-#include 
-#include 
-
-#include "internal.h"
-
-
-/*****************************************************************************/
-
-static int g_ignore_key_repeat = 0;
-
-/*****************************************************************************/
-
-
-int GLUTAPIENTRY 
-glutDeviceGet( GLenum type )
-{
-     switch (type) {
-          case GLUT_HAS_KEYBOARD:
-               return (keyboard != NULL);
-          case GLUT_HAS_MOUSE:
-               return (mouse != NULL);
-          case GLUT_NUM_MOUSE_BUTTONS:
-               if (mouse) {
-                    DFBInputDeviceDescription dsc;
-                    mouse->GetDescription( mouse, &dsc );
-                    return dsc.max_button+1;
-               }
-               break;
-          case GLUT_DEVICE_IGNORE_KEY_REPEAT:
-               return g_ignore_key_repeat;
-          case GLUT_DEVICE_KEY_REPEAT:
-               return (g_ignore_key_repeat) ? GLUT_KEY_REPEAT_OFF
-                                            : GLUT_KEY_REPEAT_ON;
-          case GLUT_HAS_JOYSTICK:
-          case GLUT_OWNS_JOYSTICK:
-               return (g_game && joystick); /* only available in game mode */
-          case GLUT_JOYSTICK_BUTTONS:
-               if (joystick) {
-                    DFBInputDeviceDescription dsc;
-                    joystick->GetDescription( joystick, &dsc );
-                    return dsc.max_button+1;
-               }
-               break;
-          case GLUT_JOYSTICK_AXES:
-               if (joystick) {
-                    DFBInputDeviceDescription dsc;
-                    joystick->GetDescription( joystick, &dsc );
-                    return dsc.max_axis+1;
-               }
-               break;
-          case GLUT_JOYSTICK_POLL_RATE:
-               if (joystick)
-                    return 1; /* hack */
-               break;
-          default:
-               break;
-     }
-     
-     return 0;
-}
-
-
-int GLUTAPIENTRY
-glutGetModifiers( void )
-{
-     if (g_current)
-          return g_current->modifiers;
-     return 0;
-}
-
-
-void GLUTAPIENTRY 
-glutIgnoreKeyRepeat( int ignore )
-{
-     g_ignore_key_repeat = ignore;
-}
-
-
-void GLUTAPIENTRY
-glutSetKeyRepeat( int mode )
-{
-     g_ignore_key_repeat = (mode == GLUT_KEY_REPEAT_OFF);
-}
-
-
-void GLUTAPIENTRY
-glutForceJoystickFunc( void )
-{
-     if (g_game && joystick && joystick_func) {
-          joystick_func( g_game->buttons, 
-                         g_game->jx, g_game->jy, g_game->jz );
-     }
-}
-
-
-static int 
-__glutSpecialKey( DFBInputDeviceKeySymbol key )
-{
-     switch (key) {
-          case DIKS_F1:
-               return GLUT_KEY_F1;
-          case DIKS_F2:
-               return GLUT_KEY_F2;
-          case DIKS_F3:
-               return GLUT_KEY_F3;
-          case DIKS_F4:
-               return GLUT_KEY_F4;
-          case DIKS_F5:
-               return GLUT_KEY_F5;
-          case DIKS_F6:
-               return GLUT_KEY_F6;
-          case DIKS_F7:
-               return GLUT_KEY_F7;
-          case DIKS_F8:
-               return GLUT_KEY_F8;
-          case DIKS_F9:
-               return GLUT_KEY_F9;
-          case DIKS_F10:
-               return GLUT_KEY_F10;
-          case DIKS_F11:
-               return GLUT_KEY_F11;
-          case DIKS_F12:
-               return GLUT_KEY_F12;
-          case DIKS_CURSOR_LEFT:
-               return GLUT_KEY_LEFT;
-          case DIKS_CURSOR_UP:
-               return GLUT_KEY_UP;
-          case DIKS_CURSOR_RIGHT:
-               return GLUT_KEY_RIGHT;
-          case DIKS_CURSOR_DOWN:
-               return GLUT_KEY_DOWN;
-          case DIKS_PAGE_UP:
-               return GLUT_KEY_PAGE_UP;
-          case DIKS_PAGE_DOWN:
-               return GLUT_KEY_PAGE_DOWN;
-          case DIKS_HOME:
-               return GLUT_KEY_HOME;
-          case DIKS_END:
-               return GLUT_KEY_END;
-          case DIKS_INSERT:
-               return GLUT_KEY_INSERT;
-          default:
-               break;
-     }
-     
-     return 0;
-}
-
-
-static int 
-__glutButton( DFBInputDeviceButtonIdentifier button )
-{
-     switch (button) {
-          case DIBI_LEFT:
-               return GLUT_LEFT_BUTTON;
-          case DIBI_MIDDLE:
-               return GLUT_MIDDLE_BUTTON;
-          case DIBI_RIGHT:
-               return GLUT_RIGHT_BUTTON;
-          default:
-               break;
-     }
-     
-     return 0;
-}
-
-
-static int 
-__glutModifiers( DFBInputDeviceModifierMask mask )
-{
-     return ((mask & DIMM_SHIFT) ? GLUT_ACTIVE_SHIFT : 0)  |
-            ((mask & DIMM_CONTROL) ? GLUT_ACTIVE_CTRL : 0) |
-            ((mask & DIMM_ALT) ? GLUT_ACTIVE_ALT : 0);
-}
-
-
-static void 
-__glutWindowEvent( DFBWindowEvent *e, DFBWindowEvent *p )
-{
-     __GlutWindow *window;
-     
-     window = __glutFindWindow( e->window_id );
-     if (!window) /* window was destroyed */
-          return;
-     
-     switch (e->type) {
-          case DWET_KEYDOWN:
-               window->modifiers = __glutModifiers( e->modifiers );
-               if (g_ignore_key_repeat && p) {
-                    if (p->type       == DWET_KEYDOWN &&
-                        p->window_id  == e->window_id &&
-                        p->key_symbol == e->key_symbol)
-                         break;
-               }
-               if (DFB_KEY_IS_ASCII( e->key_symbol )) {
-                    if (keyboard_func) {
-                         __glutSetWindow( window );
-                         keyboard_func( e->key_symbol, e->x, e->y );
-                    }
-               }
-               else {
-                    int key = __glutSpecialKey( e->key_symbol );
-                    if (key && special_func) {
-                         __glutSetWindow( window );
-                         special_func( key, e->x, e->y );
-                    }
-               }
-               break;
-          case DWET_KEYUP:
-               window->modifiers = __glutModifiers( e->modifiers );
-               if (DFB_KEY_IS_ASCII( e->key_symbol )) {
-                    if (keyboard_up_func) {
-                         __glutSetWindow( window );
-                         keyboard_up_func( e->key_symbol, e->x, e->y );
-                    }
-               }
-               else {
-                    int key = __glutSpecialKey( e->key_symbol );
-                    if (key && special_up_func) {
-                         __glutSetWindow( window );
-                         special_up_func( key, e->x, e->y );
-                    }
-               }
-               break;
-          case DWET_BUTTONDOWN:
-               if (mouse_func) {
-                    __glutSetWindow( window );
-                    mouse_func( __glutButton( e->button ), GLUT_DOWN, e->x, e->y );
-               }
-               break;
-          case DWET_BUTTONUP:
-               if (mouse_func) {
-                    __glutSetWindow( window );
-                    mouse_func( __glutButton( e->button ), GLUT_UP, e->x, e->y );
-               }
-               break;
-          case DWET_MOTION:
-               if (e->buttons) {
-                    if (motion_func) {
-                         __glutSetWindow( window );
-                         motion_func( e->cx, e->cy );
-                    }
-               }
-               else {
-                    if (passive_motion_func) {
-                         __glutSetWindow( window );
-                         passive_motion_func( e->cx, e->cy );
-                    }
-               }
-               break;
-          case DWET_ENTER:
-               if (entry_func) {
-                    __glutSetWindow( window );
-                    entry_func( GLUT_ENTERED );
-               }
-               break;
-          case DWET_LEAVE:
-               if (entry_func) {
-                    __glutSetWindow( window );
-                    entry_func( GLUT_LEFT );
-               }
-               break;
-          case DWET_SIZE:
-               window->reshape = GL_TRUE;
-               window->redisplay = GL_TRUE;
-               break;
-          default:
-               break;
-     }
-}
-
-
-static void 
-__glutInputEvent( DFBInputEvent *e, DFBInputEvent *p )
-{
-     __glutAssert( g_game != NULL );
-     
-     switch (e->type) {
-          case DIET_KEYPRESS:
-               g_game->modifiers = __glutModifiers( e->modifiers );
-               if (g_ignore_key_repeat && p) {
-                    if (p->type       == DIET_KEYPRESS &&
-                        p->key_symbol == e->key_symbol)
-                         break;
-               }
-               if (DFB_KEY_IS_ASCII( e->key_symbol )) {
-                    if (keyboard_func) {
-                         __glutSetWindow( g_game );
-                         keyboard_func( e->key_symbol, g_game->cx, g_game->cy );
-                    }
-               }
-               else {
-                    int key = __glutSpecialKey( e->key_symbol );
-                    if (key && special_func) {
-                         __glutSetWindow( g_game );
-                         special_func( key, g_game->cx, g_game->cy );
-                    }
-               }
-               break;
-          case DIET_KEYRELEASE:
-               g_game->modifiers = __glutModifiers( e->modifiers ); 
-               if (DFB_KEY_IS_ASCII( e->key_symbol )) {
-                    if (keyboard_up_func) {
-                         __glutSetWindow( g_game );
-                         keyboard_up_func( e->key_symbol, g_game->cx, g_game->cy );
-                    }
-               }
-               else {
-                    int key = __glutSpecialKey( e->key_symbol );
-                    if (key && special_up_func) {
-                         __glutSetWindow( g_game );
-                         special_up_func( key, g_game->cx, g_game->cy );
-                    }
-               }
-               break;
-          case DIET_BUTTONPRESS:
-               if (e->device_id == DIDID_JOYSTICK) {
-                    g_game->buttons = e->buttons;
-                    if (joystick_func) {
-                         __glutSetWindow( g_game );
-                         joystick_func( g_game->buttons,
-                                        g_game->jx, g_game->jy, g_game->jz );
-                    }
-               }
-               else {
-                    if (mouse_func) {
-                         __glutSetWindow( g_game );
-                         mouse_func( __glutButton( e->button ), 
-                                     GLUT_DOWN, g_game->cx, g_game->cy );
-                    }
-               }
-               break;
-          case DIET_BUTTONRELEASE:
-               if (e->device_id == DIDID_JOYSTICK) {
-                    g_game->buttons = e->buttons;
-                    if (joystick_func) {
-                         __glutSetWindow( g_game );
-                         joystick_func( g_game->buttons,
-                                        g_game->jx, g_game->jy, g_game->jz );
-                    }
-               }
-               else {
-                    if (mouse_func) {
-                         __glutSetWindow( g_game );
-                         mouse_func( __glutButton( e->button ), 
-                                     GLUT_UP, g_game->cx, g_game->cy );
-                    }
-               }
-               break;
-          case DIET_AXISMOTION:
-               if (e->device_id == DIDID_JOYSTICK) {
-                    switch (e->axis) {
-                         case DIAI_X:
-                              if (e->flags & DIEF_AXISABS)
-                                   g_game->jx = e->axisabs;
-                              else if (e->flags & DIEF_AXISREL)
-                                   g_game->jx += e->axisrel;
-                              break;
-                         case DIAI_Y:
-                              if (e->flags & DIEF_AXISABS)
-                                   g_game->jy = e->axisabs;
-                              else if (e->flags & DIEF_AXISREL)
-                                   g_game->jy += e->axisrel;
-                              break;
-                         case DIAI_Z:
-                              if (e->flags & DIEF_AXISABS)
-                                   g_game->jz = e->axisabs;
-                              else if (e->flags & DIEF_AXISREL)
-                                   g_game->jz += e->axisrel;
-                              break;
-                         default:
-                              break;
-                    } 
-                    if (joystick_func) {
-                         __glutSetWindow( g_game );
-                         joystick_func( g_game->buttons,
-                                        g_game->jx, g_game->jy, g_game->jz );
-                    }
-               }
-               else {
-                    switch (e->axis) {
-                         case DIAI_X:
-                              if (e->flags & DIEF_AXISABS)
-                                   g_game->cx = e->axisabs;
-                              else if (e->flags & DIEF_AXISREL)
-                                   g_game->cx += e->axisrel;
-                              break;
-                         case DIAI_Y:
-                              if (e->flags & DIEF_AXISABS)
-                                   g_game->cy = e->axisabs;
-                              else if (e->flags & DIEF_AXISREL)
-                                   g_game->cy += e->axisrel;
-                              break;
-                         default:
-                              return;
-                    }
-                    if (e->buttons && motion_func) {
-                         __glutSetWindow( g_game );
-                         motion_func( g_game->cx, g_game->cy );
-                    }
-                    else if (!e->buttons && passive_motion_func) {
-                         __glutSetWindow( g_game );
-                         passive_motion_func( g_game->cx, g_game->cy );
-                    }
-               }
-               break;
-          default:
-               break;
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutMainLoop( void )
-{
-     __glutAssert( events != NULL );
-     
-     __glutHandleWindows();
-     
-     while (GL_TRUE) {
-          DFBEvent evt, prev;
-          
-          g_idle = GL_TRUE;
-          
-          __glutHandleTimers();
-
-          prev.clazz = DFEC_NONE;
-          
-          while (events->GetEvent( events, &evt ) == DFB_OK) {
-               g_idle = GL_FALSE;
-               
-               switch (evt.clazz) {
-                    case DFEC_WINDOW:
-                         if (prev.clazz == DFEC_WINDOW)
-                              __glutWindowEvent( &evt.window, &prev.window );
-                         else
-                              __glutWindowEvent( &evt.window, NULL );
-                         break;
-                    case DFEC_INPUT:
-                         if (prev.clazz == DFEC_INPUT)
-                              __glutInputEvent( &evt.input, &prev.input );
-                         else
-                              __glutInputEvent( &evt.input, NULL );
-                         break;
-                    default:
-                         __glutWarning( "unexpected event class %d!\n", evt.clazz );
-                         break;
-               }
-               
-               prev = evt;
-                         
-               __glutHandleTimers();
-          }
-          
-          __glutHandleWindows();
-          
-          if (g_idle) {
-               if (idle_func) {
-                    idle_func();
-               }
-               else {
-                    int msec;
-                    __glutSetWindow( NULL );
-                    if (__glutGetTimeout( &msec ))
-                         events->WaitForEventWithTimeout( events, msec/1000, msec%1000 );
-                    else
-                         events->WaitForEvent( events );
-               }
-          }
-     }
-}
-
diff --git a/src/glut/directfb/ext.c b/src/glut/directfb/ext.c
deleted file mode 100644
index e37ecf5afa..0000000000
--- a/src/glut/directfb/ext.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include 
-#include 
-#include 
-
-#include "internal.h"
-
-
-static const struct {
-     const char     *name;
-     const GLUTproc  address;
-} glut_functions[] = {
-   { "glutInit", (const GLUTproc) glutInit },
-   { "glutInitDisplayMode", (const GLUTproc) glutInitDisplayMode },
-   { "glutInitDisplayString", (const GLUTproc) glutInitDisplayString },
-   { "glutInitWindowPosition", (const GLUTproc) glutInitWindowPosition },
-   { "glutInitWindowSize", (const GLUTproc) glutInitWindowSize },
-   { "glutMainLoop", (const GLUTproc) glutMainLoop },
-   { "glutCreateWindow", (const GLUTproc) glutCreateWindow },
-   { "glutCreateSubWindow", (const GLUTproc) glutCreateSubWindow },
-   { "glutDestroyWindow", (const GLUTproc) glutDestroyWindow },
-   { "glutPostRedisplay", (const GLUTproc) glutPostRedisplay },
-   { "glutPostWindowRedisplay", (const GLUTproc) glutPostWindowRedisplay },
-   { "glutSwapBuffers", (const GLUTproc) glutSwapBuffers },
-   { "glutGetWindow", (const GLUTproc) glutGetWindow },
-   { "glutSetWindow", (const GLUTproc) glutSetWindow },
-   { "glutSetWindowTitle", (const GLUTproc) glutSetWindowTitle },
-   { "glutSetIconTitle", (const GLUTproc) glutSetIconTitle },
-   { "glutPositionWindow", (const GLUTproc) glutPositionWindow },
-   { "glutReshapeWindow", (const GLUTproc) glutReshapeWindow },
-   { "glutPopWindow", (const GLUTproc) glutPopWindow },
-   { "glutPushWindow", (const GLUTproc) glutPushWindow },
-   { "glutIconifyWindow", (const GLUTproc) glutIconifyWindow },
-   { "glutShowWindow", (const GLUTproc) glutShowWindow },
-   { "glutHideWindow", (const GLUTproc) glutHideWindow },
-   { "glutFullScreen", (const GLUTproc) glutFullScreen },
-   { "glutSetCursor", (const GLUTproc) glutSetCursor },
-   { "glutWarpPointer", (const GLUTproc) glutWarpPointer },
-   { "glutEstablishOverlay", (const GLUTproc) glutEstablishOverlay },
-   { "glutRemoveOverlay", (const GLUTproc) glutRemoveOverlay },
-   { "glutUseLayer", (const GLUTproc) glutUseLayer },
-   { "glutPostOverlayRedisplay", (const GLUTproc) glutPostOverlayRedisplay },
-   { "glutPostWindowOverlayRedisplay", (const GLUTproc) glutPostWindowOverlayRedisplay },
-   { "glutShowOverlay", (const GLUTproc) glutShowOverlay },
-   { "glutHideOverlay", (const GLUTproc) glutHideOverlay },
-   { "glutCreateMenu", (const GLUTproc) glutCreateMenu },
-   { "glutDestroyMenu", (const GLUTproc) glutDestroyMenu },
-   { "glutGetMenu", (const GLUTproc) glutGetMenu },
-   { "glutSetMenu", (const GLUTproc) glutSetMenu },
-   { "glutAddMenuEntry", (const GLUTproc) glutAddMenuEntry },
-   { "glutAddSubMenu", (const GLUTproc) glutAddSubMenu },
-   { "glutChangeToMenuEntry", (const GLUTproc) glutChangeToMenuEntry },
-   { "glutChangeToSubMenu", (const GLUTproc) glutChangeToSubMenu },
-   { "glutRemoveMenuItem", (const GLUTproc) glutRemoveMenuItem },
-   { "glutAttachMenu", (const GLUTproc) glutAttachMenu },
-   { "glutDetachMenu", (const GLUTproc) glutDetachMenu },
-   { "glutDisplayFunc", (const GLUTproc) glutDisplayFunc },
-   { "glutReshapeFunc", (const GLUTproc) glutReshapeFunc },
-   { "glutKeyboardFunc", (const GLUTproc) glutKeyboardFunc },
-   { "glutMouseFunc", (const GLUTproc) glutMouseFunc },
-   { "glutMotionFunc", (const GLUTproc) glutMotionFunc },
-   { "glutPassiveMotionFunc", (const GLUTproc) glutPassiveMotionFunc },
-   { "glutEntryFunc", (const GLUTproc) glutEntryFunc },
-   { "glutVisibilityFunc", (const GLUTproc) glutVisibilityFunc },
-   { "glutIdleFunc", (const GLUTproc) glutIdleFunc },
-   { "glutTimerFunc", (const GLUTproc) glutTimerFunc },
-   { "glutMenuStateFunc", (const GLUTproc) glutMenuStateFunc },
-   { "glutSpecialFunc", (const GLUTproc) glutSpecialFunc },
-   { "glutSpaceballMotionFunc", (const GLUTproc) glutSpaceballMotionFunc },
-   { "glutSpaceballRotateFunc", (const GLUTproc) glutSpaceballRotateFunc },
-   { "glutSpaceballButtonFunc", (const GLUTproc) glutSpaceballButtonFunc },
-   { "glutButtonBoxFunc", (const GLUTproc) glutButtonBoxFunc },
-   { "glutDialsFunc", (const GLUTproc) glutDialsFunc },
-   { "glutTabletMotionFunc", (const GLUTproc) glutTabletMotionFunc },
-   { "glutTabletButtonFunc", (const GLUTproc) glutTabletButtonFunc },
-   { "glutMenuStatusFunc", (const GLUTproc) glutMenuStatusFunc },
-   { "glutOverlayDisplayFunc", (const GLUTproc) glutOverlayDisplayFunc },
-   { "glutWindowStatusFunc", (const GLUTproc) glutWindowStatusFunc },
-   { "glutKeyboardUpFunc", (const GLUTproc) glutKeyboardUpFunc },
-   { "glutSpecialUpFunc", (const GLUTproc) glutSpecialUpFunc },
-   { "glutJoystickFunc", (const GLUTproc) glutJoystickFunc },
-   { "glutSetColor", (const GLUTproc) glutSetColor },
-   { "glutGetColor", (const GLUTproc) glutGetColor },
-   { "glutCopyColormap", (const GLUTproc) glutCopyColormap },
-   { "glutGet", (const GLUTproc) glutGet },
-   { "glutDeviceGet", (const GLUTproc) glutDeviceGet },
-   { "glutExtensionSupported", (const GLUTproc) glutExtensionSupported },
-   { "glutGetModifiers", (const GLUTproc) glutGetModifiers },
-   { "glutLayerGet", (const GLUTproc) glutLayerGet },
-   { "glutGetProcAddress", (const GLUTproc) glutGetProcAddress },
-   { "glutBitmapCharacter", (const GLUTproc) glutBitmapCharacter },
-   { "glutBitmapWidth", (const GLUTproc) glutBitmapWidth },
-   { "glutStrokeCharacter", (const GLUTproc) glutStrokeCharacter },
-   { "glutStrokeWidth", (const GLUTproc) glutStrokeWidth },
-   { "glutBitmapLength", (const GLUTproc) glutBitmapLength },
-   { "glutStrokeLength", (const GLUTproc) glutStrokeLength },
-   { "glutWireSphere", (const GLUTproc) glutWireSphere },
-   { "glutSolidSphere", (const GLUTproc) glutSolidSphere },
-   { "glutWireCone", (const GLUTproc) glutWireCone },
-   { "glutSolidCone", (const GLUTproc) glutSolidCone },
-   { "glutWireCube", (const GLUTproc) glutWireCube },
-   { "glutSolidCube", (const GLUTproc) glutSolidCube },
-   { "glutWireTorus", (const GLUTproc) glutWireTorus },
-   { "glutSolidTorus", (const GLUTproc) glutSolidTorus },
-   { "glutWireDodecahedron", (const GLUTproc) glutWireDodecahedron },
-   { "glutSolidDodecahedron", (const GLUTproc) glutSolidDodecahedron },
-   { "glutWireTeapot", (const GLUTproc) glutWireTeapot },
-   { "glutSolidTeapot", (const GLUTproc) glutSolidTeapot },
-   { "glutWireOctahedron", (const GLUTproc) glutWireOctahedron },
-   { "glutSolidOctahedron", (const GLUTproc) glutSolidOctahedron },
-   { "glutWireTetrahedron", (const GLUTproc) glutWireTetrahedron },
-   { "glutSolidTetrahedron", (const GLUTproc) glutSolidTetrahedron },
-   { "glutWireIcosahedron", (const GLUTproc) glutWireIcosahedron },
-   { "glutSolidIcosahedron", (const GLUTproc) glutSolidIcosahedron },
-//   { "glutVideoResizeGet", (const GLUTproc) glutVideoResizeGet },
-//   { "glutSetupVideoResizing", (const GLUTproc) glutSetupVideoResizing },
-//   { "glutStopVideoResizing", (const GLUTproc) glutStopVideoResizing },
-//   { "glutVideoResize", (const GLUTproc) glutVideoResize },
-//   { "glutVideoPan", (const GLUTproc) glutVideoPan },
-   { "glutReportErrors", (const GLUTproc) glutReportErrors },
-   { "glutIgnoreKeyRepeat", (const GLUTproc) glutIgnoreKeyRepeat },
-   { "glutSetKeyRepeat", (const GLUTproc) glutSetKeyRepeat },
-   { "glutForceJoystickFunc", (const GLUTproc) glutForceJoystickFunc },
-   { "glutGameModeString", (const GLUTproc) glutGameModeString },
-   { "glutEnterGameMode", (const GLUTproc) glutEnterGameMode },
-   { "glutLeaveGameMode", (const GLUTproc) glutLeaveGameMode },
-   { "glutGameModeGet", (const GLUTproc) glutGameModeGet },
-};
-
-
-GLUTproc GLUTAPIENTRY 
-glutGetProcAddress( const char *name )
-{
-     int i;
-     
-     for (i = 0; i < sizeof(glut_functions)/sizeof(glut_functions[0]); i++) {
-          if (!strcmp( name, glut_functions[i].name ))
-               return glut_functions[i].address;
-     }
-
-#if DIRECTFBGL_INTERFACE_VERSION >= 1
-     if (g_current) {
-          void *address = NULL;
-          g_current->gl->GetProcAddress( g_current->gl, name, &address );
-          return address;
-     }
-#endif
-     return NULL;
-}
-
-
-int GLUTAPIENTRY 
-glutExtensionSupported( const char *name )
-{
-     GLubyte *extensions;
-     int      length;
-     
-     if (!name || !*name)
-          return 0;
-     
-     length = strlen( name );
-     extensions = (GLubyte*) glGetString( GL_EXTENSIONS );
-     
-     while (extensions && *extensions) {
-          GLubyte *next;
-          
-          next = strchr( extensions, ' ' );
-          if (next) {
-               if (length == (int)(next - extensions)) {
-                    if (!strncmp( extensions, name, length ))
-                         return 1;
-               }
-               extensions = next+1;
-          }
-          else {
-               if (!strcmp( extensions, name ))
-                    return 1;
-               break; 
-          }
-     } 
-
-     return 0;
-}
-
diff --git a/src/glut/directfb/font.c b/src/glut/directfb/font.c
deleted file mode 100644
index 0139cddbec..0000000000
--- a/src/glut/directfb/font.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Copyright (c) Mark J. Kilgard, 1994, 1998. 
-
-   This program is freely distributable without licensing fees 
-   and is provided without guarantee or warrantee expressed or 
-   implied. This program is -not- in the public domain. */
-
-#include "internal.h"
-#include "font.h"
-
-
-#if defined(_WIN32) || defined (GLUT_IMPORT_LIB)
-
-static inline void*
-__glutFont( void *font )
-{
-     switch((long)font) {
-          case (long)GLUT_STROKE_ROMAN:
-               return &glutStrokeRoman;
-          case (long)GLUT_STROKE_MONO_ROMAN:
-               return &glutStrokeMonoRoman;
-          case (long)GLUT_BITMAP_9_BY_15:
-               return &glutBitmap9By15;
-          case (long)GLUT_BITMAP_8_BY_13:
-               return &glutBitmap8By13;
-          case (long)GLUT_BITMAP_TIMES_ROMAN_10:
-               return &glutBitmapTimesRoman10;
-          case (long)GLUT_BITMAP_TIMES_ROMAN_24:
-               return &glutBitmapTimesRoman24;
-          case (long)GLUT_BITMAP_HELVETICA_10:
-               return &glutBitmapHelvetica10;
-          case (long)GLUT_BITMAP_HELVETICA_12:
-               return &glutBitmapHelvetica12;
-          case (long)GLUT_BITMAP_HELVETICA_18:
-               return &glutBitmapHelvetica18;
-     }
-
-     return NULL; 
-}
-
-#else
-
-static inline void*
-__glutFont( void *font )
-{
-     return font;
-}
-
-#endif
-
-
-void GLUTAPIENTRY 
-glutBitmapCharacter( GLUTbitmapFont font, int c )
-{
-     const BitmapCharRec *ch;
-     BitmapFontPtr fontinfo;
-     GLint swapbytes, lsbfirst, rowlength;
-     GLint skiprows, skippixels, alignment;
-
-     fontinfo = (BitmapFontPtr) __glutFont( font );
-
-     if (!fontinfo || c < fontinfo->first ||
-         c >= fontinfo->first + fontinfo->num_chars)
-          return;
-  
-     ch = fontinfo->ch[c - fontinfo->first];
-     if (ch) {
-          /* Save current modes. */
-          glGetIntegerv(GL_UNPACK_SWAP_BYTES, &swapbytes);
-          glGetIntegerv(GL_UNPACK_LSB_FIRST, &lsbfirst);
-          glGetIntegerv(GL_UNPACK_ROW_LENGTH, &rowlength);
-          glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skiprows);
-          glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skippixels);
-          glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
-          /* Little endian machines (DEC Alpha for example) could
-             benefit from setting GL_UNPACK_LSB_FIRST to GL_TRUE
-             instead of GL_FALSE, but this would require changing the
-             generated bitmaps too. */
-          glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
-          glPixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE);
-          glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-          glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-          glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-          glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-          glBitmap(ch->width, ch->height, ch->xorig, ch->yorig,
-                   ch->advance, 0, ch->bitmap);
-          /* Restore saved modes. */
-          glPixelStorei(GL_UNPACK_SWAP_BYTES, swapbytes);
-          glPixelStorei(GL_UNPACK_LSB_FIRST, lsbfirst);
-          glPixelStorei(GL_UNPACK_ROW_LENGTH, rowlength);
-          glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows);
-          glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippixels);
-          glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
-     }
-}
-
-
-int GLUTAPIENTRY 
-glutBitmapWidth( GLUTbitmapFont font, int c )
-{
-     BitmapFontPtr fontinfo;
-     const BitmapCharRec *ch;
-
-     fontinfo = (BitmapFontPtr) __glutFont( font );
-
-     if (!fontinfo || c < fontinfo->first || 
-         c >= fontinfo->first + fontinfo->num_chars)
-          return 0;
-  
-     ch = fontinfo->ch[c - fontinfo->first];
-     if (ch)
-          return ch->advance;
-
-     return 0;
-}
-
-
-int GLUTAPIENTRY 
-glutBitmapLength( GLUTbitmapFont font, const unsigned char *string )
-{
-     int c, length;
-     BitmapFontPtr fontinfo;
-     const BitmapCharRec *ch;
-
-     fontinfo = (BitmapFontPtr) __glutFont( font );
-     if (!fontinfo)
-          return 0;
-
-     for (length = 0; *string != '\0'; string++) {
-          c = *string;
-          if (c >= fontinfo->first &&
-              c < fontinfo->first + fontinfo->num_chars) {
-               ch = fontinfo->ch[c - fontinfo->first];
-               if (ch)
-                    length += ch->advance;
-          }
-     }
-  
-     return length;
-}
-
-
-void GLUTAPIENTRY 
-glutStrokeCharacter( GLUTstrokeFont font, int c )
-{
-     const StrokeCharRec *ch;
-     const StrokeRec *stroke;
-     const CoordRec *coord;
-     StrokeFontPtr fontinfo;
-     int i, j;
-
-     fontinfo = (StrokeFontPtr) __glutFont( font );
-
-     if (!fontinfo || c < 0 || c >= fontinfo->num_chars)
-          return;
-  
-     ch = &(fontinfo->ch[c]);
-     if (ch) {
-          for (i = ch->num_strokes, stroke = ch->stroke;
-               i > 0; i--, stroke++) {
-               glBegin(GL_LINE_STRIP);
-               for (j = stroke->num_coords, coord = stroke->coord;
-                    j > 0; j--, coord++) {
-                    glVertex2f(coord->x, coord->y);
-               }
-               glEnd();
-          }
-          glTranslatef(ch->right, 0.0, 0.0);
-     }
-}
-
-
-int GLUTAPIENTRY 
-glutStrokeWidth( GLUTstrokeFont font, int c )
-{
-     StrokeFontPtr fontinfo;
-     const StrokeCharRec *ch;
-
-     fontinfo = (StrokeFontPtr) __glutFont( font );
-
-     if (!fontinfo || c < 0 || c >= fontinfo->num_chars)
-          return 0;
-  
-     ch = &(fontinfo->ch[c]);
-     if (ch)
-          return ch->right;
-          
-     return 0;
-}
-
-
-int GLUTAPIENTRY 
-glutStrokeLength( GLUTstrokeFont font, const unsigned char *string )
-{
-     int c, length;
-     StrokeFontPtr fontinfo;
-     const StrokeCharRec *ch;
-
-     fontinfo = (StrokeFontPtr) __glutFont( font );
-     if (!fontinfo)
-          return 0;
-
-     for (length = 0; *string != '\0'; string++) {
-          c = *string;
-          if (c >= 0 && c < fontinfo->num_chars) {
-               ch = &(fontinfo->ch[c]);
-               if (ch)
-                    length += ch->right;
-          }
-     }
-  
-     return length;
-}
-
diff --git a/src/glut/directfb/font.h b/src/glut/directfb/font.h
deleted file mode 100644
index b1e76838a0..0000000000
--- a/src/glut/directfb/font.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
-
-/* This program is freely distributable without licensing fees 
-   and is provided without guarantee or warrantee expressed or 
-   implied. This program is -not- in the public domain. */
-
-#ifndef __GLUT_FONT_H__
-#define __GLUT_FONT_H__
-
-
-typedef struct {
-  const GLsizei width;
-  const GLsizei height;
-  const GLfloat xorig;
-  const GLfloat yorig;
-  const GLfloat advance;
-  const GLubyte *bitmap;
-} BitmapCharRec, *BitmapCharPtr;
-
-typedef struct {
-  const char *name;
-  const int num_chars;
-  const int first;
-  const BitmapCharRec * const *ch;
-} BitmapFontRec, *BitmapFontPtr;
-
-typedef void *GLUTbitmapFont;
-
-
-typedef struct {
-  float x;
-  float y;
-} CoordRec, *CoordPtr;
-
-typedef struct {
-  int num_coords;
-  const CoordRec *coord;
-} StrokeRec, *StrokePtr;
-
-typedef struct {
-  int num_strokes;
-  const StrokeRec *stroke;
-  float center;
-  float right;
-} StrokeCharRec, *StrokeCharPtr;
-
-typedef struct {
-  const char *name;
-  int num_chars;
-  const StrokeCharRec *ch;
-  float top;
-  float bottom;
-} StrokeFontRec, *StrokeFontPtr;
-
-typedef void *GLUTstrokeFont;
-
-
-#endif /* __GLUT_FONT_H__ */
diff --git a/src/glut/directfb/game.c b/src/glut/directfb/game.c
deleted file mode 100644
index 4c027a68f6..0000000000
--- a/src/glut/directfb/game.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include 
-#include 
-#include 
-
-#include "internal.h"
-
-
-/*****************************************************************************/
-
-static int g_display_changed = 0;
-
-/*****************************************************************************/
-
-
-void GLUTAPIENTRY
-glutGameModeString( const char *string )
-{
-     int   x, y, bpp;
-     char *tmp;
-     
-     if (!string)
-          return;
-          
-     tmp = strchr( string, 'x' );
-     if (tmp) {
-          x = strtol( string, NULL, 10 );
-          y = strtol( tmp+1, NULL, 10 );
-          
-          if (x > 0 && y > 0) {
-               g_width  = x;
-               g_height = y;
-          }
-     }
-     
-     tmp = strchr( string, ':' );
-     if (tmp) {
-          bpp = strtol( tmp+1, NULL, 10 );
-          
-          if (bpp > 0)
-               g_bpp = bpp;
-     }
-}
-
-
-int GLUTAPIENTRY
-glutEnterGameMode( void )
-{
-     DFBDisplayLayerConfig prev, cur;
-
-     glutInit( NULL, NULL );
-     
-     primary->GetConfiguration( primary, &prev );
-     primary->SetCooperativeLevel( primary, DLSCL_EXCLUSIVE );
-     
-     if (g_game)
-          __glutDestroyWindow( g_game );
-          
-     g_game = __glutCreateWindow( GL_TRUE );
-     if (!g_game)
-          return 0;
-          
-     __glutSetWindow( g_game );
-     g_game->cursor = GLUT_CURSOR_NONE;
-
-     primary->GetConfiguration( primary, &cur );
-     g_display_changed = (cur.width       != prev.width      || 
-                          cur.height      != prev.height     ||
-                          cur.pixelformat != prev.pixelformat);
-     
-     return g_game->id;
-}
-
-
-void GLUTAPIENTRY
-glutLeaveGameMode( void )
-{
-     if (g_game)
-          __glutDestroyWindow( g_game );
-
-     primary->SetCooperativeLevel( primary, DLSCL_ADMINISTRATIVE );
-}
-
-
-int GLUTAPIENTRY
-glutGameModeGet( GLenum type )
-{
-     switch (type) {
-          case GLUT_GAME_MODE_ACTIVE:
-               return (g_game != NULL);
-          case GLUT_GAME_MODE_POSSIBLE:
-               if (primary) {
-                    DFBDisplayLayerConfig c;
-                    c.flags  = DLCONF_WIDTH | DLCONF_HEIGHT;
-                    c.width  = g_width;
-                    c.height = g_height;
-                    /* XXX: bpp */
-                    if (primary->TestConfiguration( primary, &c, 0 ) == DFB_OK)
-                         return 1;
-               }
-               break;
-          case GLUT_GAME_MODE_WIDTH:
-               if (g_game) {
-                    int w;
-                    g_game->surface->GetSize( g_game->surface, &w, 0 );
-                    return w;
-               }
-               break;
-          case GLUT_GAME_MODE_HEIGHT:
-               if (g_game) {
-                    int h;
-                    g_game->surface->GetSize( g_game->surface, 0, &h );
-                    return h;
-               }
-               break;
-          case GLUT_GAME_MODE_PIXEL_DEPTH:
-               if (g_game) {
-                    DFBSurfacePixelFormat f;
-                    g_game->surface->GetPixelFormat( g_game->surface, &f );
-                    return DFB_COLOR_BITS_PER_PIXEL( f );
-               }
-               break;
-          case GLUT_GAME_MODE_REFRESH_RATE:
-               return 60; /* assume 60hz */
-          case GLUT_GAME_MODE_DISPLAY_CHANGED:
-               return g_display_changed;
-          default:
-               break;
-     }
-     
-     return 0;
-}
-
-
-        
diff --git a/src/glut/directfb/globals.c b/src/glut/directfb/globals.c
deleted file mode 100644
index 2a5291137e..0000000000
--- a/src/glut/directfb/globals.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include "internal.h"
-
-IDirectFB             *dfb      = NULL;
-IDirectFBDisplayLayer *primary  = NULL;
-IDirectFBEventBuffer  *events   = NULL;
-IDirectFBInputDevice  *keyboard = NULL;
-IDirectFBInputDevice  *mouse    = NULL;
-IDirectFBInputDevice  *joystick = NULL;
-
-GLenum        g_display_mode    = 0;
-GLuint        g_width           = DEFAULT_WIDTH;
-GLuint        g_height          = DEFAULT_HEIGHT;
-GLint         g_xpos            = 0;
-GLint         g_ypos            = 0;
-GLint         g_bpp             = 0;
-GLboolean     g_idle            = GL_TRUE;
-__GlutWindow *g_current         = NULL;
-__GlutWindow *g_game            = NULL;
-
-
-void (GLUTCALLBACK *display_func) (void)                              = 0;
-void (GLUTCALLBACK *reshape_func) (int width, int height)             = 0;
-void (GLUTCALLBACK *keyboard_func) (unsigned char key, int x, int y)  = 0;
-void (GLUTCALLBACK *mouse_func) (int button, int state, int x, int y) = 0;
-void (GLUTCALLBACK *motion_func) (int x, int y)                       = 0;
-void (GLUTCALLBACK *passive_motion_func) (int x, int y)               = 0;
-void (GLUTCALLBACK *entry_func) (int state)                           = 0;
-void (GLUTCALLBACK *visibility_func) (int state)                      = 0;
-void (GLUTCALLBACK *idle_func) (void)                                 = 0;
-void (GLUTCALLBACK *menu_state_func) (int state)                      = 0;
-void (GLUTCALLBACK *special_func) (int key, int x, int y)             = 0;
-void (GLUTCALLBACK *spaceball_motion_func) (int x, int y, int z)      = 0;
-void (GLUTCALLBACK *spaceball_rotate_func) (int x, int y, int z)      = 0;
-void (GLUTCALLBACK *spaceball_button_func) (int button, int state)    = 0;
-void (GLUTCALLBACK *button_box_func) (int button, int state)          = 0;
-void (GLUTCALLBACK *dials_func) (int dial, int value)                 = 0;
-void (GLUTCALLBACK *tablet_motion_func) (int x, int y)                = 0;
-void (GLUTCALLBACK *tabled_button_func) (int button, int state, int x, int y) = 0;
-void (GLUTCALLBACK *menu_status_func) (int status, int x, int y)      = 0;
-void (GLUTCALLBACK *overlay_display_func) (void)                      = 0;
-void (GLUTCALLBACK *window_status_func) (int state)                   = 0;
-void (GLUTCALLBACK *keyboard_up_func) (unsigned char key, int x, int y) = 0;
-void (GLUTCALLBACK *special_up_func) (int key, int x, int y)          = 0;
-void (GLUTCALLBACK *joystick_func) (unsigned int buttons, int x, int y, int z) = 0;
diff --git a/src/glut/directfb/init.c b/src/glut/directfb/init.c
deleted file mode 100644
index ba1a49adf2..0000000000
--- a/src/glut/directfb/init.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include 
-#include 
-#include 
-
-#include "internal.h"
-
-
-static void 
-__glutExit( void )
-{
-     __glutFreeTimers();
-     __glutDestroyWindows();
-     
-     if (events) {
-          events->Release( events );
-          events = NULL;
-     }
-     
-     if (joystick) {
-          joystick->Release( joystick );
-          joystick = NULL;
-     }
-     
-     if (mouse) {
-          mouse->Release( mouse );
-          mouse = NULL;
-     }
-     
-     if (keyboard) {
-          keyboard->Release( keyboard );
-          keyboard = NULL;
-     }
-     
-     if (primary) {
-          primary->Release( primary );
-          primary = NULL;
-     }
-     
-     if (dfb) {
-          dfb->Release( dfb );
-          dfb = NULL;
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutInit( int *argcp, char **argv )
-{
-     DFBResult ret;
-     
-     if (dfb)
-          return;
-     
-     glutGet( GLUT_ELAPSED_TIME );
-
-     ret = DirectFBInit( argcp, argv ? &argv : NULL );
-     if (ret)
-          DirectFBErrorFatal( "DirectFBInit()", ret );
-     
-     ret = DirectFBCreate( &dfb );
-     if (ret)
-          DirectFBErrorFatal( "DirectFBCreate()", ret );
-     
-     ret = dfb->GetDisplayLayer( dfb, DLID_PRIMARY, &primary );
-     if (ret)
-          DirectFBErrorFatal( "IDirectFB::GetDisplayLayer()", ret );
-          
-     ret = dfb->CreateEventBuffer( dfb, &events );
-     if (ret)
-          DirectFBErrorFatal( "IDirectFB::CreateEventBuffer()", ret );
-          
-     dfb->GetInputDevice( dfb, DIDID_KEYBOARD, &keyboard );
-     dfb->GetInputDevice( dfb, DIDID_MOUSE, &mouse );
-     dfb->GetInputDevice( dfb, DIDID_JOYSTICK, &joystick );
-    
-     primary->SetCooperativeLevel( primary, DLSCL_ADMINISTRATIVE );
-     
-     atexit( __glutExit );
-}
-
-
-void GLUTAPIENTRY 
-glutInitDisplayMode( unsigned int mode )
-{
-     g_display_mode = mode;
-}
-
-
-void GLUTAPIENTRY 
-glutInitWindowPosition( int x, int y )
-{
-     g_xpos = x;
-     g_ypos = y;
-}
-
-
-void GLUTAPIENTRY 
-glutInitWindowSize( int width, int height )
-{
-     g_width  = width;
-     g_height = height;
-}
-
-
-void GLUTAPIENTRY
-glutInitDisplayString( const char *string )
-{
-}
-
diff --git a/src/glut/directfb/internal.h b/src/glut/directfb/internal.h
deleted file mode 100644
index 55c4b5ce28..0000000000
--- a/src/glut/directfb/internal.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#ifndef __GLUT_INTERNAL_H__
-#define __GLUT_INTERNAL_H__
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-
-#include "GL/glut.h"
-
-
-#define VERSION_CODE( M, m, r )  (((M) << 16) | ((m) << 8) | ((r)))
-
-#define DIRECTFB_VERSION_CODE    VERSION_CODE( DIRECTFB_MAJOR_VERSION, \
-                                               DIRECTFB_MINOR_VERSION, \
-                                               DIRECTFB_MICRO_VERSION )
-
-
-#define DEFAULT_WIDTH  640
-#define DEFAULT_HEIGHT 480
-
-/*
- * Window request flags
- */
-#define WINDOW_REQUEST_POSITION   0x00000001
-#define WINDOW_REQUEST_RESIZE     0x00000002
-#define WINDOW_REQUEST_RESTACK    0x00000004
-#define WINDOW_REQUEST_SHOW       0x00000008
-#define WINDOW_REQUEST_HIDE       0x00000010
-#define WINDOW_REQUEST_DESTROY    0x00000020
-
-/*
- * GLUT Window implementation
- */
-typedef struct __GlutWindow_s {
-     int                    id;
-     DFBWindowID            wid;
-
-     IDirectFBWindow       *window; /* NULL = fullscreen (game mode) */
-     IDirectFBSurface      *surface;
-     IDirectFBGL           *gl;
-
-     /* display mode */
-     GLenum                 mode;
-
-     /* cursor position in fullscreen mode */
-     int                    cx;
-     int                    cy;
-     /* joystick position */
-     int                    jx;
-     int                    jy;
-     int                    jz;
-     /* pressed modifiers */
-     int                    modifiers;
-     /* pressed buttons */
-     int                    buttons;
-     /* current cursor shape */
-     int                    cursor;
-     
-     struct {
-          int               flags;
-          int               x;
-          int               y;
-          int               w;
-          int               h;
-          int               z;
-     } req;
-
-     GLboolean              visible;    
-     GLboolean              redisplay;
-     GLboolean              reshape;
-     GLboolean              visibility;
-
-     struct __GlutWindow_s *next;
-     struct __GlutWindow_s *prev;
-} __GlutWindow;
-
-
-/* Global Vars */
-extern IDirectFB             *dfb;
-extern IDirectFBDisplayLayer *primary;
-extern IDirectFBEventBuffer  *events;
-extern IDirectFBInputDevice  *keyboard;
-extern IDirectFBInputDevice  *mouse;
-extern IDirectFBInputDevice  *joystick;
-
-extern GLenum                 g_display_mode;
-extern GLuint                 g_width;
-extern GLuint                 g_height;
-extern GLint                  g_xpos;
-extern GLint                  g_ypos;
-extern GLint                  g_bpp;
-extern GLboolean              g_idle;
-extern __GlutWindow          *g_current;
-extern __GlutWindow          *g_game;
-
-
-/* Global Funcs */
-/* window.c */
-extern __GlutWindow* __glutCreateWindow( GLboolean fullscreen );
-extern __GlutWindow* __glutFindWindow( DFBWindowID id );
-extern void          __glutSetWindow( __GlutWindow *window );
-extern void          __glutHandleWindows( void );
-extern void          __glutDestroyWindow( __GlutWindow *window );
-extern void          __glutDestroyWindows( void );
-/* callback.c */
-extern void          __glutHandleTimers( void );
-extern GLboolean     __glutGetTimeout( int *ret_msec );
-extern void          __glutFreeTimers( void );
-
-
-/* Global Callbacks */
-extern void (GLUTCALLBACK *display_func) (void);
-extern void (GLUTCALLBACK *reshape_func) (int width, int height);
-extern void (GLUTCALLBACK *keyboard_func) (unsigned char key, int x, int y);
-extern void (GLUTCALLBACK *mouse_func) (int button, int state, int x, int y);
-extern void (GLUTCALLBACK *motion_func) (int x, int y);
-extern void (GLUTCALLBACK *passive_motion_func) (int x, int y);
-extern void (GLUTCALLBACK *entry_func) (int state);
-extern void (GLUTCALLBACK *visibility_func) (int state);
-extern void (GLUTCALLBACK *idle_func) (void);
-extern void (GLUTCALLBACK *menu_state_func) (int state);
-extern void (GLUTCALLBACK *special_func) (int key, int x, int y);
-extern void (GLUTCALLBACK *spaceball_motion_func) (int x, int y, int z);
-extern void (GLUTCALLBACK *spaceball_rotate_func) (int x, int y, int z);
-extern void (GLUTCALLBACK *spaceball_button_func) (int button, int state);
-extern void (GLUTCALLBACK *button_box_func) (int button, int state);
-extern void (GLUTCALLBACK *dials_func) (int dial, int value);
-extern void (GLUTCALLBACK *tablet_motion_func) (int x, int y);
-extern void (GLUTCALLBACK *tabled_button_func) (int button, int state, int x, int y);
-extern void (GLUTCALLBACK *menu_status_func) (int status, int x, int y);
-extern void (GLUTCALLBACK *overlay_display_func) (void);
-extern void (GLUTCALLBACK *window_status_func) (int state);
-extern void (GLUTCALLBACK *keyboard_up_func) (unsigned char key, int x, int y);
-extern void (GLUTCALLBACK *special_up_func) (int key, int x, int y);
-extern void (GLUTCALLBACK *joystick_func) (unsigned int buttons, int x, int y, int z);
-
-
-#ifdef DEBUG
-# define __glutAssert( exp ) {\
-     if (!(exp)) {\
-          fprintf( stderr, "(!!) *** Assertion [%s] failed in %s() ***\n",\
-                           #exp, __FUNCTION__ );
-          fflush( stderr );\
-          exit( -1 );\
-     }\
- }
-#else
-# define __glutAssert( exp )
-#endif
-
-#define __glutWarning( format, ... ) {\
-     fprintf( stderr, "(!) GLUT: " format "!\n", ## __VA_ARGS__ );\
-     fflush( stderr );\
-}
-
-#define __glutFatalError( format, ... ) {\
-     fprintf( stderr, "(!) GLUT: " format "!\n", ## __VA_ARGS__ );\
-     fprintf( stderr, "\t-> from %s() at line %d\n", __FUNCTION__, __LINE__ );\
-     fflush( stderr );\
-     exit( -1 );\
-}
-
-
-#endif /* __GLUT_INTERNAL_H__ */
-
diff --git a/src/glut/directfb/menu.c b/src/glut/directfb/menu.c
deleted file mode 100644
index 400e966bbb..0000000000
--- a/src/glut/directfb/menu.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include "internal.h"
-
-
-int GLUTAPIENTRY 
-glutCreateMenu( void (GLUTCALLBACK *func) (int) )
-{
-     return 0;
-}
-
-void GLUTAPIENTRY
-glutDestroyMenu( int menu )
-{
-}
-
-
-int GLUTAPIENTRY
-glutGetMenu( void )
-{
-     return 0;
-}
-
-
-void GLUTAPIENTRY 
-glutSetMenu( int menu )
-{
-}
-
-
-void GLUTAPIENTRY
-glutAddMenuEntry( const char *label, int value )
-{
-}
-
-
-void GLUTAPIENTRY
-glutAddSubMenu( const char *label, int submenu )
-{
-}
-
-
-void GLUTAPIENTRY
-glutChangeToMenuEntry( int item, const char *label, int value )
-{
-}
-
-
-void GLUTAPIENTRY
-glutChangeToSubMenu( int item, const char *label, int submenu )
-{
-}
-
-
-void GLUTAPIENTRY
-glutRemoveMenuItem( int item )
-{
-}
-
-
-void GLUTAPIENTRY
-glutAttachMenu( int button )
-{
-}
-
-
-void GLUTAPIENTRY
-glutDetachMenu( int button )
-{
-}
diff --git a/src/glut/directfb/models.c b/src/glut/directfb/models.c
deleted file mode 100644
index d96a8f5077..0000000000
--- a/src/glut/directfb/models.c
+++ /dev/null
@@ -1,599 +0,0 @@
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1997. */
-
-/**
-(c) Copyright 1993, Silicon Graphics, Inc.
-
-ALL RIGHTS RESERVED
-
-Permission to use, copy, modify, and distribute this software
-for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that
-both the copyright notice and this permission notice appear in
-supporting documentation, and that the name of Silicon
-Graphics, Inc. not be used in advertising or publicity
-pertaining to distribution of the software without specific,
-written prior permission.
-
-THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU
-"AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR
-OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN NO
-EVENT SHALL SILICON GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE
-ELSE FOR ANY DIRECT, SPECIAL, INCIDENTAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER,
-INCLUDING WITHOUT LIMITATION, LOSS OF PROFIT, LOSS OF USE,
-SAVINGS OR REVENUE, OR THE CLAIMS OF THIRD PARTIES, WHETHER OR
-NOT SILICON GRAPHICS, INC.  HAS BEEN ADVISED OF THE POSSIBILITY
-OF SUCH LOSS, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-ARISING OUT OF OR IN CONNECTION WITH THE POSSESSION, USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-US Government Users Restricted Rights
-
-Use, duplication, or disclosure by the Government is subject to
-restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
-(c)(1)(ii) of the Rights in Technical Data and Computer
-Software clause at DFARS 252.227-7013 and/or in similar or
-successor clauses in the FAR or the DOD or NASA FAR
-Supplement.  Unpublished-- rights reserved under the copyright
-laws of the United States.  Contractor/manufacturer is Silicon
-Graphics, Inc., 2011 N.  Shoreline Blvd., Mountain View, CA
-94039-7311.
-
-OpenGL(TM) is a trademark of Silicon Graphics, Inc.
-*/
-
-#include 
-#include 
-#include 
-
-#include "internal.h"
-
-/* Some  files do not define M_PI... */
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-static GLUquadricObj *quadObj;
-
-#define QUAD_OBJ_INIT() { if(!quadObj) initQuadObj(); }
-
-static void
-initQuadObj(void)
-{
-  quadObj = gluNewQuadric();
-  if (!quadObj)
-    __glutFatalError("out of memory");
-}
-
-/* CENTRY */
-void GLUTAPIENTRY
-glutWireSphere(GLdouble radius, GLint slices, GLint stacks)
-{
-  QUAD_OBJ_INIT();
-  gluQuadricDrawStyle(quadObj, GLU_LINE);
-  gluQuadricNormals(quadObj, GLU_SMOOTH);
-  /* If we ever changed/used the texture or orientation state
-     of quadObj, we'd need to change it to the defaults here
-     with gluQuadricTexture and/or gluQuadricOrientation. */
-  gluSphere(quadObj, radius, slices, stacks);
-}
-
-void GLUTAPIENTRY
-glutSolidSphere(GLdouble radius, GLint slices, GLint stacks)
-{
-  QUAD_OBJ_INIT();
-  gluQuadricDrawStyle(quadObj, GLU_FILL);
-  gluQuadricNormals(quadObj, GLU_SMOOTH);
-  /* If we ever changed/used the texture or orientation state
-     of quadObj, we'd need to change it to the defaults here
-     with gluQuadricTexture and/or gluQuadricOrientation. */
-  gluSphere(quadObj, radius, slices, stacks);
-}
-
-void GLUTAPIENTRY
-glutWireCone(GLdouble base, GLdouble height,
-  GLint slices, GLint stacks)
-{
-  QUAD_OBJ_INIT();
-  gluQuadricDrawStyle(quadObj, GLU_LINE);
-  gluQuadricNormals(quadObj, GLU_SMOOTH);
-  /* If we ever changed/used the texture or orientation state
-     of quadObj, we'd need to change it to the defaults here
-     with gluQuadricTexture and/or gluQuadricOrientation. */
-  gluCylinder(quadObj, base, 0.0, height, slices, stacks);
-}
-
-void GLUTAPIENTRY
-glutSolidCone(GLdouble base, GLdouble height,
-  GLint slices, GLint stacks)
-{
-  QUAD_OBJ_INIT();
-  gluQuadricDrawStyle(quadObj, GLU_FILL);
-  gluQuadricNormals(quadObj, GLU_SMOOTH);
-  /* If we ever changed/used the texture or orientation state
-     of quadObj, we'd need to change it to the defaults here
-     with gluQuadricTexture and/or gluQuadricOrientation. */
-  gluCylinder(quadObj, base, 0.0, height, slices, stacks);
-}
-
-/* ENDCENTRY */
-
-static void
-drawBox(GLfloat size, GLenum type)
-{
-  static GLfloat n[6][3] =
-  {
-    {-1.0, 0.0, 0.0},
-    {0.0, 1.0, 0.0},
-    {1.0, 0.0, 0.0},
-    {0.0, -1.0, 0.0},
-    {0.0, 0.0, 1.0},
-    {0.0, 0.0, -1.0}
-  };
-  static GLint faces[6][4] =
-  {
-    {0, 1, 2, 3},
-    {3, 2, 6, 7},
-    {7, 6, 5, 4},
-    {4, 5, 1, 0},
-    {5, 6, 2, 1},
-    {7, 4, 0, 3}
-  };
-  GLfloat v[8][3];
-  GLint i;
-
-  v[0][0] = v[1][0] = v[2][0] = v[3][0] = -size / 2;
-  v[4][0] = v[5][0] = v[6][0] = v[7][0] = size / 2;
-  v[0][1] = v[1][1] = v[4][1] = v[5][1] = -size / 2;
-  v[2][1] = v[3][1] = v[6][1] = v[7][1] = size / 2;
-  v[0][2] = v[3][2] = v[4][2] = v[7][2] = -size / 2;
-  v[1][2] = v[2][2] = v[5][2] = v[6][2] = size / 2;
-
-  for (i = 5; i >= 0; i--) {
-    glBegin(type);
-/*     glNormal3fv(&n[i][0]); */
-    glVertex3fv(&v[faces[i][0]][0]);
-    glVertex3fv(&v[faces[i][1]][0]);
-    glVertex3fv(&v[faces[i][2]][0]);
-    glVertex3fv(&v[faces[i][3]][0]);
-    glEnd();
-  }
-}
-
-/* CENTRY */
-void GLUTAPIENTRY
-glutWireCube(GLdouble size)
-{
-  drawBox(size, GL_LINE_LOOP);
-}
-
-void GLUTAPIENTRY
-glutSolidCube(GLdouble size)
-{
-  drawBox(size, GL_QUADS);
-}
-
-/* ENDCENTRY */
-
-static void
-doughnut(GLfloat r, GLfloat R, GLint nsides, GLint rings)
-{
-  int i, j;
-  GLfloat theta, phi, theta1;
-  GLfloat cosTheta, sinTheta;
-  GLfloat cosTheta1, sinTheta1;
-  GLfloat ringDelta, sideDelta;
-
-  ringDelta = 2.0 * M_PI / rings;
-  sideDelta = 2.0 * M_PI / nsides;
-
-  theta = 0.0;
-  cosTheta = 1.0;
-  sinTheta = 0.0;
-  for (i = rings - 1; i >= 0; i--) {
-    theta1 = theta + ringDelta;
-    cosTheta1 = cos(theta1);
-    sinTheta1 = sin(theta1);
-    glBegin(GL_QUAD_STRIP);
-    phi = 0.0;
-    for (j = nsides; j >= 0; j--) {
-      GLfloat cosPhi, sinPhi, dist;
-
-      phi += sideDelta;
-      cosPhi = cos(phi);
-      sinPhi = sin(phi);
-      dist = R + r * cosPhi;
-
-/*       glNormal3f(cosTheta1 * cosPhi, -sinTheta1 * cosPhi, sinPhi); */
-      glVertex3f(cosTheta1 * dist, -sinTheta1 * dist, r * sinPhi);
-/*       glNormal3f(cosTheta * cosPhi, -sinTheta * cosPhi, sinPhi); */
-      glVertex3f(cosTheta * dist, -sinTheta * dist,  r * sinPhi);
-    }
-    glEnd();
-    theta = theta1;
-    cosTheta = cosTheta1;
-    sinTheta = sinTheta1;
-  }
-}
-
-/* CENTRY */
-void GLUTAPIENTRY
-glutWireTorus(GLdouble innerRadius, GLdouble outerRadius,
-  GLint nsides, GLint rings)
-{
-/*   glPushAttrib(GL_POLYGON_BIT); */
-/*   glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); */
-  doughnut(innerRadius, outerRadius, nsides, rings);
-/*   glPopAttrib(); */
-}
-
-void GLUTAPIENTRY
-glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius,
-  GLint nsides, GLint rings)
-{
-  doughnut(innerRadius, outerRadius, nsides, rings);
-}
-
-/* ENDCENTRY */
-
-static GLfloat dodec[20][3];
-
-static void
-initDodecahedron(void)
-{
-  GLfloat alpha, beta;
-
-  alpha = sqrt(2.0 / (3.0 + sqrt(5.0)));
-  beta = 1.0 + sqrt(6.0 / (3.0 + sqrt(5.0)) -
-    2.0 + 2.0 * sqrt(2.0 / (3.0 + sqrt(5.0))));
-  /* *INDENT-OFF* */
-  dodec[0][0] = -alpha; dodec[0][1] = 0; dodec[0][2] = beta;
-  dodec[1][0] = alpha; dodec[1][1] = 0; dodec[1][2] = beta;
-  dodec[2][0] = -1; dodec[2][1] = -1; dodec[2][2] = -1;
-  dodec[3][0] = -1; dodec[3][1] = -1; dodec[3][2] = 1;
-  dodec[4][0] = -1; dodec[4][1] = 1; dodec[4][2] = -1;
-  dodec[5][0] = -1; dodec[5][1] = 1; dodec[5][2] = 1;
-  dodec[6][0] = 1; dodec[6][1] = -1; dodec[6][2] = -1;
-  dodec[7][0] = 1; dodec[7][1] = -1; dodec[7][2] = 1;
-  dodec[8][0] = 1; dodec[8][1] = 1; dodec[8][2] = -1;
-  dodec[9][0] = 1; dodec[9][1] = 1; dodec[9][2] = 1;
-  dodec[10][0] = beta; dodec[10][1] = alpha; dodec[10][2] = 0;
-  dodec[11][0] = beta; dodec[11][1] = -alpha; dodec[11][2] = 0;
-  dodec[12][0] = -beta; dodec[12][1] = alpha; dodec[12][2] = 0;
-  dodec[13][0] = -beta; dodec[13][1] = -alpha; dodec[13][2] = 0;
-  dodec[14][0] = -alpha; dodec[14][1] = 0; dodec[14][2] = -beta;
-  dodec[15][0] = alpha; dodec[15][1] = 0; dodec[15][2] = -beta;
-  dodec[16][0] = 0; dodec[16][1] = beta; dodec[16][2] = alpha;
-  dodec[17][0] = 0; dodec[17][1] = beta; dodec[17][2] = -alpha;
-  dodec[18][0] = 0; dodec[18][1] = -beta; dodec[18][2] = alpha;
-  dodec[19][0] = 0; dodec[19][1] = -beta; dodec[19][2] = -alpha;
-  /* *INDENT-ON* */
-
-}
-
-#define DIFF3(_a,_b,_c) { \
-    (_c)[0] = (_a)[0] - (_b)[0]; \
-    (_c)[1] = (_a)[1] - (_b)[1]; \
-    (_c)[2] = (_a)[2] - (_b)[2]; \
-}
-
-static void
-crossprod(GLfloat v1[3], GLfloat v2[3], GLfloat prod[3])
-{
-  GLfloat p[3];         /* in case prod == v1 or v2 */
-
-  p[0] = v1[1] * v2[2] - v2[1] * v1[2];
-  p[1] = v1[2] * v2[0] - v2[2] * v1[0];
-  p[2] = v1[0] * v2[1] - v2[0] * v1[1];
-  prod[0] = p[0];
-  prod[1] = p[1];
-  prod[2] = p[2];
-}
-
-static void
-normalize(GLfloat v[3])
-{
-  GLfloat d;
-
-  d = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-  if (d == 0.0) {
-/*    __glutWarning("normalize: zero length vector"); */
-    v[0] = d = 1.0;
-  }
-  d = 1 / d;
-  v[0] *= d;
-  v[1] *= d;
-  v[2] *= d;
-}
-
-static void
-pentagon(int a, int b, int c, int d, int e, GLenum shadeType)
-{
-  GLfloat n0[3], d1[3], d2[3];
-
-  DIFF3(dodec[a], dodec[b], d1);
-  DIFF3(dodec[b], dodec[c], d2);
-  crossprod(d1, d2, n0);
-  normalize(n0);
-
-  glBegin(shadeType);
-/*   glNormal3fv(n0); */
-  glVertex3fv(&dodec[a][0]);
-  glVertex3fv(&dodec[b][0]);
-  glVertex3fv(&dodec[c][0]);
-  glVertex3fv(&dodec[d][0]);
-  glVertex3fv(&dodec[e][0]);
-  glEnd();
-}
-
-static void
-dodecahedron(GLenum type)
-{
-  static int inited = 0;
-
-  if (inited == 0) {
-    inited = 1;
-    initDodecahedron();
-  }
-  pentagon(0, 1, 9, 16, 5, type);
-  pentagon(1, 0, 3, 18, 7, type);
-  pentagon(1, 7, 11, 10, 9, type);
-  pentagon(11, 7, 18, 19, 6, type);
-  pentagon(8, 17, 16, 9, 10, type);
-  pentagon(2, 14, 15, 6, 19, type);
-  pentagon(2, 13, 12, 4, 14, type);
-  pentagon(2, 19, 18, 3, 13, type);
-  pentagon(3, 0, 5, 12, 13, type);
-  pentagon(6, 15, 8, 10, 11, type);
-  pentagon(4, 17, 8, 15, 14, type);
-  pentagon(4, 12, 5, 16, 17, type);
-}
-
-/* CENTRY */
-void GLUTAPIENTRY
-glutWireDodecahedron(void)
-{
-  dodecahedron(GL_LINE_LOOP);
-}
-
-void GLUTAPIENTRY
-glutSolidDodecahedron(void)
-{
-  dodecahedron(GL_TRIANGLE_FAN);
-}
-
-/* ENDCENTRY */
-
-static void
-recorditem(GLfloat * n1, GLfloat * n2, GLfloat * n3,
-  GLenum shadeType)
-{
-  GLfloat q0[3], q1[3];
-
-  DIFF3(n1, n2, q0);
-  DIFF3(n2, n3, q1);
-  crossprod(q0, q1, q1);
-  normalize(q1);
-
-  glBegin(shadeType);
-/*   glNormal3fv(q1); */
-  glVertex3fv(n1);
-  glVertex3fv(n2);
-  glVertex3fv(n3);
-  glEnd();
-}
-
-static void
-subdivide(GLfloat * v0, GLfloat * v1, GLfloat * v2,
-  GLenum shadeType)
-{
-  int depth;
-  GLfloat w0[3], w1[3], w2[3];
-  GLfloat l;
-  int i, j, k, n;
-
-  depth = 1;
-  for (i = 0; i < depth; i++) {
-    for (j = 0; i + j < depth; j++) {
-      k = depth - i - j;
-      for (n = 0; n < 3; n++) {
-        w0[n] = (i * v0[n] + j * v1[n] + k * v2[n]) / depth;
-        w1[n] = ((i + 1) * v0[n] + j * v1[n] + (k - 1) * v2[n])
-          / depth;
-        w2[n] = (i * v0[n] + (j + 1) * v1[n] + (k - 1) * v2[n])
-          / depth;
-      }
-      l = sqrt(w0[0] * w0[0] + w0[1] * w0[1] + w0[2] * w0[2]);
-      w0[0] /= l;
-      w0[1] /= l;
-      w0[2] /= l;
-      l = sqrt(w1[0] * w1[0] + w1[1] * w1[1] + w1[2] * w1[2]);
-      w1[0] /= l;
-      w1[1] /= l;
-      w1[2] /= l;
-      l = sqrt(w2[0] * w2[0] + w2[1] * w2[1] + w2[2] * w2[2]);
-      w2[0] /= l;
-      w2[1] /= l;
-      w2[2] /= l;
-      recorditem(w1, w0, w2, shadeType);
-    }
-  }
-}
-
-static void
-drawtriangle(int i, GLfloat data[][3], int ndx[][3],
-  GLenum shadeType)
-{
-  GLfloat *x0, *x1, *x2;
-
-  x0 = data[ndx[i][0]];
-  x1 = data[ndx[i][1]];
-  x2 = data[ndx[i][2]];
-  subdivide(x0, x1, x2, shadeType);
-}
-
-/* octahedron data: The octahedron produced is centered at the
-   origin and has radius 1.0 */
-static GLfloat odata[6][3] =
-{
-  {1.0, 0.0, 0.0},
-  {-1.0, 0.0, 0.0},
-  {0.0, 1.0, 0.0},
-  {0.0, -1.0, 0.0},
-  {0.0, 0.0, 1.0},
-  {0.0, 0.0, -1.0}
-};
-
-static int ondex[8][3] =
-{
-  {0, 4, 2},
-  {1, 2, 4},
-  {0, 3, 4},
-  {1, 4, 3},
-  {0, 2, 5},
-  {1, 5, 2},
-  {0, 5, 3},
-  {1, 3, 5}
-};
-
-static void
-octahedron(GLenum shadeType)
-{
-  int i;
-
-  for (i = 7; i >= 0; i--) {
-    drawtriangle(i, odata, ondex, shadeType);
-  }
-}
-
-/* CENTRY */
-void GLUTAPIENTRY
-glutWireOctahedron(void)
-{
-  octahedron(GL_LINE_LOOP);
-}
-
-void GLUTAPIENTRY
-glutSolidOctahedron(void)
-{
-  octahedron(GL_TRIANGLES);
-}
-
-/* ENDCENTRY */
-
-/* icosahedron data: These numbers are rigged to make an
-   icosahedron of radius 1.0 */
-
-#define X .525731112119133606
-#define Z .850650808352039932
-
-static GLfloat idata[12][3] =
-{
-  {-X, 0, Z},
-  {X, 0, Z},
-  {-X, 0, -Z},
-  {X, 0, -Z},
-  {0, Z, X},
-  {0, Z, -X},
-  {0, -Z, X},
-  {0, -Z, -X},
-  {Z, X, 0},
-  {-Z, X, 0},
-  {Z, -X, 0},
-  {-Z, -X, 0}
-};
-
-static int index[20][3] =
-{
-  {0, 4, 1},
-  {0, 9, 4},
-  {9, 5, 4},
-  {4, 5, 8},
-  {4, 8, 1},
-  {8, 10, 1},
-  {8, 3, 10},
-  {5, 3, 8},
-  {5, 2, 3},
-  {2, 7, 3},
-  {7, 10, 3},
-  {7, 6, 10},
-  {7, 11, 6},
-  {11, 0, 6},
-  {0, 1, 6},
-  {6, 1, 10},
-  {9, 0, 11},
-  {9, 11, 2},
-  {9, 2, 5},
-  {7, 2, 11},
-};
-
-static void
-icosahedron(GLenum shadeType)
-{
-  int i;
-
-  for (i = 19; i >= 0; i--) {
-    drawtriangle(i, idata, index, shadeType);
-  }
-}
-
-/* CENTRY */
-void GLUTAPIENTRY
-glutWireIcosahedron(void)
-{
-  icosahedron(GL_LINE_LOOP);
-}
-
-void GLUTAPIENTRY
-glutSolidIcosahedron(void)
-{
-  icosahedron(GL_TRIANGLES);
-}
-
-/* ENDCENTRY */
-
-/* tetrahedron data: */
-
-#define T       1.73205080756887729
-
-static GLfloat tdata[4][3] =
-{
-  {T, T, T},
-  {T, -T, -T},
-  {-T, T, -T},
-  {-T, -T, T}
-};
-
-static int tndex[4][3] =
-{
-  {0, 1, 3},
-  {2, 1, 0},
-  {3, 2, 0},
-  {1, 2, 3}
-};
-
-static void
-tetrahedron(GLenum shadeType)
-{
-  int i;
-
-  for (i = 3; i >= 0; i--)
-    drawtriangle(i, tdata, tndex, shadeType);
-}
-
-/* CENTRY */
-void GLUTAPIENTRY
-glutWireTetrahedron(void)
-{
-  tetrahedron(GL_LINE_LOOP);
-}
-
-void GLUTAPIENTRY
-glutSolidTetrahedron(void)
-{
-  tetrahedron(GL_TRIANGLES);
-}
-
-/* ENDCENTRY */
diff --git a/src/glut/directfb/overlay.c b/src/glut/directfb/overlay.c
deleted file mode 100644
index 714be5f1a2..0000000000
--- a/src/glut/directfb/overlay.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include "internal.h"
-
-
-void GLUTAPIENTRY 
-glutEstablishOverlay( void )
-{
-}
-
-
-void GLUTAPIENTRY 
-glutRemoveOverlay( void )
-{
-}
-
-
-void GLUTAPIENTRY 
-glutUseLayer( GLenum layer )
-{
-}
-
-
-void GLUTAPIENTRY
-glutPostOverlayRedisplay( void )
-{
-}
-
-
-void GLUTAPIENTRY
-glutPostWindowOverlayRedisplay( int win )
-{
-}
-
-
-void GLUTAPIENTRY
-glutShowOverlay( void )
-{
-}
-
-
-void GLUTAPIENTRY
-glutHideOverlay( void )
-{
-}
diff --git a/src/glut/directfb/state.c b/src/glut/directfb/state.c
deleted file mode 100644
index 194d5bbb62..0000000000
--- a/src/glut/directfb/state.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include 
-#include 
-#include 
-
-#include "GL/glu.h"
-
-#include "internal.h"
-
-
-int GLUTAPIENTRY 
-glutGet( GLenum type )
-{   
-     switch (type) {
-          case GLUT_WINDOW_X:
-               if (g_current && g_current->window) {
-                    int x;
-                    g_current->window->GetPosition( g_current->window, &x, 0 );
-                    return x;
-               }
-               break;
-          case GLUT_WINDOW_Y:
-               if (g_current && g_current->window) {
-                    int y;
-                    g_current->window->GetPosition( g_current->window, 0, &y );
-                    return y;
-               }
-               break;
-               
-          case GLUT_WINDOW_WIDTH:
-               if (g_current) {
-                    int w;
-                    g_current->surface->GetSize( g_current->surface, &w, 0 );
-                    return w;
-               }
-               break;
-          case GLUT_WINDOW_HEIGHT:
-               if (g_current) {
-                    int h;
-                    g_current->surface->GetSize( g_current->surface, 0, &h );
-                    return h;
-               }
-               break;
-               
-          case GLUT_WINDOW_BUFFER_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.buffer_size;
-               }
-               break;             
-          case GLUT_WINDOW_STENCIL_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.stencil_size;
-               }
-               break;              
-          case GLUT_WINDOW_DEPTH_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.depth_size;
-               }
-               break;
-          case GLUT_WINDOW_RED_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.red_size;
-               }
-               break;
-          case GLUT_WINDOW_GREEN_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.green_size;
-               }
-               break;
-          case GLUT_WINDOW_BLUE_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.blue_size;
-               }
-               break;
-          case GLUT_WINDOW_ALPHA_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.alpha_size;
-               }
-               break;
-          case GLUT_WINDOW_ACCUM_RED_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.accum_red_size;
-               }
-               break;
-          case GLUT_WINDOW_ACCUM_GREEN_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.accum_green_size;
-               }
-               break;
-          case GLUT_WINDOW_ACCUM_BLUE_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.accum_blue_size;
-               }
-               break;
-          case GLUT_WINDOW_ACCUM_ALPHA_SIZE:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.accum_alpha_size;
-               }
-               break;
-          case GLUT_WINDOW_DOUBLEBUFFER:
-               if (g_current) {
-                    DFBGLAttributes a;
-                    g_current->gl->GetAttributes( g_current->gl, &a );
-                    return a.double_buffer;
-               }
-               break;                    
-          
-          case GLUT_WINDOW_RGBA:
-               return 1;
-          
-          case GLUT_WINDOW_CURSOR:
-               if (g_current)
-                    return g_current->cursor;
-               break;
-               
-          case GLUT_SCREEN_WIDTH:
-               if (primary) {
-                    DFBDisplayLayerConfig c;
-                    primary->GetConfiguration( primary, &c );
-                    return c.width;
-               }
-               break;
-          case GLUT_SCREEN_HEIGHT:
-               if (primary) {
-                    DFBDisplayLayerConfig c;
-                    primary->GetConfiguration( primary, &c );
-                    return c.height;
-               }
-               break;
-               
-          case GLUT_INIT_DISPLAY_MODE:
-               return g_display_mode;
-          case GLUT_INIT_WINDOW_X:
-               return g_xpos;
-          case GLUT_INIT_WINDOW_Y:
-               return g_ypos;
-          case GLUT_INIT_WINDOW_WIDTH:
-               return g_width;
-          case GLUT_INIT_WINDOW_HEIGHT:
-               return g_height;
-
-          case GLUT_ELAPSED_TIME:
-               {
-                    static long long start = -1;
-                    struct timeval   t;
-               
-                    gettimeofday( &t, NULL );
-                    if (start == -1) {
-                         start = t.tv_sec * 1000ll + t.tv_usec / 1000ll;
-                         return 0;
-                    }
-                    return (t.tv_sec * 1000ll + t.tv_usec / 1000ll - start);
-               }
-               break;
-               
-          default:
-               break;
-     }
-     
-     return 0;
-}
-
-
-int GLUTAPIENTRY
-glutLayerGet( GLenum type )
-{
-     return 0;
-}
-
-void GLUTAPIENTRY
-glutReportErrors( void )
-{
-     GLenum error;
-     
-     while ((error = glGetError()) != GL_NO_ERROR)
-          __glutWarning( "**OpenGL Error** %s", gluErrorString( error ) );
-}
-
-
diff --git a/src/glut/directfb/teapot.c b/src/glut/directfb/teapot.c
deleted file mode 100644
index e7f1ee812f..0000000000
--- a/src/glut/directfb/teapot.c
+++ /dev/null
@@ -1,212 +0,0 @@
-
-/* Copyright (c) Mark J. Kilgard, 1994. */
-
-/**
-(c) Copyright 1993, Silicon Graphics, Inc.
-
-ALL RIGHTS RESERVED
-
-Permission to use, copy, modify, and distribute this software
-for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that
-both the copyright notice and this permission notice appear in
-supporting documentation, and that the name of Silicon
-Graphics, Inc. not be used in advertising or publicity
-pertaining to distribution of the software without specific,
-written prior permission.
-
-THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU
-"AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR
-OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN NO
-EVENT SHALL SILICON GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE
-ELSE FOR ANY DIRECT, SPECIAL, INCIDENTAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER,
-INCLUDING WITHOUT LIMITATION, LOSS OF PROFIT, LOSS OF USE,
-SAVINGS OR REVENUE, OR THE CLAIMS OF THIRD PARTIES, WHETHER OR
-NOT SILICON GRAPHICS, INC.  HAS BEEN ADVISED OF THE POSSIBILITY
-OF SUCH LOSS, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-ARISING OUT OF OR IN CONNECTION WITH THE POSSESSION, USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-US Government Users Restricted Rights
-
-Use, duplication, or disclosure by the Government is subject to
-restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
-(c)(1)(ii) of the Rights in Technical Data and Computer
-Software clause at DFARS 252.227-7013 and/or in similar or
-successor clauses in the FAR or the DOD or NASA FAR
-Supplement.  Unpublished-- rights reserved under the copyright
-laws of the United States.  Contractor/manufacturer is Silicon
-Graphics, Inc., 2011 N.  Shoreline Blvd., Mountain View, CA
-94039-7311.
-
-OpenGL(TM) is a trademark of Silicon Graphics, Inc.
-*/
-
-#include 
-#include 
-#include "GL/glut.h"
-
-/* Rim, body, lid, and bottom data must be reflected in x and
-   y; handle and spout data across the y axis only.  */
-
-static int patchdata[][16] =
-{
-    /* rim */
-  {102, 103, 104, 105, 4, 5, 6, 7, 8, 9, 10, 11,
-    12, 13, 14, 15},
-    /* body */
-  {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-    24, 25, 26, 27},
-  {24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 35, 36,
-    37, 38, 39, 40},
-    /* lid */
-  {96, 96, 96, 96, 97, 98, 99, 100, 101, 101, 101,
-    101, 0, 1, 2, 3,},
-  {0, 1, 2, 3, 106, 107, 108, 109, 110, 111, 112,
-    113, 114, 115, 116, 117},
-    /* bottom */
-  {118, 118, 118, 118, 124, 122, 119, 121, 123, 126,
-    125, 120, 40, 39, 38, 37},
-    /* handle */
-  {41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-    53, 54, 55, 56},
-  {53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
-    28, 65, 66, 67},
-    /* spout */
-  {68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-    80, 81, 82, 83},
-  {80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-    92, 93, 94, 95}
-};
-/* *INDENT-OFF* */
-
-static float cpdata[][3] =
-{
-    {0.2, 0, 2.7}, {0.2, -0.112, 2.7}, {0.112, -0.2, 2.7}, {0,
-    -0.2, 2.7}, {1.3375, 0, 2.53125}, {1.3375, -0.749, 2.53125},
-    {0.749, -1.3375, 2.53125}, {0, -1.3375, 2.53125}, {1.4375,
-    0, 2.53125}, {1.4375, -0.805, 2.53125}, {0.805, -1.4375,
-    2.53125}, {0, -1.4375, 2.53125}, {1.5, 0, 2.4}, {1.5, -0.84,
-    2.4}, {0.84, -1.5, 2.4}, {0, -1.5, 2.4}, {1.75, 0, 1.875},
-    {1.75, -0.98, 1.875}, {0.98, -1.75, 1.875}, {0, -1.75,
-    1.875}, {2, 0, 1.35}, {2, -1.12, 1.35}, {1.12, -2, 1.35},
-    {0, -2, 1.35}, {2, 0, 0.9}, {2, -1.12, 0.9}, {1.12, -2,
-    0.9}, {0, -2, 0.9}, {-2, 0, 0.9}, {2, 0, 0.45}, {2, -1.12,
-    0.45}, {1.12, -2, 0.45}, {0, -2, 0.45}, {1.5, 0, 0.225},
-    {1.5, -0.84, 0.225}, {0.84, -1.5, 0.225}, {0, -1.5, 0.225},
-    {1.5, 0, 0.15}, {1.5, -0.84, 0.15}, {0.84, -1.5, 0.15}, {0,
-    -1.5, 0.15}, {-1.6, 0, 2.025}, {-1.6, -0.3, 2.025}, {-1.5,
-    -0.3, 2.25}, {-1.5, 0, 2.25}, {-2.3, 0, 2.025}, {-2.3, -0.3,
-    2.025}, {-2.5, -0.3, 2.25}, {-2.5, 0, 2.25}, {-2.7, 0,
-    2.025}, {-2.7, -0.3, 2.025}, {-3, -0.3, 2.25}, {-3, 0,
-    2.25}, {-2.7, 0, 1.8}, {-2.7, -0.3, 1.8}, {-3, -0.3, 1.8},
-    {-3, 0, 1.8}, {-2.7, 0, 1.575}, {-2.7, -0.3, 1.575}, {-3,
-    -0.3, 1.35}, {-3, 0, 1.35}, {-2.5, 0, 1.125}, {-2.5, -0.3,
-    1.125}, {-2.65, -0.3, 0.9375}, {-2.65, 0, 0.9375}, {-2,
-    -0.3, 0.9}, {-1.9, -0.3, 0.6}, {-1.9, 0, 0.6}, {1.7, 0,
-    1.425}, {1.7, -0.66, 1.425}, {1.7, -0.66, 0.6}, {1.7, 0,
-    0.6}, {2.6, 0, 1.425}, {2.6, -0.66, 1.425}, {3.1, -0.66,
-    0.825}, {3.1, 0, 0.825}, {2.3, 0, 2.1}, {2.3, -0.25, 2.1},
-    {2.4, -0.25, 2.025}, {2.4, 0, 2.025}, {2.7, 0, 2.4}, {2.7,
-    -0.25, 2.4}, {3.3, -0.25, 2.4}, {3.3, 0, 2.4}, {2.8, 0,
-    2.475}, {2.8, -0.25, 2.475}, {3.525, -0.25, 2.49375},
-    {3.525, 0, 2.49375}, {2.9, 0, 2.475}, {2.9, -0.15, 2.475},
-    {3.45, -0.15, 2.5125}, {3.45, 0, 2.5125}, {2.8, 0, 2.4},
-    {2.8, -0.15, 2.4}, {3.2, -0.15, 2.4}, {3.2, 0, 2.4}, {0, 0,
-    3.15}, {0.8, 0, 3.15}, {0.8, -0.45, 3.15}, {0.45, -0.8,
-    3.15}, {0, -0.8, 3.15}, {0, 0, 2.85}, {1.4, 0, 2.4}, {1.4,
-    -0.784, 2.4}, {0.784, -1.4, 2.4}, {0, -1.4, 2.4}, {0.4, 0,
-    2.55}, {0.4, -0.224, 2.55}, {0.224, -0.4, 2.55}, {0, -0.4,
-    2.55}, {1.3, 0, 2.55}, {1.3, -0.728, 2.55}, {0.728, -1.3,
-    2.55}, {0, -1.3, 2.55}, {1.3, 0, 2.4}, {1.3, -0.728, 2.4},
-    {0.728, -1.3, 2.4}, {0, -1.3, 2.4}, {0, 0, 0}, {1.425,
-    -0.798, 0}, {1.5, 0, 0.075}, {1.425, 0, 0}, {0.798, -1.425,
-    0}, {0, -1.5, 0.075}, {0, -1.425, 0}, {1.5, -0.84, 0.075},
-    {0.84, -1.5, 0.075}
-};
-
-static float tex[2][2][2] =
-{
-  { {0, 0},
-    {1, 0}},
-  { {0, 1},
-    {1, 1}}
-};
-
-/* *INDENT-ON* */
-
-static void
-teapot(GLint grid, GLdouble scale, GLenum type)
-{
-  float p[4][4][3], q[4][4][3], r[4][4][3], s[4][4][3];
-  long i, j, k, l;
-
-  glPushAttrib(GL_ENABLE_BIT | GL_EVAL_BIT);
-  glEnable(GL_AUTO_NORMAL);
-  glEnable(GL_NORMALIZE);
-  glEnable(GL_MAP2_VERTEX_3);
-  glEnable(GL_MAP2_TEXTURE_COORD_2);
-  glPushMatrix();
-  glRotatef(270.0, 1.0, 0.0, 0.0);
-  glScalef(0.5 * scale, 0.5 * scale, 0.5 * scale);
-  glTranslatef(0.0, 0.0, -1.5);
-  for (i = 0; i < 10; i++) {
-    for (j = 0; j < 4; j++) {
-      for (k = 0; k < 4; k++) {
-        for (l = 0; l < 3; l++) {
-          p[j][k][l] = cpdata[patchdata[i][j * 4 + k]][l];
-          q[j][k][l] = cpdata[patchdata[i][j * 4 + (3 - k)]][l];
-          if (l == 1)
-            q[j][k][l] *= -1.0;
-          if (i < 6) {
-            r[j][k][l] =
-              cpdata[patchdata[i][j * 4 + (3 - k)]][l];
-            if (l == 0)
-              r[j][k][l] *= -1.0;
-            s[j][k][l] = cpdata[patchdata[i][j * 4 + k]][l];
-            if (l == 0)
-              s[j][k][l] *= -1.0;
-            if (l == 1)
-              s[j][k][l] *= -1.0;
-          }
-        }
-      }
-    }
-    glMap2f(GL_MAP2_TEXTURE_COORD_2, 0, 1, 2, 2, 0, 1, 4, 2,
-      &tex[0][0][0]);
-    glMap2f(GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4,
-      &p[0][0][0]);
-    glMapGrid2f(grid, 0.0, 1.0, grid, 0.0, 1.0);
-    glEvalMesh2(type, 0, grid, 0, grid);
-    glMap2f(GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4,
-      &q[0][0][0]);
-    glEvalMesh2(type, 0, grid, 0, grid);
-    if (i < 6) {
-      glMap2f(GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4,
-        &r[0][0][0]);
-      glEvalMesh2(type, 0, grid, 0, grid);
-      glMap2f(GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4,
-        &s[0][0][0]);
-      glEvalMesh2(type, 0, grid, 0, grid);
-    }
-  }
-  glPopMatrix();
-  glPopAttrib();
-}
-
-/* CENTRY */
-void GLUTAPIENTRY 
-glutSolidTeapot(GLdouble scale)
-{
-  teapot(7, scale, GL_FILL);
-}
-
-void GLUTAPIENTRY 
-glutWireTeapot(GLdouble scale)
-{
-  teapot(10, scale, GL_LINE);
-}
-
-/* ENDCENTRY */
diff --git a/src/glut/directfb/window.c b/src/glut/directfb/window.c
deleted file mode 100644
index 62cf8bb33e..0000000000
--- a/src/glut/directfb/window.c
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- * Copyright (C) 2006 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include 
-#include 
-#include 
-#include 
-
-#include "internal.h"
-
-
-/*****************************************************************************/
-
-static __GlutWindow *g_stack = NULL;
-
-/*****************************************************************************/
-
-
-__GlutWindow* 
-__glutCreateWindow( GLboolean fullscreen )
-{
-     __GlutWindow *new;
-     DFBResult     ret;
-     static int    curid = 1;
-
-     new = calloc( 1, sizeof(__GlutWindow) );
-     if (!new)
-          __glutFatalError( "out of memory" );
-     
-     new->id = curid++;
-
-     if (fullscreen) {
-          DFBDisplayLayerConfig      config;
-          DFBDisplayLayerConfigFlags fail = 0;
-          
-          config.flags  = DLCONF_WIDTH | DLCONF_HEIGHT |
-                          DLCONF_BUFFERMODE;
-          config.width  = g_width;
-          config.height = g_height;
-          
-          if (g_display_mode & GLUT_DOUBLE)
-               config.buffermode = DLBM_BACKVIDEO;
-          else
-               config.buffermode = DLBM_FRONTONLY;
-               
-          if (g_bpp) {
-               config.flags |= DLCONF_PIXELFORMAT;
-               
-               switch (g_bpp) {
-                    case 8:
-                         config.pixelformat = DSPF_RGB332;
-                         break;
-                    case 12:
-                         config.pixelformat = DSPF_ARGB4444;
-                         break;
-                    case 15:
-                         config.pixelformat = DSPF_ARGB1555;
-                         break;
-                    case 16:
-                         config.pixelformat = DSPF_RGB16;
-                         break;
-                    case 24:
-                    case 32:
-                         config.pixelformat = DSPF_RGB32;
-                         break;
-                    default:
-                         config.flags &= ~DLCONF_PIXELFORMAT;
-                         break;
-               }
-          }
-               
-          primary->TestConfiguration( primary, &config, &fail );
-          config.flags &= ~fail;
-          primary->SetConfiguration( primary, &config );
-               
-          ret = primary->GetSurface( primary, &new->surface );
-          if (ret) {
-               DirectFBError( "IDirectFBDisplayLayer::GetSurface()", ret );
-               free( new );
-               return NULL;
-          }
-          
-          ret = new->surface->GetGL( new->surface, &new->gl );
-          if (ret) {
-               DirectFBError( "IDirectFBSurface::GetGL()", ret );
-               new->surface->Release( new->surface );
-               free( new );
-               return NULL;
-          }
-          
-          events->Reset( events );
-          if (keyboard)
-               keyboard->AttachEventBuffer( keyboard, events );
-          if (mouse)
-               mouse->AttachEventBuffer( mouse, events );
-          if (joystick)
-               joystick->AttachEventBuffer( joystick, events );
-               
-          new->visible = GL_TRUE;    
-     }
-     else {
-          DFBWindowDescription dsc;
-     
-          dsc.flags  = DWDESC_CAPS | DWDESC_POSX | DWDESC_POSY | 
-                       DWDESC_WIDTH | DWDESC_HEIGHT;
-          dsc.caps   = DWCAPS_NONE;
-          dsc.posx   = g_xpos;
-          dsc.posy   = g_ypos;
-          dsc.width  = g_width;
-          dsc.height = g_height;
-
-          if (g_display_mode & GLUT_DOUBLE)
-               dsc.caps |= DWCAPS_DOUBLEBUFFER;
-          if (g_display_mode & GLUT_ALPHA)
-               dsc.caps |= DWCAPS_ALPHACHANNEL;
-
-          ret = primary->CreateWindow( primary, &dsc, &new->window );
-          if (ret) {
-               DirectFBError( "IDirectFBDisplayLayer::CreateWindow()", ret );
-               free( new );
-               return NULL;
-          }
-
-          new->window->GetID( new->window, &new->wid );
-     
-          ret = new->window->GetSurface( new->window, &new->surface );
-          if (ret) {
-               DirectFBError( "IDirectFBWindow::GetSurface()", ret );
-               new->window->Release( new->window );
-               free( new );
-               return NULL;
-          }
-
-          ret = new->surface->GetGL( new->surface, &new->gl );
-          if (ret) {
-               DirectFBError( "IDirectFBSurface::GetGl()", ret );
-               new->surface->Release( new->surface );
-               new->window->Release( new->window );
-               free( new );
-               return NULL;
-          }
-          
-          new->window->AttachEventBuffer( new->window, events );
-          /* enable only handled events */
-          new->window->DisableEvents( new->window, DWET_ALL );
-          new->window->EnableEvents( new->window, DWET_KEYDOWN    | DWET_KEYUP    |
-                                                  DWET_BUTTONDOWN | DWET_BUTTONUP |
-                                                  DWET_ENTER      | DWET_LEAVE    |
-                                                  DWET_MOTION     | DWET_SIZE );
-          
-          new->req.flags |= WINDOW_REQUEST_SHOW;
-     }
-
-     new->mode = g_display_mode;
-     
-     new->reshape    = GL_TRUE;
-     new->visibility = GL_TRUE;
-     new->redisplay  = GL_TRUE;
-     
-     if (g_stack) {
-          new->prev = g_stack->prev;
-          g_stack->prev->next = new;
-          g_stack->prev = new;
-     }
-     else {
-          new->prev = new;
-          g_stack = new;
-     }     
-   
-     return new;
-}
-
-
-__GlutWindow*
-__glutFindWindow( DFBWindowID id )
-{
-     __GlutWindow *cur;
-
-     for (cur = g_stack; cur; cur = cur->next) {
-          if (cur->wid == id)
-               return cur;
-     }
-
-     __glutFatalError( "Window %d not found", id );
-     
-     return NULL;
-}
-
-
-void
-__glutSetWindow( __GlutWindow *window )
-{
-     if (g_current) {
-          if (g_current == window)
-               return;
-          g_current->gl->Unlock( g_current->gl );
-     }
-     
-     if (window)     
-          window->gl->Lock( window->gl );
-     g_current = window;
-}
-
-
-void
-__glutHandleWindows( void )
-{
-     __GlutWindow *cur = g_stack;
-     
-     while (cur) {
-          __GlutWindow *next      = cur->next;
-          GLboolean     displayed = GL_FALSE;
-          
-          if (cur->window && cur->req.flags) {
-               if (cur == g_current)
-                    cur->gl->Unlock( cur->gl );
-
-               if (cur->req.flags & WINDOW_REQUEST_DESTROY) {
-                    __glutDestroyWindow( cur );
-                    cur = next;
-                    continue;
-               }
-     
-               if (cur->req.flags & WINDOW_REQUEST_POSITION) {
-                    cur->window->MoveTo( cur->window, 
-                                         cur->req.x, cur->req.y );
-               }
-           
-               if (cur->req.flags & WINDOW_REQUEST_RESIZE) {
-                    cur->window->Resize( cur->window,
-                                        cur->req.w, cur->req.h );
-                    cur->reshape = GL_TRUE;
-                    cur->redisplay = GL_TRUE;
-               }
-     
-               if (cur->req.flags & WINDOW_REQUEST_RESTACK) {
-                    while (cur->req.z > 0) {
-                         if (cur->req.z >= +1000) {
-                              cur->window->RaiseToTop( cur->window );
-                              cur->req.z = 0;
-                              break;
-                         }
-               
-                         cur->window->Raise( cur->window );
-                         cur->req.z--;
-                    }
-          
-                    while (cur->req.z < 0) {
-                         if (cur->req.z <= -1000) {
-                              cur->window->LowerToBottom( cur->window );
-                              cur->req.z = 0;
-                              break;
-                         }
-               
-                         cur->window->Lower( cur->window );
-                         cur->req.z++;
-                    }
-               }
-     
-               if (cur->req.flags & WINDOW_REQUEST_SHOW) {
-                    cur->window->SetOpacity( cur->window, 0xff );
-                    cur->visible = GL_TRUE;
-                    cur->visibility = GL_TRUE;
-               }
-               else if (cur->req.flags & WINDOW_REQUEST_HIDE) {
-                    cur->window->SetOpacity( cur->window, 0x00 );
-                    cur->visible = GL_FALSE;
-                    cur->visibility = GL_TRUE;
-               }
- 
-               cur->req.flags = 0;
-
-               if (cur == g_current)
-                    cur->gl->Lock( cur->gl );
-          }
-          
-          if (cur->reshape && reshape_func) {
-               int w, h;
-               g_idle = GL_FALSE;                    
-               cur->surface->GetSize( cur->surface, &w, &h ); 
-               __glutSetWindow( cur );
-               reshape_func( w, h );
-               displayed = GL_TRUE;
-          }
-          
-          if (cur->visibility && visibility_func) {
-               g_idle = GL_FALSE;
-               __glutSetWindow( cur );
-               visibility_func( cur->visible ? GLUT_VISIBLE : GLUT_NOT_VISIBLE );
-               displayed = GL_TRUE;
-          }
-
-          if (cur->redisplay && display_func) {
-               g_idle = GL_FALSE;
-               __glutSetWindow( cur );
-               display_func();
-               displayed = GL_TRUE;
-          }
-          
-          if (displayed && cur->window && cur->visible) {
-               if (!(cur->mode & GLUT_DOUBLE)) {
-                    cur->gl->Unlock( cur->gl );
-                    cur->surface->Flip( cur->surface, NULL, 0 );
-                    cur->gl->Lock( cur->gl );
-               }
-          }
-               
-          cur->reshape    = GL_FALSE;
-          cur->visibility = GL_FALSE;
-          cur->redisplay  = GL_FALSE;
-
-          cur = next;
-     }
-}
-
-
-void
-__glutDestroyWindow( __GlutWindow *window )
-{
-     __GlutWindow *next = window->next;
-     __GlutWindow *prev = window->prev;
-     
-     __glutAssert( window != NULL );
-     
-     if (window == g_current)
-          g_current = NULL;
-     if (window == g_game)
-          g_game = NULL;
-     
-     window->gl->Unlock( window->gl );
-     window->gl->Release( window->gl );
-     window->surface->Release( window->surface );
-     
-     if (window->window) {
-#if DIRECTFB_VERSION_CODE >= VERSION_CODE(0,9,26)
-          window->window->DetachEventBuffer( window->window, events );
-#else
-          window->window->Destroy( window->window );
-#endif
-          window->window->Release( window->window );
-     }
-     else {
-#if DIRECTFB_VERSION_CODE >= VERSION_CODE(0,9,26)
-          if (joystick)
-               joystick->DetachEventBuffer( joystick, events );
-          if (mouse)
-               mouse->DetachEventBuffer( mouse, events );
-          if (keyboard)
-               keyboard->DetachEventBuffer( keyboard, events );
-#endif
-          events->Reset( events );
-     }
-     
-     free( window );
-
-     if (next)
-          next->prev = prev;
-     else
-          g_stack->prev = prev;
-
-     if (window == g_stack)
-          g_stack = next;
-     else
-          prev->next = next;
-}
-
-
-void
-__glutDestroyWindows( void )
-{
-     __GlutWindow *cur = g_stack;
-     
-     while (cur) {
-          __GlutWindow *next = cur->next;
-          __glutDestroyWindow( cur );
-          cur = next;
-     }
-} 
-
-
-int GLUTAPIENTRY 
-glutCreateWindow( const char *title )
-{
-     __GlutWindow *window;
-     
-     if (getenv( "__GLUT_GAME_MODE" ))
-          return glutEnterGameMode();
-
-     glutInit( NULL, NULL );
-     
-     window = __glutCreateWindow( GL_FALSE );
-     if (!window)
-          return 0;
-          
-     __glutSetWindow( window );
-     glutSetCursor( GLUT_CURSOR_INHERIT );
-   
-     return window->id;
-}
-
-
-int GLUTAPIENTRY 
-glutCreateSubWindow( int win, int x, int y, int width, int height )
-{
-     return GL_FALSE;
-}
-
-
-void GLUTAPIENTRY 
-glutDestroyWindow( int win )
-{
-     __GlutWindow *cur;
-     
-     for (cur = g_stack; cur; cur = cur->next) {
-          if (cur->id == win) {
-               if (cur->window)
-                    cur->window->Destroy( cur->window );
-               
-               cur->req.flags |= WINDOW_REQUEST_DESTROY;  
-               break;
-          }
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutPostRedisplay( void )
-{
-     if (g_current)
-          g_current->redisplay = GL_TRUE;
-}
-
-
-void GLUTAPIENTRY 
-glutPostWindowRedisplay( int win )
-{
-     __GlutWindow *cur;
-     
-     for (cur = g_stack; cur; cur = cur->next) {
-          if (cur->id == win) {
-               cur->redisplay = GL_TRUE;
-               break;
-          }
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutSwapBuffers( void )
-{
-     if (g_current) {
-          g_current->gl->Unlock( g_current->gl );    
-          g_current->surface->Flip( g_current->surface, NULL, 0 );    
-          g_current->gl->Lock( g_current->gl );
-     }
-}
-
-
-int GLUTAPIENTRY 
-glutGetWindow( void )
-{
-     return (g_current) ? g_current->id : 0;
-}
-
-
-void GLUTAPIENTRY 
-glutSetWindow( int win )
-{
-     __GlutWindow *cur;
-
-     if (g_current && g_current->id == win)
-          return;
-     
-     for (cur = g_stack; cur; cur = cur->next) {
-          if (cur->id == win) {
-               __glutSetWindow( cur );
-               break;
-          }
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutSetWindowTitle( const char *title )
-{
-}
-
-
-void GLUTAPIENTRY 
-glutSetIconTitle( const char *title )
-{
-}
-
-
-void GLUTAPIENTRY 
-glutFullScreen( void )
-{          
-     if (g_current && !g_game) {
-          DFBDisplayLayerConfig config;
-          
-          primary->GetConfiguration( primary, &config );
-          
-          g_current->req.flags |= WINDOW_REQUEST_POSITION |
-                                  WINDOW_REQUEST_RESIZE   |
-                                  WINDOW_REQUEST_RESTACK;
-          g_current->req.x = 0;
-          g_current->req.y = 0;
-          g_current->req.w = config.width;
-          g_current->req.h = config.height;
-          g_current->req.z = 1000;
-     }
-}   
-
-
-void GLUTAPIENTRY 
-glutPositionWindow( int x, int y )
-{
-     if (g_current && !g_game) {
-          g_current->req.flags |= WINDOW_REQUEST_POSITION; 
-          g_current->req.x = x;
-          g_current->req.y = y;
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutReshapeWindow( int width, int height )
-{
-     if (g_current && !g_game) {
-          g_current->req.flags |= WINDOW_REQUEST_RESIZE;
-          g_current->req.w = width;
-          g_current->req.h = height;
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutPopWindow( void )
-{
-     if (g_current && !g_game) {
-          g_current->req.flags |= WINDOW_REQUEST_RESTACK;
-          g_current->req.z--;
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutPushWindow( void )
-{
-     if (g_current && !g_game) {
-          g_current->req.flags |= WINDOW_REQUEST_RESTACK;
-          g_current->req.z++;
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutIconifyWindow( void )
-{
-}
-
-
-void GLUTAPIENTRY 
-glutShowWindow( void )
-{
-     if (g_current && !g_game) {
-          g_current->req.flags |= WINDOW_REQUEST_SHOW;
-          g_current->req.flags &= ~WINDOW_REQUEST_HIDE;
-     }
-}
-
-
-void GLUTAPIENTRY 
-glutHideWindow( void )
-{
-     if (g_current && !g_game) {
-          g_current->req.flags |= WINDOW_REQUEST_HIDE;
-          g_current->req.flags &= ~WINDOW_REQUEST_SHOW;
-     }
-}
-
diff --git a/src/mesa/drivers/directfb/Makefile b/src/mesa/drivers/directfb/Makefile
deleted file mode 100644
index 94c82a2c9c..0000000000
--- a/src/mesa/drivers/directfb/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# src/mesa/drivers/directfb/Makefile
-
-TOP = ../../../..
-
-include $(TOP)/configs/current
-
-
-INCLUDE_DIRS = \
-	-I$(TOP)/include \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mesa/main \
-	-I$(TOP)/src/mesa/glapi \
-	-I$(TOP)/src/mesa/math \
-	-I$(TOP)/src/mesa/tnl \
-	-I$(TOP)/src/mesa/shader \
-	-I$(TOP)/src/mesa/swrast \
-	-I$(TOP)/src/mesa/swrast_setup
-
-DFB_CFLAGS    = $(shell pkg-config --cflags directfb)
-DFB_MODULEDIR = $(shell pkg-config --variable=moduledir directfb-internal)
-
-DIRECTFBGL_MESA_SOURCES = ../common/driverfuncs.c idirectfbgl_mesa.c
-
-DIRECTFBGL_MESA_OBJECTS = $(DIRECTFBGL_MESA_SOURCES:.c=.o)
-
-DIRECTFBGL_MESA = libidirectfbgl_mesa.so
-
-LIBS = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
-
-
-.c.o:
-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DFB_CFLAGS) $< -o $@
-
-
-default: directfb-libgl directfbgl_mesa
-
-
-# XXX this used to be in src/mesa/Makefile and is probably broken now
-directfb-libgl: $(LIBS)
-	@ $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(LIBS) \
-		$(GL_LIB_DEPS)
-
-
-
-# Mesa DirectFBGL module
-directfbgl_mesa: $(DIRECTFBGL_MESA_OBJECTS)
-	$(CC) -shared $(CFLAGS) $(DIRECTFBGL_MESA_OBJECTS) -o $(DIRECTFBGL_MESA) \
-	-Wl,-soname -Wl,$(DIRECTFBGL_MESA) -L$(TOP)/$(LIB_DIR) -lGL -lm
-
-
-install:
-	@if test -d $(DFB_MODULEDIR); then \
-		echo "Installing DirectFBGL module."; \
-	else \
-		echo "*** Failed to determine DirectFB module's directory."; \
-		echo "*** Installation aborted."; \
-		exit 1; \
-	fi;
-	test -d $(DFB_MODULEDIR)/interfaces/IDirectFBGL/ || mkdir $(DFB_MODULEDIR)/interfaces/IDirectFBGL/
-	install -m 755 $(DIRECTFBGL_MESA) $(DFB_MODULEDIR)/interfaces/IDirectFBGL/
-
-
-clean:
-	-rm -f *.o *.so
-
diff --git a/src/mesa/drivers/directfb/idirectfbgl_mesa.c b/src/mesa/drivers/directfb/idirectfbgl_mesa.c
deleted file mode 100644
index 85a6f03672..0000000000
--- a/src/mesa/drivers/directfb/idirectfbgl_mesa.c
+++ /dev/null
@@ -1,982 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Claudio Ciccani 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * 
- * Based on glfbdev.c, written by Brian Paul.
- *
- */
-
-#include 
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-
-#undef CLAMP
-#include "main/glheader.h"
-#include "main/buffers.h"
-#include "main/context.h"
-#include "main/extensions.h"
-#include "main/framebuffer.h"
-#include "main/renderbuffer.h"
-#include "main/imports.h"
-#include "main/texformat.h"
-#include "main/teximage.h"
-#include "main/texstore.h"
-#include "vbo/vbo.h"
-#include "swrast/swrast.h"
-#include "swrast_setup/swrast_setup.h"
-#include "tnl/tnl.h"
-#include "tnl/t_context.h"
-#include "tnl/t_pipeline.h"
-#include "drivers/common/driverfuncs.h"
-
-
-#define VERSION_CODE( M, m, r )  (((M) * 1000) + ((m) * 100) + ((r)))
-#define DIRECTFB_VERSION_CODE    VERSION_CODE( DIRECTFB_MAJOR_VERSION, \
-                                               DIRECTFB_MINOR_VERSION, \
-                                               DIRECTFB_MICRO_VERSION )
-
-
-static DFBResult
-Probe( void *data );
-
-static DFBResult
-Construct( IDirectFBGL      *thiz,
-           IDirectFBSurface *surface );
-
-#include 
-
-DIRECT_INTERFACE_IMPLEMENTATION( IDirectFBGL, Mesa )
-
-/*
- * private data struct of IDirectFBGL
- */
-typedef struct {
-     int                     ref;       /* reference counter */
-     
-     int                     locked;
-     
-     IDirectFBSurface       *surface;
-     DFBSurfacePixelFormat   format;
-     int                     width;
-     int                     height;
-     
-     struct {
-          GLubyte           *start;
-          GLubyte           *end;
-          int                pitch;
-     } video;
-
-     GLvisual                visual;
-     GLframebuffer           framebuffer;
-     GLcontext               context;
-     struct gl_renderbuffer  render;
-} IDirectFBGL_data;
-
-/******************************************************************************/
-
-static pthread_mutex_t global_lock = PTHREAD_MUTEX_INITIALIZER;
-static unsigned int    global_ref  = 0;
-
-static INLINE int directfbgl_init( void )
-{
-     pthread_mutexattr_t attr;
-     int                 ret;
-     
-     if (global_ref++)
-          return 0;
-
-     pthread_mutexattr_init( &attr );
-     pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_ERRORCHECK );
-     ret = pthread_mutex_init( &global_lock, &attr );
-     pthread_mutexattr_destroy( &attr );
-
-     return ret;
-}
-
-static INLINE void directfbgl_finish( void )
-{
-     if (--global_ref == 0)
-          pthread_mutex_destroy( &global_lock );
-}
-
-#define directfbgl_lock()    pthread_mutex_lock( &global_lock )
-#define directfbgl_unlock()  pthread_mutex_unlock( &global_lock )
-
-/******************************************************************************/
-
-static bool  directfbgl_init_visual    ( GLvisual              *visual,
-                                         DFBSurfacePixelFormat  format );
-static bool  directfbgl_create_context ( GLcontext             *context,
-                                         GLframebuffer         *framebuffer,
-                                         GLvisual              *visual,
-                                         IDirectFBGL_data      *data );
-static void  directfbgl_destroy_context( GLcontext             *context,
-                                         GLframebuffer         *framebuffer );
-
-/******************************************************************************/
-
-
-static void
-IDirectFBGL_Mesa_Destruct( IDirectFBGL *thiz )
-{
-     IDirectFBGL_data *data = (IDirectFBGL_data*) thiz->priv;
-
-     directfbgl_destroy_context( &data->context, &data->framebuffer );
-     
-     if (data->surface)
-          data->surface->Release( data->surface );
-
-     DIRECT_DEALLOCATE_INTERFACE( thiz );
-
-     directfbgl_finish();
-}
-
-static DFBResult
-IDirectFBGL_Mesa_AddRef( IDirectFBGL *thiz )
-{
-     DIRECT_INTERFACE_GET_DATA( IDirectFBGL );
-
-     data->ref++;
-
-     return DFB_OK;
-}
-
-static DFBResult
-IDirectFBGL_Mesa_Release( IDirectFBGL *thiz )
-{
-     DIRECT_INTERFACE_GET_DATA( IDirectFBGL )
-
-     if (--data->ref == 0) 
-          IDirectFBGL_Mesa_Destruct( thiz );
-
-     return DFB_OK;
-}
-
-static DFBResult
-IDirectFBGL_Mesa_Lock( IDirectFBGL *thiz )
-{
-     IDirectFBSurface *surface;
-     int               width   = 0;
-     int               height  = 0;
-     DFBResult         ret;
-     
-     DIRECT_INTERFACE_GET_DATA( IDirectFBGL );
-
-     if (data->locked) {
-          data->locked++;
-          return DFB_OK;
-     }
-
-     if (directfbgl_lock())
-          return DFB_LOCKED;
-
-     surface = data->surface;
-     surface->GetSize( surface, &width, &height );
-     
-     ret = surface->Lock( surface, DSLF_READ | DSLF_WRITE, 
-                          (void*)&data->video.start, &data->video.pitch );
-     if (ret) {
-          D_ERROR( "DirectFBGL/Mesa: couldn't lock surface.\n" );
-          directfbgl_unlock();
-          return ret;
-     }
-     data->video.end = data->video.start + (height-1) * data->video.pitch;
-
-     data->render.Data = data->video.start;
-
-     _mesa_make_current( &data->context, 
-                         &data->framebuffer, &data->framebuffer );
-     
-     if (data->width != width || data->height != height) {
-          _mesa_resize_framebuffer( &data->context, 
-                                    &data->framebuffer, width, height );
-          data->width  = width;
-          data->height = height;                        
-     }
-
-     data->locked++;
-     
-     return DFB_OK;
-}
-
-static DFBResult
-IDirectFBGL_Mesa_Unlock( IDirectFBGL *thiz )
-{     
-     DIRECT_INTERFACE_GET_DATA( IDirectFBGL );
-
-     if (!data->locked)
-          return DFB_OK;
-          
-     if (--data->locked == 0) {
-          _mesa_make_current( NULL, NULL, NULL );
-     
-          data->surface->Unlock( data->surface );
-
-          directfbgl_unlock();
-     }
-     
-     return DFB_OK;
-}
-
-static DFBResult
-IDirectFBGL_Mesa_GetAttributes( IDirectFBGL     *thiz,
-                                DFBGLAttributes *attributes )
-{
-     DFBSurfaceCapabilities   caps;
-     GLvisual                *visual;
-     
-     DIRECT_INTERFACE_GET_DATA( IDirectFBGL );
-
-     if (!attributes)
-          return DFB_INVARG;
-
-     data->surface->GetCapabilities( data->surface, &caps );
-
-     visual = &data->visual;
-     
-     attributes->buffer_size      = visual->rgbBits ? : visual->indexBits;
-     attributes->depth_size       = visual->depthBits;
-     attributes->stencil_size     = visual->stencilBits;
-     attributes->aux_buffers      = visual->numAuxBuffers;
-     attributes->red_size         = visual->redBits;
-     attributes->green_size       = visual->greenBits;
-     attributes->blue_size        = visual->blueBits;
-     attributes->alpha_size       = visual->alphaBits;
-     attributes->accum_red_size   = visual->accumRedBits;
-     attributes->accum_green_size = visual->accumGreenBits;
-     attributes->accum_blue_size  = visual->accumBlueBits;
-     attributes->accum_alpha_size = visual->accumAlphaBits;
-     attributes->double_buffer    = ((caps & DSCAPS_FLIPPING) != 0);
-     attributes->stereo           = (visual->stereoMode != 0);
-
-     return DFB_OK;
-}
-
-#if DIRECTFBGL_INTERFACE_VERSION >= 1
-static DFBResult
-IDirectFBGL_Mesa_GetProcAddress( IDirectFBGL  *thiz,
-                                 const char   *name,
-                                 void        **ret_address )
-{
-     DIRECT_INTERFACE_GET_DATA( IDirectFBGL );
-
-     if (!name)
-          return DFB_INVARG;
-          
-     if (!ret_address)
-          return DFB_INVARG;
-          
-     *ret_address = _glapi_get_proc_address( name );
-          
-     return (*ret_address) ? DFB_OK : DFB_UNSUPPORTED;
-}
-#endif
-
-
-/* exported symbols */
-
-static DFBResult
-Probe( void *data )
-{
-     return DFB_OK;
-}
-
-static DFBResult
-Construct( IDirectFBGL *thiz, IDirectFBSurface *surface )
-{
-     DFBResult ret;
-     
-     /* Initialize global resources. */
-     if (directfbgl_init())
-          return DFB_INIT;
-     
-     /* Allocate interface data. */
-     DIRECT_ALLOCATE_INTERFACE_DATA( thiz, IDirectFBGL );
- 
-     /* Initialize interface data. */
-     data->ref = 1;
-
-     /* Duplicate destination surface. */
-     ret = surface->GetSubSurface( surface, NULL, &data->surface );
-     if (ret) {
-          IDirectFBGL_Mesa_Destruct( thiz );
-          return ret;
-     }
-
-     data->surface->GetPixelFormat( data->surface, &data->format );
-     data->surface->GetSize( data->surface, &data->width, &data->height );
-
-     /* Configure visual. */
-     if (!directfbgl_init_visual( &data->visual, data->format )) {
-          D_ERROR( "DirectFBGL/Mesa: failed to initialize visual.\n" );
-          IDirectFBGL_Mesa_Destruct( thiz );
-          return DFB_UNSUPPORTED;
-     }
-     
-     /* Create context. */
-     if (!directfbgl_create_context( &data->context,
-                                     &data->framebuffer,
-                                     &data->visual, data )) {
-          D_ERROR( "DirectFBGL/Mesa: failed to create context.\n" );
-          IDirectFBGL_Mesa_Destruct( thiz );
-          return DFB_UNSUPPORTED;
-     }
-
-     /* Assign interface pointers. */
-     thiz->AddRef         = IDirectFBGL_Mesa_AddRef;
-     thiz->Release        = IDirectFBGL_Mesa_Release;
-     thiz->Lock           = IDirectFBGL_Mesa_Lock;
-     thiz->Unlock         = IDirectFBGL_Mesa_Unlock;
-     thiz->GetAttributes  = IDirectFBGL_Mesa_GetAttributes;
-#if DIRECTFBGL_INTERFACE_VERSION >= 1
-     thiz->GetProcAddress = IDirectFBGL_Mesa_GetProcAddress;
-#endif 
-
-     return DFB_OK;
-}
-
-
-/***************************** Driver functions ******************************/
-
-static const GLubyte*
-dfbGetString( GLcontext *ctx, GLenum pname )
-{
-     return NULL;
-}
-
-static void
-dfbUpdateState( GLcontext *ctx, GLuint new_state )
-{
-     _swrast_InvalidateState( ctx, new_state );
-     _swsetup_InvalidateState( ctx, new_state );
-     _vbo_InvalidateState( ctx, new_state );
-     _tnl_InvalidateState( ctx, new_state );
-}
-
-static void
-dfbGetBufferSize( GLframebuffer *buffer, GLuint *width, GLuint *height )
-{
-     GLcontext        *ctx  = _mesa_get_current_context();
-     IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-
-     *width  = (GLuint) data->width;
-     *height = (GLuint) data->height;
-}
-
-/**
- * We only implement this function as a mechanism to check if the
- * framebuffer size has changed (and update corresponding state).
- */
-static void
-dfbSetViewport( GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h )
-{
-     /* Nothing to do (the surface can't be resized while it's locked). */
-     return;
-}
-
-static void
-dfbClear( GLcontext *ctx, GLbitfield mask )
-{
-     IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
- 
-#define BUFFER_BIT_MASK (BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_FRONT_RIGHT | \
-                         BUFFER_BIT_BACK_LEFT  | BUFFER_BIT_BACK_RIGHT  )
-     if (mask & BUFFER_BIT_MASK  &&
-         ctx->Color.ColorMask[0][0] &&
-         ctx->Color.ColorMask[0][1] &&
-         ctx->Color.ColorMask[0][2] &&
-         ctx->Color.ColorMask[0][3])
-     {
-          DFBRegion clip;
-          GLubyte   a, r, g, b;
-          
-          UNCLAMPED_FLOAT_TO_UBYTE( a, ctx->Color.ClearColor[ACOMP] );
-          UNCLAMPED_FLOAT_TO_UBYTE( r, ctx->Color.ClearColor[RCOMP] );
-          UNCLAMPED_FLOAT_TO_UBYTE( g, ctx->Color.ClearColor[GCOMP] );
-          UNCLAMPED_FLOAT_TO_UBYTE( b, ctx->Color.ClearColor[BCOMP] );
-
-          clip.x1 = ctx->DrawBuffer->_Xmin;
-          clip.y1 = ctx->DrawBuffer->_Ymin;
-          clip.x2 = ctx->DrawBuffer->_Xmax - 1;
-          clip.y2 = ctx->DrawBuffer->_Ymax - 1;
-          data->surface->SetClip( data->surface, &clip );
-          
-          data->surface->Unlock( data->surface );
-          
-          data->surface->Clear( data->surface, r, g, b, a );
-          
-          data->surface->Lock( data->surface, DSLF_READ | DSLF_WRITE,
-                               (void*)&data->video.start, &data->video.pitch );
-          data->video.end = data->video.start + (data->height-1) * data->video.pitch;
-          data->render.Data = data->video.start;
-          
-          mask &= ~BUFFER_BIT_MASK;
-     }
-#undef BUFFER_BIT_MASK
-     
-     if (mask)
-          _swrast_Clear( ctx, mask );
-}
-
-
-/************************ RenderBuffer functions *****************************/
-
-static void
-dfbDeleteRenderbuffer( struct gl_renderbuffer *render )
-{
-     return;
-}
-
-static GLboolean
-dfbRenderbufferStorage( GLcontext *ctx, struct gl_renderbuffer *render,
-                        GLenum internalFormat, GLuint width, GLuint height )
-{
-     return GL_TRUE;
-}
-
-
-/***************************** Span functions ********************************/
-
-/* RGB332 */
-#define NAME(PREFIX) PREFIX##_RGB332
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLubyte *P = data->video.end - (Y) * data->video.pitch + (X);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( (((S[RCOMP]) & 0xe0)     ) | \
-          (((S[GCOMP]) & 0xe0) >> 3) | \
-          (((S[BCOMP])       ) >> 6) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = ((*P & 0xe0)     ); \
-   D[GCOMP] = ((*P & 0x1c) << 3); \
-   D[BCOMP] = ((*P & 0x03) << 6); \
-   D[ACOMP] = 0xff
-
-#include "swrast/s_spantemp.h"
-
-/* ARGB4444 */
-#define NAME(PREFIX) PREFIX##_ARGB4444
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLushort *P = (GLushort *) (data->video.end - (Y) * data->video.pitch + (X) * 2);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL_RGB(P, X, Y, S) \
-   *P = ( 0xf000                     | \
-          (((S[RCOMP]) & 0xf0) << 4) | \
-          (((S[GCOMP]) & 0xf0)     ) | \
-          (((S[BCOMP]) & 0xf0) >> 4) )
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( (((S[ACOMP]) & 0xf0) << 8) | \
-          (((S[RCOMP]) & 0xf0) << 4) | \
-          (((S[GCOMP]) & 0xf0)     ) | \
-          (((S[BCOMP]) & 0xf0) >> 4) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = ((*P & 0x0f00) >> 4) | ((*P & 0x0f00) >>  8); \
-   D[GCOMP] = ((*P & 0x00f0)     ) | ((*P & 0x00f0) >>  4); \
-   D[BCOMP] = ((*P & 0x000f) << 4) | ((*P & 0x000f)      ); \
-   D[ACOMP] = ((*P & 0xf000) >> 8) | ((*P & 0xf000) >> 12)
-
-#include "swrast/s_spantemp.h"
-
-/* RGB444 */
-#define NAME(PREFIX) PREFIX##_RGB444
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLushort *P = (GLushort *) (data->video.end - (Y) * data->video.pitch + (X) * 2);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( (((S[RCOMP]) & 0xf0) << 4) | \
-          (((S[GCOMP]) & 0xf0)     ) | \
-          (((S[BCOMP]) & 0xf0) >> 4) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = ((*P & 0x0f00) >> 4) | ((*P & 0x0f00) >> 8); \
-   D[GCOMP] = ((*P & 0x00f0)     ) | ((*P & 0x00f0) >> 4); \
-   D[BCOMP] = ((*P & 0x000f) << 4) | ((*P & 0x000f)     ); \
-   D[ACOMP] = 0xff
-
-#include "swrast/s_spantemp.h"
-
-/* ARGB2554 */
-#define NAME(PREFIX) PREFIX##_ARGB2554
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLushort *P = (GLushort *) (data->video.end - (Y) * data->video.pitch + (X) * 2);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL_RGB(P, X, Y, S) \
-   *P = ( 0xc000                     | \
-          (((S[RCOMP]) & 0xf8) << 6) | \
-          (((S[GCOMP]) & 0xf8) << 1) | \
-          (((S[BCOMP]) & 0xf0) >> 4) )
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( (((S[ACOMP]) & 0xc0) << 8) | \
-          (((S[RCOMP]) & 0xf8) << 6) | \
-          (((S[GCOMP]) & 0xf8) << 1) | \
-          (((S[BCOMP]) & 0xf0) >> 4) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = ((*P & 0x3e00) >>  9); \
-   D[GCOMP] = ((*P & 0x01f0) >>  4); \
-   D[BCOMP] = ((*P & 0x000f) <<  4); \
-   D[ACOMP] = ((*P & 0xc000) >> 14)
-
-#include "swrast/s_spantemp.h"
-   
-/* ARGB1555 */
-#define NAME(PREFIX) PREFIX##_ARGB1555
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLushort *P = (GLushort *) (data->video.end - (Y) * data->video.pitch + (X) * 2);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL_RGB(P, X, Y, S) \
-   *P = ( 0x8000                      | \
-          (((S[RCOMP]) & 0xf8) <<  7) | \
-          (((S[GCOMP]) & 0xf8) <<  2) | \
-          (((S[BCOMP])       ) >>  3) )
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( (((S[ACOMP]) & 0x80) << 16) | \
-          (((S[RCOMP]) & 0xf8) <<  7) | \
-          (((S[GCOMP]) & 0xf8) <<  2) | \
-          (((S[BCOMP])       ) >>  3) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = ((*P & 0x7c00) >> 7) | ((*P & 0x7c00) >> 12); \
-   D[GCOMP] = ((*P & 0x03e0) >> 2) | ((*P & 0x03e0) >>  7); \
-   D[BCOMP] = ((*P & 0x001f) << 3) | ((*P & 0x001f) <<  2); \
-   D[ACOMP] = ((*P & 0x8000) ? 0xff : 0)
-
-#include "swrast/s_spantemp.h"
-
-/* RGB555 */
-#define NAME(PREFIX) PREFIX##_RGB555
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLushort *P = (GLushort *) (data->video.end - (Y) * data->video.pitch + (X) * 2);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( (((S[RCOMP]) & 0xf8) <<  7) | \
-          (((S[GCOMP]) & 0xf8) <<  2) | \
-          (((S[BCOMP])       ) >>  3) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = ((*P & 0x7c00) >> 7) | ((*P & 0x7c00) >> 12); \
-   D[GCOMP] = ((*P & 0x03e0) >> 2) | ((*P & 0x03e0) >>  7); \
-   D[BCOMP] = ((*P & 0x001f) << 3) | ((*P & 0x001f) <<  2); \
-   D[ACOMP] = 0xff
-
-#include "swrast/s_spantemp.h"
-
-/* RGB16 */
-#define NAME(PREFIX) PREFIX##_RGB16
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLushort *P = (GLushort *) (data->video.end - (Y) * data->video.pitch + (X) * 2);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( (((S[RCOMP]) & 0xf8) << 8) | \
-          (((S[GCOMP]) & 0xfc) << 3) | \
-          (((S[BCOMP])       ) >> 3) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = ((*P & 0xf800) >> 8) | ((*P & 0xf800) >> 13); \
-   D[GCOMP] = ((*P & 0x07e0) >> 3) | ((*P & 0x07e0) >>  9); \
-   D[BCOMP] = ((*P & 0x001f) << 3) | ((*P & 0x001f) >>  2); \
-   D[ACOMP] = 0xff
-
-#include "swrast/s_spantemp.h"
-
-/* RGB24 */
-#define NAME(PREFIX) PREFIX##_RGB24
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLubyte *P = data->video.end - (Y) * data->video.pitch + (X) * 3;
-#define INC_PIXEL_PTR(P) P += 3
-#define STORE_PIXEL(P, X, Y, S) \
-   P[0] = S[BCOMP];  P[1] = S[GCOMP];  P[2] = S[BCOMP]
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = P[2];  D[GCOMP] = P[1];  D[BCOMP] = P[0]; D[ACOMP] = 0xff
-
-#include "swrast/s_spantemp.h"
-
-/* RGB32 */
-#define NAME(PREFIX) PREFIX##_RGB32
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLuint *P = (GLuint*) (data->video.end - (Y) * data->video.pitch + (X) * 4);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( ((S[RCOMP]) << 16) | \
-          ((S[GCOMP]) <<  8) | \
-          ((S[BCOMP])      ) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = ((*P & 0x00ff0000) >> 16); \
-   D[GCOMP] = ((*P & 0x0000ff00) >>  8); \
-   D[BCOMP] = ((*P & 0x000000ff)      ); \
-   D[ACOMP] = 0xff
-
-#include "swrast/s_spantemp.h"
-   
-/* ARGB */
-#define NAME(PREFIX) PREFIX##_ARGB
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLuint *P = (GLuint*) (data->video.end - (Y) * data->video.pitch + (X) * 4);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL_RGB(P, X, Y, S) \
-   *P = ( 0xff000000         | \
-          ((S[RCOMP]) << 16) | \
-          ((S[GCOMP]) <<  8) | \
-          ((S[BCOMP])      ) )
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( ((S[ACOMP]) << 24) | \
-          ((S[RCOMP]) << 16) | \
-          ((S[GCOMP]) <<  8) | \
-          ((S[BCOMP])      ) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] = ((*P & 0x00ff0000) >> 16); \
-   D[GCOMP] = ((*P & 0x0000ff00) >>  8); \
-   D[BCOMP] = ((*P & 0x000000ff)      ); \
-   D[ACOMP] = ((*P & 0xff000000) >> 24)
-
-#include "swrast/s_spantemp.h"
-
-/* AiRGB */
-#define NAME(PREFIX) PREFIX##_AiRGB
-#define FORMAT GL_RGBA8
-#define RB_TYPE GLubyte
-#define SPAN_VARS \
-   IDirectFBGL_data *data = (IDirectFBGL_data*) ctx->DriverCtx;
-#define INIT_PIXEL_PTR(P, X, Y) \
-   GLuint *P = (GLuint*) (data->video.end - (Y) * data->video.pitch + (X) * 4);
-#define INC_PIXEL_PTR(P) P += 1
-#define STORE_PIXEL_RGB(P, X, Y, S) \
-   *P = ( ((S[RCOMP]) << 16) | \
-          ((S[GCOMP]) <<  8) | \
-          ((S[BCOMP])      ) )
-#define STORE_PIXEL(P, X, Y, S) \
-   *P = ( (((S[ACOMP]) ^ 0xff) << 24) | \
-          (((S[RCOMP])       ) << 16) | \
-          (((S[GCOMP])       ) <<  8) | \
-          (((S[BCOMP])       )      ) )
-#define FETCH_PIXEL(D, P) \
-   D[RCOMP] =  ((*P & 0x00ff0000) >> 16); \
-   D[GCOMP] =  ((*P & 0x0000ff00) >>  8); \
-   D[BCOMP] =  ((*P & 0x000000ff)      ); \
-   D[ACOMP] = (((*P & 0xff000000) >> 24) ^ 0xff)
-
-#include "swrast/s_spantemp.h"
-
-
-/*****************************************************************************/
-
-static bool
-directfbgl_init_visual( GLvisual              *visual,
-                        DFBSurfacePixelFormat  format )
-{
-     GLboolean  rgbFlag        = GL_TRUE;
-     GLboolean  dbFlag         = GL_FALSE;
-     GLboolean  stereoFlag     = GL_FALSE;
-     GLint      redBits        = 0;
-     GLint      blueBits       = 0;
-     GLint      greenBits      = 0;
-     GLint      alphaBits      = 0;
-     GLint      indexBits      = 0;
-     GLint      depthBits      = 0;
-     GLint      stencilBits    = 0;
-     GLint      accumRedBits   = 0;
-     GLint      accumGreenBits = 0;
-     GLint      accumBlueBits  = 0;
-     GLint      accumAlphaBits = 0;
-     GLint      numSamples     = 0;
-
-     /* FIXME: LUT8 support. */
-     switch (format) {
-          case DSPF_RGB332:
-               redBits   = 3;
-               greenBits = 3;
-               blueBits  = 2;
-               break;
-          case DSPF_ARGB4444:
-               alphaBits = 4;
-          case DSPF_RGB444:
-               redBits   = 4;
-               greenBits = 4;
-               blueBits  = 4;
-               break;
-          case DSPF_ARGB2554:
-               alphaBits = 2;
-               redBits   = 5;
-               greenBits = 5;
-               blueBits  = 4;
-               break;
-          case DSPF_ARGB1555:
-               alphaBits = 1;
-          case DSPF_RGB555:
-               redBits   = 5;
-               greenBits = 5;
-               blueBits  = 5;
-               break;
-          case DSPF_RGB16:
-               redBits   = 5;
-               greenBits = 6;
-               blueBits  = 5;
-               break;
-          case DSPF_ARGB:
-          case DSPF_AiRGB:
-               alphaBits = 8;
-          case DSPF_RGB24:
-          case DSPF_RGB32:
-               redBits   = 8;
-               greenBits = 8;
-               blueBits  = 8;
-               break;
-          default:
-               D_WARN( "unsupported pixelformat" );
-               return false;
-     }
-
-     if (rgbFlag) {
-          accumRedBits   = redBits;
-          accumGreenBits = greenBits;
-          accumBlueBits  = blueBits;
-          accumAlphaBits = alphaBits;
-          depthBits      = redBits + greenBits + blueBits;
-          stencilBits    = alphaBits;
-     } else
-          depthBits      = 8;
-
-     return _mesa_initialize_visual( visual,
-                                     rgbFlag, dbFlag, stereoFlag,
-                                     redBits, greenBits, blueBits, alphaBits,
-                                     indexBits, depthBits, stencilBits,
-                                     accumRedBits, accumGreenBits,
-                                     accumBlueBits, accumAlphaBits,
-                                     numSamples );
-}
-
-static bool
-directfbgl_create_context( GLcontext        *context,
-                           GLframebuffer    *framebuffer,
-                           GLvisual         *visual,
-                           IDirectFBGL_data *data )
-{
-     struct dd_function_table functions;
-     
-     _mesa_initialize_window_framebuffer( framebuffer, visual );
-     
-     _mesa_init_driver_functions( &functions );
-     functions.GetString     = dfbGetString;
-     functions.UpdateState   = dfbUpdateState;
-     functions.GetBufferSize = dfbGetBufferSize;
-     functions.Viewport      = dfbSetViewport;
-     functions.Clear         = dfbClear;
-     
-     if (!_mesa_initialize_context( context, visual, NULL,
-                                    &functions, (void*) data )) {
-          D_DEBUG( "DirectFBGL/Mesa: _mesa_initialize_context() failed.\n" );
-          _mesa_free_framebuffer_data( framebuffer );
-          return false;
-     }
-
-     _swrast_CreateContext( context );
-     _vbo_CreateContext( context );
-     _tnl_CreateContext( context );
-     _swsetup_CreateContext( context );
-     _swsetup_Wakeup( context );
-
-     _mesa_init_renderbuffer( &data->render, 0 );
-     data->render.InternalFormat = GL_RGBA;
-     data->render._BaseFormat    = GL_RGBA;
-     data->render.DataType       = GL_UNSIGNED_BYTE;
-     data->render.Data           = data->video.start;
-     data->render.Delete         = dfbDeleteRenderbuffer;
-     data->render.AllocStorage   = dfbRenderbufferStorage;
-     
-     switch (data->format) {
-          case DSPF_RGB332:
-               data->render.GetRow        = get_row_RGB332;
-               data->render.GetValues     = get_values_RGB332;
-               data->render.PutRow        = put_row_RGB332;
-               data->render.PutRowRGB     = put_row_rgb_RGB332;
-               data->render.PutMonoRow    = put_mono_row_RGB332;
-               data->render.PutValues     = put_values_RGB332;
-               data->render.PutMonoValues = put_mono_values_RGB332;
-               break;
-          case DSPF_ARGB4444: 
-               data->render.GetRow        = get_row_ARGB4444;
-               data->render.GetValues     = get_values_ARGB4444;
-               data->render.PutRow        = put_row_ARGB4444;
-               data->render.PutRowRGB     = put_row_rgb_ARGB4444;
-               data->render.PutMonoRow    = put_mono_row_ARGB4444;
-               data->render.PutValues     = put_values_ARGB4444;
-               data->render.PutMonoValues = put_mono_values_ARGB4444;
-               break;
-          case DSPF_RGB444: 
-               data->render.GetRow        = get_row_RGB444;
-               data->render.GetValues     = get_values_RGB444;
-               data->render.PutRow        = put_row_RGB444;
-               data->render.PutRowRGB     = put_row_rgb_RGB444;
-               data->render.PutMonoRow    = put_mono_row_RGB444;
-               data->render.PutValues     = put_values_RGB444;
-               data->render.PutMonoValues = put_mono_values_RGB444;
-               break;
-          case DSPF_ARGB2554: 
-               data->render.GetRow        = get_row_ARGB2554;
-               data->render.GetValues     = get_values_ARGB2554;
-               data->render.PutRow        = put_row_ARGB2554;
-               data->render.PutRowRGB     = put_row_rgb_ARGB2554;
-               data->render.PutMonoRow    = put_mono_row_ARGB2554;
-               data->render.PutValues     = put_values_ARGB2554;
-               data->render.PutMonoValues = put_mono_values_ARGB2554;
-               break;
-          case DSPF_ARGB1555:
-               data->render.GetRow        = get_row_ARGB1555;
-               data->render.GetValues     = get_values_ARGB1555;
-               data->render.PutRow        = put_row_ARGB1555;
-               data->render.PutRowRGB     = put_row_rgb_ARGB1555;
-               data->render.PutMonoRow    = put_mono_row_ARGB1555;
-               data->render.PutValues     = put_values_ARGB1555;
-               data->render.PutMonoValues = put_mono_values_ARGB1555;
-               break;
-          case DSPF_RGB555:
-               data->render.GetRow        = get_row_RGB555;
-               data->render.GetValues     = get_values_RGB555;
-               data->render.PutRow        = put_row_RGB555;
-               data->render.PutRowRGB     = put_row_rgb_RGB555;
-               data->render.PutMonoRow    = put_mono_row_RGB555;
-               data->render.PutValues     = put_values_RGB555;
-               data->render.PutMonoValues = put_mono_values_RGB555;
-               break;
-          case DSPF_RGB16:
-               data->render.GetRow        = get_row_RGB16;
-               data->render.GetValues     = get_values_RGB16;
-               data->render.PutRow        = put_row_RGB16;
-               data->render.PutRowRGB     = put_row_rgb_RGB16;
-               data->render.PutMonoRow    = put_mono_row_RGB16;
-               data->render.PutValues     = put_values_RGB16;
-               data->render.PutMonoValues = put_mono_values_RGB16;
-               break;
-          case DSPF_RGB24:
-               data->render.GetRow        = get_row_RGB24;
-               data->render.GetValues     = get_values_RGB24;
-               data->render.PutRow        = put_row_RGB24;
-               data->render.PutRowRGB     = put_row_rgb_RGB24;
-               data->render.PutMonoRow    = put_mono_row_RGB24;
-               data->render.PutValues     = put_values_RGB24;
-               data->render.PutMonoValues = put_mono_values_RGB24;
-               break;
-          case DSPF_RGB32:
-               data->render.GetRow        = get_row_RGB32;
-               data->render.GetValues     = get_values_RGB32;
-               data->render.PutRow        = put_row_RGB32;
-               data->render.PutRowRGB     = put_row_rgb_RGB32;
-               data->render.PutMonoRow    = put_mono_row_RGB32;
-               data->render.PutValues     = put_values_RGB32;
-               data->render.PutMonoValues = put_mono_values_RGB32;
-               break;
-          case DSPF_ARGB:
-               data->render.GetRow        = get_row_ARGB;
-               data->render.GetValues     = get_values_ARGB;
-               data->render.PutRow        = put_row_ARGB;
-               data->render.PutRowRGB     = put_row_rgb_ARGB;
-               data->render.PutMonoRow    = put_mono_row_ARGB;
-               data->render.PutValues     = put_values_ARGB;
-               data->render.PutMonoValues = put_mono_values_ARGB;
-               break;
-          case DSPF_AiRGB:
-               data->render.GetRow        = get_row_AiRGB;
-               data->render.GetValues     = get_values_AiRGB;
-               data->render.PutRow        = put_row_AiRGB;
-               data->render.PutRowRGB     = put_row_rgb_AiRGB;
-               data->render.PutMonoRow    = put_mono_row_AiRGB;
-               data->render.PutValues     = put_values_AiRGB;
-               data->render.PutMonoValues = put_mono_values_AiRGB;
-               break;
-          default:
-               D_BUG( "unexpected pixelformat" );
-               return false;
-     }
-
-     data->render.Width = data->width;
-     data->render.Height = data->height;
-
-     _mesa_add_renderbuffer( framebuffer, BUFFER_FRONT_LEFT, &data->render );
-     
-     _mesa_add_soft_renderbuffers( framebuffer,
-                                   GL_FALSE,
-                                   visual->haveDepthBuffer,
-                                   visual->haveStencilBuffer,
-                                   visual->haveAccumBuffer,
-                                   GL_FALSE,
-                                   GL_FALSE );
-
-     TNL_CONTEXT( context )->Driver.RunPipeline = _tnl_run_pipeline;
-
-     _mesa_enable_sw_extensions( context );
-     
-     return true;
-}
-
-static void
-directfbgl_destroy_context( GLcontext     *context,
-                            GLframebuffer *framebuffer )
-{
-     _swsetup_DestroyContext( context );
-     _swrast_DestroyContext( context );
-     _tnl_DestroyContext( context );
-     _vbo_DestroyContext( context );
-     //_mesa_free_framebuffer_data( framebuffer );
-     _mesa_free_context_data( context );
-}    
- 
-- 
cgit v1.2.3


From 97972244d5254cb2862325f8fe03db0a82a8041a Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg 
Date: Thu, 25 Feb 2010 15:52:32 -0500
Subject: Remove d3d driver

---
 docs/README.D3D                        |  124 --
 src/mesa/drivers/d3d/D3DCAPS.CPP       |  250 ----
 src/mesa/drivers/d3d/D3DHAL.H          |   68 -
 src/mesa/drivers/d3d/D3DInit.cpp       |  891 -------------
 src/mesa/drivers/d3d/D3DMESA.H         |   84 --
 src/mesa/drivers/d3d/D3DRaster.cpp     |  213 ----
 src/mesa/drivers/d3d/D3DShared.h       |  154 ---
 src/mesa/drivers/d3d/D3DTEXT.CPP       |  576 ---------
 src/mesa/drivers/d3d/D3DTextureMgr.cpp |  947 --------------
 src/mesa/drivers/d3d/D3DTextureMgr.h   |   62 -
 src/mesa/drivers/d3d/D3DUTILS.CPP      |  638 ----------
 src/mesa/drivers/d3d/D3Dvbrender.c     | 2149 --------------------------------
 src/mesa/drivers/d3d/DDrawPROCS.c      |  399 ------
 src/mesa/drivers/d3d/DEBUG.C           |  143 ---
 src/mesa/drivers/d3d/DEBUG.H           |   90 --
 src/mesa/drivers/d3d/DbgEnv.bat        |   25 -
 src/mesa/drivers/d3d/MAKEFILE          |  101 --
 src/mesa/drivers/d3d/NULLProcs.h       |   49 -
 src/mesa/drivers/d3d/NullProcs.c       |   49 -
 src/mesa/drivers/d3d/OPENGL32.DEF      |  442 -------
 src/mesa/drivers/d3d/WGL.C             | 1262 -------------------
 src/mesa/drivers/d3d/d3dText.h         |   53 -
 22 files changed, 8769 deletions(-)
 delete mode 100644 docs/README.D3D
 delete mode 100644 src/mesa/drivers/d3d/D3DCAPS.CPP
 delete mode 100644 src/mesa/drivers/d3d/D3DHAL.H
 delete mode 100644 src/mesa/drivers/d3d/D3DInit.cpp
 delete mode 100644 src/mesa/drivers/d3d/D3DMESA.H
 delete mode 100644 src/mesa/drivers/d3d/D3DRaster.cpp
 delete mode 100644 src/mesa/drivers/d3d/D3DShared.h
 delete mode 100644 src/mesa/drivers/d3d/D3DTEXT.CPP
 delete mode 100644 src/mesa/drivers/d3d/D3DTextureMgr.cpp
 delete mode 100644 src/mesa/drivers/d3d/D3DTextureMgr.h
 delete mode 100644 src/mesa/drivers/d3d/D3DUTILS.CPP
 delete mode 100644 src/mesa/drivers/d3d/D3Dvbrender.c
 delete mode 100644 src/mesa/drivers/d3d/DDrawPROCS.c
 delete mode 100644 src/mesa/drivers/d3d/DEBUG.C
 delete mode 100644 src/mesa/drivers/d3d/DEBUG.H
 delete mode 100644 src/mesa/drivers/d3d/DbgEnv.bat
 delete mode 100644 src/mesa/drivers/d3d/MAKEFILE
 delete mode 100644 src/mesa/drivers/d3d/NULLProcs.h
 delete mode 100644 src/mesa/drivers/d3d/NullProcs.c
 delete mode 100644 src/mesa/drivers/d3d/OPENGL32.DEF
 delete mode 100644 src/mesa/drivers/d3d/WGL.C
 delete mode 100644 src/mesa/drivers/d3d/d3dText.h

(limited to 'docs')

diff --git a/docs/README.D3D b/docs/README.D3D
deleted file mode 100644
index b41fcb6208..0000000000
--- a/docs/README.D3D
+++ /dev/null
@@ -1,124 +0,0 @@
-
-                     DirectX 6 Driver for Mesa 3.0
-
-
-This software is distributed under the terms of the GNU Library
-General Public License, see the LICENSE file for details.
-
-
-
-What do you need ?
-------------------
-
-	- A PC with a DirectX 6 video driver installed.
-
-	- Mesa 3.0
-
-	- The 3Dfx Glide library 2.3 or later for your OS (the 2.4 works fine).
-	  The Voodoo2 requires the Glide library 2.51. The Glide 3.0 is not
-	  compatible with the Glide 2.x so it doesn't work with the current
-	  version of the driver;
-
-	- Visual C++ 5.0 is only compiler test but others should be ok with
-       changes to the makefiles (CFLAGS/LFLAGS).
-
-	- DirectX 6 SDK (was a MS download but not sure if still available).
-
-	- SoftIce or another debugger that will get DPF's is nice.
-
-
-Tested on:
-----------
-	Windows 95
-  	Windows 98
-	Windows NT 5.0 (beta 2)
-
-
-What is able to do ?
---------------------
-
-	- the driver will try and use DirectX to rasterize the OpenGL primitives
-	that are sent to the driver.  The driver will fall back to SW  if the rendering 
-	context is too big.  The fallback to SW still uses DirectDraw.  If the driver
-	fails to support and operation (accum, stencil, etc) then it will try and get
-	Mesa to render it in SW.  DirectX 6 features that are unsupported by the 
-	installed DirectX 6 driver will be mapped to some other best fit feature.
-
-
-How to compile:
----------------
-
-	These instructions assume you have Visual C++ installed.
-
-	  You might need to increase you enviroment space.  You can do this by 
-	adding the following statement to you config.sys.
-
-	shell=C:\COMMAND.COM C:\ /p /e:8198
-
-	  Next setup you compiler enviroment by running vcvars32.bat in the Visual C++
- 	'bin' directoy.
-
-	c:\DevStudio\VC\bin\vcvars32.bat
-
-	  Modify the D3D makefile to point at your SDK install.  Example has the SDK
-	installed on my 'f' drive in the root.
-
-	file: \Mesa-3.0\src\makefile.d3d
-
-	SDKROOT=f:\mssdk
-
-	  Now you can simply make the project.  If you look in the makefile you can see
-	I have some different targets like 'install'.  
-
-	nmake /f makefile.d3d
-
-
-FAQ:
-----
-
-	1) I don't think the driver is using my DirectX driver.
-
- 	  This maybe true as the current version will only select the Primary D3D driver
-	installed.  If you 3D card is the secondary (3dfx) then your out of luck for this
-	release.
-
-	2) The driver seems like its not HW accelerated.
-
-	  If you have a video card with limited memory then you might want to try and 
-	change your destop resolution to a low setting (640x480x16) so that the 3D part
-	of the card has more resources.  Remeber the driver can't make the card better...
-
-	3) Nothing works.
-
-	  Make sure you have a DirectX '6' driver installed.  Check you driver docs for this
-	info or use the SDK info utilities.
-	  The final 'dll' is named opengl32.dll and is either in the same directory as the 
-	OpenGL program or in your system directory (x:\windows\system or x:\winnt\system32).
-	  Check your destop resolution.  Most DirectX 6 drivers will only support 16bit and
-	32bit color depth.  To find out for sure you can check the DirectX Info Viewer in
-	the SDK.
-	  
-
-	4) Rendering doesn't look right.
-
-	  Sometimes this is because the card doesn't support a feature that that is required.
-	This is usually due to unsupported alpha functions (test/blend) or texture mapping.
-	Some cards suffer from too small of an alpha channel.  The driver does its best to
-	fallback on unsupported features.  This is not to say the driver may not have a bug(s).
-
-	5) Textures look bad.
-
-	  No mipmapping in this release.
-
-
-Thanks to:
-----------
-
-Brian Paul
-
-
-
-
-Leigh McRae (leigh@altsoftware.com)
-February 9, 1999
-
diff --git a/src/mesa/drivers/d3d/D3DCAPS.CPP b/src/mesa/drivers/d3d/D3DCAPS.CPP
deleted file mode 100644
index 80ee91d922..0000000000
--- a/src/mesa/drivers/d3d/D3DCAPS.CPP
+++ /dev/null
@@ -1,250 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                       Build 5   */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include "D3DHAL.h"
-/*===========================================================================*/
-/* Macros.                                                                   */
-/*===========================================================================*/
-#define SRCBLEND_MAP(gl,d3d,fall)	if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwSrcBlendCaps & d3d ) \
-                                   { \
-					            sprintf( buffer, "SRC Blend: %s -> %s", # gl, # d3d ); \
-                                     DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), buffer )); \
-                                     pShared->dwSrcBlendCaps[index] = d3d; \
-						     } \
-							else \
-                                   { \
-					            sprintf( buffer, "SRC Blend: %s -> %s", # gl, # fall ); \
-                                     DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), buffer )); \
-                                     pShared->dwSrcBlendCaps[index] = fall; \
-							}
-#define DSTBLEND_MAP(gl,d3d,fall)	if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwDestBlendCaps & d3d ) \
-                                   { \
-					            sprintf( buffer, "DST Blend: %s -> %s", # gl, # d3d ); \
-                                     DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), buffer )); \
-                                     pShared->dwDestBlendCaps[index] = d3d; \
-						     } \
-							else \
-                                   { \
-					            sprintf( buffer, "DST Blend: %s -> %s", # gl, # fall ); \
-                                     DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), buffer )); \
-                                     pShared->dwDestBlendCaps[index] = fall; \
-							}
-
-/*===========================================================================*/
-/*  I use this function to handle the fact that the D3D texture blending and */
-/* OpenGL texture blending functions don't map one to one.  Also there is the*/
-/* problem with cards not supporting all the D3D functions. So I use the CAPS*/
-/* of the card to make a table of functions that will have defaults for the  */
-/* unsupported functions.                                                    */
-/*  So first I fill the table with the fallback function then I check to see */
-/* if the card supports the requested function.  If it does I replace the    */
-/* default thats already in the array.  Now order does matter as I used an   */
-/* enum type in D3DShared.h so that the mapping would be a little easier.    */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-void AlphaBlendTableHAL( PMESAD3DHAL pHAL )
-{
-  PMESAD3DSHARED	pShared = &pHAL->shared;
-  int			index;
-  char			buffer[128];
-
-  DPF(( DBG_FUNC, "AlphaBlendTableHAL();" ));
-
-  /* Make the fallback for the Source blend. */
-  for( index = 0; index < 14; index++ )
-  {
-    switch( index )
-    {
-      case s_zero:
-        SRCBLEND_MAP( GL_ZERO, D3DBLEND_ZERO, D3DBLEND_ONE );
-	   break;
-      case s_one:
-        SRCBLEND_MAP( GL_ONE, D3DBLEND_ONE, D3DBLEND_ONE );
-	   break;
-      case s_dst_color:
-        SRCBLEND_MAP( GL_DST_COLOR, D3DBLEND_DESTCOLOR, D3DBLEND_ONE );
-	   break;
-      case s_one_minus_dst_color:
-        SRCBLEND_MAP( GL_ONE_MINUS_DST_COLOR, D3DBLEND_INVDESTCOLOR, D3DBLEND_ONE );
-	   break;
-      case s_src_alpha:
-        SRCBLEND_MAP( GL_SRC_ALPHA, D3DBLEND_SRCALPHA, D3DBLEND_ONE );
-	   break;
-      case s_one_minus_src_alpha:
-        SRCBLEND_MAP( GL_ONE_MINUS_SRC_ALPHA, D3DBLEND_INVSRCALPHA, D3DBLEND_ONE );
-	   break;
-      case s_dst_alpha:
-        SRCBLEND_MAP( GL_DST_ALPHA, D3DBLEND_DESTALPHA, D3DBLEND_ONE );
-	   break;
-      case s_one_minus_dst_alpha:
-        SRCBLEND_MAP( GL_ONE_MINUS_DST_ALPHA, D3DBLEND_INVDESTALPHA, D3DBLEND_ONE );
-	   break;
-      case s_src_alpha_saturate:
-        SRCBLEND_MAP( GL_SRC_ALPHA_SATURATE, D3DBLEND_SRCALPHASAT, D3DBLEND_ONE );
-	   break;
-      case s_constant_color:
-        SRCBLEND_MAP( GL_CONSTANT_COLOR, D3DBLEND_SRCCOLOR, D3DBLEND_ONE );
-	   break;
-      case s_one_minus_constant_color:
-        SRCBLEND_MAP( GL_ONE_MINUS_CONSTANT_COLOR, D3DBLEND_INVSRCCOLOR, D3DBLEND_ONE );
-	   break;
-      case s_constant_alpha:
-        SRCBLEND_MAP( GL_CONSTANT_ALPHA, D3DBLEND_BOTHSRCALPHA, D3DBLEND_ONE );
-	   break;
-      case s_one_minus_constant_alpha:
-        SRCBLEND_MAP( GL_ONE_MINUS_CONSTANT_ALPHA, D3DBLEND_BOTHINVSRCALPHA, D3DBLEND_ONE );
-	   break;
-    }
-  }
-
-  /* Make the fallback for the Destination blend. */
-  for( index = 0; index < 14; index++ )
-  {
-    switch( index )
-    {
-      case d_zero:
-        DSTBLEND_MAP( GL_ZERO, D3DBLEND_ZERO, D3DBLEND_ONE );
-	   break;
-      case d_one:
-        DSTBLEND_MAP( GL_ONE, D3DBLEND_ONE, D3DBLEND_ONE );
-	   break;
-      case d_src_color:
-        DSTBLEND_MAP( GL_SRC_COLOR, D3DBLEND_SRCCOLOR, D3DBLEND_ONE );
-	   break;
-      case d_one_minus_src_color:
-        DSTBLEND_MAP( GL_ONE_MINUS_SRC_COLOR, D3DBLEND_INVSRCCOLOR, D3DBLEND_ONE );
-	   break;
-      case d_src_alpha:
-        DSTBLEND_MAP( GL_SRC_ALPHA, D3DBLEND_SRCALPHA, D3DBLEND_ONE );
-	   break;
-      case d_one_minus_src_alpha:
-        DSTBLEND_MAP( GL_ONE_MINUS_SRC_ALPHA, D3DBLEND_INVSRCALPHA, D3DBLEND_ONE );
-	   break;
-      case d_dst_alpha:
-        DSTBLEND_MAP( GL_DST_ALPHA, D3DBLEND_DESTALPHA, D3DBLEND_ONE );
-	   break;
-      case d_one_minus_dst_alpha:
-        DSTBLEND_MAP( GL_ONE_MINUS_DST_ALPHA, D3DBLEND_INVDESTALPHA, D3DBLEND_ONE );
-	   break;
-      case d_constant_color:
-        DSTBLEND_MAP( GL_CONSTANT_COLOR, D3DBLEND_DESTCOLOR, D3DBLEND_ONE );
-	   break;
-      case d_one_minus_constant_color:
-        DSTBLEND_MAP( GL_ONE_MINUS_CONSTANT_COLOR, D3DBLEND_INVDESTCOLOR, D3DBLEND_ONE );
-	   break;
-      case d_constant_alpha:
-        DSTBLEND_MAP( GL_CONSTANT_ALPHAR, D3DBLEND_BOTHSRCALPHA, D3DBLEND_ONE );
-	   break;
-      case d_one_minus_constant_alpha:
-        DSTBLEND_MAP( GL_ONE_MINUS_CONSTANT_ALPHA, D3DBLEND_BOTHINVSRCALPHA, D3DBLEND_ONE );
-	   break;
-    }
-  }
-
-  /* Make the fallbacks for the texture functions. */
-  for( index = 0; index < 4; index++ )
-  {
-    switch( index )
-    {
-      case d3dtblend_decal:
-	   if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_DECAL )
-	   {
-		DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_DECAL -> D3DTBLEND_DECAL" )); 
-		pShared->dwTexFunc[index] = D3DTBLEND_DECAL; 
-	   }
-        else
-	   {
-		if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_MODULATE )
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_DECAL -> D3DTBLEND_MODULATE" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_MODULATE; 
-		}
-		else
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_DECAL -> D3DTBLEND_ADD" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_ADD; 
-		}
-	   }
-	   break;
-      case d3dtblend_decalalpha:
-	   if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_DECALALPHA )
-	   {
-		DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_DECALALPHA -> D3DTBLEND_DECALALPHA" )); 
-		pShared->dwTexFunc[index] = D3DTBLEND_DECALALPHA; 
-	   }
-        else
-	   {
-		if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_DECAL )
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_DECALALPA -> D3DTBLEND_DECAL" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_DECAL; 
-		}
-		else
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_DECALALPHA -> D3DTBLEND_ADD" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_ADD; 
-		}
-	   }
-	   break;
-    case d3dtblend_modulate:
-	   if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_MODULATE )
-	   {
-		DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_MODULATE -> D3DTBLEND_MODULATE" )); 
-		pShared->dwTexFunc[index] = D3DTBLEND_MODULATE; 
-	   }
-        else
-	   {
-		if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_MODULATEALPHA )
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_MODULATE -> D3DTBLEND_MODULATEALPHA" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_MODULATEALPHA; 
-		}
-		else	if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_DECAL )
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_MODULATE -> D3DTBLEND_DECAL" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_DECAL; 
-		}
-		else
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_MODULATE -> D3DTBLEND_ADD" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_ADD; 
-		}
-	   }
-	   break;
-    case d3dtblend_modulatealpha:
-	   if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_MODULATEALPHA )
-	   {
-		DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_MODULATEALPHA -> D3DTBLEND_MODULATEALPHA" )); 
-		pShared->dwTexFunc[index] = D3DTBLEND_MODULATEALPHA; 
-	   }
-        else
-	   {
-		if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_MODULATE )
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_MODULATEALPHA -> D3DTBLEND_MODULATE" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_MODULATE;
-		}
-		else	if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureBlendCaps & D3DTBLEND_DECAL )
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_MODULATEALPHA -> D3DTBLEND_DECALE" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_DECAL; 
-		}
-		else
-		{
-		  DPF(( (DBG_CNTX_INFO|DBG_TXT_INFO), "D3DTBLEND_MODULATEALPHA -> D3DTBLEND_ADD" )); 
-		  pShared->dwTexFunc[index] = D3DTBLEND_ADD; 
-		}
-	   }
-	   break;
-    }
-  }
-}
-
diff --git a/src/mesa/drivers/d3d/D3DHAL.H b/src/mesa/drivers/d3d/D3DHAL.H
deleted file mode 100644
index 2496d164e5..0000000000
--- a/src/mesa/drivers/d3d/D3DHAL.H
+++ /dev/null
@@ -1,68 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#ifndef _D3D_HAL_INC
-#define _D3D_HAL_INC
-   
-/*===========================================================================*/
-/* Includes.                                                                 */
-/*===========================================================================*/
-#include 
-#include 
-#include 
-#include 
-#include 
-#include "D3DShared.h"
-#include "D3DTextureMgr.h"
-#include "Debug.h"
-/*===========================================================================*/
-/* Defines.                                                                  */
-/*===========================================================================*/
-#define	DX_RESTORE(ps)			if ( (ps) && (ps)->IsLost() ) (ps)->Restore();
-/*===========================================================================*/
-/* Type defines.                                                             */
-/*===========================================================================*/
-typedef struct _d3d_hal_struct
-{
-  MESAD3DSHARED		shared;
-
-  GUID				guid;
-  LPDIRECTDRAW  		lpDD;
-  LPDIRECTDRAW4        	lpDD4;
-  LPDIRECT3D3          	lpD3D3;
-  LPDIRECT3DDEVICE3    	lpD3DDevice;
-  D3DDEVICEDESC 	 	D3DHWDevDesc;
-  LPDIRECTDRAWSURFACE4 	lpDDSPrimary,
-                         lpDDSRender,
-                         lpDDSZbuffer;
-  LPDIRECT3DVIEWPORT3  	lpViewport;
-  LPDIRECTDRAWCLIPPER	lpClipper;
-  DDPIXELFORMAT        	ddpf,
-                         ddpfZBuffer;
-  PTM_OBJECT           	pTMList;
-
-} MESAD3DHAL, *PMESAD3DHAL;
-/*===========================================================================*/
-/* External function prototypes.                                             */
-/*===========================================================================*/
-extern BOOL InitTMgrHAL( PMESAD3DHAL pHAL );
-extern void TermTMgrHAL( PMESAD3DHAL pHAL );
-extern void AlphaBlendTableHAL( PMESAD3DHAL pHAL );
-
-extern void Solve8BitChannelPixelFormat( DDPIXELFORMAT *pddpf, PPIXELINFO pPixel );
-extern char *ErrorStringD3D( HRESULT hr );
-extern void  FatalShutDown( PMESAD3DHAL pHAL );
-/*===========================================================================*/
-/* Global variables.                                                         */
-/*===========================================================================*/
-extern char	*errorMsg;
-
-#endif
-
diff --git a/src/mesa/drivers/d3d/D3DInit.cpp b/src/mesa/drivers/d3d/D3DInit.cpp
deleted file mode 100644
index e21cd21e25..0000000000
--- a/src/mesa/drivers/d3d/D3DInit.cpp
+++ /dev/null
@@ -1,891 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                       Build 5   */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include "D3DHAL.h"
-/*===========================================================================*/
-/* Local function prototypes.                                                */
-/*===========================================================================*/
-static void	DestroyAllSurfaces( PMESAD3DHAL pHAL );
-static void	DestroyDevice( PMESAD3DHAL pHAL );
-static void	DestroyInterfaces( PMESAD3DHAL pHAL );
-
-HRESULT WINAPI   EnumSurfacesHook( LPDIRECTDRAWSURFACE4 lpDDS, LPDDSURFACEDESC2 lpDDSDesc, LPVOID pVoid );
-HRESULT CALLBACK EnumZBufferHook( DDPIXELFORMAT* pddpf, VOID *pVoid );
-HRESULT CALLBACK EnumDeviceHook( GUID FAR* lpGuid, LPSTR lpDesc, LPSTR lpName, LPD3DDEVICEDESC lpD3DHWDesc, LPD3DDEVICEDESC lpD3DHELDesc,  void *pVoid );
-/*===========================================================================*/
-/* Globals.                                                                  */
-/*===========================================================================*/
-//char		*errorMsg;
-/*===========================================================================*/
-/*  This function is responable for allocating the actual MESAD3DHAL struct. */
-/* Each Mesa context will have its own MESAD3DHAL struct so its like a mini  */
-/* context to some extent. All one time allocations/operations get done here.*/
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-extern "C" PMESAD3DSHARED InitHAL( HWND hwnd )
-{
-  PMESAD3DHAL	pHAL;
-  ULONG     	rc;
-
-  DPF(( DBG_FUNC, "InitHAL();" ));
-  DPF(( DBG_CNTX_INFO, "hwnd: %d", hwnd ));
-
-  /* Allocate the structure and zero it out. */   
-  pHAL = (PMESAD3DHAL)ALLOC( sizeof(MESAD3DHAL) );
-  if ( pHAL == NULL )
-  {   
-    RIP( pHAL, "InitHAL->", "Memory Allocation" );
-    return (PMESAD3DSHARED)NULL;
-  }
-  memset( pHAL, 0, sizeof(MESAD3DHAL) );
-
-  /* Get the texture manager going. */
-  rc = InitTMgrHAL( pHAL );
-  if ( rc == FALSE )
-  {   
-    RIP( pHAL, "InitTMgrHAL->", "Failed" );
-    return (PMESAD3DSHARED)NULL;
-  }
-
-  /* Fill in the window parameters if we can. */
-  pHAL->shared.hwnd = hwnd;
-
-  /* Parse the user's enviroment variables to generate a debug mask. */
-  ReadDBGEnv();
-  
-  return (PMESAD3DSHARED)pHAL;
-}
-/*===========================================================================*/
-/*  This function will unload all the resources that the MESAD3DHAL struct   */
-/* has bound to it.  The actual structure itself will be freed.              */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void TermHAL( PMESAD3DSHARED pShared )
-{
-  PMESAD3DHAL	pHAL = (PMESAD3DHAL)pShared;
-
-  DPF(( DBG_FUNC, "TermHAL();" ));
-
-  /* Check for an empty wrapper structure. */
-  if ( pHAL == NULL )
-    return;
-
-  /* Kill this texture manager. */
-  TermTMgrHAL( pHAL );
-
-  /* Kill any DDraw stuff if exists. */
-  DestroyDevice( pHAL );
-  DestroyAllSurfaces( pHAL );
-  DestroyInterfaces( pHAL );
-
-  FREE( pHAL );
-}
-/*===========================================================================*/
-/*  This function is used to init and resize the rendering surface as the two*/
-/* are almost the same.  First the device and all the surfaces are destoryed */
-/* if they already exist.  Next we create a OffScreen rendering surface and  */
-/* save some pixelformat info to do color convertions. Next we start to take */
-/* care of getting the most out of the hardware. I use bHardware to determine*/
-/* the state of the device we found in the device enumeration.  The enum proc*/
-/* will try for hardware first.  I next use a bForceSW to make the enum proc */
-/* choose a software device.  So I will try some combinations with HW first  */
-/* until I feel I have to set the bForceSW and call this function again.  If */
-/* this function is called with no width or height then use the internals.   */
-/*   NOTE:  The worst case is that all will be in SW (RGBDevice) and really  */
-/*         I should forget the whole thing and fall back to a DDraw span type*/
-/*         rendering but what is the point.  This way I always know I have a */
-/*         D3DDevice and that makes things easier.  I do impliment the span  */
-/*         rendering function for stuff that I haven't done support for such */
-/*         as points and lines.                                              */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE                                                       */
-/*===========================================================================*/
-extern "C" BOOL	CreateHAL( PMESAD3DSHARED pShared )
-{
-  PMESAD3DHAL 		pHAL = (PMESAD3DHAL)pShared;
-  DDSURFACEDESC2	ddsd2;
-  D3DDEVICEDESC  	D3DSWDevDesc;
-  DDSCAPS2 	  	ddscaps;
-  DWORD          	dwCoopFlags,
-                    dwWidth,
-                    dwHeight;
-  ULONG          	rc;
-
-  DPF(( DBG_FUNC, "CreateHAL();" ));
-
-#define InitDDSD2(f)      memset( &ddsd2, 0, sizeof(DDSURFACEDESC2) ); \
-                          ddsd2.dwSize  = sizeof( DDSURFACEDESC2 ); \
-                          ddsd2.dwFlags = f;
-
-  if ( pHAL == NULL )
-    return FALSE;
-
-  /* Use the internal rectangle struct. */
-  dwWidth  = pShared->rectW.right - pShared->rectW.left;
-  dwHeight = pShared->rectW.bottom - pShared->rectW.top;
-
-  DPF(( DBG_CNTX_INFO, "Width: %d Height: %d", dwWidth, dwHeight ));
-
-  /* The dimensions might still be the same so just leave. */
-  if ( (dwWidth == pShared->dwWidth) && (dwHeight == pShared->dwHeight) )
-  {
-    DPF(( DBG_CNTX_WARN, "Context size hasn't changed" ));
-    return TRUE;
-  }
-
-  /* If one of the dimensions are zero then leave. WM_SIZE should get us back here. */
-  if ( (dwWidth == 0) || (dwHeight == 0) )
-    return TRUE;
-
-  /* Save the renders dimensions. */
-  pShared->dwWidth  = dwWidth;
-  pShared->dwHeight = dwHeight;
-
-  DPF(( DBG_CNTX_INFO, "Creating Context:\n cx:%d cy:%d", pShared->dwWidth, pShared->dwHeight ));
-
-  /*=================================*/
-  /* Create all required interfaces. */
-  /*=================================*/
-
-  /* Kill any DDraw stuff if exists. */
-  DestroyDevice( pHAL );
-  DestroyAllSurfaces( pHAL );
-  DestroyInterfaces( pHAL );
-
-  /* Create a instance of DDraw using the Primary display driver. */
-  rc = DirectDrawCreate( NULL, &pHAL->lpDD, NULL );
-  if( FAILED(rc) )
-  {
-    RIP( pHAL, "DirectDrawCreate->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-  /* Get the DDraw4 interface. */
-  rc = pHAL->lpDD->QueryInterface( IID_IDirectDraw4, (void **)&pHAL->lpDD4 );
-  if( FAILED(rc) )
-  {
-    RIP( pHAL, "QueryInterface (IID_IDirectDraw4) ->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-  /* Get the Direct3D3 interface. */
-  rc = pHAL->lpDD4->QueryInterface( IID_IDirect3D3, (void **)&pHAL->lpD3D3 );
-  if( FAILED(rc) )
-  {
-    RIP( pHAL, "QueryInterface (IID_IDirect3D3) ->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-  /* Set the Cooperative level. NOTE: we need to know if we are FS at this point.*/
-  dwCoopFlags = (pShared->bWindow == TRUE) ? DDSCL_NORMAL : (DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
-  rc = pHAL->lpDD4->SetCooperativeLevel( pShared->hwnd, dwCoopFlags );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "SetCooperativeLevel->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-  /*==================================================================*/
-  /* Get the best device we can and note whether its hardware or not. */
-  /*==================================================================*/
-  pShared->bForceSW = FALSE;
-  pHAL->lpD3D3->EnumDevices( EnumDeviceHook, (void *)pHAL );
-  pShared->bHardware = IsEqualIID( pHAL->guid, IID_IDirect3DHALDevice );
-  DPF(( DBG_CNTX_INFO, "bHardware: %s", (pShared->bHardware) ? "TRUE" : "FALSE" ));
-  DPF(( DBG_CNTX_INFO, "bWindowed: %s", (pShared->bWindow) ? "TRUE" : "FALSE" ));
-
-  /*========================================================================*/
-  /* HARDWARE was found.                                                    */
-  /*========================================================================*/
-  if ( pShared->bHardware == TRUE )
-  {
-    /*===================================*/
-    /* HARDWARE -> Z-BUFFER.             */
-    /*===================================*/
-
-    /* Get a Z-Buffer pixelformat. */
-    memset( &ddsd2, 0, sizeof(DDSURFACEDESC2) );
-    ddsd2.dwSize = sizeof( DDSURFACEDESC2 );
-    rc = pHAL->lpD3D3->EnumZBufferFormats( pHAL->guid, EnumZBufferHook, (VOID*)&ddsd2.ddpfPixelFormat );
-    if ( FAILED(rc) )
-    {
-	 RIP( pHAL, "EnumZBufferFormatsl->", ErrorStringD3D(rc) );
-	 return FALSE;
-    }
-        
-    /* Setup our request structure for the Z-buffer surface. */
-    ddsd2.dwFlags        = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;
-    ddsd2.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | DDSCAPS_VIDEOMEMORY;
-    ddsd2.dwWidth        = dwWidth;
-    ddsd2.dwHeight       = dwHeight;
-    rc = pHAL->lpDD4->CreateSurface( &ddsd2, &pHAL->lpDDSZbuffer, NULL );
-    if ( !FAILED(rc) )
-    {
-	 DPF(( DBG_CNTX_INFO, "HW ZBuffer" ));
-
-	 /*===================================*/
-	 /* HARDWARE -> Z-BUFFER -> FLIPABLE  */
-	 /*===================================*/
-	 if ( pShared->bWindow == FALSE )
-	 {
-	   InitDDSD2( DDSD_CAPS | DDSD_BACKBUFFERCOUNT );
-	   ddsd2.dwBackBufferCount = 1;
-	   ddsd2.ddsCaps.dwCaps    = DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE | DDSCAPS_FLIP | DDSCAPS_COMPLEX;
-	   rc = pHAL->lpDD4->CreateSurface( &ddsd2, &pHAL->lpDDSPrimary, NULL );
-	   if ( FAILED(rc) )
-	   {	
-		/* Make sure we try the next fall back. */
-		DPF(( DBG_CNTX_WARN, "HW Flip/Complex not available" ));
-		pHAL->lpDDSPrimary = NULL;
-	   }
-	   else
-	   {
-		/* Get the back buffer that was created. */
-		ddscaps.dwCaps = DDSCAPS_BACKBUFFER;
-		rc = pHAL->lpDDSPrimary->GetAttachedSurface( &ddscaps, &pHAL->lpDDSRender );
-		if ( FAILED(rc) )
-		{	
-		  DPF(( DBG_CNTX_WARN, "GetAttachedSurface failed -> HW Flip/Complex" ));
-		  
-		  /* Make sure we try the next fall back. */
- 		  pHAL->lpDDSPrimary->Release();
-		  pHAL->lpDDSPrimary = NULL;
-		}	
-		else
-		{
-		  /*  I have had problems when a complex surface comes back  */
-		  /* with the back buffer being created in SW.  Not sure why */
-		  /* or how this is possable but I'm checking for it here.   */
-		  memset( &ddsd2, 0, sizeof(DDSURFACEDESC2) ); 
-		  ddsd2.dwSize = sizeof( DDSURFACEDESC2 );
-		  DX_RESTORE( pHAL->lpDDSRender );
-		  rc = pHAL->lpDDSRender->GetSurfaceDesc( &ddsd2 );
-		  if ( FAILED(rc) )
-		  {
-		    RIP( pHAL, "GetSurfaceDesc (RENDER) ->", ErrorStringD3D(rc) );
-		    return FALSE;
-		  }
-
-		  /* If the surface is in VID then we are happy with are Flipable. */
-		  if ( ddsd2.ddsCaps.dwCaps & DDSCAPS_LOCALVIDMEM )
-		  {
-		    pShared->bFlipable = TRUE;
-		    DPF(( DBG_CNTX_INFO, "HW Flip/Complex!" ));
-		  }
-		  else
-		  {
-		    /* Kill this setup. */
-		    pHAL->lpDDSPrimary->Release();
-		    pHAL->lpDDSPrimary = NULL;
-		  }
-		}
-	   }
-	 }
-
-	 /*===================================*/
-	 /* HARDWARE -> Z-BUFFER -> BLT       */
-	 /*===================================*/
-	 if ( pHAL->lpDDSPrimary == NULL )
-	 {
-	   pShared->bFlipable = FALSE;
-
-	   /* Create the Primary (front buffer). */
-	   InitDDSD2( DDSD_CAPS );
-	   ddsd2.ddsCaps.dwCaps  = DDSCAPS_PRIMARYSURFACE;
-	   rc = pHAL->lpDD4->CreateSurface( &ddsd2, &pHAL->lpDDSPrimary, NULL );
-	   if ( FAILED(rc) )
-	   {
-		/* This is an error as we should be able to do this at minimum. */
-		RIP( pHAL, "CreateSurface (PRIMARY) ->", ErrorStringD3D(rc) );
-		return FALSE;
-	   }
-
-	   /* Create the Render (back buffer). */
-	   InitDDSD2( DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT );
-	   ddsd2.dwWidth	    = dwWidth;
-	   ddsd2.dwHeight	    = dwHeight;
-	   ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
-	   rc = pHAL->lpDD4->CreateSurface( &ddsd2, &pHAL->lpDDSRender, NULL );
-	   if ( FAILED(rc) )
-	   {
-		DPF(( DBG_CNTX_WARN, "Failed HW Offscreen surface" ));
-
-		/* Make sure we try the next fall back. */
-		pHAL->lpDDSPrimary->Release();
-		pHAL->lpDDSPrimary = NULL;
-	   }
-	   else
-	   {
-		/*  Might as well check here too see if this surface is in */
-		/* hardware.  If nothing else just to be consistant.       */
-		memset( &ddsd2, 0, sizeof(DDSURFACEDESC2) ); 
-		ddsd2.dwSize = sizeof( DDSURFACEDESC2 );
-		DX_RESTORE( pHAL->lpDDSRender );
-		rc = pHAL->lpDDSRender->GetSurfaceDesc( &ddsd2 );
-		if ( FAILED(rc) )
-		{
-		  RIP( pHAL, "GetSurfaceDesc (RENDER) ->", ErrorStringD3D(rc) );
-		  return FALSE;
-		}
-
-		/* If the surface is in VID then we are happy. */
-		if ( ddsd2.ddsCaps.dwCaps & DDSCAPS_LOCALVIDMEM )
-		{
-		  /*  Create a clipper object so that DDraw will be able to blt windows that */
-		  /* have been clipped by the screen or other windows.                       */
-		  pHAL->lpDD4->CreateClipper( 0, &pHAL->lpClipper, NULL );
-		  pHAL->lpClipper->SetHWnd( 0, pShared->hwnd );
-		  pHAL->lpDDSPrimary->SetClipper( pHAL->lpClipper );
-		  pHAL->lpClipper->Release();
-		  DPF(( DBG_CNTX_INFO, "HW RENDER surface" ));
-		}
-		else
-		{
-		  /* Kill this setup. */
-		  pHAL->lpDDSRender->Release();
-		  pHAL->lpDDSRender = NULL;
-		  pHAL->lpDDSPrimary->Release();
-		  pHAL->lpDDSPrimary = NULL;
-		}
-	   }
-	 }	
-
-	 /*===================================*/
-	 /* Create D3DDEVICE -> HARDWARE.     */
-	 /*===================================*/
-	 if ( pHAL->lpDDSZbuffer && pHAL->lpDDSPrimary && pHAL->lpDDSRender )
-	 {
-	   DX_RESTORE( pHAL->lpDDSRender );
-	   DX_RESTORE( pHAL->lpDDSZbuffer );
-
-	   rc = pHAL->lpDDSRender->AddAttachedSurface( pHAL->lpDDSZbuffer );
-	   if ( FAILED(rc) )
-	   {
-		RIP( pHAL, "AddAttachedSurface (ZBUFFER) ->", ErrorStringD3D(rc) );
-		return FALSE;
-	   }
-
-	   rc = pHAL->lpD3D3->CreateDevice( IID_IDirect3DHALDevice, pHAL->lpDDSRender, &pHAL->lpD3DDevice, NULL );
-	   if ( rc != D3D_OK )
-	   {
-		DPF(( DBG_CNTX_WARN, "Failed HW Device" ));
-		pHAL->lpD3DDevice = NULL;
-	   }
-	   else
-	   {
-		DPF(( DBG_CNTX_INFO, "HW Device" ));
-	   }
-	 }
-    }	
-  }
-      
-  /*========================================================================*/
-  /* SOFTWARE fallback.                                                     */
-  /*========================================================================*/
-  if ( pHAL->lpD3DDevice == NULL )
-  {
-    DPF(( DBG_CNTX_INFO, "SW fallback :(" ));
-
-    /* Make sure we have no surfaces allocated.  Just incase. */
-    DestroyAllSurfaces( pHAL );
-
-    /* Get a software device. */
-    pShared->bFlipable = FALSE;
-    pShared->bForceSW = TRUE;
-    pHAL->lpD3D3->EnumDevices( EnumDeviceHook, (void *)pHAL );
-    pShared->bHardware = IsEqualIID( pHAL->guid, IID_IDirect3DHALDevice );
-
-     /*===================================*/
-    /* SOFTWARE -> Z-BUFFER.             */
-    /*===================================*/
-
-    /*===================================*/
-    /* SOFTWARE -> Z-BUFFER -> FLIPABLE  */
-    /*===================================*/
-    if ( pShared->bWindow == FALSE )
-    {
-	 InitDDSD2( DDSD_CAPS | DDSD_BACKBUFFERCOUNT );
-	 ddsd2.dwBackBufferCount = 1;
-	 ddsd2.ddsCaps.dwCaps    = DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE | DDSCAPS_FLIP | DDSCAPS_COMPLEX;
-	 ddsd2.ddpfPixelFormat.dwSize  = sizeof( DDPIXELFORMAT );
-	 ddsd2.ddpfPixelFormat.dwFlags = (DDPF_RGB | DDPF_ALPHAPIXELS);
-	 rc = pHAL->lpDD4->CreateSurface( &ddsd2, &pHAL->lpDDSPrimary, NULL );
-	 if ( FAILED(rc) )
-	 {	
-	   DPF(( DBG_CNTX_WARN, "Failed SW Flip/Complex" ));
-
-	   /* Make sure we try the next fall back. */
-	   pHAL->lpDDSPrimary = NULL;
-	 }
-	 else
-	 {
-	   ddscaps.dwCaps = DDSCAPS_BACKBUFFER;
-	   rc = pHAL->lpDDSPrimary->GetAttachedSurface( &ddscaps, &pHAL->lpDDSRender );
-	   if ( FAILED(rc) )
-	   {	
-		/* Make sure we try the next fall back. */
-		DPF(( DBG_CNTX_WARN, "GetAttachedSurface failed -> SW Flip/Complex" ));
-		pHAL->lpDDSPrimary->Release();
-		pHAL->lpDDSPrimary = NULL;
-	   }	
-	   else
-	   {
-		DPF(( DBG_CNTX_INFO, "SW Flip/Complex" ));
-		pShared->bFlipable = TRUE;
-	   }
-	 }
-    }		
-
-    /*===================================*/
-    /* SOFTWARE -> Z-BUFFER -> BLT       */
-    /*===================================*/
-    if ( pHAL->lpDDSPrimary == NULL )
-    {
-	 /* Create the Primary (front buffer). */
-	 InitDDSD2( DDSD_CAPS );
-	 ddsd2.ddsCaps.dwCaps  = DDSCAPS_PRIMARYSURFACE;
-	 rc = pHAL->lpDD4->CreateSurface( &ddsd2, &pHAL->lpDDSPrimary, NULL );
-	 if ( FAILED(rc) )
-	 {
-	   /* This is an error as we should be able to do this at minimum. */
-	   RIP( pHAL, "CreateSurface (PRIMARY) ->", ErrorStringD3D(rc) );
-	   return FALSE;
-	 }
-
-	 /* Create the Render (back buffer). */
-	 InitDDSD2( DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT );
-	 ddsd2.dwWidth					= dwWidth;
-	 ddsd2.dwHeight				= dwHeight;
-	 ddsd2.ddsCaps.dwCaps 			= DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
-	 ddsd2.ddpfPixelFormat.dwSize 	= sizeof( DDPIXELFORMAT );
-	 ddsd2.ddpfPixelFormat.dwFlags	= (DDPF_RGB | DDPF_ALPHAPIXELS);
-	 rc = pHAL->lpDD4->CreateSurface( &ddsd2, &pHAL->lpDDSRender, NULL );
-	 if ( FAILED(rc) )
-	 {
-	   /* That was our last hope. */
-	   RIP( pHAL, "CreateSurface (RENDER) ->", ErrorStringD3D(rc) );
-	   return FALSE;
-	 }
-	 else
-	 {
-	   DPF(( DBG_CNTX_INFO, "SW RENDER surface" ));
-
-	   /*  Create a clipper object so that DDraw will be able to blt windows that */
-	   /* have been clipped by the screen or other windows.                       */
-	   pHAL->lpDD4->CreateClipper( 0, &pHAL->lpClipper, NULL );
-	   pHAL->lpClipper->SetHWnd( 0, pShared->hwnd );
-	   pHAL->lpDDSPrimary->SetClipper( pHAL->lpClipper );
-	   pHAL->lpClipper->Release();
-	 }
-    }		
-	
-    /*===================================*/
-    /* Create D3DDEVICE -> SOFTWARE.     */
-    /*===================================*/
-    if ( pHAL->lpDDSPrimary && pHAL->lpDDSRender )
-    {
-	 DX_RESTORE( pHAL->lpDDSRender );
-	 rc = pHAL->lpD3D3->CreateDevice( IID_IDirect3DRGBDevice, pHAL->lpDDSRender, &pHAL->lpD3DDevice, NULL );
-	 if ( rc != D3D_OK )
-	 {
-	   /* That was our last hope. */
-	   RIP( pHAL, "CreateDevice (IID_IDirect3DRGBDevice) ->", ErrorStringD3D(rc) );
-	   return FALSE;
-	 }
-	 
-	 DPF(( DBG_CNTX_INFO, "SW Device" ));
-    }	
-  }
-
-  /*==============================================================================*/
-  /* Get a copy of the render pixelformat so that wgl.c can call GetPixelInfoD3D. */
-  /*==============================================================================*/
-  memset( &pHAL->ddpf, 0, sizeof(DDPIXELFORMAT) );
-  pHAL->ddpf.dwSize = sizeof( DDPIXELFORMAT );
-  rc = pHAL->lpDDSRender->GetPixelFormat( &pHAL->ddpf );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "GetPixelFormat ->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-  DebugPixelFormat( "Using OFFSCREEN", &pHAL->ddpf );
-  DebugPixelFormat( "Using ZBUFFER", &ddsd2.ddpfPixelFormat );
-
-  /* Get a copy of what the D3DDevice supports for later use. */
-  memset( &D3DSWDevDesc, 0, sizeof(D3DDEVICEDESC) );
-  memset( &pHAL->D3DHWDevDesc, 0, sizeof(D3DDEVICEDESC) );
-  D3DSWDevDesc.dwSize       = sizeof( D3DDEVICEDESC );
-  pHAL->D3DHWDevDesc.dwSize = sizeof( D3DDEVICEDESC );
-  rc = pHAL->lpD3DDevice->GetCaps( &pHAL->D3DHWDevDesc, &D3DSWDevDesc );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "GetCaps ->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-  /* Get a copy of the pixel convertion stuff for direct buffer access. */
-  Solve8BitChannelPixelFormat( &pHAL->ddpf, &pShared->pixel );
-  AlphaBlendTableHAL( pHAL );
-
-  /* We must prime the Begin/End scene for SwapBuffers to work. */
-  rc = pHAL->lpD3DDevice->BeginScene();   
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "BeginScene ->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-#undef InitDDSD2
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  This function will make sure a viewport is created and set for the device*/
-/* in the supplied structure.  If a rect is supplied then it will be used for*/
-/* the viewport otherwise the current setting in the strucute will be used.  */
-/* Note that the rect is relative to the window.  So left/top must be 0,0 to */
-/* use the whole window else there is scissoring going down.                 */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-extern "C" BOOL SetViewportHAL( PMESAD3DSHARED pShared, RECT *pRect, float minZ, float maxZ  )
-{
-  PMESAD3DHAL	pHAL = (PMESAD3DHAL)pShared;
-  D3DVIEWPORT2 vdData;
-  ULONG		rc;
-  POINT		pt;
-
-  DPF(( DBG_FUNC, "SetViewportHAL();" ));
-
-  /* Make sure we have enough info. */
-  if ( !pHAL || !pHAL->lpDDSPrimary || !pHAL->lpD3DDevice )
-  {
-    DPF(( DBG_CNTX_WARN, "SetViewport() -> NULL Pointer" ));
-    return FALSE;
-  }
-
-  /* TODO: this is just a temp fix to stop redundant changes. */
-  if ( pRect &&
-	  (pShared->rectV.left   == pRect->left)    &&
-	  (pShared->rectV.right  == pRect->right)   &&
-	  (pShared->rectV.top    == pRect->top)     &&
-	  (pShared->rectV.bottom == pRect->bottom) )
-  {
-    DPF(( DBG_CNTX_WARN, "Redundant viewport" ));
-    return TRUE;
-  }
-
-  DPF(( DBG_CNTX_INFO, "Current Viewport:" ));
-  DPF(( DBG_CNTX_INFO, "x: %d y: %d", pShared->rectV.left, pShared->rectV.top ));
-  DPF(( DBG_CNTX_INFO, "cx: %d cy: %d", (pShared->rectV.right-pShared->rectV.left), (pShared->rectV.bottom-pShared->rectV.top) ));
-  DPF(( DBG_CNTX_INFO, "New Viewport:" ));
-  DPF(( DBG_CNTX_INFO, "x: %d y: %d", pRect->left, pRect->top ));
-  DPF(( DBG_CNTX_INFO, "cx: %d cy: %d", (pRect->right-pRect->left), (pRect->bottom-pRect->top) ));
-
-  /* Update the current viewport rect if one is supplied. */
-  if ( pRect )      
-    memcpy( &pShared->rectV, pRect, sizeof(RECT) );
-	 
-  /* Build the request structure. */
-  memset( &vdData, 0, sizeof(D3DVIEWPORT2) );
-  vdData.dwSize   = sizeof(D3DVIEWPORT2);  
-  vdData.dwX      = pShared->rectV.left;
-  vdData.dwY      = pShared->rectV.top;
-  vdData.dwWidth  = (pShared->rectV.right - pShared->rectV.left);
-  vdData.dwHeight = (pShared->rectV.bottom - pShared->rectV.top);
-
-  if ( !vdData.dwWidth || !vdData.dwHeight )
-  {
-    GetClientRect( pShared->hwnd, &pShared->rectW );
-    pt.x = pt.y = 0;
-    ClientToScreen( pShared->hwnd, &pt );
-    OffsetRect( &pShared->rectW, pt.x, pt.y);
-    vdData.dwX      = pShared->rectW.left;
-    vdData.dwY      = pShared->rectW.top;
-    vdData.dwWidth  = (pShared->rectW.right - pShared->rectW.left);
-    vdData.dwHeight = (pShared->rectW.bottom - pShared->rectW.top);
-    memcpy( &pShared->rectV, &pShared->rectW, sizeof(RECT) );
-  }
-
-  // The dvClipX, dvClipY, dvClipWidth, dvClipHeight, dvMinZ, 
-  // and dvMaxZ members define the non-normalized post-perspective 
-  // 3-D view volume which is visible to the viewer. In most cases, 
-  // dvClipX is set to -1.0 and dvClipY is set to the inverse of 
-  // the viewport's aspect ratio on the target surface, which can be 
-  // calculated by dividing the dwHeight member by dwWidth. Similarly, 
-  // the dvClipWidth member is typically 2.0 and dvClipHeight is set 
-  // to twice the aspect ratio set in dwClipY. The dvMinZ and dvMaxZ 
-  // are usually set to 0.0 and 1.0.
-  vdData.dvClipX      = -1.0f;
-  vdData.dvClipWidth  = 2.0f;
-  vdData.dvClipY      = 1.0f;
-  vdData.dvClipHeight = 2.0f;
-  vdData.dvMaxZ       = maxZ;
-  vdData.dvMinZ       = minZ;
-
-  DPF(( DBG_CNTX_INFO, "zMin: %f zMax: %f", minZ, maxZ ));
-
-  /*  I'm going to destroy the viewport everytime as when we size we will */
-  /* have a new D3DDevice.  As this area doesn't need to be fast...       */
-  if ( pHAL->lpViewport )
-  {
-    DPF(( DBG_CNTX_INFO, "DeleteViewport" ));
-
-    pHAL->lpD3DDevice->DeleteViewport( pHAL->lpViewport );
-    rc = pHAL->lpViewport->Release();
-    pHAL->lpViewport = NULL;
-  }
-
-  rc = pHAL->lpD3D3->CreateViewport( &pHAL->lpViewport, NULL );
-  if ( rc != D3D_OK )
-  {
-    DPF(( DBG_CNTX_ERROR, "CreateViewport Failed" ));
-    return FALSE;
-  }
-
-  /* Update the device with the new viewport. */
-  pHAL->lpD3DDevice->AddViewport( pHAL->lpViewport );
-  pHAL->lpViewport->SetViewport2( &vdData );
-  pHAL->lpD3DDevice->SetCurrentViewport( pHAL->lpViewport );
-
-  return TRUE; 
-}
-/*===========================================================================*/
-/*                                                                           */
-/*                                                                           */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-HRESULT WINAPI EnumSurfacesHook( LPDIRECTDRAWSURFACE4 lpDDS, LPDDSURFACEDESC2 lpDDSDesc, LPVOID pVoid )
-{
-  DDSURFACEDESC2 *pddsd2 = (DDSURFACEDESC2 *)pVoid;
-
-  DPF(( DBG_FUNC, "EnumSurfacesHook();" ));
-
-  if ( (lpDDSDesc->ddpfPixelFormat.dwFlags == pddsd2->ddpfPixelFormat.dwFlags) && (lpDDSDesc->ddsCaps.dwCaps == pddsd2->ddsCaps.dwCaps) )
-  {
-    /* Save the pixelformat now so that we know we have one. */
-    memcpy( pddsd2, lpDDSDesc, sizeof(DDSURFACEDESC2) );
-
-    return D3DENUMRET_CANCEL;
-  }
-
-  return D3DENUMRET_OK;
-}
-/*===========================================================================*/
-/*  This is the callback proc to get a Z-Buffer.  Thats it.                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-HRESULT CALLBACK  EnumZBufferHook( DDPIXELFORMAT* pddpf, VOID *pVoid )
-{
-  DDPIXELFORMAT  *pddpfChoice = (DDPIXELFORMAT *)pVoid;
-
-  DPF(( DBG_FUNC, "EnumZBufferHook();" ));
-
-  /* If this is ANY type of depth-buffer, stop. */
-  if( pddpf->dwFlags == DDPF_ZBUFFER )
-  {
-    /* Save the pixelformat now so that we know we have one. */
-    memcpy( pddpfChoice, pddpf, sizeof(DDPIXELFORMAT) );
-
-    /* I feel if the hardware supports this low then lets use it.  Could get ugly. */
-    if( pddpf->dwZBufferBitDepth >= 8 )
-    {
-	 return D3DENUMRET_CANCEL;
-    }
-  }
- 
-   return D3DENUMRET_OK;
-}
-/*===========================================================================*/
-/*  This function handles the callback for the D3DDevice enumeration.  Good  */
-/* god who's idea was this?  The D3D wrapper has two variable related to what*/
-/* kind of device we want and have.  First we have a Bool that is set if we  */
-/* have allocated a HW device.  We always look for the HW device first.  The */
-/* other variable is used to force SW.  If we have run into a case that we   */
-/* want to fallback to SW then we set this.  We will fallback if we cannot   */
-/* texture in video memory (among others).                                   */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-HRESULT CALLBACK  EnumDeviceHook( GUID FAR* lpGuid, LPSTR lpDesc, LPSTR lpName, LPD3DDEVICEDESC lpD3DHWDesc, LPD3DDEVICEDESC lpD3DHELDesc,  void *pVoid )
-{
-  PMESAD3DHAL		pHAL = (PMESAD3DHAL)pVoid;
-  LPD3DDEVICEDESC   pChoice = lpD3DHWDesc;
-
-  DPF(( DBG_FUNC, "EnumDeviceHook();" ));
-
-  /* Determine if which device description is valid. */
-  if ( pChoice->dcmColorModel == 0 )
-    pChoice = lpD3DHELDesc;
-
-  /* Make sure we always have a GUID. */
-  memcpy( &pHAL->guid, lpGuid, sizeof(GUID) );
-
-  /* This controls whether we will except HW or not. */
-  if ( pHAL->shared.bForceSW == TRUE )
-  {
-    return (pChoice == lpD3DHELDesc) ? D3DENUMRET_CANCEL : D3DENUMRET_OK;
-  }
-
-  /* Always try for hardware. */
-  if ( pChoice == lpD3DHWDesc )
-  {
-    return D3DENUMRET_CANCEL;
-  }
-
-  return D3DENUMRET_OK;
-}
-/*===========================================================================*/
-/*  This function will destroy any and all surfaces that this context has    */
-/* allocated.  If there is a clipper object then it will also be destoryed as*/
-/* it is part of the Primary Surface.                                        */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void DestroyAllSurfaces( PMESAD3DHAL pHAL )
-{
-  LONG	refCount;
-
-  DPF(( DBG_FUNC, "DestroyAllSurfaces();" ));
-
-  DX_RESTORE( pHAL->lpDDSPrimary );
-  DX_RESTORE( pHAL->lpDDSRender );
-  DX_RESTORE( pHAL->lpDDSZbuffer);
-
-  if ( pHAL->lpDDSRender )
-  {
-    pHAL->lpDDSRender->Unlock( NULL );
-
-    /* If this isn't a Flipable surface then we must clean up the render. */
-    if ( pHAL->shared.bFlipable == FALSE)
-    {
-	 if ( pHAL->lpDDSZbuffer )
-	 {
-	   DPF(( DBG_CNTX_INFO, "Remove attached surfaces from RENDER" ));
-	   pHAL->lpDDSRender->DeleteAttachedSurface( 0, NULL );
-	 }
-
-	 DPF(( DBG_CNTX_INFO, "Release RENDER" ));
-	 refCount = pHAL->lpDDSRender->Release();
-	 pHAL->lpDDSRender = NULL;
-    }
-  }
-
-  if ( pHAL->lpDDSZbuffer )
-  {
-    DPF(( DBG_CNTX_INFO, "Release ZBuffer" ));
-    pHAL->lpDDSZbuffer->Unlock( NULL );
-    refCount = pHAL->lpDDSZbuffer->Release();
-    pHAL->lpDDSZbuffer = NULL;
-  }
-
-  if ( pHAL->lpClipper )
-  {
-    DPF(( DBG_CNTX_INFO, "Release Clipper" ));
-    refCount = pHAL->lpClipper->Release();
-    pHAL->lpClipper = NULL;
-  }
-
-  if ( pHAL->lpDDSPrimary )
-  {
-    pHAL->lpDDSPrimary->Unlock( NULL );
-
-    DPF(( DBG_CNTX_INFO, "Release PRIMARY" ));
-    refCount = pHAL->lpDDSPrimary->Release();
-    pHAL->lpDDSPrimary = NULL;
-  }
-}
-/*===========================================================================*/
-/*  This function will destroy the current D3DDevice and any resources that  */
-/* belong to it.                                                             */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void DestroyDevice( PMESAD3DHAL pHAL )
-{
-  LONG	refCount;
-
-  DPF(( DBG_FUNC, "DestroyDevice();" ));
-
-  /* Kill the D3D stuff if exists. */
-  if ( pHAL->lpViewport )
-  {
-    DPF(( DBG_CNTX_INFO, "Delete Viewport" ));
-    pHAL->lpD3DDevice->DeleteViewport( pHAL->lpViewport );
-
-    DPF(( DBG_CNTX_INFO, "Release Viewport" ));
-    refCount = pHAL->lpViewport->Release();
-    pHAL->lpViewport = NULL;
-  }
-
-  if ( pHAL->lpD3DDevice != NULL )
-  {
-    DPF(( DBG_CNTX_INFO, "Release D3DDevice" ));
-    refCount = pHAL->lpD3DDevice->EndScene();  
-    refCount = pHAL->lpD3DDevice->Release();
-    pHAL->lpD3DDevice = NULL;
-  }
-}
-/*===========================================================================*/
-/*  This function will destroy the current D3DDevice and any resources that  */
-/* belong to it.                                                             */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void DestroyInterfaces( PMESAD3DHAL pHAL )
-{
-  LONG	refCount;
-
-  DPF(( DBG_FUNC, "DestroyInterfaces();" ));
-
-  if ( pHAL->lpD3D3 != NULL )
-  {
-    DPF(( DBG_CNTX_INFO, "Release Direct3D3" ));
-    refCount = pHAL->lpD3D3->Release();
-    pHAL->lpD3D3 = NULL;
-  }
-
-  if ( pHAL->lpDD4 != NULL )
-  {
-    DPF(( DBG_CNTX_INFO, "Release DDraw4" ));
-    refCount = pHAL->lpDD4->Release();
-    pHAL->lpDD4 = NULL;
-  }
-
-  if ( pHAL->lpDD != NULL )
-  {
-    DPF(( DBG_CNTX_INFO, "Release DDraw" ));
-    refCount = pHAL->lpDD->Release();
-    pHAL->lpDD = NULL;
-  }
-}
-/*===========================================================================*/
-/*  This function will first send (not post) a message to the client window  */
-/* that this context is using.  The client will respond by unbinding itself  */
-/* and binding the 'default' context.  This allows the API to be supported   */
-/* until the window can be destroyed.  Finally we post the quit message to   */
-/* the client in hopes to end the application.                               */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-void  FatalShutDown( PMESAD3DHAL pHAL )
-{
-  /* Whip this baby in too try and support the API until we die... */
-  if ( pHAL )
-    SendMessage( pHAL->shared.hwnd, UM_FATALSHUTDOWN, 0L, 0L );
-
-  /* Close the client application down. */
-  PostQuitMessage( 0 );
-}
-
diff --git a/src/mesa/drivers/d3d/D3DMESA.H b/src/mesa/drivers/d3d/D3DMESA.H
deleted file mode 100644
index 71a7cd8aed..0000000000
--- a/src/mesa/drivers/d3d/D3DMESA.H
+++ /dev/null
@@ -1,84 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#ifndef D3D_MESA_H
-#define D3D_MESA_H
-/*===========================================================================*/
-/* Includes.                                                                 */
-/*===========================================================================*/
-#include 
-#include 
-#include 
-#include "matrix.h"
-#include "context.h"
-#include "mtypes.h"
-#include "vb.h"
-#include "D3DShared.h"
-#include "Debug.h"
-#include "NULLProcs.h"
-/*===========================================================================*/
-/* Macros.                                                                   */
-/*===========================================================================*/
-#define FLIP(h,y)                       (h-y)
-/*===========================================================================*/
-/* Magic numbers.                                                            */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Type defines.                                                             */
-/*===========================================================================*/
-struct __extensions__
-{
-   PROC  proc;
-   char  *name;
-};
-
-typedef GLbitfield   (*ClearPROC)( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height );
-typedef void         (*WSpanRGBPROC)( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte rgb[][3], const GLubyte mask[] );
-typedef void         (*WSpanRGBAPROC)( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] );
-typedef void         (*WSpanRGBAMonoPROC)( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte mask[] );
-typedef void         (*WPixelsRGBAPROC)( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte rgba[][4], const GLubyte mask[] );
-typedef void         (*WPixelsRGBAMonoPROC)( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte mask[] );
-typedef void         (*RSpanRGBAPROC)( const GLcontext* ctx, GLuint n, GLint x, GLint y, GLubyte rgba[][4] );
-typedef void         (*RPixelsRGBAPROC)( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], GLubyte rgba[][4], const GLubyte mask[] );
-
-typedef struct D3D_mesa_context 
-{
-  PMESAD3DSHARED        pShared;
-
-  GLcontext             *gl_ctx;       /* The core GL/Mesa context */
-  GLvisual              *gl_visual;    /* Describes the buffers */
-  GLframebuffer *gl_buffer;    /* Depth, stencil, accum, etc buffers */
-
-  HDC                   hdc;
-  WNDPROC               hOldProc;
-
-  UCHAR                 rClear,         /* Current clear colors. */
-		    gClear,
-		    bClear,
-		    aClear,
-		    rCurrent,           /* Current rendering colors. */
-		    gCurrent,
-		    bCurrent,
-		    aCurrent;
-
-   struct D3D_mesa_context *next;
-
-} D3DMESACONTEXT, *PD3DMESACONTEXT;
-/*===========================================================================*/
-/* Extern function prototypes.                                               */
-/*===========================================================================*/
-extern void gl_Viewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height );
-/*===========================================================================*/
-/* Global variables.                                                         */
-/*===========================================================================*/
-extern D3DTLVERTEX   D3DTLVertices[(VB_MAX*6)];
-
-#endif
-
diff --git a/src/mesa/drivers/d3d/D3DRaster.cpp b/src/mesa/drivers/d3d/D3DRaster.cpp
deleted file mode 100644
index 41e42ad94c..0000000000
--- a/src/mesa/drivers/d3d/D3DRaster.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include "D3DHAL.h"
-/*===========================================================================*/
-/*  This function clears the context bound to the supplied shared context.   */
-/* The function takes the D3D flags D3DCLEAR_TARGET, D3DCLEAR_STENCIL and    */
-/* D3DCLEAR_ZBUFFER.  Set bAll to TRUE for a full clear else supply the coord*/
-/* of the rect to be cleared relative to the window.  The color is always a  */
-/* 32bit value (RGBA).  Fill in the z-value and stencil if needed.           */
-/*                                                                           */
-/*  TODO: this can be redone to be called by Mesa directly.                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void ClearHAL( PMESAD3DSHARED pShared, DWORD dwFlags, BOOL bAll, int x, int y, int cx, int cy, DWORD dwColor, float zv, DWORD dwStencil )
-{
-  PMESAD3DHAL	pHAL = (PMESAD3DHAL)pShared;
-  D3DRECT		d3dRect;
-
-#ifdef D3D_DEBUG
-  HRESULT		rc;
-
-  DPF(( DBG_FUNC, "CleaHAL();" ));
-
-  /* Make sure we have enough info. */
-  if ( (pHAL == NULL) || (pHAL->lpViewport == NULL) )
-    return;
-#endif
-
-  if ( bAll )
-  {
-    /* I assume my viewport is valid. */
-    d3dRect.lX1 = pShared->rectV.left;
-    d3dRect.lY1 = pShared->rectV.top;
-    d3dRect.lX2 = pShared->rectV.right;
-    d3dRect.lY2 = pShared->rectV.bottom;
-  }
-  else
-  {
-    d3dRect.lX1 = pShared->rectV.left + x;
-    d3dRect.lY1 = pShared->rectV.top  + y;
-    d3dRect.lX2 = d3dRect.lX1 + cx;
-    d3dRect.lY2 = d3dRect.lY1 + cy;
-  }
-
-#ifdef D3D_DEBUG
-  rc = pHAL->lpViewport->Clear2( 1, &d3dRect, dwFlags, dwColor, zv, dwStencil );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "Clear2 ->", ErrorStringD3D(rc) );
-  }
-#else
-  pHAL->lpViewport->Clear2( 1, &d3dRect, dwFlags, dwColor, zv, dwStencil );
-#endif
-}
-/*===========================================================================*/
-/*  Well this is the guts of it all.  Here we rasterize the primitives that  */
-/* are in their final form.  OpenGL has done all the lighting, transfomations*/
-/* and clipping at this point.                                               */
-/*                                                                           */
-/* TODO:  I'm not sure if I want to bother to check for errors on this call. */
-/*       The overhead kills me...                                            */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void DrawPrimitiveHAL( PMESAD3DSHARED pShared, D3DPRIMITIVETYPE dptPrimitiveType, D3DTLVERTEX *pVertices, DWORD dwCount )
-{
-  PMESAD3DHAL	pHAL = (PMESAD3DHAL)pShared;
-
-#ifdef D3D_DEBUG
-  HRESULT		rc;      
-
-  DPF(( DBG_FUNC, "DrawPrimitveHAL();" ));
-
-  /* Make sure we have enough info. */
-  if ( (pHAL == NULL) || (pHAL->lpD3DDevice == NULL) )
-    return;
-
-  DPF(( DBG_PRIM_INFO, "DP( %d )", dwCount ));
-
-  rc = pHAL->lpD3DDevice->DrawPrimitive( dptPrimitiveType,
-								 D3DFVF_TLVERTEX,
-								 (LPVOID)pVertices,
-								 dwCount, 
-								 (D3DDP_DONOTCLIP | D3DDP_DONOTLIGHT) );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "DrawPrimitive ->", ErrorStringD3D(rc) );
-  }
-#else
-  pHAL->lpD3DDevice->DrawPrimitive( dptPrimitiveType,
-							 D3DFVF_TLVERTEX,
-							 (LPVOID)pVertices,
-							 dwCount, 
-							 (D3DDP_DONOTCLIP | D3DDP_DONOTLIGHT) );
-#endif
-}
-/*===========================================================================*/
-/*  This call will handle the swapping of the buffers.  Now I didn't bother  */
-/* to support single buffered so this will be used for glFlush() as its all  */
-/* the same.  So first we do an EndScene as we are always considered to be in*/
-/* a BeginScene because when we leave we do a BeginScene.  Now note that when*/
-/* the context is created in the first place we do a BeginScene also just to */
-/* get things going.  The call will use either Flip/blt based on the type of */
-/* surface was created for rendering.                                        */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void SwapBuffersHAL( PMESAD3DSHARED pShared )
-{
-  PMESAD3DHAL	pHAL = (PMESAD3DHAL)pShared;
-
-#ifdef D3D_DEBUG
-  HRESULT		rc;      
-
-  DPF(( DBG_FUNC, "SwapBuffersHAL();" ));
-  DPF(( DBG_ALL_PROFILE, "=================SWAP===================" ));
-
-  /* Make sure we have enough info. */
-  if ( (pHAL == NULL) || (pHAL->lpD3DDevice == NULL) )
-    return;
-
-  /* Make sure we have enough info. */
-  if ( pHAL->lpDDSPrimary != NULL )
-  {
-    rc = pHAL->lpD3DDevice->EndScene();   
-    if ( FAILED(rc) )
-    {
-	 RIP( pHAL, "EndScene ->", ErrorStringD3D(rc) );
-    }
- 
-    if ( pShared->bFlipable )
-    {
-	 DPF(( DBG_CNTX_PROFILE, "Swap->FLIP" ));
-	 rc = pHAL->lpDDSPrimary->Flip( NULL, DDFLIP_WAIT );
-    }
-    else
-    {
-	 DPF(( DBG_CNTX_PROFILE, "Swap->Blt" ));
-	 rc = pHAL->lpDDSPrimary->Blt( &pShared->rectW, pHAL->lpDDSRender, NULL, DDBLT_WAIT, NULL );
-    }
-    if ( FAILED(rc) )
-    {
-	 RIP( pHAL, "Blt (RENDER/PRIMARY) ->", ErrorStringD3D(rc) );
-    }
-
-    rc = pHAL->lpD3DDevice->BeginScene(); 
-    if ( FAILED(rc) )
-    {
-	 RIP( pHAL, "BeginScene ->", ErrorStringD3D(rc) );
-    }
-  }
-#else
-  pHAL->lpD3DDevice->EndScene();   
-
-  if ( pShared->bFlipable )
-    pHAL->lpDDSPrimary->Flip( NULL, DDFLIP_WAIT );
-  else
-    pHAL->lpDDSPrimary->Blt( &pShared->rectW, pHAL->lpDDSRender, NULL, DDBLT_WAIT, NULL );
-
-  pHAL->lpD3DDevice->BeginScene(); 
-
-#endif
-}
-/*===========================================================================*/
-/*  This function is a very thin wrapper for the D3D call 'SetRenderState'.  */
-/* Using this function requires all the types to be defined by including the */
-/* D3D header file.                                                          */
-/*                                                                           */
-/*  TODO:  would be much better to get ride of all these calls per VBRender. */
-/*        I feel I should get this call into SetRenderStates() the RenderVB. */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void SetStateHAL( PMESAD3DSHARED pShared, DWORD dwType, DWORD dwState )
-{
-  PMESAD3DHAL	pHAL = (PMESAD3DHAL)pShared;
-
-#ifdef D3D_DEBUG   
-  HRESULT		rc;
-
-  DPF(( DBG_FUNC, "SetStateHAL();" ));
-
-  /* Make sure we have enough info. */
-  if ( (pHAL == NULL) || (pHAL->lpD3DDevice == NULL) )
-    return;
-
-  rc = pHAL->lpD3DDevice->SetRenderState( (D3DRENDERSTATETYPE)dwType, dwState );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "SetRenderState ->", ErrorStringD3D(rc) );
-  }
-
-#else
-  pHAL->lpD3DDevice->SetRenderState( (D3DRENDERSTATETYPE)dwType, dwState );
-#endif
-}
-
-
-
-
-
-
-
-
diff --git a/src/mesa/drivers/d3d/D3DShared.h b/src/mesa/drivers/d3d/D3DShared.h
deleted file mode 100644
index cc629e2111..0000000000
--- a/src/mesa/drivers/d3d/D3DShared.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#ifndef D3D_MESA_ALL_H
-#define D3D_MESA_ALL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*===========================================================================*/
-/* Includes.                                                                 */
-/*===========================================================================*/
-#include 
-#include 
-/*===========================================================================*/
-/* Magic numbers.                                                            */
-/*===========================================================================*/
-#define	TM_ACTION_LOAD      0x01
-#define 	TM_ACTION_BIND      0x02
-#define 	TM_ACTION_UPDATE  	0x04
-
-#define	UM_FATALSHUTDOWN	(WM_USER+42)
-/*===========================================================================*/
-/* Macros defines.                                                           */
-/*===========================================================================*/
-#define  ALLOC(cb)            malloc( (cb) )
-#define  FREE(p)              { free( (p) ); (p) = NULL; }
-/*===========================================================================*/
-/* Type defines.                                                             */
-/*===========================================================================*/
-typedef struct _pixel_convert
-{
-  int	cb,			/* Count in bytes of one pixel. */
-          rShift,		/* Shift count that postions each componet. */
-	     gShift,		
-	     bShift,		
-          aShift;		
-  float   rScale,		/* Value that scales a color that ranges 0.0 -> 1.0 */
-          gScale,		/* to this pixel format.                            */
-          bScale,
-          aScale;
-  DWORD   dwRMask,		/* Color mask per component. */
-	     dwGMask,
-          dwBMask,
-          dwAMask;
-
-} PIXELINFO, *PPIXELINFO;
-
-
-typedef struct _d3d_shared_info
-{
-  HWND		hwnd;
-  BOOL    	bWindow,
-               bFlipable,
-               bForceSW,
-               bHardware;
-  RECT    	rectW,			/* Window size and postion in screen space. */
-               rectV;			/* Viewport size and postion. */
-  DWORD		dwWidth,			/* Current render size for quick checks. */
-               dwHeight;
-
-  PIXELINFO	pixel;			
-  DWORD		dwSrcBlendCaps[14],	/* See D3DCAPS.CPP */
-               dwDestBlendCaps[14],
-               dwTexFunc[4];
-
-} MESAD3DSHARED, *PMESAD3DSHARED;
-
-typedef struct _render_options
-{
-  BOOL	bForceSoftware,		/* TODO: Add user switches. */
-	     bStretchtoPrimary;
-
-} USER_CTRL, *PUSER_CRTL;
-
-enum { s_zero = 0,				
-	  s_one, 
-	  s_dst_color, 
-	  s_one_minus_dst_color, 
-	  s_src_alpha, 
-	  s_one_minus_src_alpha, 
-	  s_dst_alpha,
-	  s_one_minus_dst_alpha,
-	  s_src_alpha_saturate, 
-	  s_constant_color, 
-	  s_one_minus_constant_color, 
-	  s_constant_alpha, 
-	  s_one_minus_constant_alpha };
-
-enum { d_zero = 0, 
-	  d_one, 
-	  d_src_color, 
-	  d_one_minus_src_color, 
-	  d_src_alpha, 
-	  d_one_minus_src_alpha, 
-	  d_dst_alpha,
-	  d_one_minus_dst_alpha,
-	  d_constant_color,
-	  d_one_minus_constant_color,
-	  d_constant_alpha,
-	  d_one_minus_constant_alpha };
-
-enum { d3dtblend_decal = 0,
-	  d3dtblend_decalalpha,
-	  d3dtblend_modulate,
-	  d3dtblend_modulatealpha };
-
-/*===========================================================================*/
-/* Function prototypes.                                                      */
-/*===========================================================================*/
-PMESAD3DSHARED	InitHAL( HWND hwnd );
-void 	   	TermHAL( PMESAD3DSHARED pShared );
-BOOL 	   	CreateHAL( PMESAD3DSHARED pShared );
-BOOL 	   	SetViewportHAL( PMESAD3DSHARED pShared, RECT *pRect, float minZ, float maxZ  );
-
-void ClearHAL( PMESAD3DSHARED pShared, DWORD dwFlags, BOOL bAll, int x, int y, int cx, int cy, DWORD dwColor, float zv, DWORD dwStencil );
-void SetStateHAL( PMESAD3DSHARED pShared, DWORD dwType, DWORD dwState );
-void DrawPrimitiveHAL( PMESAD3DSHARED pShared, D3DPRIMITIVETYPE dptPrimitiveType, D3DTLVERTEX *pVertices, DWORD dwCount );
-
-void 		SwapBuffersHAL( PMESAD3DSHARED pShared );
-DDSURFACEDESC2 *LockHAL( PMESAD3DSHARED pShared, BOOL bBack );
-void 		UnlockHAL( PMESAD3DSHARED pShared, BOOL bBack );
-void 		UpdateScreenPosHAL( PMESAD3DSHARED pShared );
-void			GetPixelInfoHAL( PMESAD3DSHARED pShared, PPIXELINFO pPixel );
-BOOL CreateTMgrHAL( PMESAD3DSHARED pShared, DWORD dwName, int level, DWORD dwRequestFlags, RECT *rectDirty, DWORD dwWidth, DWORD dwHeight, DWORD dwAction, void *pPixels );
-void DisableTMgrHAL( PMESAD3DSHARED pShared );
-
-
-int  SaveDIBitmap( char *filename, BITMAPINFO *info, void *bits );
-int	ARGB_SaveBitmap( char *filename, int width, int height, unsigned char *pARGB );
-int  BGRA_SaveBitmap( char *filename, int width, int height, unsigned char *pBGRA );
-int  BGR_SaveBitmap( char *filename, int width, int height, unsigned char *pBGR );
-/*===========================================================================*/
-/* Global variables.                                                         */
-/*===========================================================================*/
-extern float	g_DepthScale,	/* Mesa needs to scale Z in SW.  The HAL */
-               g_MaxDepth;    /* doesn't but I wanted SW still to work.*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
-
diff --git a/src/mesa/drivers/d3d/D3DTEXT.CPP b/src/mesa/drivers/d3d/D3DTEXT.CPP
deleted file mode 100644
index 39855b65fa..0000000000
--- a/src/mesa/drivers/d3d/D3DTEXT.CPP
+++ /dev/null
@@ -1,576 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include "d3dText.h"
-
-/*=============================================================================
-
-       1     
-     ------
-    |      | 
-  6 |      | 2
-    |  7   |
-     ------  
-    |      |
-  5 |      | 3
-    |      |
-     ------ 
-       4 
-
-	    TL_0		TR_0
-TLL		TL_1		TR_1	TRR
-
-MLL_0   ML_0		MR_0	MRR_0
-MLL_1   ML_1		MR_1	MRR_1
-
-BLL		BL_0		BR_0	BRR
-        BL_1		BR_1
-
-=============================================================================*/
-
-#define TLL		0
-#define TRR		1
-#define TL_0	2
-#define TL_1	3
-#define TR_0	4
-#define TR_1	5
-
-#define	MLL_0	6
-#define	MLL_1	7
-#define	MRR_0	8
-#define	MRR_1	9
-
-#define	ML_0	10
-#define	ML_1	11
-#define	MR_0	12
-#define	MR_1	13
-
-#define	BL_0	14
-#define	BL_1	15
-#define	BR_0	16
-#define	BR_1	17
-#define	BLL		18
-#define	BRR		19
-
-#define	BIT1	0x00000001
-#define	BIT2	0x00000002
-#define	BIT3	0x00000004
-#define	BIT4	0x00000008
-#define	BIT5	0x00000010
-#define	BIT6	0x00000020
-#define	BIT7	0x00000040
-
-#define TOP		BIT4
-#define MIDDLE		BIT7
-#define BOTTOM		BIT1
-#define TLEFT 		BIT5
-#define BLEFT   	BIT6
-#define LEFT		(TLEFT|BLEFT)
-#define TRIGHT		BIT3
-#define BRIGHT		BIT2
-#define RIGHT		(TRIGHT|BRIGHT)
-#define ALL		0xFFFFFFFF
-
-/*===========================================================================*/
-/*  This is the static array that will map the ASCII value of the character  */
-/* being draw to the bit mask that will be scan converted to the LED display.*/
-/*===========================================================================*/
-DWORD	textBitMasks[] = 
-{
-  0xFFFFFFFF, // 000
-  0xFFFFFFFF, // 001
-  0xFFFFFFFF, // 002
-  0xFFFFFFFF, // 003  
-  0xFFFFFFFF, // 004
-  0xFFFFFFFF, // 005
-  0xFFFFFFFF, // 006
-  0xFFFFFFFF, // 007  
-  0xFFFFFFFF, // 008
-  0xFFFFFFFF, // 009
-  0xFFFFFFFF, // 010
-  0xFFFFFFFF, // 011
-  0xFFFFFFFF, // 012
-  0xFFFFFFFF, // 013
-  0xFFFFFFFF, // 014
-  0xFFFFFFFF, // 015
-  0xFFFFFFFF, // 016
-  0xFFFFFFFF, // 017
-  0xFFFFFFFF, // 018
-  0xFFFFFFFF, // 019
-  0xFFFFFFFF, // 020
-  0xFFFFFFFF, // 021
-  0xFFFFFFFF, // 022
-  0xFFFFFFFF, // 023 
-  0xFFFFFFFF, // 024
-  0xFFFFFFFF, // 025
-  0xFFFFFFFF, // 026
-  0xFFFFFFFF, // 027
-  0xFFFFFFFF, // 028
-  0xFFFFFFFF, // 029
-  0xFFFFFFFF, // 030
-  0XFFFFFFFF, // 031 
-  0x00000000, // 032 'SPC'
-  0xFFFFFFFF, // 033
-  0xFFFFFFFF, // 034
-  0xFFFFFFFF, // 035
-  0xFFFFFFFF, // 036
-  0xFFFFFFFF, // 037
-  0xFFFFFFFF, // 038
-  0xFFFFFFFF, // 039
-  0xFFFFFFFF, // 040
-  0xFFFFFFFF, // 041
-  0xFFFFFFFF, // 042
-  0xFFFFFFFF, // 043
-  0xFFFFFFFF, // 044
-  0xFFFFFFFF, // 045
-  0xFFFFFFFF, // 046
-  0xFFFFFFFF, // 047 
-  (ALL &~ MIDDLE), 			// 048	'0'
-  (RIGHT),     				// 049	'1'
-  (ALL &~ TLEFT &~ BRIGHT), // 050	'2'
-  (ALL &~ LEFT), 			// 051	'3'
-  (TLEFT | MIDDLE | RIGHT), // 052	'4'
-  (ALL &~ TRIGHT &~ BLEFT), // 053	'5'
-  (ALL &~ TRIGHT), 			// 054	'6'
-  (TOP | RIGHT), 			// 055	'7'
-  (ALL), 					// 056	'8'
-  (ALL &~ BOTTOM &~ BLEFT), // 057	'9'
-  0xFFFFFFFF, // 058
-  0xFFFFFFFF, // 059
-  0xFFFFFFFF, // 060
-  0XFFFFFFFF, // 061
-  0xFFFFFFFF, // 062
-  0xFFFFFFFF, // 063
-  0xFFFFFFFF, // 064
-  (ALL &~ BOTTOM),			// 065	'A'
-  (ALL), 					// 066	'B'
-  (TOP | LEFT | BOTTOM), 	// 067	'C'
-  (ALL &~ MIDDLE), 			// 068	'D'
-  (ALL &~ RIGHT), 			// 069	'E'
-  (LEFT | TOP | MIDDLE), 	// 070	'F'
-  0x00000000,  				// 071	'G'
-  (ALL &~ TOP &~ BOTTOM), 	// 072	'H'
-  (RIGHT), 					// 073	'I'
-  (RIGHT | BOTTOM),			// 074	'J'
-  0x00000000,  				// 075	'K'
-  (LEFT | BOTTOM),			// 076	'L'
-  0x00000000, 				// 088	'M'
-  0x00000000, 				// 089	'N'
-  (ALL &~ MIDDLE),  		// 090	'O'
-  (ALL &~ BRIGHT &~ BOTTOM),// 091	'P'
-  0x00000000, 				// 092	'Q'
-  0x00000000,				// 093	'R'
-  (ALL &~ TRIGHT &~ BLEFT),	// 094	'S'
-  0X00000000, 				// 095	'T'
-  (LEFT | RIGHT | BOTTOM),  // 096	'U'
-  0x00000000, 				// 097	'V'
-  0x00000000, 				// 098	'W'
-  0x00000000, 				// 099	'X'
-  0x00000000,  				// 1000	'Z'
-  0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,  // 100 
-  0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,  // 104 
-  0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,  // 108 
-  0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,  // 112 
-  0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,  // 116 
-  0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,  // 120 
-  0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF   // 124 
-};
-
-#define	CT	1.0f
-#define	CX	7.0f
-#define	CY	13.0f
-#define CM	((CY-(CT*3.0f))/2.0f)
-
-float lCoords[][2] = 
-{
-  /* Top outsides. */
-  { 0,  		(CY-CT) },		
-  { CX, 		(CY-CT) },
-
-  /* Top Line. */
-  { CT, 		CY },
-  { CT, 		(CY-CT) },
-  { (CX-CT), 	CY },
-  { (CX-CT), 	(CY-CT) },
-
-  /* Middle outsides. */
-  { 0.0f,		(CT+CM+CT) },
-  { 0.0f,		(CT+CM) },
-  { CX,			(CT+CM+CT) },
-  { CX,			(CT+CM) },
-
-  /* Middle Line. */
-  { CT,			(CT+CM+CT) },	
-  { CT,			(CT+CM)	},	
-  { (CX-CT),	(CT+CM+CT) },
-  { (CX-CT),	(CT+CM) },
-
-  /* Bottom line. */
-  { CT,			CT },
-  { CT,			0.0f },
-  { (CX-CT),	CT },
-  { (CX-CT),	0.0f },
-
-  /* Bottom outsides. */
-  { 0.0f,		CT},
-  { CX,			CT }
-};
-
-static int	ConvertCharacter( char *c, int cIndex,  PD3DFONTMETRICS pfntMetrics );
-
-D3DTLVERTEX TextVertices[MAX_VERTICES];
-/*===========================================================================*/
-/*  When we attach I will zero out the whole D3D vertex buffer I'm using for */
-/* the text.  This way I don't need to set all the redundant values.  I also */
-/* set all the oow values to 1 as I will be doing direct rendering.          */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-extern "C" BOOL InitD3DText( void )
-{
-  int	index;
-
-  /* Set the D3D Vertex Buffer up once so we don't do redundant changes. */
-  memset( &TextVertices[0], 0, sizeof(TextVertices) );
-  for( index = 0; index < MAX_VERTICES; index++ )
-	TextVertices[index].rhw	= D3DVAL( 1.0 );
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  This function takes a single character and draw it using the supplied    */
-/* fontmetrics structure.                                                    */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void d3dTextDrawString( char *pszString, int x, int y, PD3DFONTMETRICS pfntMetrics )
-{
-  int	cIndex,
-	     nIndex,
-	     index;
-  float	cWidth = CX,
-	     cHeight = CY;
-
-  /*  Find the max width/height of a character and add the spacing so */
-  /* that we can use this value to calculate the x,y of the character.*/
-  cWidth  = (cWidth  * pfntMetrics->fntXScale)  + pfntMetrics->fntXSpacing;
-  cHeight = (cHeight * pfntMetrics->fntYScale) + pfntMetrics->fntYSpacing;
-
-  /* Walk the string.  This must be NULL terminated. */
-  for( cIndex = 0, nIndex = 0; *pszString; pszString++, cIndex = nIndex, x++ )
-  {
-	/* Convert the character and get the index into the text vertex buffer. */
-	nIndex = ConvertCharacter( &pszString[0], cIndex, pfntMetrics );
-	if ( (nIndex - cIndex) > 2 )
-    {
-	  /* Modify the text vertex buffer based on the fntMetrics structure. */
-	  for( index = cIndex; index < nIndex; index++ )
-	  {
-		/* Scale the character. */
-		TextVertices[index].sx	*= pfntMetrics->fntXScale;
-		TextVertices[index].sy   *= pfntMetrics->fntYScale;
-		
-		/* Move the character. */
-		TextVertices[index].sx	+= (cWidth*x);
-		TextVertices[index].sy   += (cHeight*y);
-
-		/* Set the color. */
-		TextVertices[index].color = pfntMetrics->dwColor;
-	  }
-	}
-  }
-
-  if ( nIndex < 3 )
-	return;
-
-  /* Set the states that slim things down. */
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_CULLMODE, 			D3DCULL_NONE );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_FILLMODE, 			D3DFILL_SOLID );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_ZENABLE, 			FALSE );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_ZWRITEENABLE , 		FALSE );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_ALPHATESTENABLE, 	FALSE );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_ALPHABLENDENABLE, 	FALSE );
-
-  /* Blast them baby... */
-  pfntMetrics->lpD3DDevice->DrawPrimitive( D3DPT_TRIANGLELIST,
-										   D3DFVF_TLVERTEX,
-										   (LPVOID)&TextVertices[0],
-										   nIndex, 
-										   (D3DDP_DONOTCLIP | D3DDP_DONOTLIGHT) );
-}
-/*===========================================================================*/
-/*  This function takes a single character and draw it directly to the screen*/
-/* unsing the supplied fntMetrics structure.  The character will be drawn at */
-/* the supplied x,y.  The x,y position is relative to the top left and uses  */
-/* the spacing in the fntMetrics structure.                                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void d3dTextDrawCharacter( char *c, int x, int y, PD3DFONTMETRICS pfntMetrics )
-{
-  int	cIndex = 0,
-	    index;
-  float	cWidth = CX,
-	    cHeight = CY;
-
-  /* Convert the character and get the index into the text vertex buffer. */
-  cIndex = ConvertCharacter( c, 0, pfntMetrics );
-  if ( cIndex < 3 )
-	return;
-
-  /*  Find the max width/height of a character and add the spacing so */
-  /* that we can use this value to calculate the x,y of the character.*/
-  cWidth  = (cWidth  * pfntMetrics->fntXScale)  + pfntMetrics->fntXSpacing;
-  cHeight = (cHeight * pfntMetrics->fntYScale) + pfntMetrics->fntYSpacing;
-
-  /* Modify the text vertex buffer based on the fntMetrics structure. */
-  for( index = 0; index < cIndex; index++ )
-  {
-	/* Scale the character. */
-	TextVertices[index].sx	*= pfntMetrics->fntXScale;
-	TextVertices[index].sy   *= pfntMetrics->fntYScale;
-
-	/* Move the character. */
-	TextVertices[index].sx	+= (cWidth*x);
-	TextVertices[index].sy   += (cHeight*y);
-
-	/* Set the color. */
-	TextVertices[index].color = pfntMetrics->dwColor;
-  }
- 
-
-  /* Set the states that slim things down. */
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_CULLMODE, 			D3DCULL_NONE );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_FILLMODE, 			D3DFILL_SOLID );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_ZENABLE, 			FALSE );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_ZWRITEENABLE , 		FALSE );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_ALPHATESTENABLE, 	FALSE );
-  pfntMetrics->lpD3DDevice->SetRenderState( D3DRENDERSTATE_ALPHABLENDENABLE, 	FALSE );
-
-  /* Blast them baby... */
-  pfntMetrics->lpD3DDevice->DrawPrimitive( D3DPT_TRIANGLELIST,
-										   D3DFVF_TLVERTEX,
-										   (LPVOID)&TextVertices[0],
-										   cIndex, 
-										   (D3DDP_DONOTCLIP | D3DDP_DONOTLIGHT) );
-}
-/*===========================================================================*/
-/*  This function takes a single character and draw it using the supplied    */
-/* fontmetrics structure.                                                    */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static int	ConvertCharacter( char *c, int cIndex,  PD3DFONTMETRICS pfntMetrics )
-{
-  DWORD	asciiChar = (int)(*c);
-
-  /* Handle the TOP line. */
-  if ( textBitMasks[asciiChar] & BIT1 )
-  { 
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[TL_0][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[TL_0][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[TR_0][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[TR_0][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[TR_1][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[TR_1][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[TR_1][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[TR_1][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[TL_1][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[TL_1][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[TL_0][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[TL_0][1] );
-  }
-
-  /* Handle the TOP/BOTTOM RIGHT lines. */
-  //  if ( textBitMasks[index] & (BIT2|BIT3) )
-  if ( 1 == 0 )
-  {
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[TR_1][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[TR_1][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[TRR][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[TRR][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[BRR][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[BRR][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[BRR][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[BRR][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[BR_0][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[BR_0][1] );
-    TextVertices[cIndex].sx	= D3DVAL( lCoords[TR_1][0] );
-    TextVertices[cIndex++].sy= D3DVAL( lCoords[TR_1][1] );
-  }
-  else 
-  {
-	if ( textBitMasks[asciiChar] & BIT2 )
-	{
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[TR_1][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[TR_1][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[TRR][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[TRR][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[MRR_0][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[MRR_0][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[MRR_0][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[MRR_0][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[MR_0][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[MR_0][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[TR_1][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[TR_1][1] );
-	}
-	if ( textBitMasks[asciiChar] & BIT3 )
-	{
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[MR_1][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[MR_1][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[MRR_1][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[MRR_1][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[BRR][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[BRR][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[BRR][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[BRR][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[BR_0][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[BR_0][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[MR_1][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[MR_1][1] );
-	}
-  }
-
-  /* Handle the TOP/BOTTOM LEFT lines. */
-  //  if ( textBitMasks[asciiChar] & (BIT5|BIT6) )
-  if ( 1 == 0 )
-  {
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[TLL][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[TLL][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[TL_1][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[TL_1][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[BL_0][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[BL_0][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[BL_0][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[BL_0][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[BLL][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[BLL][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[TLL][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[TLL][1] );
-  }
-  else 
-  {
-	if ( textBitMasks[asciiChar] & BIT5 )
-	{
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[MLL_1][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[MLL_1][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[ML_1][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[ML_1][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[BL_0][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[BL_0][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[BL_0][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[BL_0][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[BLL][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[BLL][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[MLL_1][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[MLL_1][1] );
-	}
-	if ( textBitMasks[asciiChar] & BIT6 )
-	{
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[TLL][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[TLL][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[TL_1][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[TL_1][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[ML_0][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[ML_0][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[ML_0][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[ML_0][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[MLL_0][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[MLL_0][1] );
-	  TextVertices[cIndex].sx	= D3DVAL( lCoords[TLL][0] );
-	  TextVertices[cIndex++].sy	= D3DVAL( lCoords[TLL][1] );
-	}
-  }
-
-  /* Handle the MIDDLE line. */
-  if ( textBitMasks[asciiChar] & BIT7 )
-  {
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[ML_0][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[ML_0][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[MR_0][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[MR_0][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[MR_1][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[MR_1][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[MR_1][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[MR_1][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[ML_1][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[ML_1][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[ML_0][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[ML_0][1] );
-  }
-
-  /* Handle the BOTTOM line. */
-  if ( textBitMasks[asciiChar] & BIT4 )
-  {
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[BL_0][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[BL_0][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[BR_0][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[BR_0][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[BR_1][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[BR_1][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[BR_1][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[BR_1][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[BL_1][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[BL_1][1] );
-	TextVertices[cIndex].sx	= D3DVAL( lCoords[BL_0][0] );
-	TextVertices[cIndex++].sy= D3DVAL( lCoords[BL_0][1] );
-  }
-  
-  return cIndex;
-}
-
-#undef CM
-#undef CY
-#undef CX
-#undef CT
-
-#undef TLL
-#undef TRR
-#undef TL_0
-#undef TL_1
-#undef TR_0
-#undef TR_1
-
-#undef	MLL_0
-#undef	MLL_1
-#undef	MRR_0
-#undef	MRR_1
-
-#undef	ML_0
-#undef	ML_1
-#undef	MR_0
-#undef	MR_1
-
-#undef	BL_0
-#undef	BL_1
-#undef	BR_0
-#undef	BR_1
-#undef	BLL
-#undef	BRR
-
-#undef	BIT1
-#undef	BIT2
-#undef	BIT3
-#undef	BIT4
-#undef	BIT5
-#undef	BIT6
-#undef	BIT7
-
-#undef TOP
-#undef MIDDLE
-#undef BOTTOM
-#undef TLEFT
-#undef BLEFT
-#undef LEFT
-#undef TRIGHT
-#undef BRIGHT
-#undef RIGHT
-#undef ALL
diff --git a/src/mesa/drivers/d3d/D3DTextureMgr.cpp b/src/mesa/drivers/d3d/D3DTextureMgr.cpp
deleted file mode 100644
index a6600cab02..0000000000
--- a/src/mesa/drivers/d3d/D3DTextureMgr.cpp
+++ /dev/null
@@ -1,947 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include "D3DHAL.h"
-/*===========================================================================*/
-/* Local function prototypes.                                                */
-/*===========================================================================*/
-static void UpdateTexture( PTM_OBJECT pTMObj, BOOL bVideo, RECT *pRect, UCHAR *pixels );
-static BOOL LoadTextureInVideo( PMESAD3DHAL pHAL, PTM_OBJECT pTMObj );
-static BOOL FreeTextureMemory( PMESAD3DHAL pHAL, PTM_OBJECT pTMObject );
-static BOOL DestroyTextureObject( PMESAD3DHAL pHAL, PTM_OBJECT pTMObject );
-HRESULT CALLBACK EnumPFHook( LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext );
-/*===========================================================================*/
-/*  This function will simply set the top of stack to NULL.  I only used it  */
-/* just incase I want to add something later.                                */
-/*===========================================================================*/
-/* RETURN: TRUE.                                                             */
-/*===========================================================================*/
-BOOL InitTMgrHAL( PMESAD3DHAL pHAL )
-{
-  DPF(( DBG_FUNC, "InitTMgrHAL();" ));
-
-  /* Be clean my friend. */
-  pHAL->pTMList = NULL;
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  This function will walk the Texture Managers linked list and destroy all */
-/* surfaces (SYSTEM/VIDEO).  The texture objects themselves also will be     */
-/* freed.                                                                    */
-/*  NOTE: this is per/context.                                               */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-void TermTMgrHAL( PMESAD3DHAL pHAL )
-{
-  DPF(( DBG_FUNC, "TermTMgrHAL();" ));
-
-  if ( pHAL && pHAL->pTMList )
-  {
-    /* Destroy the surface and remove the TMO from the stack. */
-    while( DestroyTextureObject(pHAL,NULL) );
-
-    /* Be clean my friend. */
-    pHAL->pTMList = NULL;
-  }
-}
-/*===========================================================================*/
-/*  This function is a HACK as I don't know how I can disable a texture with-*/
-/* out booting it out.  Is there know state change?                          */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void DisableTMgrHAL( PMESAD3DSHARED pShared )
-{
-  PMESAD3DHAL	pHAL = (PMESAD3DHAL)pShared;
-
-  DPF(( DBG_FUNC, "DisableTMgrHAL();" ));
-
-  /* Check too see that we have a valid context. */
-  if ( (pHAL == NULL) && (pHAL->lpD3DDevice != NULL)  ) 
-  {
-    DPF(( DBG_TXT_WARN, "Null HAL/Direct3D Device!" ));
-    return;
-  }
-
-  // TODO: This is a hack to shut off textures.
-  pHAL->lpD3DDevice->SetTexture( 0, NULL );
-}
-/*===========================================================================*/
-/*  This function is the only entry into the TextureManager that Mesa/wgl    */
-/* will see.  It uses a dwAction to specify what we are doing.  I did this as*/
-/* depending on the cards resources the action taken can change.             */
-/*  When this function is called we will always search the Texture Managers  */
-/* linked list (per context remember) and try and find a structure that has  */
-/* the same dwName.  If we have a match we pull it out of the list and put it*/
-/* at the top of the list (TOL).  If we don't find one then we create a struc*/
-/* and put it a TOL.  This TOL idea makes for some caching as we will always */
-/* destroy Texture Surfaces from the bottom up...                            */
-/*  All texture objects at this point will create a texture surface in System*/
-/* memory (SMEM).  Then we will copy the Mesa texture into the surface using */
-/* the 'pixel' struc to get the translation info.  So now this means that all*/
-/* textures that Mesa gives me I will have a Surface with a copy.  If Mesa   */
-/* changes the texture the I update the surface in (SMEM).                   */
-/*  Now we have a texture struc and a Texture Surface in SMEM.  At this point*/
-/* we create another surface on the card (VMEM).  Finally we blt from the    */
-/* SMEM to the VMEM and set the texture as current.  Why do I need two? First*/
-/* this solves square textures.  If the cards CAPS is square textures only   */
-/* then I change the dimensions of the VMEM surface and the blt solves it for*/
-/* me.  Second it saves me from filling D3D textures over and over if the    */
-/* card needs to be creating and destroying surfaces because of low memory.  */
-/*  The surface in SMEM is expected to work always.  When a surface has to be*/
-/* created in VMEM then we put it in a loop that tries to create the surface.*/
-/* If we create the surface ok then we brake from the loop.  If we fail then */
-/* we will call 'FreeTextureMemory' that will return TRUE/FALSE as to whether*/
-/* memory was freed.  If memory was freed then we can try again. If no memory*/
-/* was freed then it just can't fit.                                         */
-/*  'FreeTextureMemory' will find the end of the list and start freeing VMEM */
-/* (never SMEM) surfaces that are not locked.                                */
-/*  BIND - when we bind and there is a texture struct with a texture surface */
-/* in VMEM then we just make it current.  If we have a struct and a surface  */
-/* in SMEM but no VMEM surface then we create the surface in VMEM and blt    */
-/* from the SMEM surface.  If we have nothing its just like a creation...    */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-extern "C" BOOL CreateTMgrHAL( PMESAD3DSHARED pShared, DWORD dwName, int level, DWORD dwRequestFlags, 
-						 RECT *rectDirty, DWORD dwWidth, DWORD dwHeight, DWORD dwAction, void *pPixels )
-{
-  PMESAD3DHAL		pHAL = (PMESAD3DHAL)pShared;
-  PTM_OBJECT     	pTMObj,
-                    pTemp;
-  DDSURFACEDESC2 	ddsd2;
-  HRESULT        	rc;
-
-
-  DPF(( DBG_FUNC, "CreateTMgrHAL();" ));
-
-  DPF(( DBG_TXT_INFO, "Texture:" ));
-  DPF(( DBG_TXT_INFO, "cx: %d cy: %d", dwWidth, dwHeight ));
-  DPF(( DBG_TXT_INFO, "Rect:" ));
-  if ( rectDirty )
-  {
-    DPF(( DBG_TXT_INFO, "x0: %d y0: %d", rectDirty->left, rectDirty->top ));
-    DPF(( DBG_TXT_INFO, "x1: %d y1: %d", rectDirty->right, rectDirty->bottom ));
-  }
-
-  /* Check too see that we have a valid context. */
-  if ( (pHAL == NULL) && (pHAL->lpD3DDevice != NULL)  ) 
-  {
-    DPF(( DBG_TXT_WARN, "Null HAL/Direct3D Device!" ));
-    return FALSE;
-  }
-
-  /*=================================================*/
-  /* See if we can find this texture object by name. */
-  /*=================================================*/
-  for( pTMObj = pHAL->pTMList; pTMObj && (pTMObj->dwName != dwName); pTMObj = pTMObj->next );
-
-  /*=========================================================*/
-  /* Allocate a new object if we didn't get a matching name. */
-  /*=========================================================*/
-  if ( pTMObj == NULL )
-  {
-    pTMObj = (PTM_OBJECT)ALLOC( sizeof(TM_OBJECT) );
-    if ( pTMObj == NULL )
-	 return FALSE;
-    memset( pTMObj, 0, sizeof(TM_OBJECT) );
-
-    /* Put the object at the beginning of the list. */
-    pTMObj->next = pHAL->pTMList;
-    if ( pTMObj->next )
-    {
-	 pTemp = pTMObj->next;
-	 pTemp->prev = pTMObj;
-    }
-    pHAL->pTMList = pTMObj;
-  }
-  else
-  {
-    /*===============================================================*/
-    /* Make some caching happen by pulling this object to the front. */ 
-    /*===============================================================*/
-    if ( pHAL->pTMList != pTMObj )
-    {
-	 /* Pull the object out of the list. */
-	 if ( pTMObj->prev )
-	 {
-	   pTemp = pTMObj->prev;
-	   pTemp->next = pTMObj->next;
-	 }
-	 if ( pTMObj->next )
-      {
-	   pTemp = pTMObj->next;
-	   pTemp->prev = pTMObj->prev;
-	 }
-
-	 pTMObj->prev = NULL;
-	 pTMObj->next = NULL;
-
-	 /* Put the object at the front of the list. */
-	 pTMObj->next = pHAL->pTMList;
-	 if ( pTMObj->next )
-      {
-	   pTemp = pTMObj->next;
-	   pTemp->prev = pTMObj;
-	 }
-	 pHAL->pTMList = pTMObj;
-    }
-  }
-
-  /*========================================================*/
-  /* If we are doing BIND and the texture is in VID memory. */
-  /*========================================================*/
-  if ( (dwAction == TM_ACTION_BIND) && pTMObj->lpDDS_Video  )
-  {
-    DPF(( DBG_TXT_PROFILE, "Cache HIT (%d)", dwName ));
-	   
-    /* Make this the current texture. */
-    rc = pHAL->lpD3DDevice->SetTexture( 0, pTMObj->lpD3DTexture2 );
-    if ( FAILED(rc) )
-    {
-	 DPF(( DBG_TXT_WARN, "Failed SetTexture() (%s)", ErrorStringD3D(rc) ));
-	 pHAL->lpD3DDevice->SetTexture( 0, NULL );
-	 return FALSE;
-    }	
-
-    return TRUE;
-  }	
-
-  /*=================================================================*/
-  /* If we are doing BIND and the texture is at least in SYS memory. */
-  /*=================================================================*/
-  if ( (dwAction == TM_ACTION_BIND) && pTMObj->lpDDS_System  )
-  {
-    DPF(( DBG_TXT_PROFILE, "Cache MISS (%d)", dwName ));
-
-    /* Create the texture on the card. */
-    rc = LoadTextureInVideo( pHAL, pTMObj );
-    if ( rc == FALSE )
-	 return FALSE;
-	   
-    /* Make this the current texture. */
-    rc = pHAL->lpD3DDevice->SetTexture( 0, pTMObj->lpD3DTexture2 );
-    if ( FAILED(rc) )
-    {
-	 DPF(( DBG_TXT_WARN, "Failed SetTexture() (%s)", ErrorStringD3D(rc) ));
-	 pHAL->lpD3DDevice->SetTexture( 0, NULL );
-	 return FALSE;
-    }	
-
-    return TRUE;
-  }	
-
-  /*=========================================================*/
-  /* If we are doing UPDATE then try in VID first for speed. */
-  /*=========================================================*/
-  if ( (dwAction == TM_ACTION_UPDATE) && pTMObj->lpDDS_Video &&
-	  !(pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_SQUAREONLY) )
-  {
-    DPF(( DBG_TXT_INFO, "Fix the SubTexture update Leigh!" ));
-
-    /* Update the texture on the card. */
-    UpdateTexture( pTMObj, TRUE, rectDirty, (UCHAR *)pPixels );
-
-    /* We updated the texture in VID so kill the SYS so we know its dirty. */
-    if ( pTMObj->lpDDS_System )
-    {
-	 DPF(( DBG_TXT_INFO, "Release texture (SYS)" ));
-	 DX_RESTORE( pTMObj->lpDDS_System );
-	 pTMObj->lpDDS_System->Release();
-	 pTMObj->lpDDS_System = NULL;
-    }
-
-    /* Make this the current texture. */
-    rc = pHAL->lpD3DDevice->SetTexture( 0, pTMObj->lpD3DTexture2 );
-    if ( FAILED(rc) )
-    {
-	 DPF(( DBG_TXT_WARN, "Failed SetTexture() (%s)", ErrorStringD3D(rc) ));
-	 pHAL->lpD3DDevice->SetTexture( 0, NULL );
-	 return FALSE;
-    }	
-
-    return TRUE;
-  }
-
-  /*===========================================================*/
-  /* If we are doing UPDATE then try in SYS still gives speed. */
-  /*===========================================================*/
-  if ( (dwAction == TM_ACTION_UPDATE) && pTMObj->lpDDS_System )
-  {
-    DPF(( DBG_TXT_INFO, "Fix the SubTexture update Leigh!" ));
-
-    /* Update the texture in SYS. */
-    UpdateTexture( pTMObj, FALSE, NULL, (UCHAR *)pPixels );
-
-    /* We updated the SYS texture only so now blt to the VID. */
-    rc = LoadTextureInVideo( pHAL, pTMObj );
-    if ( rc == FALSE )
-	 return FALSE;
-
-    /* Make this the current texture. */
-    rc = pHAL->lpD3DDevice->SetTexture( 0, pTMObj->lpD3DTexture2 );
-    if ( FAILED(rc) )
-    {
-	 DPF(( DBG_TXT_WARN, "Failed SetTexture() (%s)", ErrorStringD3D(rc) ));
-	 pHAL->lpD3DDevice->SetTexture( 0, NULL );
-	 return FALSE;
-    }	
-
-    return TRUE;
-  }
-
-  /*  At this point we have a valid Texture Manager Object with updated */
-  /* links.  We now need to create or update a texture surface that is  */
-  /* in system memory.  Every texture has a copy in system so we can use*/
-  /* blt to solve problems with textures allocated on the card (square  */
-  /* only textures, pixelformats...).                                   */
-  
-  // TODO: make support for update also.  Dirty rectangle basicly...
-
-  /* Kill the interface if we have one no matter what. */
-  if ( pTMObj->lpD3DTexture2 )
-  {
-    DPF(( DBG_TXT_INFO, "Release Texture2" ));
-    pTMObj->lpD3DTexture2->Release();
-    pTMObj->lpD3DTexture2 = NULL;
-  }	
-
-  /* Kill the system surface. TODO: should try to get the SubIMage going again */
-  if ( pTMObj->lpDDS_System )
-  {
-    DPF(( DBG_TXT_INFO, "Release texture (SYS)" ));
-    DX_RESTORE( pTMObj->lpDDS_System );
-    pTMObj->lpDDS_System->Release();
-    pTMObj->lpDDS_System = NULL;
-  }
-
-  /* Kill the Video surface. TODO: need some reuse system... */
-  if ( pTMObj->lpDDS_Video )
-  {
-    DPF(( DBG_TXT_INFO, "Release texture (VID)" ));
-    DX_RESTORE( pTMObj->lpDDS_Video );
-    pTMObj->lpDDS_Video->Release();
-    pTMObj->lpDDS_Video = NULL;
-  }
-
-  /*================================================================*/
-  /* Translate the the Mesa/OpenGL pixel channels to the D3D flags. */
-  /*================================================================*/
-  switch( dwRequestFlags )
-  {
-    case GL_ALPHA:
-	 dwRequestFlags = DDPF_ALPHA; 
-	 DPF(( DBG_TXT_WARN, "GL_ALPHA not supported!)" ));
-	 return FALSE;
-	 
-    case GL_INTENSITY:
-    case GL_LUMINANCE:
-	 DPF(( DBG_TXT_WARN, "GL_INTENSITY/GL_LUMINANCE not supported!)" ));
-	 dwRequestFlags = DDPF_LUMINANCE; 
-	 return FALSE;
-	 
-    case GL_LUMINANCE_ALPHA:
-	 DPF(( DBG_TXT_WARN, "GL_LUMINANCE_ALPHA not supported!)" ));
-	 dwRequestFlags = DDPF_LUMINANCE | DDPF_ALPHAPIXELS; 
-	 return FALSE;
-	 
-    case GL_RGB:
-	 DPF(( DBG_TXT_INFO, "Texture -> GL_RGB" ));
-	 dwRequestFlags = DDPF_RGB; 
-	 break;
-
-    case GL_RGBA:
-	 DPF(( DBG_TXT_INFO, "Texture -> GL_RGBA" ));
-	 dwRequestFlags = DDPF_RGB | DDPF_ALPHAPIXELS; 
-	 break;
-  }
-
-  /*==============================*/
-  /* Populate the texture object. */
-  /*==============================*/
-  pTMObj->dwName      = dwName;
-  pTMObj->lpD3DDevice = pHAL->lpD3DDevice;
-  pTMObj->dwFlags     = dwRequestFlags;
-  if ( pHAL->D3DHWDevDesc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_SQUAREONLY )
-  {
-    DPF(( DBG_TXT_INFO, "Convert to Square..." ));
-    pTMObj->dwSHeight  = dwHeight;
-    pTMObj->dwSWidth   = dwWidth;
-
-    /* Shrink non-square textures. */
-    pTMObj->dwVHeight  = (dwHeight > dwWidth) ? dwWidth : dwHeight;
-    pTMObj->dwVWidth	= (dwHeight > dwWidth) ? dwWidth : dwHeight;
-  }
-  else
-  {
-    pTMObj->dwSHeight  = dwHeight;
-    pTMObj->dwSWidth   = dwWidth;
-    pTMObj->dwVHeight  = dwHeight;
-    pTMObj->dwVWidth   = dwWidth;
-  }
-
-  /*========================*/  
-  /* Create SYSTEM surface. */
-  /*========================*/
-
-  /*  Request a surface in system memory. */
-  memset( &ddsd2, 0, sizeof(DDSURFACEDESC2) );
-  ddsd2.dwSize          = sizeof( DDSURFACEDESC2 );
-  ddsd2.dwWidth         = pTMObj->dwSWidth;
-  ddsd2.dwHeight        = pTMObj->dwSHeight;
-  ddsd2.dwFlags         = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;
-  ddsd2.ddsCaps.dwCaps  = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY;
-  ddsd2.ddsCaps.dwCaps2 = 0L;
-  memset( &ddsd2.ddpfPixelFormat, 0, sizeof(DDPIXELFORMAT) );
-  ddsd2.ddpfPixelFormat.dwSize  = sizeof( DDPIXELFORMAT );
-  ddsd2.ddpfPixelFormat.dwFlags = dwRequestFlags;
-  rc = pHAL->lpD3DDevice->EnumTextureFormats( EnumPFHook, &ddsd2.ddpfPixelFormat );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "EnumerTextureFormats (SYSTEM)->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-  /* Create the surface using the enumerated pixelformat. */
-  rc = pHAL->lpDD4->CreateSurface( &ddsd2, &pTMObj->lpDDS_System, NULL );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "CreateSurface (TEXTURE/SYSTEM)->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-  /* Solve the pixel mapping info using the surface pixelformat. */
-  Solve8BitChannelPixelFormat( &ddsd2.ddpfPixelFormat, &pTMObj->pixel );
-
-  /*===================================================================*/
-  /* Fill the texture using the PixelInfo structure to do the mapping. */
-  /*===================================================================*/
-  UpdateTexture( pTMObj, FALSE, NULL, (UCHAR *)pPixels );
-
-  /*=======================*/
-  /* Create VIDEO surface. */
-  /*=======================*/
-  rc = LoadTextureInVideo( pHAL, pTMObj );
-  if ( rc == FALSE )
-    return FALSE;
-
-  /* Make this the current texture. */
-  rc = pHAL->lpD3DDevice->SetTexture( 0, pTMObj->lpD3DTexture2 );
-  if ( FAILED(rc) )
-  {
-    DPF(( DBG_TXT_WARN, "Failed SetTexture() (%s)", ErrorStringD3D(rc) ));
-    pHAL->lpD3DDevice->SetTexture( 0, NULL );
-    return FALSE;
-  }
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  This function will handle the creation and destruction of the texture    */
-/* surfaces on the card.  Using the dw'V'Width/Height dimensions the call    */
-/* try and create the texture on the card and keep using FreeTextureMemory   */
-/* until the surace can be created.  Once the surface is created we get the  */
-/* interface that we will use to make it the current texture.  I didn't put  */
-/* the code to make the texture current in this function as BIND needs to    */
-/* use the same code and this function doesn't always get called when we do a*/
-/* bind.                                                                     */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-static BOOL	LoadTextureInVideo( PMESAD3DHAL pHAL, PTM_OBJECT pTMObj )
-{
-  DDSURFACEDESC2	ddsd2;
-  HRESULT       	rc;
-
-  DPF(( DBG_FUNC, "LoadTextureInVideo();" ));
-
-  /* Kill the interface if we have one no matter what. */
-  if ( pTMObj->lpD3DTexture2 )
-  {
-    DPF(( DBG_TXT_INFO, "Release Texture2" ));
-    pTMObj->lpD3DTexture2->Release();
-    pTMObj->lpD3DTexture2 = NULL;
-  }	
-
-  /* Kill the Video surface. TODO: need some reuse system... */
-  if ( pTMObj->lpDDS_Video )
-  {
-    DPF(( DBG_TXT_INFO, "Release texture (VID)" ));
-    DX_RESTORE( pTMObj->lpDDS_Video );
-    pTMObj->lpDDS_Video->Release();
-    pTMObj->lpDDS_Video = NULL;
-  }
-
-  /*  Request a surface in Video memory. */
-  memset( &ddsd2, 0, sizeof(DDSURFACEDESC2) );
-  ddsd2.dwSize          = sizeof( DDSURFACEDESC2 );
-  ddsd2.dwWidth         = pTMObj->dwVWidth;
-  ddsd2.dwHeight        = pTMObj->dwVHeight;
-  ddsd2.dwFlags         = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;
-  ddsd2.ddsCaps.dwCaps  = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY;
-  ddsd2.ddsCaps.dwCaps2 = 0L;
-  memset( &ddsd2.ddpfPixelFormat, 0, sizeof(DDPIXELFORMAT) );
-  ddsd2.ddpfPixelFormat.dwSize  = sizeof( DDPIXELFORMAT );
-  ddsd2.ddpfPixelFormat.dwFlags = pTMObj->dwFlags;
-  rc = pHAL->lpD3DDevice->EnumTextureFormats( EnumPFHook, &ddsd2.ddpfPixelFormat );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "EnumerTextureFormats ->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-  /* Make sure we lock so we don't nuke this texture trying to free memory for it. */
-  pTMObj->bLock = TRUE;
-
-  /*  Start a loop that will free all textures until we have created the texture */
-  /* surface or we can't free up more memory.                                    */
-  do
-  {
-    /* Try to create the texture surface. */
-    rc = pHAL->lpDD4->CreateSurface( &ddsd2, &pTMObj->lpDDS_Video, NULL );
-    if ( !FAILED(rc) )
-	 break;
-
-    DPF(( DBG_TXT_INFO, "Free Texture Memory" ));
-
-    /* DestroyTexture will return TRUE if a surface was freed. */
-  } while( FreeTextureMemory(pHAL,NULL) );
-
-  /* Make sure we unlock or we won't be able to nuke the TMO later. */
-  pTMObj->bLock = FALSE;
-
-  /* Did we create a valid texture surface? */
-  if ( FAILED(rc) )
-  {
-    DPF(( DBG_TXT_WARN, "Failed to load texture" ));
-    pHAL->lpD3DDevice->SetTexture( 0, NULL );
-    return FALSE;
-  }
-
-  DX_RESTORE( pTMObj->lpDDS_System );
-  DX_RESTORE( pTMObj->lpDDS_Video );
-
-  DPF(( DBG_TXT_INFO, "Texture Blt SYSTEM -> VID" ));
-
-  /* Now blt the texture in system memory to the card. */
-  rc = pTMObj->lpDDS_Video->Blt( NULL, pTMObj->lpDDS_System, NULL, DDBLT_WAIT, NULL );
-  if ( FAILED(rc) )
-  {
-    RIP( pHAL, "Blt (TEXTURE) ->", ErrorStringD3D(rc) );
-    return FALSE;
-  }
-
-  /* Get the Texture interface that is used to render with. */
-  pTMObj->lpDDS_Video->QueryInterface( IID_IDirect3DTexture2, (void **)&pTMObj->lpD3DTexture2 ); 
-  if ( pTMObj->lpD3DTexture2 == NULL )
-  {
-    DPF(( DBG_TXT_WARN, "Failed QueryTextureInterface" ));
-    pHAL->lpD3DDevice->SetTexture( 0, NULL );
-    return FALSE;
-  }
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  If this function gets a texture object struc then we will try and free   */
-/* it.  If we get a NULL then we will search from the bottom up and free one */
-/* VMEM surface.  I can only free when the surface isn't locked and of course*/
-/* there must be a VMEM surface.  We never free SMEM surfaces as that isn't  */
-/* the point.                                                                */
-/* TODO: should have a pointer to the bottom of the stack really.            */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static BOOL FreeTextureMemory( PMESAD3DHAL pHAL, PTM_OBJECT pTMObject )
-{
-  PTM_OBJECT	pCurrent;
-  BOOL		bFreed = FALSE;
-
-  DPF(( DBG_FUNC, "FreeTextureMemory();" ));
-  DPF(( DBG_TXT_WARN, "FREE TEXTURE!" ));
-
-  /* Just to be safe. */
-  if ( !pHAL || !pHAL->pTMList )
-  {
-    DPF(( DBG_TXT_WARN, "FreeTextureMemory() -> NULL pHAL/pHAL->pTMList" ));
-    return FALSE;
-  }
-
-  /* Free the last texture in the list. */
-  if ( pTMObject == NULL )
-  {
-    DPF(( DBG_TXT_INFO, "Free Last texture in cache" ));
-
-    /* Find the last texture object. */
-    for( pCurrent = pHAL->pTMList; pCurrent->next; pCurrent = pCurrent->next );
-
-    /* Now backup until we find a texture on the card. */
-    while( pCurrent && (pCurrent->lpDDS_Video == NULL) && (pCurrent->bLock == FALSE) )
-	 pCurrent = pCurrent->prev;
-
-    /* Didn't find anything. */
-    if ( pCurrent == NULL )
-    {
-	 DPF(( DBG_TXT_INFO, "No texture memory freed" ));
-	 return FALSE;
-    }
-  }
-  else
-  {
-    /* See if we can find this texture object. */
-    for( pCurrent = pHAL->pTMList; pCurrent && (pCurrent != pTMObject); pCurrent = pCurrent->next );
-
-    /* Didn't find anything. */
-    if ( pCurrent == NULL )
-    {
-	 DPF(( DBG_TXT_INFO, "Requested texture to be freed NOT FOUND" ));
-	 return FALSE;
-    }
-  }
-
-  /* Can't free this baby. */
-  if ( pCurrent->bLock == TRUE )
-  {
-    DPF(( DBG_TXT_WARN, "Requested texture LOCKED" ));
-    return FALSE;
-  }
-
-  /* Free the texture memory. */
-  if ( pCurrent->lpD3DTexture2 )
-  {
-    DPF(( DBG_TXT_INFO, "Release Texture2" ));
-    pCurrent->lpD3DTexture2->Release();
-    pCurrent->lpD3DTexture2 = NULL;
-    bFreed = TRUE;
-  }
-  if ( pCurrent->lpDDS_Video )
-  {
-    DPF(( DBG_TXT_INFO, "Release texture (VID):" ));
-    DPF(( DBG_TXT_INFO, "dwName: %d", pCurrent->dwName ));
-    DPF(( DBG_TXT_INFO, "cx: %d, cy: %d", pCurrent->dwVWidth, pCurrent->dwVHeight ));
-    pCurrent->lpDDS_Video->Release();
-    pCurrent->lpDDS_Video = NULL;
-    bFreed = TRUE;
-  }
-  
-  return bFreed;
-}
-/*===========================================================================*/
-/*  This function searches the linked list of texture objects in the supplied*/
-/* D3Dwrapper structure.  If it finds a match it will free it and pull it out*/
-/* of the linked list.  The function works on the bases of a matching pointer*/
-/* to the object (not matching content).                                     */
-/*  If the function gets passed a NULL then we want to free the last texture */
-/* object in the list.  Used in a loop to destory all.                       */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-static BOOL DestroyTextureObject( PMESAD3DHAL pHAL, PTM_OBJECT pTMObject )
-{
-  PTM_OBJECT	pCurrent;
-
-  DPF(( DBG_FUNC, "DestoryTextureObject();" ));
-
-  /* Just to be safe. */
-  if ( !pHAL || !pHAL->pTMList )
-  {
-    DPF(( DBG_TXT_WARN, "DestroyTextureObject() -> NULL pHAL/pHAL->pTMList" ));
-    return FALSE;
-  }
-
-  /* Free the last texture in the list. */
-  if ( pTMObject == NULL )
-  {
-    /* Find the last texture object. */
-    for( pCurrent = pHAL->pTMList; pCurrent->next; pCurrent = pCurrent->next );
-  }
-  else
-  {
-    /* See if we can find this texture object. */
-    for( pCurrent = pHAL->pTMList; pCurrent && (pCurrent != pTMObject); pCurrent = pCurrent->next );
-
-    /* Didn't find anything. */
-    if ( pCurrent == NULL )
-    {
-	 DPF(( DBG_TXT_WARN, "No textures to be freed" ));
-	 return FALSE;
-    }
-  }
-
-  /* Can't free this baby. */
-  if ( pCurrent->bLock == TRUE )
-  {
-    DPF(( DBG_TXT_WARN, "Requested texture to be freed LOCKED" ));
-    return FALSE;
-  }
-
-  /* Free the texture memory. */
-  if ( pCurrent->lpD3DTexture2 )
-  { 
-    DPF(( DBG_TXT_INFO, "Release Texture2" ));
-    pCurrent->lpD3DTexture2->Release();
-    pCurrent->lpD3DTexture2 = NULL;
-  }
-  if ( pCurrent->lpDDS_Video )
-  {
-    DPF(( DBG_TXT_INFO, "Release texture (VID):" ));
-    pCurrent->lpDDS_Video->Release();
-    pCurrent->lpDDS_Video = NULL;
-  }
-  if ( pCurrent->lpDDS_System )
-  {
-    DPF(( DBG_TXT_INFO, "Release texture (SYS):" ));
-    pCurrent->lpDDS_System->Release();
-    pCurrent->lpDDS_System = NULL;
-  }
-
-  /* Pull this texture out of the list. */
-  if ( pCurrent == pHAL->pTMList )
-    pHAL->pTMList = NULL;
-  if ( pCurrent->prev )
-    (pCurrent->prev)->next = pCurrent->next;
-  if ( pCurrent->next )
-    (pCurrent->next)->prev = pCurrent->prev;
-  FREE( pCurrent );
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  This function is the callback function that gets called when we are doing*/
-/* an enumeration of the texture formats supported by this device. The choice*/
-/* is made by checking to see if we have a match with the supplied D3D pixel-*/
-/* format.  So the enumeration has to pass a desired D3D PF as the user var. */
-/*===========================================================================*/
-/* RETURN: D3DENUMRET_OK, D3DENUMRET_CANCEL.                                 */
-/*===========================================================================*/
-static void UpdateTexture( PTM_OBJECT pTMObj, BOOL bVideo, RECT *pRect, UCHAR *pixels )
-{
-  LPDIRECTDRAWSURFACE4	lpDDS;
-  DDSURFACEDESC2		ddsd2;
-  DWORD          		srcPitch,
-                         dwHeight, 
-                         dwWidth,
-                         dwCol,
-                         dwColor;
-  UCHAR          		*pSrc,
-                         *pSrcRow,
-                         *pDest,
-                         *pDestRow;
-  int				rc;
-
-  // TODO:  Do I need to pass the h/w when its in the object!
-  DPF(( DBG_FUNC, "UpdateTexture();" ));
-
-  /* Get the surface pointer we are looking for. */
-  lpDDS = (bVideo) ? pTMObj->lpDDS_Video : pTMObj->lpDDS_System;
-
-  /*===================================================================*/
-  /* Fill the texture using the PixelInfo structure to do the mapping. */
-  /*===================================================================*/
-	 
-  /* Get the surface pointer. */
-  memset( &ddsd2, 0, sizeof(DDSURFACEDESC2) );
-  ddsd2.dwSize = sizeof(DDSURFACEDESC2);
-  rc = lpDDS->Lock( NULL, &ddsd2, DDLOCK_WAIT, NULL );
-  if ( FAILED(rc) )
-  {
-    RIP( NULL, "Lock (TEXTURE/SYSTEM)->", ErrorStringD3D(rc) );
-    return;
-  }
-
-  /* For now we are only updating the system surface so use its dimensions. */
-  dwWidth  = (bVideo) ? pTMObj->dwVWidth : pTMObj->dwSWidth;
-  dwHeight = (bVideo) ? pTMObj->dwVHeight : pTMObj->dwSHeight;
-
-  /*  If we are updating the whole surface then the pDest/pSrc will */
-  /* always be the same.                                            */
-  if ( pRect == NULL )
-  {
-    pDest = (UCHAR *)ddsd2.lpSurface;
-    pSrc  = pixels;
-  }
-
-  /* Fill the texture surface based on the pixelformat flags. */
-  if ( pTMObj->dwFlags == (DDPF_RGB | DDPF_ALPHAPIXELS) )
-  {
-    srcPitch = dwWidth * 4;
-    if ( pRect )
-    {
-	 pDest = ((UCHAR *)ddsd2.lpSurface) + (pRect->top * ddsd2.lPitch) + (pRect->left * pTMObj->pixel.cb);
-	 pSrc  = pixels + (pRect->top * dwWidth * 4) + (pRect->left * 4);
-	 dwHeight = (pRect->bottom - pRect->top);
-	 dwWidth = (pRect->right - pRect->left);
-    }
-
-    for( pDestRow = pDest, pSrcRow = pSrc; dwHeight > 0; dwHeight--, pDestRow += ddsd2.lPitch, pSrcRow += srcPitch )
-    {
-	 for( dwCol = 0, pDest = pDestRow, pSrc = pSrcRow; dwCol < dwWidth; dwCol++ )
-      {
-	   dwColor =  ( ((DWORD)(*(pSrc  ) * pTMObj->pixel.rScale)) << pTMObj->pixel.rShift );
-	   dwColor |= ( ((DWORD)(*(pSrc+1) * pTMObj->pixel.gScale)) << pTMObj->pixel.gShift );
-	   dwColor |= ( ((DWORD)(*(pSrc+2) * pTMObj->pixel.bScale)) << pTMObj->pixel.bShift );
-	   if ( pTMObj->pixel.aScale == -1.0 )
-		dwColor |= ( (*(pSrc+3) & 0x80) ? (1 << pTMObj->pixel.aShift) : 0 );
-	   else
-		dwColor |= ( ((DWORD)(*(pSrc+3) * pTMObj->pixel.aScale)) << pTMObj->pixel.aShift );
-	   memcpy( pDest, &dwColor, pTMObj->pixel.cb );
-	   pDest += pTMObj->pixel.cb;
-	   pSrc  += 4;
-	 }
-    }
-  }
-  else if ( pTMObj->dwFlags == DDPF_RGB )
-  {
-    srcPitch = dwWidth * 3;
-    if ( pRect )
-    {
-	 pDest = ((UCHAR *)ddsd2.lpSurface) + (pRect->top * ddsd2.lPitch) + (pRect->left * pTMObj->pixel.cb);
-	 pSrc  = pixels + (pRect->top * dwWidth * 3) + (pRect->left * 3);
-	 dwHeight = (pRect->bottom - pRect->top);
-	 dwWidth  = (pRect->right - pRect->left);
-    }
-
-    for( pDestRow = pDest, pSrcRow = pSrc; dwHeight > 0; dwHeight--, pDestRow += ddsd2.lPitch, pSrcRow += srcPitch )
-    {
-	 for( dwCol = 0, pDest = pDestRow, pSrc = pSrcRow; dwCol < dwWidth; dwCol++ )
-      {
-	   dwColor =  ( ((DWORD)(*(pSrc  ) * pTMObj->pixel.rScale)) << pTMObj->pixel.rShift );
-	   dwColor |= ( ((DWORD)(*(pSrc+1) * pTMObj->pixel.gScale)) << pTMObj->pixel.gShift );
-	   dwColor |= ( ((DWORD)(*(pSrc+2) * pTMObj->pixel.bScale)) << pTMObj->pixel.bShift );
-	   memcpy( pDest, &dwColor, pTMObj->pixel.cb );
-	   pDest += pTMObj->pixel.cb;
-	   pSrc  += 3;
-	 }
-    }
-  }
-  else if ( pTMObj->dwFlags == (DDPF_LUMINANCE | DDPF_ALPHAPIXELS) )
-  {
-    srcPitch = dwWidth * 2;
-    if ( pRect )
-    {
-	 pDest = ((UCHAR *)ddsd2.lpSurface) + (pRect->top * ddsd2.lPitch) + (pRect->left * pTMObj->pixel.cb);
-	 pSrc  = pixels + (pRect->top * dwWidth * 2) + (pRect->left * 2);
-	 dwHeight = (pRect->bottom - pRect->top);
-	 dwWidth  = (pRect->right - pRect->left);
-    }
-
-    for( pDestRow = pDest, pSrcRow = pSrc; dwHeight > 0; dwHeight--, pDestRow += ddsd2.lPitch, pSrcRow += srcPitch )
-    {
-	 for( dwCol = 0, pDest = pDestRow, pSrc = pSrcRow; dwCol < dwWidth; dwCol++ )
-      {
-	   dwColor =  ( ((DWORD)(*(pSrc  ) * pTMObj->pixel.rScale)) << pTMObj->pixel.rShift );
-	   if ( pTMObj->pixel.aScale == -1.0 )
-		dwColor |= ( (*(pSrc+1) & 0x80) ? (1 << pTMObj->pixel.aShift) : 0 );
-	   else
-		dwColor |= ( ((DWORD)(*(pSrc+1) * pTMObj->pixel.aScale)) << pTMObj->pixel.aShift );
-	   memcpy( pDest, &dwColor, pTMObj->pixel.cb );
-	   pDest += pTMObj->pixel.cb;
-	   pSrc  += 2;
-	 }
-    }
-  }
-  else if ( pTMObj->dwFlags == DDPF_LUMINANCE )
-  {
-    srcPitch = dwWidth;
-    if ( pRect )
-    {
-	 pDest = ((UCHAR *)ddsd2.lpSurface) + (pRect->top * ddsd2.lPitch) + (pRect->left * pTMObj->pixel.cb);
-	 pSrc  = pixels + (pRect->top * dwWidth) + (pRect->left);
-	 dwHeight = (pRect->bottom - pRect->top);
-	 dwWidth  = (pRect->right - pRect->left);
-    }
-
-    for( pDestRow = pDest, pSrcRow = pSrc; dwHeight > 0; dwHeight--, pDestRow += ddsd2.lPitch, pSrcRow += srcPitch )
-    {
-	 for( dwCol = 0, pDest = pDestRow, pSrc = pSrcRow; dwCol < dwWidth; dwCol++ )
-      {
-	   dwColor =  ( ((DWORD)(*pSrc * pTMObj->pixel.rScale)) << pTMObj->pixel.rShift );
-	   memcpy( pDest, &dwColor, pTMObj->pixel.cb );
-	   pDest += pTMObj->pixel.cb;
-	   pSrc++;
-	 }
-    }
-  }
-  else if ( pTMObj->dwFlags == DDPF_ALPHAPIXELS )
-  {
-    srcPitch = dwWidth;
-    if ( pRect )
-    {
-	 pDest = ((UCHAR *)ddsd2.lpSurface) + (pRect->top * ddsd2.lPitch) + (pRect->left * pTMObj->pixel.cb);
-	 pSrc  = pixels + (pRect->top * dwWidth) + (pRect->left);
-	 dwHeight = (pRect->bottom - pRect->top);
-	 dwWidth  = (pRect->right - pRect->left);
-    }
-
-    for( pDestRow = pDest, pSrcRow = pSrc; dwHeight > 0; dwHeight--, pDestRow += ddsd2.lPitch, pSrcRow += srcPitch )
-    {
-	 for( dwCol = 0, pDest = pDestRow, pSrc = pSrcRow; dwCol < dwWidth; dwCol++ )
-      {
-	   if ( pTMObj->pixel.aScale == -1.0 )
-		dwColor = ( (*pSrc & 0x80) ? (1 << pTMObj->pixel.aShift) : 0 );
-	   else
-		dwColor = ( ((DWORD)(*pSrc * pTMObj->pixel.aScale)) << pTMObj->pixel.aShift );
-	   memcpy( pDest, &dwColor, pTMObj->pixel.cb );
-	   pDest += pTMObj->pixel.cb;
-	   pSrc++;
-	 }
-    }
-  }
-
-  /* Unlock the surface. */
-  rc = lpDDS->Unlock( NULL );
-  if ( FAILED(rc) )
-  {
-    RIP( NULL, "Unlock (TEXTURE/SYSTEM)->", ErrorStringD3D(rc) );
-  }
-}
-/*===========================================================================*/
-/*  This function is the callback function that gets called when we are doing*/
-/* an enumeration of the texture formats supported by this device. The choice*/
-/* is made by checking to see if we have a match with the supplied D3D pixel-*/
-/* format.  So the enumeration has to pass a desired D3D PF as the user var. */
-/*===========================================================================*/
-/* RETURN: D3DENUMRET_OK, D3DENUMRET_CANCEL.                                 */
-/*===========================================================================*/
-HRESULT CALLBACK EnumPFHook( LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext )
-{
-  LPDDPIXELFORMAT   lpDDPixFmtRequest = (LPDDPIXELFORMAT)lpContext;
-  PIXELINFO    	pixel;
-
-  DPF(( DBG_FUNC, "EnumPFHook();" ));
-
-  if ( lpDDPixFmt->dwFlags == lpDDPixFmtRequest->dwFlags )
-  {
-    /* Are we looking for an alpha channel? */
-    if ( lpDDPixFmtRequest->dwFlags & DDPF_ALPHAPIXELS )
-    {
-	 /* Try for something that has more then 1bits of Alpha. */
-	 Solve8BitChannelPixelFormat( lpDDPixFmt, &pixel );
-	 if ( pixel.aScale == -1.0 )
-	 {
-	   /* Save this format no matter what as its a match of sorts. */
-	   memcpy( lpDDPixFmtRequest, lpDDPixFmt, sizeof(DDPIXELFORMAT) );
-	   return D3DENUMRET_OK;
-	 }
-    }
-
-    /* Save this format as its a good match. */
-    memcpy( lpDDPixFmtRequest, lpDDPixFmt, sizeof(DDPIXELFORMAT) );
-
-    /* We are happy at this point so lets leave. */
-    return D3DENUMRET_CANCEL;
-  }
-  
-  return D3DENUMRET_OK;
-}
-
-
diff --git a/src/mesa/drivers/d3d/D3DTextureMgr.h b/src/mesa/drivers/d3d/D3DTextureMgr.h
deleted file mode 100644
index 8a64ceaaec..0000000000
--- a/src/mesa/drivers/d3d/D3DTextureMgr.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#ifndef _TEXTURE_MGR_INC
-#define _TEXTURE_MGR_INC
-   
-/*===========================================================================*/
-/* Includes.                                                                 */
-/*===========================================================================*/
-#include 
-#include 
-#include 
-#include 
-#include 
-#include "GL/gl.h"
-/*========================================================================*/
-/* Defines.                                                               */
-/*========================================================================*/
-/*========================================================================*/
-/* Type defines.                                                          */
-/*========================================================================*/
-typedef struct _local_texture_object
-{
-   DWORD                dwName,
-                        dwPriority,
-                        dwFlags,
-                        dwSWidth,
-                        dwSHeight,
-                        dwVWidth,
-                        dwVHeight;
-   BOOL                 bLock,
-	                   bDirty;		/*  I only update VID on SubImage calls so the system */
-                                        /* texture can get invalid.                           */
-
-   LPDIRECT3DDEVICE3    lpD3DDevice;	/* If the device changes we must get new handles... */
-   LPDIRECTDRAWSURFACE4 lpDDS_System,
-	                   lpDDS_Video;
-   LPDIRECT3DTEXTURE2   lpD3DTexture2;
-
-   PIXELINFO            pixel;
-
-   struct _local_texture_object *next;
-   struct _local_texture_object *prev;
-
-} TM_OBJECT, *PTM_OBJECT;
-/*========================================================================*/
-/* Function prototypes.                                                   */
-/*========================================================================*/
-void APIENTRY  InitTMD3D( void *pVoid );
-void APIENTRY  TermTMD3D( void *pVoid );
-/*========================================================================*/
-/* Global variables declaration.                                          */
-/*========================================================================*/
-
-#endif 
diff --git a/src/mesa/drivers/d3d/D3DUTILS.CPP b/src/mesa/drivers/d3d/D3DUTILS.CPP
deleted file mode 100644
index 02664f96e4..0000000000
--- a/src/mesa/drivers/d3d/D3DUTILS.CPP
+++ /dev/null
@@ -1,638 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include "D3DHAL.h"
-/*===========================================================================*/
-/* Local only functions.                                                     */
-/*===========================================================================*/
-static int  CountTrailingZeros( DWORD dwMask );
-/*===========================================================================*/
-/*  This function is used to get the pointer to the surface and the pitch for*/
-/* the scanline rendering functions.                                         */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" DDSURFACEDESC2 *LockHAL( PMESAD3DSHARED pShared, BOOL bBack )
-{
-  PMESAD3DHAL			pHAL = (PMESAD3DHAL)pShared;
-  static DDSURFACEDESC2	ddsd2;
-  HRESULT               	rc;      
-
-  DPF(( DBG_FUNC, "LockHAL();" ));
-
-  /* Set the request structure up first. */
-  memset( &ddsd2, 0, sizeof(DDSURFACEDESC2) );
-  ddsd2.dwSize = sizeof(DDSURFACEDESC2);
-
-  /* Make sure we have enough info. */
-  if ( pHAL )
-  {
-    rc = pHAL->lpDDSRender->Lock( NULL, &ddsd2, DDLOCK_WAIT, NULL );
-    if ( FAILED(rc) )
-    {
-	 RIP( pHAL, "Lock (RENDER) ->", ErrorStringD3D(rc) );
-    }
-  }
-
-  return &ddsd2;
-}
-/*===========================================================================*/
-/*  This is just a simple wrapper.  I probably don't need to do any error    */
-/* checking as the Lock must have worked inorder to get here...              */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void UnlockHAL( PMESAD3DSHARED pShared, BOOL bBack )
-{
-  PMESAD3DHAL	pHAL = (PMESAD3DHAL)pShared;
-  HRESULT		rc;
-
-  DPF(( DBG_FUNC, "UnlockHAL();" ));
-
-  /* Make sure we have enough info. */
-  if ( pHAL )
-  {
-    rc = pHAL->lpDDSRender->Unlock( NULL );
-    if ( FAILED(rc) )
-    {
-	 RIP( pHAL, "Unlock (RENDER) ->", ErrorStringD3D(rc) );
-    }
-  }
-}
-/*===========================================================================*/
-/*  This function will track the main/Primary window that will be used as the*/
-/* target for the Blt in SwapBuffers.  As a side effect the call will check  */
-/* to see if the primary surface is the same size and position as the screen.*/
-/* If they are the same size we will call it fullscreen...                   */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-extern "C" void UpdateScreenPosHAL( PMESAD3DSHARED pShared )
-{
-  PMESAD3DHAL	pHAL = (PMESAD3DHAL)pShared;
-  POINT		pt;
-  DWORD		dwWidth, dwHeight;
-
-  DPF(( DBG_FUNC, "UpdateScreenPosHAL();" ));
-
-  /* Make sure we have enough info. */
-  if ( pHAL != NULL )
-  {
-    /* Update the windows screen position. */
-    GetClientRect( pShared->hwnd, &pShared->rectW );
-    pt.x = pt.y = 0;
-    ClientToScreen( pShared->hwnd, &pt );
-    OffsetRect( &pShared->rectW, pt.x, pt.y);
-
-    /* Compare the primary to the screen. */
-    dwWidth = GetSystemMetrics( SM_CXSCREEN );
-    dwHeight =  GetSystemMetrics( SM_CYSCREEN );
-    if ( (pShared->rectW.left > 0) ||  (pShared->rectW.top > 0)  ||
-	    (pShared->rectW.right > dwWidth) || (pShared->rectW.bottom > dwHeight) )
-	 pShared->bWindow = TRUE;
-    else
-	 pShared->bWindow = FALSE;
-  }
-}
-/*===========================================================================*/
-/*  This function will fill in the pixel info structure defined in D3Dshared.*/
-/* Basicly it will take a DirectDraw pixelformat structure and make scaling  */
-/* values that will convert from 8bit channels to whatever the supplied ddpf */
-/* uses.  Also we will generate shift values that will be used to get move   */
-/* each component of the pixel into place.                                   */
-/*  I have now added a special case for a 1bit alpha channel.  If I find a 1b*/
-/* alpha then I will set the scale to -1.0 which should be unique.  Later I  */
-/* can check the alpha scale value too see if its -1.0 and thus handle it.  I*/
-/* was finding that the case was not working tom my advantage so this is my  */
-/* HACK for the day.  As a TODO I should work on this...                     */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-void	Solve8BitChannelPixelFormat( DDPIXELFORMAT *pddpf, PPIXELINFO pPixel )
-{
-  DPF(( DBG_FUNC, "Solve8BitChannelPixelFromat();" ));
-
-  memset( pPixel, 0, sizeof(PPIXELINFO) );
-
-  /* Check too see if the color space is valid in the PF. */
-  if ( pddpf->dwFlags & DDPF_RGB )
-  {
-    /* Solve the red stuff. */
-    pPixel->dwRMask = pddpf->dwRBitMask;
-    pPixel->rShift = CountTrailingZeros( pPixel->dwRMask );
-    pPixel->rScale = (float)0.00392156 * (float)(pPixel->dwRMask >> pPixel->rShift);
-
-    /* Solve the green thingy's. */
-    pPixel->dwGMask = pddpf->dwGBitMask;
-    pPixel->gShift = CountTrailingZeros( pPixel->dwGMask );
-    pPixel->gScale = (float)0.00392156 * (float)(pPixel->dwGMask >> pPixel->gShift);
-
-    /* Solve the blues. */
-    pPixel->dwBMask = pddpf->dwBBitMask;
-    pPixel->bShift = CountTrailingZeros( pddpf->dwBBitMask );
-    pPixel->bScale = (float)0.00392156 * (float)(pddpf->dwBBitMask >> pPixel->bShift);
-  }
-
-  /* Do the alpha channel if there is one. */
-  if ( pddpf->dwFlags & DDPF_ALPHAPIXELS )
-  {
-    pPixel->dwAMask = pddpf->dwRGBAlphaBitMask;
-    pPixel->aShift = CountTrailingZeros( pPixel->dwAMask );
-
-    /* Special case a 1bit alpha. */
-    if ( (pPixel->dwAMask >> pPixel->aShift) == 1 )
-	 pPixel->aScale = -1.0;
-    else
-	 pPixel->aScale = (float)0.00392156 * (float)(pPixel->dwAMask >> pPixel->aShift);
-  }
-
-  /* Get the size of the pixel in bytes. Should work as dwRGBBitCount is in a union. */
-  pPixel->cb = pddpf->dwRGBBitCount / 8;
-}
-/*===========================================================================*/
-/*  See RETURN :)                                                            */
-/*===========================================================================*/
-/* RETURN: number of contiguous zeros starting from the right.               */
-/*===========================================================================*/
-static int  CountTrailingZeros( DWORD dwMask )
-{
-  DWORD Mask;
-
-  if ( dwMask == 0 ) 
-    return 32;
-
-  /* Can't take credit for this one! */
-  Mask = dwMask & -(int)dwMask;
-  return ((Mask & 0xFFFF0000)!=0) << 4
-         | ((Mask & 0xFF00FF00)!=0) << 3
-         | ((Mask & 0xF0F0F0F0)!=0) << 2
-         | ((Mask & 0xCCCCCCCC)!=0) << 1
-         | ((Mask & 0xAAAAAAAA)!=0);
-}
-/*===========================================================================*/
-/*  This function will convert the DDraw error code to its macro string.  The*/
-/* returned pointer is static so you need not worry about memory managemnet  */
-/* but the error message gets written over from call to call...              */
-/*===========================================================================*/
-/* RETURN: pointer to the single static buffer that hold the error message.  */
-/*===========================================================================*/
-char *ErrorStringD3D( HRESULT hr )
-{
-  static   char  errorString[128];
-
-  switch( hr )
-    {
-    case DDERR_ALREADYINITIALIZED:
-	 strcpy( errorString, "DDERR_ALREADYINITIALIZED" );
-	 break;
-	 
-    case DDERR_CANNOTATTACHSURFACE:
-	 strcpy( errorString, "DDERR_CANNOTATTACHSURFACE" );
-	 break;
-	 
-    case DDERR_CANNOTDETACHSURFACE:
-	 strcpy( errorString, "DDERR_CANNOTDETACHSURFACE" );
-	 break;
-	 
-    case DDERR_CURRENTLYNOTAVAIL:
-	 strcpy( errorString, "DDERR_CURRENTLYNOTAVAIL" );
-	 break;
-	 
-    case DDERR_EXCEPTION:
-	 strcpy( errorString, "DDERR_EXCEPTION" );
-	 break;
-	 
-    case DDERR_GENERIC:
-	 strcpy( errorString, "DDERR_GENERIC" );
-	 break;
-	 
-    case DDERR_HEIGHTALIGN:
-	 strcpy( errorString, "DDERR_HEIGHTALIGN" );
-	 break;
-	 
-    case DDERR_INCOMPATIBLEPRIMARY:
-	 strcpy( errorString, "DDERR_INCOMPATIBLEPRIMARY" );
-	 break;
-	 
-    case DDERR_INVALIDCAPS:
-	 strcpy( errorString, "DDERR_INVALIDCAPS" );
-	 break;
-	 
-    case DDERR_INVALIDCLIPLIST:
-	 strcpy( errorString, "DDERR_INVALIDCLIPLIST" );
-	 break;
-	 
-    case DDERR_INVALIDMODE:
-	 strcpy( errorString, "DDERR_INVALIDMODE" );
-	 break;
-	 
-    case DDERR_INVALIDOBJECT:
-	 strcpy( errorString, "DDERR_INVALIDOBJECT" );
-	 break;
-	 
-    case DDERR_INVALIDPARAMS:
-	 strcpy( errorString, "DDERR_INVALIDPARAMS" );
-	 break;
-	 
-    case DDERR_INVALIDPIXELFORMAT:
-	 strcpy( errorString, "DDERR_INVALIDPIXELFORMAT" );
-	 break;
-	 
-    case DDERR_INVALIDRECT:
-	 strcpy( errorString, "DDERR_INVALIDRECT" );
-	 break;
-	 
-    case DDERR_LOCKEDSURFACES:
-	 strcpy( errorString, "DDERR_LOCKEDSURFACES" );
-	 break;
-	 
-    case DDERR_NO3D:
-	 strcpy( errorString, "DDERR_NO3D" );
-	 break;
-	 
-    case DDERR_NOALPHAHW:
-	 strcpy( errorString, "DDERR_NOALPHAHW" );
-	 break;
-	 
-    case DDERR_NOCLIPLIST:
-	 strcpy( errorString, "DDERR_NOCLIPLIST" );
-	 break;
-	 
-    case DDERR_NOCOLORCONVHW:
-	 strcpy( errorString, "DDERR_NOCOLORCONVHW" );
-	 break;
-	 
-    case DDERR_NOCOOPERATIVELEVELSET:
-	 strcpy( errorString, "DDERR_NOCOOPERATIVELEVELSET" );
-	 break;
-	 
-    case DDERR_NOCOLORKEY:
-	 strcpy( errorString, "DDERR_NOCOLORKEY" );
-	 break;
-	 
-    case DDERR_NOCOLORKEYHW:
-	 strcpy( errorString, "DDERR_NOCOLORKEYHW" );
-	 break;
-	 
-    case DDERR_NODIRECTDRAWSUPPORT:
-	 strcpy( errorString, "DDERR_NODIRECTDRAWSUPPORT" );
-	 break;
-	 
-    case DDERR_NOEXCLUSIVEMODE:
-	 strcpy( errorString, "DDERR_NOEXCLUSIVEMODE" );
-	 break;
-	 
-    case DDERR_NOFLIPHW:
-	 strcpy( errorString, "DDERR_NOFLIPHW" );
-	 break;
-	 
-    case DDERR_NOGDI:
-	 strcpy( errorString, "DDERR_NOGDI" );
-	 break;
-	 
-    case DDERR_NOMIRRORHW:
-	 strcpy( errorString, "DDERR_NOMIRRORHW" );
-	 break;
-	 
-    case DDERR_NOTFOUND:
-	 strcpy( errorString, "DDERR_NOTFOUND" );
-	 break;
-	 
-    case DDERR_NOOVERLAYHW:
-	 strcpy( errorString, "DDERR_NOOVERLAYHW" );
-	 break;
-	 
-    case DDERR_OVERLAPPINGRECTS:
-	 strcpy( errorString, "DDERR_OVERLAPPINGRECTS" );
-	 break;
-	 
-    case DDERR_NORASTEROPHW:
-	 strcpy( errorString, "DDERR_NORASTEROPHW" );
-	 break;
-	 
-    case DDERR_NOROTATIONHW:
-	 strcpy( errorString, "DDERR_NOROTATIONHW" );
-	 break;
-	 
-    case DDERR_NOSTRETCHHW:
-	 strcpy( errorString, "DDERR_NOSTRETCHHW" );
-	 break;
-	 
-    case DDERR_NOT4BITCOLOR:
-	 strcpy( errorString, "DDERR_NOT4BITCOLOR" );
-	 break;
-	 
-    case DDERR_NOT4BITCOLORINDEX:
-	 strcpy( errorString, "DDERR_NOT4BITCOLORINDEX" );
-	 break;
-	 
-    case DDERR_NOT8BITCOLOR:
-	 strcpy( errorString, "DDERR_NOT8BITCOLOR" );
-	 break;
-	 
-    case DDERR_NOTEXTUREHW:
-	 strcpy( errorString, "DDERR_NOTEXTUREHW" );
-	 break;
-	 
-    case DDERR_NOVSYNCHW:
-	 strcpy( errorString, "DDERR_NOVSYNCHW" );
-	 break;
-	 
-    case DDERR_NOZBUFFERHW:
-	 strcpy( errorString, "DDERR_NOZBUFFERHW" );
-	 break;
-
-    case DDERR_NOZOVERLAYHW:
-	 strcpy( errorString, "DDERR_NOZOVERLAYHW" );
-	 break;
-	 
-    case DDERR_OUTOFCAPS:
-	 strcpy( errorString, "DDERR_OUTOFCAPS" );
-	 break;
-	 
-    case DDERR_OUTOFMEMORY:
-	 strcpy( errorString, "DDERR_OUTOFMEMORY" );
-	 break;
-	 
-    case DDERR_OUTOFVIDEOMEMORY:
-	 strcpy( errorString, "DDERR_OUTOFVIDEOMEMORY" );
-	 break;
-	 
-    case DDERR_OVERLAYCANTCLIP:
-	 strcpy( errorString, "DDERR_OVERLAYCANTCLIP" );
-	 break;
-	 
-    case DDERR_OVERLAYCOLORKEYONLYONEACTIVE:
-	 strcpy( errorString, "DDERR_OVERLAYCOLORKEYONLYONEACTIVE" );
-	 break;
-	 
-    case DDERR_PALETTEBUSY:
-	 strcpy( errorString, "DDERR_PALETTEBUSY" );
-	 break;
-	 
-    case DDERR_COLORKEYNOTSET:
-	 strcpy( errorString, "DDERR_COLORKEYNOTSET" );
-	 break;
-	 
-    case DDERR_SURFACEALREADYATTACHED:
-	 strcpy( errorString, "DDERR_SURFACEALREADYATTACHED" );
-	 break;
-	 
-    case DDERR_SURFACEALREADYDEPENDENT:
-	 strcpy( errorString, "DDERR_SURFACEALREADYDEPENDENT" );
-	 break;
-	 
-    case DDERR_SURFACEBUSY:
-	 strcpy( errorString, "DDERR_SURFACEBUSY" );
-	 break;
-	 
-    case DDERR_CANTLOCKSURFACE:
-	 strcpy( errorString, "DDERR_CANTLOCKSURFACE" );
-	 break;
-
-    case DDERR_SURFACEISOBSCURED:
-	 strcpy( errorString, "DDERR_SURFACEISOBSCURED" );
-	 break;
-
-    case DDERR_SURFACELOST:
-	 strcpy( errorString, "DDERR_SURFACELOST" );
-	 break;
-	 
-    case DDERR_SURFACENOTATTACHED:
-	 strcpy( errorString, "DDERR_SURFACENOTATTACHED" );
-	 break;
-	 
-    case DDERR_TOOBIGHEIGHT:
-	 strcpy( errorString, "DDERR_TOOBIGHEIGHT" );
-	 break;
-	 
-    case DDERR_TOOBIGSIZE:
-	 strcpy( errorString, "DDERR_TOOBIGSIZE" );
-	 break;
-	 
-    case DDERR_TOOBIGWIDTH:
-	 strcpy( errorString, "DDERR_TOOBIGWIDTH" );
-	 break;
-	 
-    case DDERR_UNSUPPORTED:
-	 strcpy( errorString, "DDERR_UNSUPPORTED" );
-	 break;
-	 
-    case DDERR_UNSUPPORTEDFORMAT:
-	 strcpy( errorString, "DDERR_UNSUPPORTEDFORMAT" );
-	 break;
-	 
-    case DDERR_UNSUPPORTEDMASK:
-	 strcpy( errorString, "DDERR_UNSUPPORTEDMASK" );
-	 break;
-	 
-    case DDERR_INVALIDSTREAM:
-	 strcpy( errorString, "DDERR_INVALIDSTREAM" );
-	 break;
-	 
-    case DDERR_VERTICALBLANKINPROGRESS:
-	 strcpy( errorString, "DDERR_VERTICALBLANKINPROGRESS" );
-	 break;
-	 
-    case DDERR_WASSTILLDRAWING:
-	 strcpy( errorString, "DDERR_WASSTILLDRAWING" );
-	 break;
-	 
-    case DDERR_XALIGN:
-	 strcpy( errorString, "DDERR_XALIGN" );
-	 break;
-	 
-    case DDERR_INVALIDDIRECTDRAWGUID:
-	 strcpy( errorString, "DDERR_INVALIDDIRECTDRAWGUID" );
-	 break;
-	 
-    case DDERR_DIRECTDRAWALREADYCREATED:
-	 strcpy( errorString, "DDERR_DIRECTDRAWALREADYCREATED" );
-	 break;
-	 
-    case DDERR_NODIRECTDRAWHW:
-	 strcpy( errorString, "DDERR_NODIRECTDRAWHW" );
-	 break;
-	 
-    case DDERR_PRIMARYSURFACEALREADYEXISTS:
-	 strcpy( errorString, "DDERR_PRIMARYSURFACEALREADYEXISTS" );
-	 break;
-	 
-    case DDERR_NOEMULATION:
-	 strcpy( errorString, "DDERR_NOEMULATION" );
-	 break;
-	 
-    case DDERR_REGIONTOOSMALL:
-	 strcpy( errorString, "DDERR_REGIONTOOSMALL" );
-	 break;
-	 
-    case DDERR_CLIPPERISUSINGHWND:
-	 strcpy( errorString, "DDERR_CLIPPERISUSINGHWND" );
-	 break;
-	 
-    case DDERR_NOCLIPPERATTACHED:
-	 strcpy( errorString, "DDERR_NOCLIPPERATTACHED" );
-	 break;
-	 
-    case DDERR_NOHWND:
-	 strcpy( errorString, "DDERR_NOHWND" );
-	 break;
-	 
-    case DDERR_HWNDSUBCLASSED:
-	 strcpy( errorString, "DDERR_HWNDSUBCLASSED" );
-	 break;
-	 
-    case DDERR_HWNDALREADYSET:
-	 strcpy( errorString, "DDERR_HWNDALREADYSET" );
-	 break;
-	 
-    case DDERR_NOPALETTEATTACHED:
-	 strcpy( errorString, "DDERR_NOPALETTEATTACHED" );
-	 break;
-	 
-    case DDERR_NOPALETTEHW:
-	 strcpy( errorString, "DDERR_NOPALETTEHW" );
-	 break;
-	 
-    case DDERR_BLTFASTCANTCLIP:
-         strcpy( errorString, "DDERR_BLTFASTCANTCLIP" );
-         break;
-
-      case DDERR_NOBLTHW:
-         strcpy( errorString, "DDERR_NOBLTHW" );
-         break;
-
-      case DDERR_NODDROPSHW:
-         strcpy( errorString, "DDERR_NODDROPSHW" );
-         break;
-
-      case DDERR_OVERLAYNOTVISIBLE:
-         strcpy( errorString, "DDERR_OVERLAYNOTVISIBLE" );
-         break;
-
-      case DDERR_NOOVERLAYDEST:
-         strcpy( errorString, "DDERR_NOOVERLAYDEST" );
-         break;
-
-      case DDERR_INVALIDPOSITION:
-         strcpy( errorString, "DDERR_INVALIDPOSITION" );
-         break;
-
-      case DDERR_NOTAOVERLAYSURFACE:
-         strcpy( errorString, "DDERR_NOTAOVERLAYSURFACE" );
-         break;
-
-      case DDERR_EXCLUSIVEMODEALREADYSET:
-         strcpy( errorString, "DDERR_EXCLUSIVEMODEALREADYSET" );
-         break;
-
-      case DDERR_NOTFLIPPABLE:
-         strcpy( errorString, "DDERR_NOTFLIPPABLE" );
-         break;
-
-      case DDERR_CANTDUPLICATE:
-         strcpy( errorString, "DDERR_CANTDUPLICATE" );
-         break;
-
-      case DDERR_NOTLOCKED:
-         strcpy( errorString, "DDERR_NOTLOCKED" );
-         break;
-
-      case DDERR_CANTCREATEDC:
-         strcpy( errorString, "DDERR_CANTCREATEDC" );
-         break;
-
-      case DDERR_NODC:
-         strcpy( errorString, "DDERR_NODC" );
-         break;
-
-      case DDERR_WRONGMODE:
-         strcpy( errorString, "DDERR_WRONGMODE" );
-         break;
-
-      case DDERR_IMPLICITLYCREATED:
-         strcpy( errorString, "DDERR_IMPLICITLYCREATED" );
-         break;
-
-      case DDERR_NOTPALETTIZED:
-         strcpy( errorString, "DDERR_NOTPALETTIZED" );
-         break;
-
-      case DDERR_UNSUPPORTEDMODE:
-         strcpy( errorString, "DDERR_UNSUPPORTEDMODE" );
-         break;
-
-      case DDERR_NOMIPMAPHW:
-         strcpy( errorString, "DDERR_NOMIPMAPHW" );
-         break;
-
-      case DDERR_INVALIDSURFACETYPE:
-         strcpy( errorString, "DDERR_INVALIDSURFACETYPE" );
-         break;
-
-      case DDERR_NOOPTIMIZEHW:
-         strcpy( errorString, "DDERR_NOOPTIMIZEHW" );
-         break;
-
-      case DDERR_NOTLOADED:
-         strcpy( errorString, "DDERR_NOTLOADED" );
-         break;
-
-      case DDERR_NOFOCUSWINDOW:
-         strcpy( errorString, "DDERR_NOFOCUSWINDOW" );
-         break;
-
-      case DDERR_DCALREADYCREATED:
-         strcpy( errorString, "DDERR_DCALREADYCREATED" );
-         break;
-
-      case DDERR_NONONLOCALVIDMEM:
-         strcpy( errorString, "DDERR_NONONLOCALVIDMEM" );
-         break;
-
-      case DDERR_CANTPAGELOCK:
-         strcpy( errorString, "DDERR_CANTPAGELOCK" );
-         break;
-
-      case DDERR_CANTPAGEUNLOCK:
-         strcpy( errorString, "DDERR_CANTPAGEUNLOCK" );
-         break;
-
-      case DDERR_NOTPAGELOCKED:
-         strcpy( errorString, "DDERR_NOTPAGELOCKED" );
-         break;
-
-      case DDERR_MOREDATA:
-         strcpy( errorString, "DDERR_MOREDATA" );
-         break;
-
-      case DDERR_EXPIRED:
-         strcpy( errorString, "DDERR_EXPIRED" );
-         break;
-
-      case DDERR_VIDEONOTACTIVE:
-         strcpy( errorString, "DDERR_VIDEONOTACTIVE" );
-         break;
-
-      case DDERR_DEVICEDOESNTOWNSURFACE:
-         strcpy( errorString, "DDERR_DEVICEDOESNTOWNSURFACE" );
-         break;
-
-      case DDERR_NOTINITIALIZED:
-         strcpy( errorString, "DDERR_NOTINITIALIZED" );
-         break;
-
-      default:
-         strcpy( errorString, "" );
-         break;
-   }
-
-   return &errorString[0];
-} 
diff --git a/src/mesa/drivers/d3d/D3Dvbrender.c b/src/mesa/drivers/d3d/D3Dvbrender.c
deleted file mode 100644
index 09857f1dc8..0000000000
--- a/src/mesa/drivers/d3d/D3Dvbrender.c
+++ /dev/null
@@ -1,2149 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include 
-#include "clip.h"
-#include "context.h"
-#include "light.h"
-#include "lines.h"
-#include "macros.h"
-#include "matrix.h"
-#include "pb.h"
-#include "points.h"
-#include "mtypes.h"
-#include "vb.h"
-#include "vbrender.h"
-#include "xform.h"
-#include "D3DMesa.h"
-
-static void SetRenderStates( GLcontext *ctx );
-static void DebugRenderStates( GLcontext *ctx, BOOL bForce );
-
-static void RenderPointsVB( GLcontext *ctx, GLuint start, GLuint end );
-static void RenderTriangleVB( GLcontext *ctx, GLuint start, GLuint end );
-static void RenderTriangleFanVB( GLcontext *ctx, GLuint start, GLuint end );
-static void RenderTriangleStripVB( GLcontext *ctx, GLuint start, GLuint end );
-static void RenderQuadVB( GLcontext *ctx, GLuint start, GLuint end );
-static void RenderQuad( GLcontext *ctx, GLuint v1, GLuint v2, GLuint v3, GLuint v4, GLuint pv );
-void		RenderOneTriangle( GLcontext *ctx, GLuint v1, GLuint v2, GLuint v3, GLuint pv );
-void 	RenderOneLine( GLcontext *ctx, GLuint v1, GLuint v2, GLuint pv );
-
-/*  I went with a D3D vertex buffer that is 6 times that of the Mesa one */
-/* instead of having the D3D one flush when its full.  This way Mesa will*/
-/* handle all the flushing.  I need x6 as points can use 4 vertex each.  */
-D3DTLVERTEX 	D3DTLVertices[ (VB_MAX*6) ];
-GLuint   		VList[VB_SIZE];
-/*===========================================================================*/
-/* Compute Z offsets for a polygon with plane defined by (A,B,C,D)           */
-/* D is not needed. TODO: Currently we are calculating this but not using it.*/
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void OffsetPolygon( GLcontext *ctx, GLfloat a, GLfloat b, GLfloat c )
-{
-  GLfloat	ac,
-          bc,
-          m,
-          offset;
-
-  DPF(( DBG_FUNC, "OffsetPolygon();" ));
-
-  if ( (c < 0.001F) && (c > - 0.001F) )
-  {
-    /* Prevents underflow problems. */
-    ctx->PointZoffset   = 0.0F;
-    ctx->LineZoffset    = 0.0F;
-    ctx->PolygonZoffset = 0.0F;
-  }
-  else
-  {
-    ac = a / c;
-    bc = b / c;
-    if ( ac < 0.0F )
-	 ac = -ac;
-    if ( bc<0.0F )
-	 bc = -bc;
-    m = MAX2( ac, bc );     /* m = sqrt( ac*ac + bc*bc ); */
-
-    offset = (m * ctx->Polygon.OffsetFactor + ctx->Polygon.OffsetUnits);
-    ctx->PointZoffset   = ctx->Polygon.OffsetPoint ? offset : 0.0F;
-    ctx->LineZoffset    = ctx->Polygon.OffsetLine  ? offset : 0.0F;
-    ctx->PolygonZoffset = ctx->Polygon.OffsetFill  ? offset : 0.0F;
-  }
-
-  DPF(( DBG_PRIM_INFO, "OffsetPolygon: %f", offset ));
-}
-/*===========================================================================*/
-/*  Compute signed area of the n-sided polgyon specified by vertices         */
-/* vb->Win[] and vertex list vlist[].                                        */
-/*  A clockwise polygon will return a negative area.  A counter-clockwise    */
-/* polygon will return a positive area.  I have changed this function to     */
-/* actually calculate twice the area as its faster and still gives the sign. */
-/*===========================================================================*/
-/* RETURN: signed area of the polgon.                                        */
-/*===========================================================================*/
-static GLfloat PolygonArea( const struct vertex_buffer *vb, GLuint n, const GLuint vlist[] )
-{
-  GLfloat	area;
-  GLuint  i;
-
-  DPF(( DBG_FUNC, "PolygonArea();" ));
-
-#define  j0    vlist[i]
-#define  j1    vlist[(i+1)%n]
-#define  x0    vb->Win[j0][0]
-#define  y0    vb->Win[j0][1]
-#define  x1    vb->Win[j1][0]
-#define  y1    vb->Win[j1][1]
-
-  /* area = sum of trapezoids */
-  for( i = 0, area = 0.0; i < n; i++ )
-    area += ((x0 - x1) * (y0 + y1));  /* Note: no divide by two here! */
-
-#undef x0
-#undef y0
-#undef x1
-#undef y1
-#undef j1
-#undef j0
-
-  // TODO: I don't see the point or * 0.5 as we just want the sign...
-  return area;
-}
-/*===========================================================================*/
-/*  Render a polygon that needs clipping on at least one vertex. The function*/
-/* will first clip the polygon to any user clipping planes then clip to the  */
-/* viewing volume.  The final polygon will be draw as single triangles that  */
-/* first need minor proccessing (culling, offset, etc) before we draw the    */
-/* polygon as a fan.  NOTE: the fan is draw as single triangles as its not   */
-/* formed sequentaly in the VB but is in the vlist[].                        */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void RenderClippedPolygon( GLcontext *ctx, GLuint n, GLuint vlist[] )
-{
-  struct vertex_buffer	*VB = ctx->VB;
-  GLfloat 			(*win)[3] = VB->Win,
-                         *proj = ctx->ProjectionMatrix,
-                         ex, ey,
-                         fx, fy, c,
-	                    wInv;
-  GLuint				index,
-	                    pv,
-                         facing;
-
-  DPF(( DBG_FUNC, "RenderClippedPolygon();" ));
-
-  DPF(( DBG_PRIM_INFO, "RenderClippedtPolygon( %d )", n ));
-
-  /* Which vertex dictates the color when flat shading. */
-  pv = (ctx->Primitive==GL_POLYGON) ? vlist[0] : vlist[n-1];
-
-  /*  Clipping may introduce new vertices.  New vertices will be stored in */
-  /* the vertex buffer arrays starting with location VB->Free.  After we've*/
-  /* rendered the polygon, these extra vertices can be overwritten.        */
-  VB->Free = VB_MAX;
-
-  /* Clip against user clipping planes in eye coord space. */
-  if ( ctx->Transform.AnyClip )
-  {
-    n = gl_userclip_polygon( ctx, n, vlist );
-    if ( n < 3 )
-	 return;
-
-    /* Transform vertices from eye to clip coordinates:  clip = Proj * eye */
-    for( index = 0; index < n; index++ )
-    {
-	 TRANSFORM_POINT( VB->Clip[vlist[index]], proj, VB->Eye[vlist[index]] );
-    }
-  }
-
-  /* Clip against view volume in clip coord space */
-  n = gl_viewclip_polygon( ctx, n, vlist );
-  if ( n < 3 )
-    return;
-
-  /* Transform new vertices from clip to ndc to window coords.    */
-  /* ndc = clip / W    window = viewport_mapping(ndc)             */
-  /* Note that window Z values are scaled to the range of integer */
-  /* depth buffer values.                                         */
-
-  /* Only need to compute window coords for new vertices */
-  for( index = VB_MAX; index < VB->Free; index++ )
-  {
-    if ( VB->Clip[index][3] != 0.0F )
-    {
-	 wInv = 1.0F / VB->Clip[index][3];
-
-	 win[index][0] = VB->Clip[index][0] * wInv * ctx->Viewport.Sx + ctx->Viewport.Tx;
-	 win[index][1] = VB->Clip[index][1] * wInv * ctx->Viewport.Sy + ctx->Viewport.Ty;
-	 win[index][2] = VB->Clip[index][2] * wInv * ctx->Viewport.Sz + ctx->Viewport.Tz;
-    }
-    else
-    {
-	 /* Can't divide by zero, so... */
-	 win[index][0] = win[index][1] = win[index][2] = 0.0F;
-    }
-  }
-
-  /* Draw filled polygon as a triangle fan */
-  for( index = 2; index < n; index++ )
-  {
-    /* Compute orientation of triangle */
-    ex = win[vlist[index-1]][0] - win[vlist[0]][0];
-    ey = win[vlist[index-1]][1] - win[vlist[0]][1];
-    fx = win[vlist[index]][0]   - win[vlist[0]][0];
-    fy = win[vlist[index]][1]   - win[vlist[0]][1];
-    c = (ex * fy) - (ey * fx);
-
-    /* polygon is perpindicular to view plane, don't draw it */
-    if ( (c == 0.0F) && !ctx->Polygon.Unfilled )
-	 continue;
-
-    /* Backface culling. */
-    facing = (c < 0.0F) ^ ctx->Polygon.FrontBit;
-    if ( (facing + 1) & ctx->Polygon.CullBits )
-	 continue;
-
-    if ( ctx->IndirectTriangles & DD_TRI_LIGHT_TWOSIDE )
-    {
-	 if ( facing == 1 )
-	 {
-	   /* use back color */
-	   VB->Color   = VB->Bcolor;
-	   VB->Specular= VB->Bspec;
-	 }
-	 else
-	 {
-	   /* use front color */
-	   VB->Color   = VB->Fcolor;
-	   VB->Specular= VB->Fspec;
-	 }
-    }
-
-    if ( ctx->IndirectTriangles & DD_TRI_OFFSET )
-    {
-	 /* finish computing plane equation of polygon, compute offset */
-	 GLfloat fz = win[vlist[index]][2]   - win[vlist[0]][2];
-	 GLfloat ez = win[vlist[index-1]][2] - win[vlist[0]][2];
-	 GLfloat a = (ey * fz) - (ez * fy);
-	 GLfloat b = (ez * fx) - (ex * fz);
-	 OffsetPolygon( ctx, a, b, c );
-    }
-    RenderOneTriangle( ctx, vlist[0], vlist[index-1], vlist[index], pv );
-  }
-}
-/*===========================================================================*/
-/*  This function gets called when either the vertex buffer is full or glEnd */
-/* has been called.  If the we aren't in rendering mode (FEEDBACK) then I    */
-/* pass the vertex buffer back to Mesa to deal with by returning FALSE.      */
-/*  If I can render the primitive types in the buffer directly then I will   */
-/* return TRUE after I render the vertex buffer and reset the vertex buffer. */
-/*                                                                           */
-/* TODO: I don't handle the special case of when the vertex buffer is full   */
-/*      and we have a primitive that bounds this buffer and the next one to  */
-/*      come.  I'm not sure right now if Mesa handles this for me...         */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-GLboolean RenderVertexBuffer( GLcontext *ctx, GLboolean allDone )
-{
-  struct vertex_buffer	*VB = ctx->VB;
-  GLuint 		    		index,
-	                    vlist[VB_SIZE];
-
-  DPF(( DBG_FUNC, "RenderVertexBuffer();" ));
-
-  /* We only need to hook actual tri's that need rendering. */
-  if ( ctx->RenderMode != GL_RENDER )
-  {
-	   //	   (ctx->Visual->AccumBits > 0) )
-	   //	   (ctx->Visual->StencilBits > 0) )
-    DPF(( DBG_PRIM_INFO, "Passing VB back to Mesa" ));
-    return FALSE;
-  }
-
-  /*  I'm going to set the states here so that all functions will  */
-  /* be assured to have the right states.  If Mesa's vertex bufefr */
-  /* function calls one of my primitive functions (TRI,POINT,LINE) */
-  /* it will need the right states.  So instead of doing it in the */
-  /* primitive function I will always do it here at risk of some   */
-  /* slow down to some cases...                                    */
-  SetRenderStates( ctx );
-
-  switch( ctx->Primitive )
-  {
-    case GL_POINTS:
-	 DPF(( DBG_PRIM_INFO, "GL_POINTS( %d )", VB->Count ));
-	 RenderPointsVB( ctx, 0, VB->Count );
-	 break;
-
-    case GL_LINES:
-    case GL_LINE_STRIP:
-    case GL_LINE_LOOP:
-	 /*  Not supported functions yet so pass back that we failed to */
-	 /* render the vertex buffer and Mesa will have to do it.       */
-	 DPF(( DBG_PRIM_INFO, "GL_LINE_?( %d )", VB->Count ));
-	 return FALSE;
-
-    case GL_TRIANGLES:
-	 if ( VB->Count < 3 )
-	 {
-	   DPF(( DBG_PRIM_WARN, "GL_TRIANGLES( %d )", VB->Count ));
-	   return FALSE;
-	 }
-
-	 DPF(( DBG_PRIM_INFO, "GL_TRIANGLES( %d )", VB->Count ));
-      RenderTriangleVB( ctx, 0, VB->Count );
-	 break;
-
-    case GL_TRIANGLE_STRIP:
-	 if ( VB->Count < 3 )
-	 {
-	   DPF(( DBG_PRIM_WARN, "GL_TRIANGLE_STRIP( %d )", VB->Count ));
-	   return FALSE;
-	 }
-
-	 DPF(( DBG_PRIM_INFO, "GL_TRIANGLE_STRIP( %d )", VB->Count ));
-	 RenderTriangleStripVB( ctx, 0, VB->Count );
-	 break;
-
-    case GL_TRIANGLE_FAN:
-	 if ( VB->Count < 3 )
-	 {
-	   DPF(( DBG_PRIM_WARN, "GL_TRIANGLE_FAN( %d )", VB->Count ));
-	   return FALSE;
-	 }
-
-	 DPF(( DBG_PRIM_INFO, "GL_TRIANGLE_FAN( %d )", VB->Count ));
-	 RenderTriangleFanVB( ctx, 0, VB->Count );
-	 break;
-
-    case GL_QUADS:
-	 if ( VB->Count < 4 )
-	 {
-	   DPF(( DBG_PRIM_WARN, "GL_QUADS( %d )", VB->Count ));
-	   return FALSE;
-	 }
-
-	  DPF(( DBG_PRIM_INFO, "GL_QUADS( %d )", VB->Count ));
-	  RenderQuadVB( ctx, 0, VB->Count );
-	  break;
-
-    case GL_QUAD_STRIP:
-	 if ( VB->Count < 4 )
-	 {
-	   DPF(( DBG_PRIM_WARN, "GL_QUAD_STRIP( %d )", VB->Count ));
-	   return FALSE;
-	 }
-
-	 DPF(( DBG_PRIM_INFO, "GL_QUAD_STRIP( %d )", VB->Count ));
-
-	 if ( VB->ClipOrMask )
-	 {
-	   for( index = 3; index < VB->Count; index += 2 )
-	   {
-		if ( VB->ClipMask[index-3] & VB->ClipMask[index-2] & VB->ClipMask[index-1] & VB->ClipMask[index] & CLIP_ALL_BITS )
-		{
-		   /* All points clipped by common plane */
-		  DPF(( DBG_PRIM_WARN, "GL_QUAD_STRIP( %d )", VB->Count ));
-		  continue;
-		}
-		else if ( VB->ClipMask[index-3] | VB->ClipMask[index-2] | VB->ClipMask[index-1] | VB->ClipMask[index] )
-		{
-		  vlist[0] = index - 3;
-		  vlist[1] = index - 2;
-		  vlist[2] = index;
-		  vlist[3] = index - 1;
-		  RenderClippedPolygon( ctx, 4, vlist );
-		}
-		else
-		{
-		  RenderQuad( ctx, (index-3), (index-2), index, (index-1), index );
-		}	
-	   }
-	 }
-	 else
-	 {
-	   /* No clipping needed */
-	   for( index = 3; index < VB->Count; index += 2 )
-		RenderQuad( ctx, (index-3), (index-2), index, (index-1), index );
-	 }	
-	 break;
-	
-    case GL_POLYGON:
-	 if ( VB->Count < 3 )
-	 {
-	   DPF(( DBG_PRIM_WARN, "GL_POLYGON( %d )", VB->Count ));
-	   return FALSE;
-	 }
-
-	 DPF(( DBG_PRIM_INFO, "GL_POLYGON( %d )", VB->Count ));
-
-	 /* All points clipped by common plane, draw nothing */
-	 if ( !(VB->ClipAndMask & CLIP_ALL_BITS) )
-	   RenderTriangleFanVB( ctx, 0, VB->Count );
-	 break;
-
-    default:
-	 /* should never get here */
-	 _mesa_problem( ctx, "invalid mode in gl_render_vb" );
-   }
-
-  DPF(( DBG_PRIM_INFO, "ResetVB" ));
-
-  /* We return TRUE to indicate we rendered the VB. */
-  gl_reset_vb( ctx, allDone );
-  return TRUE;
-}
-/*===========================================================================*/
-/*  This function will render the current vertex buffer as triangles.  The   */
-/* buffer has to be able to be rendered directly.  This means that we are    */
-/* filled, no offsets, no culling and one sided rendering.  Also we must be  */
-/* in render mode of course.                                                 */
-/*  First I will fill the global D3D vertice buffer.  Next I will set all the*/
-/* states for D3D based on the current OGL state.  Finally I pass the D3D VB */
-/* to the wrapper that call DrawPrimitives.                                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void RenderTriangleVB( GLcontext *ctx, GLuint start, GLuint end )
-{
-  D3DMESACONTEXT      	*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  struct vertex_buffer 	*VB = ctx->VB;
-  int                    index,
-                         cVertex,
-                         height = (pContext->pShared->rectW.bottom - pContext->pShared->rectW.top);
-   DWORD                	dwPVColor;
-   GLfloat              	ex, ey,
-                         fx, fy, c;
-   GLuint               	facing;
-
-   DPF(( DBG_FUNC, "RenderTriangleVB" ));
-
-   if ( !VB->ClipOrMask )
-   {
-	DPF(( DBG_PRIM_INFO, "DirectTriangles( %d )", (end-start) ));
-	for( index = start, cVertex = 0; index < end; )
-	{
-	  dwPVColor = (VB->Color[(index+2)][3]<<24) | (VB->Color[(index+2)][0]<<16) | (VB->Color[(index+2)][1]<<8) | VB->Color[(index+2)][2];
-
-	  /*=====================================*/
-	  /* Populate the the triangle vertices. */
-	  /*=====================================*/
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[index][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[index][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[index][2] );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[index][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[index][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	  D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-	                                  dwPVColor :
-                                       (VB->Color[index][3]<<24) | (VB->Color[index][0]<<16) | (VB->Color[index][1]<<8) | VB->Color[index][2];
-	  index++;
-
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[index][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[index][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[index][2] );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[index][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[index][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	  D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                       dwPVColor :
-                                       (VB->Color[index][3]<<24) | (VB->Color[index][0]<<16) | (VB->Color[index][1]<<8) | VB->Color[index][2];
-	  index++;
-
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[index][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[index][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[index][2] );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[index][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[index][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	  D3DTLVertices[cVertex++].color= dwPVColor;
-	  index++;
-	}
-   }
-   else
-   {
-#define v1     index
-#define v2     (index+1)
-#define v3     (index+2)
-
-	for( index = start, cVertex = 0; index < end; index += 3 )
-	{
-	  if ( VB->ClipMask[v1] & VB->ClipMask[v2] & VB->ClipMask[v3] & CLIP_ALL_BITS )
-	  {
-	    continue;
-	  }
-	  else if ( VB->ClipMask[v1] | VB->ClipMask[v2] | VB->ClipMask[v3] )
-	  {
-	    VList[0] = v1;
-	    VList[1] = v2;
-	    VList[2] = v3;
-	    RenderClippedPolygon( ctx, 3, VList );
-	    continue;
-	  }
-
-	  /* Compute orientation of triangle */
-	  ex = VB->Win[v2][0] - VB->Win[v1][0];
-	  ey = VB->Win[v2][1] - VB->Win[v1][1];
-	  fx = VB->Win[v3][0] - VB->Win[v1][0];
-	  fy = VB->Win[v3][1] - VB->Win[v1][1];
-	  c = (ex * fy) - (ey * fx);
-
-	  /* polygon is perpindicular to view plane, don't draw it */
-	  if ( (c == 0.0F) && !ctx->Polygon.Unfilled )
-	    continue;
-
-	  /* Backface culling. */
-	  facing = (c < 0.0F) ^ ctx->Polygon.FrontBit;
-	  if ( (facing + 1) & ctx->Polygon.CullBits )
-	    continue;
-
-	  if ( ctx->IndirectTriangles & DD_TRI_LIGHT_TWOSIDE )
-	  {
-	    if ( facing == 1 )
-	    {
-		 /* use back color */
-		 VB->Color   = VB->Bcolor;
-		 VB->Specular= VB->Bspec;
-	    }
-	    else
-	    {
-		 /* use front color */
-		 VB->Color   = VB->Fcolor;
-		 VB->Specular= VB->Fspec;
-	    }
-	  }
-
-	  if ( ctx->IndirectTriangles & DD_TRI_OFFSET )
-	  {
-	    /* Finish computing plane equation of polygon, compute offset */
-	    GLfloat fz = VB->Win[v3][2] - VB->Win[v1][2];
-	    GLfloat ez = VB->Win[v2][2] - VB->Win[v1][2];
-	    GLfloat a = (ey * fz) - (ez * fy);
-	    GLfloat b = (ez * fx) - (ex * fz);
-	    OffsetPolygon( ctx, a, b, c );
-	  }
-
-	  /*=====================================*/
-	  /* Populate the the triangle vertices. */
-	  /*=====================================*/
-	  /* Solve the prevoking vertex color as we need it for the 3rd triangle and flat shading. */
-	  dwPVColor = (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v1][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v1][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v1][2] + ctx->PolygonZoffset) );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v1][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v1][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-	  D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                       dwPVColor :
-                                       (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v2][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v2][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v2][2] + ctx->PolygonZoffset) );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v2][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v2][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v2][3]) );
-	  D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                       dwPVColor :
-                                       (VB->Color[v2][3]<<24) | (VB->Color[v2][0]<<16) | (VB->Color[v2][1]<<8) | VB->Color[v2][2];
-
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v3][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v3][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v3][2] + ctx->PolygonZoffset) );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v3][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v3][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-	  D3DTLVertices[cVertex++].color= dwPVColor;
-	}
-#undef v1
-#undef v2
-#undef v3
-   }
-
-   /* Render the converted vertex buffer. */
-   if ( cVertex > 2 )
-	DrawPrimitiveHAL( pContext->pShared, D3DPT_TRIANGLELIST, &D3DTLVertices[0], cVertex );
-}
-/*===========================================================================*/
-/*  This function will render the current vertex buffer as a triangle fan.   */
-/* The buffer has to be able to be rendered directly.  This means that we are*/
-/* filled, no offsets, no culling and one sided rendering.  Also we must be  */
-/* in render mode of course.                                                 */
-/*  First I will fill the global D3D vertice buffer.  Next I will set all the*/
-/* states for D3D based on the current OGL state.  Finally I pass the D3D VB */
-/* to the wrapper that call DrawPrimitives.                                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void RenderTriangleFanVB( GLcontext *ctx, GLuint start, GLuint end )
-{
-  D3DMESACONTEXT     	*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  struct vertex_buffer 	*VB = ctx->VB;
-  int                  	index,
-                         cVertex,
-                         height = (pContext->pShared->rectW.bottom - pContext->pShared->rectW.top);
-   GLfloat              	ex, ey,
-                         fx, fy, c;
-   GLuint               	facing;
-   DWORD                	dwPVColor;
-
-   DPF(( DBG_FUNC, "RenderTriangleFanVB();" ));
-
-   /* Special case that we can blast the fan without culling, offset, etc... */
-   if ( !VB->ClipOrMask && (ctx->Light.ShadeModel != GL_FLAT) )
-   {
-	DPF(( DBG_PRIM_INFO, "DirectTriangles( %d )", (end-start) ));
-
-	/* Seed the the fan. */
-	D3DTLVertices[0].sx   = D3DVAL( VB->Win[start][0] );
-	D3DTLVertices[0].sy   = D3DVAL( (height - VB->Win[start][1]) );
-	D3DTLVertices[0].sz   = D3DVAL( VB->Win[start][2] );
-	D3DTLVertices[0].tu   = D3DVAL( VB->TexCoord[start][0] );
-	D3DTLVertices[0].tv   = D3DVAL( VB->TexCoord[start][1] );
-	D3DTLVertices[0].rhw  = D3DVAL( (1.0 / VB->Clip[start][3]) );
-	D3DTLVertices[0].color= (VB->Color[start][3]<<24) | (VB->Color[start][0]<<16) | (VB->Color[start][1]<<8) | VB->Color[start][2];
-
-	/* Seed the the fan. */
-	D3DTLVertices[1].sx   = D3DVAL( VB->Win[(start+1)][0] );
-	D3DTLVertices[1].sy   = D3DVAL( (height - VB->Win[(start+1)][1]) );
-	D3DTLVertices[1].sz   = D3DVAL( VB->Win[(start+1)][2] );
-	D3DTLVertices[1].tu   = D3DVAL( VB->TexCoord[(start+1)][0] );
-	D3DTLVertices[1].tv   = D3DVAL( VB->TexCoord[(start+1)][1] );
-	D3DTLVertices[1].rhw  = D3DVAL( (1.0 / VB->Clip[(start+1)][3]) );
-	D3DTLVertices[1].color= (VB->Color[(start+1)][3]<<24) | (VB->Color[(start+1)][0]<<16) | (VB->Color[(start+1)][1]<<8) | VB->Color[(start+1)][2];
-
-	for( index = (start+2), cVertex = 2; index < end; index++, cVertex++ )
-	{
-	  /*=================================*/
-	  /* Add the next vertex to the fan. */
-	  /*=================================*/
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[index][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[index][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[index][2] );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[index][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[index][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	  D3DTLVertices[cVertex].color  = (VB->Color[index][3]<<24) | (VB->Color[index][0]<<16) | (VB->Color[index][1]<<8) | VB->Color[index][2];
-      }
-
-	/* Render the converted vertex buffer. */
-	if ( cVertex )
-	  DrawPrimitiveHAL( pContext->pShared, D3DPT_TRIANGLEFAN, &D3DTLVertices[0], cVertex );
-   }
-   else
-   {
-#define v1     start
-#define v2     (index-1)
-#define v3     index
-
-	for( index = (start+2), cVertex = 0; index < end; index++ )
-	{
-	  if ( VB->ClipOrMask )
-	  {
-	    /* All points clipped by common plane */
-	    if ( VB->ClipMask[v1] & VB->ClipMask[v2] & VB->ClipMask[v3] & CLIP_ALL_BITS )
-	    {
-		 continue;
-	    }
-	    else if ( VB->ClipMask[v1] | VB->ClipMask[v2] | VB->ClipMask[v3] )
-	    {
-		 VList[0] = v1;
-		 VList[1] = v2;
-		 VList[2] = v3;
-		 RenderClippedPolygon( ctx, 3, VList );
-		 continue;
-	    }
-	  }
-
-	  /* Compute orientation of triangle */
-	  ex = VB->Win[v2][0] - VB->Win[v1][0];
-	  ey = VB->Win[v2][1] - VB->Win[v1][1];
-	  fx = VB->Win[v3][0] - VB->Win[v1][0];
-	  fy = VB->Win[v3][1] - VB->Win[v1][1];
-	  c = (ex * fy) - (ey * fx);
-
-	  /* polygon is perpindicular to view plane, don't draw it */
-	  if ( (c == 0.0F) && !ctx->Polygon.Unfilled )
-	    continue;
-
-	  /* Backface culling. */
-	  facing = (c < 0.0F) ^ ctx->Polygon.FrontBit;
-	  if ( (facing + 1) & ctx->Polygon.CullBits )
-	    continue;
-
-	  if ( ctx->IndirectTriangles & DD_TRI_OFFSET )
-	  {
-	    /* Finish computing plane equation of polygon, compute offset */
-	    GLfloat fz = VB->Win[v3][2] - VB->Win[v1][2];
-	    GLfloat ez = VB->Win[v2][2] - VB->Win[v1][2];
-	    GLfloat a = (ey * fz) - (ez * fy);
-	    GLfloat b = (ez * fx) - (ex * fz);
-	    OffsetPolygon( ctx, a, b, c );
-	  }
-
-	  /*=====================================*/
-	  /* Populate the the triangle vertices. */
-	  /*=====================================*/
-	  dwPVColor = (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v1][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v1][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v1][2] + ctx->PolygonZoffset) );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v1][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v1][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-	  D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                                         (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v2][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v2][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v2][2] + ctx->PolygonZoffset)  );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v2][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v2][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v2][3]) );
-	  D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                                         (VB->Color[v2][3]<<24) | (VB->Color[v2][0]<<16) | (VB->Color[v2][1]<<8) | VB->Color[v2][2];
-
-	  D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v3][0] );
-	  D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v3][1]) );
-	  D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v3][2] + ctx->PolygonZoffset) );
-	  D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v3][0] );
-	  D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v3][1] );
-	  D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-	  D3DTLVertices[cVertex++].color= dwPVColor;
-	}
-
-	/* Render the converted vertex buffer. */
-	if ( cVertex )
-	  DrawPrimitiveHAL( pContext->pShared, D3DPT_TRIANGLELIST, &D3DTLVertices[0], cVertex );
-#undef v1
-#undef v2
-#undef v3
-   }
-}
-/*===========================================================================*/
-/*  This function will render the current vertex buffer as a triangle strip. */
-/* The buffer has to be able to be rendered directly.  This means that we are*/
-/* filled, no offsets, no culling and one sided rendering.  Also we must be  */
-/* in render mode of course.                                                 */
-/*  First I will fill the global D3D vertice buffer.  Next I will set all the*/
-/* states for D3D based on the current OGL state.  Finally I pass the D3D VB */
-/* to the wrapper that call DrawPrimitives.                                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void RenderTriangleStripVB( GLcontext *ctx, GLuint start, GLuint end )
-{
-  D3DMESACONTEXT     	*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  struct vertex_buffer 	*VB = ctx->VB;
-  int                    index,
-                         cVertex = 0,
-	                    v1, v2, v3,
-                         height = (pContext->pShared->rectW.bottom - pContext->pShared->rectW.top);
-  GLfloat              	ex, ey,
-                         fx, fy, c;
-  GLuint               	facing;
-  DWORD                	dwPVColor;
-
-  DPF(( DBG_FUNC, "RenderTriangleStripVB();" ));
-
-  /* Special case that we can blast the fan without culling, offset, etc... */
-  if ( !VB->ClipOrMask && (ctx->Light.ShadeModel != GL_FLAT) )
-  {
-    DPF(( DBG_PRIM_PROFILE, "DirectTriangles" ));
-
-    /* Seed the the strip. */
-    D3DTLVertices[0].sx   = D3DVAL( VB->Win[start][0] );
-    D3DTLVertices[0].sy   = D3DVAL( (height - VB->Win[start][1]) );
-    D3DTLVertices[0].sz   = D3DVAL( VB->Win[start][2] );
-    D3DTLVertices[0].tu   = D3DVAL( VB->TexCoord[start][0] );
-    D3DTLVertices[0].tv   = D3DVAL( VB->TexCoord[start][1] );
-    D3DTLVertices[0].rhw  = D3DVAL( (1.0 / VB->Clip[start][3]) );
-    D3DTLVertices[0].color= (VB->Color[start][3]<<24) | (VB->Color[start][0]<<16) | (VB->Color[start][1]<<8) | VB->Color[start][2];
-
-    /* Seed the the strip. */
-    D3DTLVertices[1].sx   = D3DVAL( VB->Win[(start+1)][0] );
-    D3DTLVertices[1].sy   = D3DVAL( (height - VB->Win[(start+1)][1]) );
-    D3DTLVertices[1].sz   = D3DVAL( VB->Win[(start+1)][2] );
-    D3DTLVertices[1].tu   = D3DVAL( VB->TexCoord[(start+1)][0] );
-    D3DTLVertices[1].tv   = D3DVAL( VB->TexCoord[(start+1)][1] );
-    D3DTLVertices[1].rhw  = D3DVAL( (1.0 / VB->Clip[(start+1)][3]) );
-    D3DTLVertices[1].color= (VB->Color[(start+1)][3]<<24) | (VB->Color[(start+1)][0]<<16) | (VB->Color[(start+1)][1]<<8) | VB->Color[(start+1)][2];
-
-    for( index = (start+2), cVertex = 2; index < end; index++, cVertex++ )
-    {
-	 /*===================================*/
-	 /* Add the next vertex to the strip. */
-	 /*===================================*/
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[index][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[index][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[index][2] );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[index][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[index][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	 D3DTLVertices[cVertex].color  = (VB->Color[index][3]<<24) | (VB->Color[index][0]<<16) | (VB->Color[index][1]<<8) | VB->Color[index][2];
-    }
-
-    /* Render the converted vertex buffer. */
-    if ( cVertex )
-	 DrawPrimitiveHAL( pContext->pShared, D3DPT_TRIANGLESTRIP, &D3DTLVertices[0], cVertex );
-  }
-  else
-  {
-    for( index = (start+2); index < end; index++ )
-    {
-	 /* We need to switch order so that winding won't be a problem. */
-	 if ( index & 1 )
-	 {
-	   v1 = index - 1;
-	   v2 = index - 2;
-	   v3 = index - 0;
-	 }
-	 else
-	 {
-	   v1 = index - 2;
-	   v2 = index - 1;
-	   v3 = index - 0;
-	 }
-
-	 /* All vertices clipped by common plane */
-	 if ( VB->ClipMask[v1] & VB->ClipMask[v2] & VB->ClipMask[v3] & CLIP_ALL_BITS )
-	   continue;
-
-	 /* Check if any vertices need clipping. */
-	 if ( VB->ClipMask[v1] | VB->ClipMask[v2] | VB->ClipMask[v3] )
-	 {
-	   VList[0] = v1;
-	   VList[1] = v2;
-	   VList[2] = v3;
-	   RenderClippedPolygon( ctx, 3, VList );
-	 }
-	 else
-	 {
-	   /* Compute orientation of triangle */
-	   ex = VB->Win[v2][0] - VB->Win[v1][0];
-	   ey = VB->Win[v2][1] - VB->Win[v1][1];
-	   fx = VB->Win[v3][0] - VB->Win[v1][0];
-	   fy = VB->Win[v3][1] - VB->Win[v1][1];
-	   c = (ex * fy) - (ey * fx);
-
-	   /* Polygon is perpindicular to view plane, don't draw it */
-	   if ( (c == 0.0F) && !ctx->Polygon.Unfilled )
-		continue;
-
-	   /* Backface culling. */
-	   facing = (c < 0.0F) ^ ctx->Polygon.FrontBit;
-	   if ( (facing + 1) & ctx->Polygon.CullBits )
-		continue;
-
-	   /* Need right color if we have two sided lighting. */
-	   if ( ctx->IndirectTriangles & DD_TRI_LIGHT_TWOSIDE )
-	   {
-		if ( facing == 1 )
-		{
-		  /* use back color */
-		  VB->Color   = VB->Bcolor;
-		  VB->Specular= VB->Bspec;
-		}
-		else
-		{
-		  /* use front color */
-		  VB->Color   = VB->Fcolor;
-		  VB->Specular= VB->Fspec;
-		}
-	   }
-
-	   if ( ctx->IndirectTriangles & DD_TRI_OFFSET )
-	   {
-		/* Finish computing plane equation of polygon, compute offset */
-		GLfloat fz = VB->Win[v3][2] - VB->Win[v1][2];
-		GLfloat ez = VB->Win[v2][2] - VB->Win[v1][2];
-		GLfloat a = (ey * fz) - (ez * fy);
-		GLfloat b = (ez * fx) - (ex * fz);
-		OffsetPolygon( ctx, a, b, c );
-	   }
-	   /*=====================================*/
-	   /* Populate the the triangle vertices. */
-	   /*=====================================*/
-
-	   /* Solve the prevoking vertex color as we need it for the 3rd triangle and flat shading. */
-	   dwPVColor = (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-
-	   D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v1][0] );
-	   D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v1][1]) );
-	   D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v1][2] + ctx->PolygonZoffset) );
-	   D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v1][0] );
-	   D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v1][1] );
-	   D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-	   D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                        dwPVColor :
-                                        (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-	   D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v2][0] );
-	   D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v2][1]) );
-	   D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v2][2] + ctx->PolygonZoffset) );
-	   D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v2][0] );
-	   D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v2][1] );
-	   D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v2][3]) );
-	   D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                          dwPVColor :
-                                          (VB->Color[v2][3]<<24) | (VB->Color[v2][0]<<16) | (VB->Color[v2][1]<<8) | VB->Color[v2][2];
-
-	   D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v3][0] );
-	   D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v3][1]) );
-	   D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v3][2] + ctx->PolygonZoffset) );
-	   D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v3][0] );
-	   D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v3][1] );
-	   D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-	   D3DTLVertices[cVertex++].color= dwPVColor;
-	 }
-    }
-
-    /* Render the converted vertex buffer. */
-    if ( cVertex )	
-	 DrawPrimitiveHAL( pContext->pShared, D3DPT_TRIANGLELIST, &D3DTLVertices[0], cVertex );
-  }	
-}
-/*===========================================================================*/
-/*  This function will render the current vertex buffer as Quads.  The buffer*/
-/* has to be able to be rendered directly.  This means that we are filled, no*/
-/* offsets, no culling and one sided rendering.  Also we must be in render   */
-/* mode of cource.                                                           */
-/*  First I will fill the global D3D vertice buffer.  Next I will set all the*/
-/* states for D3D based on the current OGL state.  Finally I pass the D3D VB */
-/* to the wrapper that call DrawPrimitives.                                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void RenderQuadVB( GLcontext *ctx, GLuint start, GLuint end )
-{
-  D3DMESACONTEXT       	*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  struct vertex_buffer	*VB = ctx->VB;
-  int                  	index,
-                         cVertex,
-                         height = (pContext->pShared->rectW.bottom - pContext->pShared->rectW.top);
-  DWORD                	dwPVColor;
-  GLfloat             	ex, ey,
-                         fx, fy, c;
-  GLuint				facing;  /* 0=front, 1=back */
-
-  DPF(( DBG_FUNC, "RenderQuadVB();" ));
-
-#define  v1 (index)
-#define  v2 (index+1)
-#define  v3 (index+2)
-#define  v4 (index+3)
-
-  if ( !VB->ClipOrMask )
-  {
-    DPF(( DBG_PRIM_PROFILE, "DirectTriangles" ));
-
-    for( cVertex = 0, index = start; index < end; index += 4 )
-    {
-	 if ( ctx->Light.ShadeModel == GL_FLAT )
-	   dwPVColor = (VB->Color[v4][3]<<24) | (VB->Color[v4][0]<<16) | (VB->Color[v4][1]<<8) | VB->Color[v4][2];
-
-	 /*=====================================*/
-	 /* Populate the the triangle vertices. */
-	 /*=====================================*/
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v1][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v1][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[v1][2] );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v1][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v1][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                      dwPVColor :
-	                                 (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v2][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v2][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[v2][2] );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v2][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v2][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v2][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                      dwPVColor :
-                                      (VB->Color[v2][3]<<24) | (VB->Color[v2][0]<<16) | (VB->Color[v2][1]<<8) | VB->Color[v2][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v3][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v3][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[v3][2] );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v3][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v3][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-	                                 dwPVColor :
-                                      (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v1][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v1][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[v1][2] );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v1][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v1][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-	                                 dwPVColor :
-                                      (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v3][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v3][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[v3][2] );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v3][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v3][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                      dwPVColor :
-                                      (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v4][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v4][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( VB->Win[v4][2] );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v4][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v4][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v4][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                      dwPVColor :
-                                      (VB->Color[v4][3]<<24) | (VB->Color[v4][0]<<16) | (VB->Color[v4][1]<<8) | VB->Color[v4][2];
-    }
-  }
-  else
-  {
-    for( cVertex = 0, index = start; index < end; index += 4 )
-    {
-	 if ( VB->ClipMask[v1] & VB->ClipMask[v2] & VB->ClipMask[v3]  & VB->ClipMask[v4] & CLIP_ALL_BITS )
-	 {
-	   continue;
-	 }	
-	 else if ( VB->ClipMask[v1] | VB->ClipMask[v2] | VB->ClipMask[v3] | VB->ClipMask[v4] )
-	 {
-	   VList[0] = v1;
-	   VList[1] = v2;
-	   VList[2] = v3;
-	   VList[3] = v4;
-	   RenderClippedPolygon( ctx, 4, VList );
-	   continue;
-	 }
-
-	 /* Compute orientation of triangle */
-	 ex = VB->Win[v2][0] - VB->Win[v1][0];
-	 ey = VB->Win[v2][1] - VB->Win[v1][1];
-	 fx = VB->Win[v3][0] - VB->Win[v1][0];
-	 fy = VB->Win[v3][1] - VB->Win[v1][1];
-	 c = (ex * fy) - (ey * fx);
-
-	 /* polygon is perpindicular to view plane, don't draw it */
-	 if ( (c == 0.0F) && !ctx->Polygon.Unfilled )
-	   continue;
-
-	 /* Backface culling. */
-	 facing = (c < 0.0F) ^ ctx->Polygon.FrontBit;
-	 if ( (facing + 1) & ctx->Polygon.CullBits )
-	   continue;
-
-	 if ( ctx->IndirectTriangles & DD_TRI_LIGHT_TWOSIDE )
-	 {
-	   if ( facing == 1 )
-	   {
-		/* use back color */
-		VB->Color   = VB->Bcolor;
-		VB->Specular= VB->Bspec;
-	   }
-	   else
-	   {
-		/* use front color */
-		VB->Color   = VB->Fcolor;
-		VB->Specular= VB->Fspec;
-	   }	
-	 }	
-
-	 if ( ctx->IndirectTriangles & DD_TRI_OFFSET )
-	 {
-	   /* Finish computing plane equation of polygon, compute offset */
-	   GLfloat fz = VB->Win[v3][2] - VB->Win[v1][2];
-	   GLfloat ez = VB->Win[v2][2] - VB->Win[v1][2];
-	   GLfloat a = (ey * fz) - (ez * fy);
-	   GLfloat b = (ez * fx) - (ex * fz);
-	   OffsetPolygon( ctx, a, b, c );
-	 }
-
-	 if ( ctx->Light.ShadeModel == GL_FLAT )
-	   dwPVColor = (VB->Color[v4][3]<<24) | (VB->Color[v4][0]<<16) | (VB->Color[v4][1]<<8) | VB->Color[v4][2];
-
-	 /*=====================================*/
-	 /* Populate the the triangle vertices. */
-	 /*=====================================*/
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v1][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v1][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v1][2] + ctx->PolygonZoffset) );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v1][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v1][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                       dwPVColor :
-                                       (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v2][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v2][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v2][2] + ctx->PolygonZoffset) );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v2][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v2][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v2][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                       dwPVColor :
-                                       (VB->Color[v2][3]<<24) | (VB->Color[v2][0]<<16) | (VB->Color[v2][1]<<8) | VB->Color[v2][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v3][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v3][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v3][2] + ctx->PolygonZoffset) );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v3][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v3][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                       dwPVColor :
-                                       (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v1][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v1][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v1][2] + ctx->PolygonZoffset) );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v1][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v1][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-	                                  dwPVColor :
-                                       (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v3][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v3][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v3][2] + ctx->PolygonZoffset) );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v3][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v3][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                       dwPVColor :
-                                       (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-
-	 D3DTLVertices[cVertex].sx     = D3DVAL( VB->Win[v4][0] );
-	 D3DTLVertices[cVertex].sy     = D3DVAL( (height - VB->Win[v4][1]) );
-	 D3DTLVertices[cVertex].sz     = D3DVAL( (VB->Win[v4][2] + ctx->PolygonZoffset) );
-	 D3DTLVertices[cVertex].tu     = D3DVAL( VB->TexCoord[v4][0] );
-	 D3DTLVertices[cVertex].tv     = D3DVAL( VB->TexCoord[v4][1] );
-	 D3DTLVertices[cVertex].rhw    = D3DVAL( (1.0 / VB->Clip[v4][3]) );
-	 D3DTLVertices[cVertex++].color= (ctx->Light.ShadeModel == GL_FLAT) ?
-                                       dwPVColor :
-                                       (VB->Color[v4][3]<<24) | (VB->Color[v4][0]<<16) | (VB->Color[v4][1]<<8) | VB->Color[v4][2];
-    }
-  }
-
-#undef   v4
-#undef   v3
-#undef   v2
-#undef   v1
-
-  /* Render the converted vertex buffer. */
-  if ( cVertex )
-    DrawPrimitiveHAL( pContext->pShared, D3DPT_TRIANGLELIST, &D3DTLVertices[0], cVertex );
-}
-/*===========================================================================*/
-/*                                                                           */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-static void RenderQuad( GLcontext *ctx, GLuint v1, GLuint v2, GLuint v3, GLuint v4, GLuint pv )
-{
-  D3DMESACONTEXT     	*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  struct vertex_buffer 	*VB = ctx->VB;
-  int                  	height = (pContext->pShared->rectW.bottom - pContext->pShared->rectW.top);
-  DWORD                	dwPVColor;
-  GLfloat              	ex, ey,
-                         fx, fy, c;
-  GLuint               	facing;  /* 0=front, 1=back */
-  static D3DTLVERTEX   	TLVertices[6];
-
-  DPF(( DBG_FUNC, "RenderQuad" ));
-  DPF(( DBG_PRIM_INFO, "RenderQuad( 1 )" ));
-
-  /* Compute orientation of triangle */
-  ex = VB->Win[v2][0] - VB->Win[v1][0];
-  ey = VB->Win[v2][1] - VB->Win[v1][1];
-  fx = VB->Win[v3][0] - VB->Win[v1][0];
-  fy = VB->Win[v3][1] - VB->Win[v1][1];
-  c = (ex * fy) - (ey * fx);
-
-  /* polygon is perpindicular to view plane, don't draw it */
-  if ( (c == 0.0F) && !ctx->Polygon.Unfilled )
-    return;
-
-  /* Backface culling. */
-  facing = (c < 0.0F) ^ ctx->Polygon.FrontBit;
-  if ( (facing + 1) & ctx->Polygon.CullBits )
-    return;
-
-  if ( ctx->IndirectTriangles & DD_TRI_LIGHT_TWOSIDE )
-  {
-    if ( facing == 1 )
-    {
-	 /* use back color */
-	 VB->Color   = VB->Bcolor;
-	 VB->Specular= VB->Bspec;
-    }
-    else
-    {
-	 /* use front color */
-	 VB->Color   = VB->Fcolor;
-	 VB->Specular= VB->Fspec;
-    }
-  }
-
-  if ( ctx->IndirectTriangles & DD_TRI_OFFSET )
-  {
-    /* Finish computing plane equation of polygon, compute offset */
-    GLfloat fz = VB->Win[v3][2] - VB->Win[v1][2];
-    GLfloat ez = VB->Win[v2][2] - VB->Win[v1][2];
-    GLfloat a = (ey * fz) - (ez * fy);
-    GLfloat b = (ez * fx) - (ex * fz);
-    OffsetPolygon( ctx, a, b, c );
-  }
-
-  if ( ctx->Light.ShadeModel == GL_FLAT )
-    dwPVColor = (VB->Color[pv][3]<<24) | (VB->Color[pv][0]<<16) | (VB->Color[pv][1]<<8) | VB->Color[pv][2];
-
-  /*=====================================*/
-  /* Populate the the triangle vertices. */
-  /*=====================================*/
-  TLVertices[0].sx      = D3DVAL( VB->Win[v1][0] );
-  TLVertices[0].sy      = D3DVAL( (height - VB->Win[v1][1]) );
-  TLVertices[0].sz      = D3DVAL( (VB->Win[v1][2] + ctx->PolygonZoffset) );
-  TLVertices[0].tu      = D3DVAL( VB->TexCoord[v1][0] );
-  TLVertices[0].tv      = D3DVAL( VB->TexCoord[v1][1] );
-  TLVertices[0].rhw     = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-  TLVertices[0].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                           (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-   TLVertices[1].sx      = D3DVAL( VB->Win[v2][0] );
-   TLVertices[1].sy      = D3DVAL( (height - VB->Win[v2][1]) );
-   TLVertices[1].sz      = D3DVAL( (VB->Win[v2][2] + ctx->PolygonZoffset) );
-   TLVertices[1].tu      = D3DVAL( VB->TexCoord[v2][0] );
-   TLVertices[1].tv      = D3DVAL( VB->TexCoord[v2][1] );
-   TLVertices[1].rhw     = D3DVAL( (1.0 / VB->Clip[v2][3]) );
-   TLVertices[1].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                           (VB->Color[v2][3]<<24) | (VB->Color[v2][0]<<16) | (VB->Color[v2][1]<<8) | VB->Color[v2][2];
-
-   TLVertices[2].sx      = D3DVAL( VB->Win[v3][0] );
-   TLVertices[2].sy      = D3DVAL( (height - VB->Win[v3][1]) );
-   TLVertices[2].sz      = D3DVAL( (VB->Win[v3][2] + ctx->PolygonZoffset) );
-   TLVertices[2].tu      = D3DVAL( VB->TexCoord[v3][0] );
-   TLVertices[2].tv      = D3DVAL( VB->TexCoord[v3][1] );
-   TLVertices[2].rhw     = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-   TLVertices[2].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                           (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-
-   TLVertices[3].sx      = D3DVAL( VB->Win[v3][0] );
-   TLVertices[3].sy      = D3DVAL( (height - VB->Win[v3][1]) );
-   TLVertices[3].sz      = D3DVAL( (VB->Win[v3][2] + ctx->PolygonZoffset) );
-   TLVertices[3].tu      = D3DVAL( VB->TexCoord[v3][0] );
-   TLVertices[3].tv      = D3DVAL( VB->TexCoord[v3][1] );
-   TLVertices[3].rhw     = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-   TLVertices[3].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                           (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-
-   TLVertices[4].sx      = D3DVAL( VB->Win[v4][0] );
-   TLVertices[4].sy      = D3DVAL( (height - VB->Win[v4][1]) );
-   TLVertices[4].sz      = D3DVAL( (VB->Win[v4][2] + ctx->PolygonZoffset) );
-   TLVertices[4].tu      = D3DVAL( VB->TexCoord[v4][0] );
-   TLVertices[4].tv      = D3DVAL( VB->TexCoord[v4][1] );
-   TLVertices[4].rhw     = D3DVAL( (1.0 / VB->Clip[v4][3]) );
-   TLVertices[4].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                           (VB->Color[v4][3]<<24) | (VB->Color[v4][0]<<16) | (VB->Color[v4][1]<<8) | VB->Color[v4][2];
-
-   TLVertices[5].sx      = D3DVAL( VB->Win[v1][0] );
-   TLVertices[5].sy      = D3DVAL( (height - VB->Win[v1][1]) );
-   TLVertices[5].sz      = D3DVAL( (VB->Win[v1][2] + ctx->PolygonZoffset) );
-   TLVertices[5].tu      = D3DVAL( VB->TexCoord[v1][0] );
-   TLVertices[5].tv      = D3DVAL( VB->TexCoord[v1][1] );
-   TLVertices[5].rhw     = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-   TLVertices[5].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                           (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-   /* Draw the two triangles. */
-   DrawPrimitiveHAL( pContext->pShared, D3DPT_TRIANGLELIST, &TLVertices[0], 6 );
-}
-/*===========================================================================*/
-/*                                                                           */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-void	RenderOneTriangle( GLcontext *ctx, GLuint v1, GLuint v2, GLuint v3, GLuint pv )
-{
-  D3DMESACONTEXT       	*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  struct vertex_buffer 	*VB = ctx->VB;
-  int                  	height = (pContext->pShared->rectW.bottom - pContext->pShared->rectW.top);
-  DWORD                	dwPVColor;
-  static D3DTLVERTEX   	TLVertices[3];
-
-  DPF(( DBG_FUNC, "RenderOneTriangle" ));
-  DPF(( DBG_PRIM_INFO, "RenderTriangle( 1 )" ));
-
-  /*=====================================*/
-  /* Populate the the triangle vertices. */
-  /*=====================================*/
-  if ( ctx->Light.ShadeModel == GL_FLAT )
-    dwPVColor = (VB->Color[pv][3]<<24) | (VB->Color[pv][0]<<16) | (VB->Color[pv][1]<<8) | VB->Color[pv][2];
-
-  TLVertices[0].sx      = D3DVAL( VB->Win[v1][0] );
-  TLVertices[0].sy      = D3DVAL( (height - VB->Win[v1][1]) );
-  TLVertices[0].sz      = D3DVAL( (VB->Win[v1][2] + ctx->PolygonZoffset) );
-  TLVertices[0].tu      = D3DVAL( VB->TexCoord[v1][0] );
-  TLVertices[0].tv      = D3DVAL( VB->TexCoord[v1][1] );
-  TLVertices[0].rhw     = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-  TLVertices[0].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                          (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-  DPF(( DBG_PRIM_INFO, "V1 -> x:%f y:%f z:%f c:%x",
-	   TLVertices[0].sx,
-	   TLVertices[0].sy,
-	   TLVertices[0].sz,
-	   TLVertices[0].color ));
-
-  TLVertices[1].sx      = D3DVAL( VB->Win[v2][0] );
-  TLVertices[1].sy      = D3DVAL( (height - VB->Win[v2][1]) );
-  TLVertices[1].sz      = D3DVAL( (VB->Win[v2][2] + ctx->PolygonZoffset) );
-  TLVertices[1].tu      = D3DVAL( VB->TexCoord[v2][0] );
-  TLVertices[1].tv      = D3DVAL( VB->TexCoord[v2][1] );
-  TLVertices[1].rhw     = D3DVAL( (1.0 / VB->Clip[v2][3]) );
-  TLVertices[1].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                          (VB->Color[v2][3]<<24) | (VB->Color[v2][0]<<16) | (VB->Color[v2][1]<<8) | VB->Color[v2][2];
-  DPF(( DBG_PRIM_INFO, "V2 -> x:%f y:%f z:%f c:%x",
-	   TLVertices[1].sx,
-	   TLVertices[1].sy,
-	   TLVertices[1].sz,
-	   TLVertices[1].color ));
-
-  TLVertices[2].sx      = D3DVAL( VB->Win[v3][0] );
-  TLVertices[2].sy      = D3DVAL( (height - VB->Win[v3][1]) );
-  TLVertices[2].sz      = D3DVAL( (VB->Win[v3][2] + ctx->PolygonZoffset) );
-  TLVertices[2].tu      = D3DVAL( VB->TexCoord[v3][0] );
-  TLVertices[2].tv      = D3DVAL( VB->TexCoord[v3][1] );
-  TLVertices[2].rhw     = D3DVAL( (1.0 / VB->Clip[v3][3]) );
-  TLVertices[2].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                          (VB->Color[v3][3]<<24) | (VB->Color[v3][0]<<16) | (VB->Color[v3][1]<<8) | VB->Color[v3][2];
-  DPF(( DBG_PRIM_INFO, "V3 -> x:%f y:%f z:%f c:%x",
-	   TLVertices[2].sx,
-	   TLVertices[2].sy,
-	   TLVertices[2].sz,
-	   TLVertices[2].color ));
-
-  /* Draw the triangle. */
-  DrawPrimitiveHAL( pContext->pShared, D3DPT_TRIANGLELIST, &TLVertices[0], 3 );
-}
-/*===========================================================================*/
-/*                                                                           */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-void RenderOneLine( GLcontext *ctx, GLuint v1, GLuint v2, GLuint pv )
-{
-  D3DMESACONTEXT     	*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  struct vertex_buffer 	*VB = ctx->VB;
-  int                  	height = (pContext->pShared->rectW.bottom - pContext->pShared->rectW.top);
-  DWORD                	dwPVColor;
-  static D3DTLVERTEX	TLVertices[2];
-
-  DPF(( DBG_FUNC, "RenderOneLine" ));
-  DPF(( DBG_PRIM_INFO, "RenderLine( 1 )" ));
-
-  if ( VB->MonoColor )
-    dwPVColor = (pContext->aCurrent<<24) | (pContext->rCurrent<<16) | (pContext->gCurrent<<8) | pContext->bCurrent;
-  else 	
-    dwPVColor = (VB->Color[pv][3]<<24) | (VB->Color[pv][0]<<16) | (VB->Color[pv][1]<<8) | VB->Color[pv][2];
-
-   TLVertices[0].sx      = D3DVAL( VB->Win[v1][0] );
-   TLVertices[0].sy      = D3DVAL( (height - VB->Win[v1][1]) );
-   TLVertices[0].sz      = D3DVAL( (VB->Win[v1][2] + ctx->LineZoffset) );
-   TLVertices[0].tu      = D3DVAL( VB->TexCoord[v1][0] );
-   TLVertices[0].tv      = D3DVAL( VB->TexCoord[v1][1] );
-   TLVertices[0].rhw     = D3DVAL( (1.0 / VB->Clip[v1][3]) );
-   TLVertices[0].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                           (VB->Color[v1][3]<<24) | (VB->Color[v1][0]<<16) | (VB->Color[v1][1]<<8) | VB->Color[v1][2];
-
-   TLVertices[1].sx      = D3DVAL( VB->Win[v2][0] );
-   TLVertices[1].sy      = D3DVAL( (height - VB->Win[v2][1]) );
-   TLVertices[1].sz      = D3DVAL( (VB->Win[v2][2] + ctx->LineZoffset) );
-   TLVertices[1].tu      = D3DVAL( VB->TexCoord[v2][0] );
-   TLVertices[1].tv      = D3DVAL( VB->TexCoord[v2][1] );
-   TLVertices[1].rhw     = D3DVAL( (1.0 / VB->Clip[v2][3]) );
-   TLVertices[1].color   = (ctx->Light.ShadeModel == GL_FLAT) ? dwPVColor :
-                           (VB->Color[v2][3]<<24) | (VB->Color[v2][0]<<16) | (VB->Color[v2][1]<<8) | VB->Color[v2][2];
-
-   /* Draw line from (x0,y0) to (x1,y1) with current pixel color/index */
-   DrawPrimitiveHAL( pContext->pShared, D3DPT_LINELIST, &TLVertices[0], 2 );
-}
-/*===========================================================================*/
-/*  This function was written to convert points into triangles.  I did this  */
-/* as all card accelerate triangles and most drivers do this anyway.  In hind*/
-/* thought this might be a bad idea as some cards do better.                 */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void RenderPointsVB( GLcontext *ctx, GLuint start, GLuint end )
-{
-  D3DMESACONTEXT 		*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  struct vertex_buffer 	*VB = ctx->VB;
-  struct pixel_buffer 	*PB = ctx->PB;
-  GLuint 				index;
-  GLfloat                radius, z,
-                         xmin, ymin,
-                         xmax, ymax;
-  GLint				cVertex,
-                         height = (pContext->pShared->rectW.bottom - pContext->pShared->rectW.top);
-  DWORD				dwPVColor;
-
-  DPF(( DBG_FUNC, "RenderPointsVB();" ));
-
-  radius = CLAMP( ctx->Point.Size, MIN_POINT_SIZE, MAX_POINT_SIZE ) * 0.5F;
-
-  for( index = start, cVertex = 0; index <= end; index++ )
-  {
-    if ( VB->ClipMask[index] == 0 )
-    {
-	 xmin = D3DVAL( VB->Win[index][0] - radius );
-	 xmax = D3DVAL( VB->Win[index][0] + radius );
-	 ymin = D3DVAL( height - VB->Win[index][1] - radius );
-	 ymax = D3DVAL( height - VB->Win[index][1] + radius );
-	 z    = D3DVAL( (VB->Win[index][2] + ctx->PointZoffset) );
-
-	 dwPVColor = (VB->Color[index][3]<<24) |
-	             (VB->Color[index][0]<<16) |
-	             (VB->Color[index][1]<<8) |
-                  VB->Color[index][2];
-
-	 D3DTLVertices[cVertex].sx	  = xmin;
-	 D3DTLVertices[cVertex].sy      = ymax;
-	 D3DTLVertices[cVertex].sz      = z;
-	 D3DTLVertices[cVertex].tu      = 0.0;
-	 D3DTLVertices[cVertex].tv      = 0.0;
-	 D3DTLVertices[cVertex].rhw     = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	 D3DTLVertices[cVertex++].color = dwPVColor;
-
-	 D3DTLVertices[cVertex].sx      = xmin;
-	 D3DTLVertices[cVertex].sy      = ymin;
-	 D3DTLVertices[cVertex].sz      = z;
-	 D3DTLVertices[cVertex].tu      = 0.0;
-	 D3DTLVertices[cVertex].tv      = 0.0;
-	 D3DTLVertices[cVertex].rhw     = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	 D3DTLVertices[cVertex++].color = dwPVColor;
-
-	 D3DTLVertices[cVertex].sx      = xmax;
-	 D3DTLVertices[cVertex].sy      = ymin;
-	 D3DTLVertices[cVertex].sz      = z;
-	 D3DTLVertices[cVertex].tu      = 0.0;
-	 D3DTLVertices[cVertex].tv      = 0.0;
-	 D3DTLVertices[cVertex].rhw     = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	 D3DTLVertices[cVertex++].color = dwPVColor;
-
-	 D3DTLVertices[cVertex].sx      = xmax;
-	 D3DTLVertices[cVertex].sy      = ymin;
-	 D3DTLVertices[cVertex].sz      = z;
-	 D3DTLVertices[cVertex].tu      = 0.0;
-	 D3DTLVertices[cVertex].tv      = 0.0;
-	 D3DTLVertices[cVertex].rhw     = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	 D3DTLVertices[cVertex++].color = dwPVColor;
-
-	 D3DTLVertices[cVertex].sx	  = xmax;
-	 D3DTLVertices[cVertex].sy      = ymax;
-	 D3DTLVertices[cVertex].sz      = z;
-	 D3DTLVertices[cVertex].tu      = 0.0;
-	 D3DTLVertices[cVertex].tv      = 0.0;
-	 D3DTLVertices[cVertex].rhw     = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	 D3DTLVertices[cVertex++].color = dwPVColor;
-
-	 D3DTLVertices[cVertex].sx	  = xmin;
-	 D3DTLVertices[cVertex].sy      = ymax;
-	 D3DTLVertices[cVertex].sz      = z;
-	 D3DTLVertices[cVertex].tu      = 0.0;
-	 D3DTLVertices[cVertex].tv      = 0.0;
-	 D3DTLVertices[cVertex].rhw     = D3DVAL( (1.0 / VB->Clip[index][3]) );
-	 D3DTLVertices[cVertex++].color = dwPVColor;
-    }
-  }
-
-  /* Render the converted vertex buffer. */
-  if ( cVertex )
-    DrawPrimitiveHAL( pContext->pShared, D3DPT_TRIANGLELIST, &D3DTLVertices[0], cVertex );
-}
-/*===========================================================================*/
-/*  This gets call before we render any primitives so that the current OGL   */
-/* states will be mapped the D3D context.  I'm still not sure how D3D works  */
-/* but I'm finding that it doesn't act like a state machine as OGL is.  It   */
-/* looks like the state gets set back to the defaults after a DrawPrimitives */
-/* or an EndScene.  Also I set states that are the default even though this  */
-/* is redundant as the defaults seem screwed up.                             */
-/* TODO: make a batch call.                                                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void SetRenderStates( GLcontext *ctx )
-{
-   D3DMESACONTEXT	*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DWORD          	dwFunc;
-   static	BOOL		bTexture = FALSE;
-   static int		texName = -1;
-
-   DPF(( DBG_FUNC, "SetRenderStates();" ));
-
-   if ( g_DBGMask & DBG_STATES )
-	DebugRenderStates( ctx, FALSE );
-
-   SetStateHAL( pContext->pShared, D3DRENDERSTATE_CULLMODE, D3DCULL_NONE );
-   SetStateHAL( pContext->pShared, D3DRENDERSTATE_DITHERENABLE, (ctx->Color.DitherFlag) ? TRUE : FALSE );
-
-   /*================================================*/
-   /* Check too see if there are new TEXTURE states. */
-   /*================================================*/
-   if ( ctx->Texture._EnabledUnits )
-   {
-      switch( ctx->Texture.Set[ctx->Texture.CurrentSet].EnvMode )
-      {
-        case GL_MODULATE:
-		if ( ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Format == GL_RGBA )
-		  dwFunc = pContext->pShared->dwTexFunc[d3dtblend_modulatealpha];
-		else
-		  dwFunc = pContext->pShared->dwTexFunc[d3dtblend_modulate];
-		break;
-
-	   case GL_BLEND:
-		dwFunc = pContext->pShared->dwTexFunc[d3dtblend_decalalpha];
-		break;
-
-        case GL_REPLACE:
-		dwFunc = pContext->pShared->dwTexFunc[d3dtblend_decal];
-		break;
-
-        case GL_DECAL:
-		if ( ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Format == GL_RGBA )
-		  dwFunc = pContext->pShared->dwTexFunc[d3dtblend_decalalpha];
-		else
-		  dwFunc = pContext->pShared->dwTexFunc[d3dtblend_decal];
-		break;
-      }
-      SetStateHAL( pContext->pShared, D3DRENDERSTATE_TEXTUREMAPBLEND, dwFunc );
-
-      switch( ctx->Texture.Set[ctx->Texture.CurrentSet].Current->MagFilter )
-      {
-	   case GL_NEAREST:
-		dwFunc = D3DFILTER_NEAREST;
-		break;
-        case GL_LINEAR:
-		dwFunc = D3DFILTER_LINEAR;
-		break;
-        case GL_NEAREST_MIPMAP_NEAREST:
-		dwFunc = D3DFILTER_MIPNEAREST;
-		break;
-        case GL_LINEAR_MIPMAP_NEAREST:
-		dwFunc = D3DFILTER_LINEARMIPNEAREST;
-		break;
-        case GL_NEAREST_MIPMAP_LINEAR:
-		dwFunc = D3DFILTER_MIPLINEAR;
-		break;
-        case GL_LINEAR_MIPMAP_LINEAR:
-		dwFunc = D3DFILTER_LINEARMIPLINEAR;
-		break;
-      }
-      SetStateHAL( pContext->pShared, D3DRENDERSTATE_TEXTUREMAG, dwFunc );
-
-      switch( ctx->Texture.Set[ctx->Texture.CurrentSet].Current->MinFilter )
-      {
-	   case GL_NEAREST:
-		dwFunc = D3DFILTER_NEAREST;
-		break;
-        case GL_LINEAR:
-		dwFunc = D3DFILTER_LINEAR;
-		break;
-        case GL_NEAREST_MIPMAP_NEAREST:
-		dwFunc = D3DFILTER_MIPNEAREST;
-		break;
-        case GL_LINEAR_MIPMAP_NEAREST:
-		dwFunc = D3DFILTER_LINEARMIPNEAREST;
-		break;
-        case GL_NEAREST_MIPMAP_LINEAR:
-		dwFunc = D3DFILTER_MIPLINEAR;
-		break;
-        case GL_LINEAR_MIPMAP_LINEAR:
-		dwFunc = D3DFILTER_LINEARMIPLINEAR;
-		break;
-      }
-      SetStateHAL( pContext->pShared, D3DRENDERSTATE_TEXTUREMIN, dwFunc  );
-
-	 /* Another hack to cut down on redundant texture binding. */
-	 //	 if ( texName != ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Name )
-	 //	 {
-	   texName = ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Name;
-	   CreateTMgrHAL( pContext->pShared,
-				   texName,
-				   0,
-				   ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Format,
-				   (RECT *)NULL,
-				   ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Width,
-				   ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Height,
-				   TM_ACTION_BIND,
-				   (void *)ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Data );
-	   //	 }
-	 bTexture = TRUE;
-   }
-   else
-   {
-	/* This is nasty but should cut down on the number of redundant calls. */
-	if ( bTexture == TRUE )
-	{
-	  DisableTMgrHAL( pContext->pShared );
-	  bTexture = FALSE;
-	}
-   }
-
-   /*===============================================*/
-   /* Check too see if there are new RASTER states. */
-   /*===============================================*/
-
-   // TODO: no concept of front & back.
-   switch( ctx->Polygon.FrontMode )
-   {
-     case GL_POINT:
-	  SetStateHAL( pContext->pShared, D3DRENDERSTATE_FILLMODE, D3DFILL_POINT );
-	  break;
-     case GL_LINE:
-	  SetStateHAL( pContext->pShared, D3DRENDERSTATE_FILLMODE, D3DFILL_WIREFRAME );
-	  break;
-     case GL_FILL:
-	  SetStateHAL( pContext->pShared, D3DRENDERSTATE_FILLMODE, D3DFILL_SOLID );
-	  break;
-   }
-
-   /*************/
-   /* Z-Buffer. */
-   /*************/
-   if ( ctx->Depth.Test == GL_TRUE )
-   {
-	switch( ctx->Depth.Func )
-	{
-	  case GL_NEVER:
-	    dwFunc = D3DCMP_NEVER;
-	    break;
-	  case GL_LESS:
-	    dwFunc = D3DCMP_LESS;
-	    break;
-  	  case GL_GEQUAL:
-	    dwFunc = D3DCMP_GREATEREQUAL;
-	    break;
-  	  case GL_LEQUAL:
-	    dwFunc = D3DCMP_LESSEQUAL;
-	    break;
-	  case GL_GREATER:
-	    dwFunc = D3DCMP_GREATER;
-	    break;
-	  case GL_NOTEQUAL:
-	    dwFunc = D3DCMP_NOTEQUAL;
-	    break;
-	  case GL_EQUAL:
-	    dwFunc = D3DCMP_EQUAL;
-	    break;
-	  case GL_ALWAYS:
-	    dwFunc = D3DCMP_ALWAYS;
-	    break;
-	}
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_ZFUNC, dwFunc );
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_ZENABLE, TRUE );
-   }	
-   else
-   {
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_ZENABLE, FALSE );
-   }
-
-   /*******************/
-   /* Z-Write Enable. */
-   /*******************/
-   SetStateHAL( pContext->pShared, D3DRENDERSTATE_ZWRITEENABLE , (ctx->Depth.Mask == GL_TRUE) ? TRUE : FALSE );
-
-   /***************/
-   /* Alpha test. */
-   /***************/
-   if ( ctx->Color.AlphaEnabled == GL_TRUE )
-   {
-	switch( ctx->Color.AlphaFunc )
-     {
-	  case GL_NEVER:
-	    dwFunc = D3DCMP_NEVER;
-	    break;
-	  case GL_LESS:
-	    dwFunc = D3DCMP_LESS;
-	    break;
-  	  case GL_GEQUAL:
-	    dwFunc = D3DCMP_GREATEREQUAL;
-	    break;
-  	  case GL_LEQUAL:
-	    dwFunc = D3DCMP_LESSEQUAL;
-	    break;
-	  case GL_GREATER:
-	    dwFunc = D3DCMP_GREATER;
-	    break;
-	  case GL_NOTEQUAL:
-	    dwFunc = D3DCMP_NOTEQUAL;
-	    break;
-	  case GL_EQUAL:
-	    dwFunc = D3DCMP_EQUAL;
-	    break;
-	  case GL_ALWAYS:
-	    dwFunc = D3DCMP_ALWAYS;
-	    break;
-	}
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_ALPHAFUNC , dwFunc );
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_ALPHATESTENABLE, TRUE );
-   }
-   else
-   {
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_ALPHATESTENABLE, FALSE );
-   }
-
-   /****************/
-   /* Alpha blend. */
-   /****************/
-   if ( ctx->Color.BlendEnabled == GL_TRUE )
-   {
-	switch( ctx->Color.BlendSrc )
-	{
-	  case GL_ZERO:	    			
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_zero];
-	    break;
-       case GL_ONE:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_one];
-	    break;
-       case GL_DST_COLOR:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_dst_color];
-	    break;
-       case GL_ONE_MINUS_DST_COLOR:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_one_minus_dst_color];
-	    break;
-       case GL_SRC_ALPHA:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_src_alpha];
-	    break;
-       case GL_ONE_MINUS_SRC_ALPHA:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_one_minus_src_alpha];
-	    break;
-       case GL_DST_ALPHA:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_dst_alpha];
-	    break;
-       case GL_ONE_MINUS_DST_ALPHA:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_one_minus_dst_alpha];
-	    break;
-       case GL_SRC_ALPHA_SATURATE:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_src_alpha_saturate];
-	    break;
-       case GL_CONSTANT_COLOR:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_constant_color];
-	    break;
-       case GL_ONE_MINUS_CONSTANT_COLOR:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_one_minus_constant_color];
-	    break;
-       case GL_CONSTANT_ALPHA:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_constant_alpha];
-	    break;
-       case GL_ONE_MINUS_CONSTANT_ALPHA:
-	    dwFunc = pContext->pShared->dwSrcBlendCaps[s_one_minus_constant_alpha];
-	    break;
-	}
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_SRCBLEND, dwFunc );
-
-	switch( ctx->Color.BlendDst )
-	{
-       case GL_ZERO:                  	
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_zero];
-	    break;
-       case GL_ONE:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_one];
-	    break;
-       case GL_SRC_COLOR:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_src_color];
-	    break;
-       case GL_ONE_MINUS_SRC_COLOR:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_one_minus_src_color];
-	    break;
-       case GL_SRC_ALPHA:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_src_alpha];
-	    break;
-       case GL_ONE_MINUS_SRC_ALPHA:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_one_minus_src_alpha];
-	    break;
-       case GL_DST_ALPHA:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_dst_alpha];
-	    break;
-       case GL_ONE_MINUS_DST_ALPHA:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_one_minus_dst_alpha];
-	    break;
-       case GL_CONSTANT_COLOR:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_constant_color];
-	    break;
-       case GL_ONE_MINUS_CONSTANT_COLOR:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_one_minus_constant_color];
-	    break;
-       case GL_CONSTANT_ALPHA:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_constant_alpha];
-	    break;
-       case GL_ONE_MINUS_CONSTANT_ALPHA:
-	    dwFunc = pContext->pShared->dwDestBlendCaps[d_one_minus_constant_alpha];
-	    break;
-	}
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_DESTBLEND, dwFunc );
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE );
-   }
-   else
-   {
-	SetStateHAL( pContext->pShared, D3DRENDERSTATE_ALPHABLENDENABLE, FALSE );
-   }
-}
-/*===========================================================================*/
-/*  If this function is called it will track the changes to the current      */
-/* states that I'm setting in Direct3D.  I did this so that the DPF's would  */
-/* be under control!                                                         */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void DebugRenderStates( GLcontext *ctx, BOOL bForce )
-{
-   D3DMESACONTEXT	*pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DWORD			dwFunc;
-   static int		dither = -1,
-	               texture = -1,
-                    textName = -1,
-	               textEnv = -1,
-                    textMin = -1,
-                    textMag = -1,
-                    polyMode = -1,
-	               depthTest = -1,
-	               depthFunc = -1,
-	               depthMask = -1,
-	               alphaTest = -1,
-                    alphaFunc = -1,
-	               blend = -1,
-                    blendSrc = -1,
-                    blendDest = -1;
-
-   /* Force a displayed update of all current states. */
-   if ( bForce )
-   {
-	dither = texture = textName = textEnv = textMin = textMag = -1;
-	polyMode = depthTest = depthFunc = depthMask = -1;
-	alphaTest = alphaFunc = blend = blendSrc = blendDest = -1;
-   }
-
-   if ( dither != ctx->Color.DitherFlag )
-   {
-	dither = ctx->Color.DitherFlag;
-	DPF(( 0, "\tDither\t\t%s", (dither) ? "ENABLED" : "--------" ));
-   }
-   if ( depthTest != ctx->Depth.Test )
-   {
-	depthTest = ctx->Depth.Test;
-	DPF(( 0, "\tDepth Test\t%s", (depthTest) ? "ENABLED" : "--------" ));
-   }
-   if ( alphaTest != ctx->Color.AlphaEnabled )
-   {	
-	alphaTest = ctx->Color.AlphaEnabled;
-	
-	DPF(( 0, "\tAlpha Test\t%s", (alphaTest) ? "ENABLED" : "--------" ));
-   }
-   if ( blend != ctx->Color.BlendEnabled )
-   {	
-	blend = ctx->Color.BlendEnabled;
-	
-	DPF(( 0, "\tBlending\t%s", (blend) ? "ENABLED" : "--------" ));
-   }
-
-   /*================================================*/
-   /* Check too see if there are new TEXTURE states. */
-   /*================================================*/
-   if ( texture != ctx->Texture._EnabledUnits )
-   {
-	texture = ctx->Texture._EnabledUnits;
-	DPF(( 0, "\tTexture\t\t%s", (texture) ? "ENABLED" : "--------" ));
-   }	
-
-   if ( ctx->Texture.Set[ctx->Texture.CurrentSet].Current )
-   {
-	if ( ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Name != textName )
-	{
-	  textName = ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Name;
-	  DPF(( 0, "\tTexture Name:\t%d", textName ));
-	  DPF(( 0, "\tTexture Format:\t%s",
-		   (ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Format == GL_RGBA) ?
-		   "GL_RGBA" : "GLRGB" ));
-	}
-
-	if ( textEnv != ctx->Texture.Set[ctx->Texture.CurrentSet].EnvMode )
-	{
-	  textEnv = ctx->Texture.Set[ctx->Texture.CurrentSet].EnvMode;
-
-	  switch( textEnv )
-	  {
-       case GL_MODULATE:
-	    DPF(( 0, "\tTexture\tMode\tGL_MODULATE" ));
-	    break;
-       case GL_BLEND:
-	    DPF(( 0, "\tTexture\tMode\tGL_BLEND" ));
-	    break;
-       case GL_REPLACE:
-	    DPF(( 0, "\tTexture\tMode\tGL_REPLACE" ));
-	    break;
-       case GL_DECAL:
-	    DPF(( 0, "\tTexture\tMode\tGL_DECAL" ));
-	    break;
-	  }
-	}
-
-	if ( textMag != ctx->Texture.Set[ctx->Texture.CurrentSet].Current->MagFilter )
-	{
-	  textMag = ctx->Texture.Set[ctx->Texture.CurrentSet].Current->MagFilter;
-	
-	  switch( textMag )
-	  {
-       case GL_NEAREST:
-	    DPF(( 0, "\tTexture MAG\tGL_NEAREST" ));
-	    break;
-       case GL_LINEAR:
-	    DPF(( 0, "\tTexture MAG\tGL_LINEAR" ));
-	    break;
-       case GL_NEAREST_MIPMAP_NEAREST:
-	    DPF(( 0, "\tTexture MAG\tGL_NEAREST_MIPMAP_NEAREST" ));
-	    break;
-       case GL_LINEAR_MIPMAP_NEAREST:
-	    DPF(( 0, "\tTexture MAG\tGL_LINEAR_MIPMAP_NEAREST" ));
-	    break;
-       case GL_NEAREST_MIPMAP_LINEAR:
-	    DPF(( 0, "\tTexture MAG\tGL_NEAREST_MIPMAP_LINEAR" ));
-	    break;
-       case GL_LINEAR_MIPMAP_LINEAR:
-	    DPF(( 0, "\tTexture MAG\tGL_LINEAR_MIPMAP_LINEAR" ));
-	    break;
-	  }
-	}
-
-	if ( textMin != ctx->Texture.Set[ctx->Texture.CurrentSet].Current->MinFilter )
-	{
-	  textMin = ctx->Texture.Set[ctx->Texture.CurrentSet].Current->MinFilter;
-
-	  switch( textMin )
-	  {
-       case GL_NEAREST:
-	    DPF(( 0, "\tTexture MIN\tGL_NEAREST" ));
-	    break;
-       case GL_LINEAR:
-	    DPF(( 0, "\tTexture MIN\tGL_LINEAR" ));
-	    break;
-       case GL_NEAREST_MIPMAP_NEAREST:
-	    DPF(( 0, "\tTexture MIN\tGL_NEAREST_MIPMAP_NEAREST" ));
-	    break;
-       case GL_LINEAR_MIPMAP_NEAREST:
-	    DPF(( 0, "\tTexture MIN\tGL_LINEAR_MIPMAP_NEAREST" ));
-	    break;
-       case GL_NEAREST_MIPMAP_LINEAR:
-	    DPF(( 0, "\tTexture MIN\tGL_LINEAR_MIPMAP_LINEAR" ));
-	    break;
-       case GL_LINEAR_MIPMAP_LINEAR:
-	    DPF(( 0, "\tTexture MIN\tGL_LINEAR_MIPMAP_LINEAR" ));
-	    break;
-	  }
-	}	
-   }
-
-   if ( ctx->Polygon.FrontMode != polyMode )
-   {
-	polyMode = ctx->Polygon.FrontMode;
-
-	switch( polyMode )
-	{
-       case GL_POINT:
-	    DPF(( 0, "\tMode\t\tGL_POINT" ));
-	    break;
-       case GL_LINE:
-	    DPF(( 0, "\tMode\t\tGL_LINE" ));
-	    break;
-       case GL_FILL:
-	    DPF(( 0, "\tMode\t\tGL_FILL" ));
-	    break;
-	}
-   }
-
-   if ( depthFunc != ctx->Depth.Func )
-   {
-	depthFunc = ctx->Depth.Func;
-
-	switch( depthFunc )
-	{
-       case GL_NEVER:
-	    DPF(( 0, "\tDepth Func\tGL_NEVER" ));
-	    break;
-       case GL_LESS:
-	    DPF(( 0, "\tDepth Func\tGL_LESS" ));
-	    break;
-       case GL_GEQUAL:
-	    DPF(( 0, "\tDepth Func\tGL_GEQUAL" ));
-	    break;
-       case GL_LEQUAL:
-	    DPF(( 0, "\tDepth Func\tGL_LEQUAL" ));
-	    break;
-       case GL_GREATER:
-	    DPF(( 0, "\tDepth Func\tGL_GREATER" ));
-	    break;
-       case GL_NOTEQUAL:
- 	    DPF(( 0, "\tDepth Func\tGL_NOTEQUAL" ));
-	    break;
-       case GL_EQUAL:
-	    DPF(( 0, "\tDepth Func\tGL_EQUAL" ));
-	    break;
-       case GL_ALWAYS:
-	    DPF(( 0, "\tDepth Func\tGL_ALWAYS" ));
-	    break;
-	}
-   }	
-
-   if ( depthMask != ctx->Depth.Mask )
-   {
-	depthMask = ctx->Depth.Mask;
-	DPF(( 0, "\tZWrite\t\t%s", (depthMask) ? "ENABLED" : "--------" ));
-   }
-
-   if ( alphaFunc != ctx->Color.AlphaFunc )
-   {
-	alphaFunc = ctx->Color.AlphaFunc;
-
-	switch( alphaFunc )
-     {
-	  case GL_NEVER:
-	    DPF(( 0, "\tAlpha Func\tGL_NEVER" ));
-	    break;
-	  case GL_LESS:
-	    DPF(( 0, "\tAlpha Func\tGL_LESS" ));
-	    break;
-  	  case GL_GEQUAL:
-	    DPF(( 0, "\tAlpha Func\tGL_GEQUAL" ));
-	    break;
-  	  case GL_LEQUAL:
-	    DPF(( 0, "\tAlpha Func\tGL_LEQUAL" ));
-	    break;
-	  case GL_GREATER:
-	    DPF(( 0, "\tAlpha Func\tGL_GREATER" ));
-	    break;
-	  case GL_NOTEQUAL:
-	    DPF(( 0, "\tAlpha Func\tGL_NOTEQUAL" ));
-	    break;
-	  case GL_EQUAL:
-	    DPF(( 0, "\tAlpha Func\tGL_EQUAL" ));
-	    break;
-	  case GL_ALWAYS:
-	    DPF(( 0, "\tAlpha Func\tGL_ALWAYS" ));
-	    break;
-	}
-   }
-
-   if ( blendSrc != ctx->Color.BlendSrc )
-   {
-	blendSrc = ctx->Color.BlendSrc;
-
-	switch( blendSrc )
-	{
-	  case GL_ZERO:	    			
-	    DPF(( 0, "\tSRC Blend\tGL_ZERO" ));
-	    break;
-       case GL_ONE:
-	    DPF(( 0, "\tSRC Blend\tGL_ONE" ));
-	    break;
-       case GL_DST_COLOR:
-	    DPF(( 0, "\tSRC Blend\tGL_DST_COLOR" ));
-	    break;
-       case GL_ONE_MINUS_DST_COLOR:
-	    DPF(( 0, "\tSRC Blend\tGL_ONE_MINUS_DST_COLOR" ));
-	    break;
-       case GL_SRC_ALPHA:
-	    DPF(( 0, "\tSRC Blend\tGL_SRC_ALPHA" ));
-	    break;
-       case GL_ONE_MINUS_SRC_ALPHA:
-	    DPF(( 0, "\tSRC Blend\tGL_MINUS_SRC_ALPHA" ));
-	    break;
-       case GL_DST_ALPHA:
-	    DPF(( 0, "\tSRC Blend\tGL_DST_ALPHA" ));
-	    break;
-       case GL_ONE_MINUS_DST_ALPHA:
-	    DPF(( 0, "\tSRC Blend\tGL_ONE_MINUS_DST_ALPHA" ));
-	    break;
-       case GL_SRC_ALPHA_SATURATE:
-	    DPF(( 0, "\tSRC Blend\tGL_SRC_ALPHA_SATURATE" ));
-	    break;
-       case GL_CONSTANT_COLOR:
-	    DPF(( 0, "\tSRC Blend\tGL_CONSTANT_COLOR" ));
-	    break;
-       case GL_ONE_MINUS_CONSTANT_COLOR:
-	    DPF(( 0, "\tSRC Blend\tGL_ONE_MINUS_CONSTANT_COLOR" ));
-	    break;
-       case GL_CONSTANT_ALPHA:
-	    DPF(( 0, "\tSRC Blend\tGL_CONSTANT_ALPHA" ));
-	    break;
-       case GL_ONE_MINUS_CONSTANT_ALPHA:
-	    DPF(( 0, "\tSRC Blend\tGL_ONE_MINUS_CONSTANT_ALPHA" ));
-	    break;
-	}
-   }
-
-   if ( blendDest != ctx->Color.BlendDst )
-   {
-	blendDest = ctx->Color.BlendDst;
-
-	switch( blendDest )
-	{
-       case GL_ZERO:                  	
-	    DPF(( 0, "\tDST Blend\tGL_ZERO" ));
-	    break;
-       case GL_ONE:
-	    DPF(( 0, "\tDST Blend\tGL_ONE" ));
-	    break;
-       case GL_SRC_COLOR:
-	    DPF(( 0, "\tDST Blend\tGL_SRC_COLOR" ));
-	    break;
-       case GL_ONE_MINUS_SRC_COLOR:
-	    DPF(( 0, "\tDST Blend\tGL_ONE_MINUS_SRC_COLOR" ));
-	    break;
-       case GL_SRC_ALPHA:
-	    DPF(( 0, "\tDST Blend\tGL_SRC_ALPHA" ));
-	    break;
-       case GL_ONE_MINUS_SRC_ALPHA:
-	    DPF(( 0, "\tDST Blend\tGL_ONE_MINUS_SRC_ALPHA" ));
-	    break;
-       case GL_DST_ALPHA:
-	    DPF(( 0, "\tDST Blend\tGL_DST_ALPHA" ));
-	    break;
-       case GL_ONE_MINUS_DST_ALPHA:
-	    DPF(( 0, "\tDST Blend\tGL_ONE_MINUS_DST_ALPHA" ));
-	    break;
-       case GL_CONSTANT_COLOR:
-	    DPF(( 0, "\tDST Blend\tGL_CONSTANT_COLOR" ));
-	    break;
-       case GL_ONE_MINUS_CONSTANT_COLOR:
-	    DPF(( 0, "\tDST Blend\tGL_ONE_MINUS_CONSTANT_COLOR" ));
-	    break;
-       case GL_CONSTANT_ALPHA:
-	    DPF(( 0, "\tDST Blend\tGL_CONSTANT_ALPHA" ));
-	    break;
-       case GL_ONE_MINUS_CONSTANT_ALPHA:
-	    DPF(( 0, "\tDST Blend\tGL_ONE_MINUS_CONSTANT_ALPHA" ));
-	    break;
-	}
-   }	
-}
diff --git a/src/mesa/drivers/d3d/DDrawPROCS.c b/src/mesa/drivers/d3d/DDrawPROCS.c
deleted file mode 100644
index 10dcfdbabb..0000000000
--- a/src/mesa/drivers/d3d/DDrawPROCS.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                	             */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include "D3DMesa.h"
-/*===========================================================================*/
-/*  This call will clear the render surface using the pixel info built from  */
-/* the surface at creation time.  The call uses Lock/Unlock to access the    */
-/* surface.  The call also special cases a full clear or a dirty rectangle.  */
-/*  Finally the call returns the new clear mask that reflects that the color */
-/* buffer was cleared.                                                       */
-/*===========================================================================*/
-/* RETURN: the original mask with the bits cleared that represents the buffer*/
-/* or buffers we just cleared.                                               */
-/*===========================================================================*/
-GLbitfield ClearBuffers( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DDSURFACEDESC2 *pddsd2;
-   UCHAR          *pBuffer,
-                  *pScanLine;
-   int            index,
-	              index2;
-   DWORD          dwColor;
-
-   if ( mask & GL_COLOR_BUFFER_BIT )
-   {
-	/* Lock the surface to get the surface pointer. */
-	pddsd2 = LockHAL( pContext->pShared, TRUE );
-   
-	/* Solve the color once only. */
-	dwColor =  ( ((DWORD)((float)pContext->rClear * pContext->pShared->pixel.rScale)) << pContext->pShared->pixel.rShift );
-	dwColor |= ( ((DWORD)((float)pContext->gClear * pContext->pShared->pixel.gScale)) << pContext->pShared->pixel.gShift );
-	dwColor |= ( ((DWORD)((float)pContext->bClear * pContext->pShared->pixel.bScale)) << pContext->pShared->pixel.bShift );
-   
-	if ( all ) 
-	{
-	  for( index = 0, pScanLine = (UCHAR *)pddsd2->lpSurface; index < pContext->pShared->dwHeight; index++, pScanLine += pddsd2->lPitch )
-	    for( pBuffer = pScanLine, index2 = 0; index2 < pContext->pShared->dwWidth; index2++, pBuffer += pContext->pShared->pixel.cb )
-               memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	}
-	else
-	{
-	  pScanLine = ((UCHAR *)pddsd2->lpSurface) +
-          	    ( (FLIP( pContext->pShared->dwHeight, (y+height)) * pddsd2->lPitch) + (x * pContext->pShared->pixel.cb) );
-
-	  for( index = 0; index < height; index++, pScanLine += pddsd2->lPitch )
-	  {
-	    for( index2 = 0, pBuffer = pScanLine; index2 < width; index2++, pBuffer += pContext->pShared->pixel.cb )
-		 memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	  }
-	}
-   
-	UnlockHAL( pContext->pShared, TRUE );
-   }
-   
-   return (mask & ~GL_COLOR_BUFFER_BIT);
-}
-/*===========================================================================*/
-/*  This proc (as all others) has been written for the general case. I use   */
-/* the PIXELINFO structure to pack the pixel from RGB24 to whatever the Off- */
-/* Screen render surface uses.  The alpha is ignored as Mesa does it in SW.  */
-/*===========================================================================*/
-/* RETURN:                                                                   */ 
-/*===========================================================================*/
-void WSpanRGB( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte rgb[][3], const GLubyte mask[] )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DDSURFACEDESC2 *pddsd2;
-   UCHAR          *pBuffer;
-   int            index;
-   DWORD          dwColor;
-
-   /* Get the surface pointer and the pitch. */
-   pddsd2 = LockHAL( pContext->pShared, TRUE );
-
-   /* Find the start of the span. Invert y for Windows. */
-   pBuffer = (UCHAR *)pddsd2->lpSurface + (FLIP(pContext->pShared->dwHeight,y) * pddsd2->lPitch) + (x*pContext->pShared->pixel.cb);
-
-   if ( mask ) 
-   {
-	for( index = 0; index < n; index++, pBuffer += pContext->pShared->pixel.cb )
-	{
-	  if ( mask[index] )
-	  {
-	    /* Pack the color components. */
-	    dwColor =  ( ((DWORD)((float)rgb[index][RCOMP] * pContext->pShared->pixel.rScale)) << pContext->pShared->pixel.rShift );
-	    dwColor |= ( ((DWORD)((float)rgb[index][GCOMP] * pContext->pShared->pixel.gScale)) << pContext->pShared->pixel.gShift );
-	    dwColor |= ( ((DWORD)((float)rgb[index][BCOMP] * pContext->pShared->pixel.bScale)) << pContext->pShared->pixel.bShift );
-	    memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	  }
-	}	
-   }
-   else
-   {
-	for( index = 0; index < n; index++, pBuffer += pContext->pShared->pixel.cb )
-	{
-	  /* Pack the color components. */
-	  dwColor =  ( ((DWORD)((float)rgb[index][RCOMP] * pContext->pShared->pixel.rScale)) << pContext->pShared->pixel.rShift );
-	  dwColor |= ( ((DWORD)((float)rgb[index][GCOMP] * pContext->pShared->pixel.gScale)) << pContext->pShared->pixel.gShift );
-	  dwColor |= ( ((DWORD)((float)rgb[index][BCOMP] * pContext->pShared->pixel.bScale)) << pContext->pShared->pixel.bShift );
-	  memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	}
-   }
-
-   /* Giver back. */
-   UnlockHAL( pContext->pShared, TRUE );
-}
-/*===========================================================================*/
-/*  This proc (as all others) has been written for the general case. I use   */
-/* the PIXELINFO structure to pack the pixel from RGB24 to whatever the Off- */
-/* Screen render surface uses.  The alpha is ignored as Mesa does it in SW.  */
-/*===========================================================================*/
-/* RETURN:                                                                   */ 
-/*===========================================================================*/
-void WSpanRGBA( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DDSURFACEDESC2 *pddsd2;
-   UCHAR          *pBuffer;
-   int            index;
-   DWORD          dwColor;
-
-   /* Get the surface pointer and the pitch. */
-   pddsd2 = LockHAL( pContext->pShared, TRUE );
-
-   /* Find the start of the span. Invert y for Windows. */
-   pBuffer = (UCHAR *)pddsd2->lpSurface + (FLIP(pContext->pShared->dwHeight,y) * pddsd2->lPitch) + (x*pContext->pShared->pixel.cb);
-
-   if ( mask ) 
-   {
-	for( index = 0; index < n; index++, pBuffer += pContext->pShared->pixel.cb )
-	{
-	  if ( mask[index] )
-	  {
-         /* Pack the color components. */
-	    dwColor =  ( ((DWORD)((float)rgba[index][RCOMP] * pContext->pShared->pixel.rScale)) << pContext->pShared->pixel.rShift );
-	    dwColor |= ( ((DWORD)((float)rgba[index][GCOMP] * pContext->pShared->pixel.gScale)) << pContext->pShared->pixel.gShift );
-	    dwColor |= ( ((DWORD)((float)rgba[index][BCOMP] * pContext->pShared->pixel.bScale)) << pContext->pShared->pixel.bShift );
-	    memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	  }
-	}	
-   }
-   else
-   {
-	for( index = 0; index < n; index++, pBuffer += pContext->pShared->pixel.cb )
-	{
-	  /* Pack the color components. */
-	  dwColor =  ( ((DWORD)((float)rgba[index][RCOMP] * pContext->pShared->pixel.rScale)) << pContext->pShared->pixel.rShift );
-	  dwColor |= ( ((DWORD)((float)rgba[index][GCOMP] * pContext->pShared->pixel.gScale)) << pContext->pShared->pixel.gShift );
-	  dwColor |= ( ((DWORD)((float)rgba[index][BCOMP] * pContext->pShared->pixel.bScale)) << pContext->pShared->pixel.bShift );
-	  memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	}
-   }
-
-   /* Giver back. */
-   UnlockHAL( pContext->pShared, TRUE );
-}
-/*===========================================================================*/
-/*  This proc (as all others) has been written for the general case. I use   */
-/* the PIXELINFO structure to pack the pixel from RGB24 to whatever the Off- */
-/* Screen render surface uses.  The color is solved once from the current    */
-/* color components.  The alpha is ignored as Mesa is doing it in SW.        */
-/*===========================================================================*/
-/* RETURN:                                                                   */ 
-/*===========================================================================*/
-void WSpanRGBAMono( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte mask[] )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DDSURFACEDESC2 *pddsd2;
-   UCHAR          *pBuffer;
-   int            index;
-   DWORD          dwColor;
-
-   /* Lock the surface to get the surface pointer and the pitch. */
-   pddsd2 = LockHAL( pContext->pShared, TRUE );
-
-   /* Solve the color once only. (no alpha) */
-   dwColor =  ( ((DWORD)((float)pContext->rCurrent * pContext->pShared->pixel.rScale)) << pContext->pShared->pixel.rShift );
-   dwColor |= ( ((DWORD)((float)pContext->gCurrent * pContext->pShared->pixel.gScale)) << pContext->pShared->pixel.gShift );
-   dwColor |= ( ((DWORD)((float)pContext->bCurrent * pContext->pShared->pixel.bScale)) << pContext->pShared->pixel.bShift );
-
-   /* Find the start of the span. Invert y for Windows. */
-   pBuffer = (UCHAR *)pddsd2->lpSurface + (FLIP(pContext->pShared->dwHeight,y) * pddsd2->lPitch) + (x*pContext->pShared->pixel.cb);
-
-   if ( mask ) 
-   {
-	for( index = 0; index < n; index++, pBuffer += pContext->pShared->pixel.cb )
-	  if ( mask[index] )
-	    memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-   }
-   else
-   {
-	for( index = 0; index < n; index++, pBuffer += pContext->pShared->pixel.cb )
-	  memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-   }
-
-   /* Giver back. */
-   UnlockHAL( pContext->pShared, TRUE );
-}
-/*===========================================================================*/
-/*  This proc (as all others) has been written for the general case. I use   */
-/* the PIXELINFO structure to pack the pixel from RGB24 to whatever the Off- */
-/* Screen render surface uses.  The alpha is ignored as Mesa does it in SW.  */
-/*===========================================================================*/
-/* RETURN:                                                                   */ 
-/*===========================================================================*/
-void WPixelsRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte rgba[][4], const GLubyte mask[] )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DDSURFACEDESC2 *pddsd2;
-   UCHAR          *pBuffer;
-   int            index;
-   DWORD          dwColor;
-
-   /* Get the surface pointer and the pitch. */
-   pddsd2 = LockHAL( pContext->pShared, TRUE );
-
-   if ( mask ) 
-   {
-	for( index = 0; index < n; index++ )
-	{
-	  if ( mask[index] )
-	  {
-	    /* Pack the color components. */
-	    dwColor =  ( ((DWORD)((float)rgba[index][RCOMP] * pContext->pShared->pixel.rScale)) << pContext->pShared->pixel.rShift );
-	    dwColor |= ( ((DWORD)((float)rgba[index][GCOMP] * pContext->pShared->pixel.gScale)) << pContext->pShared->pixel.gShift );
-	    dwColor |= ( ((DWORD)((float)rgba[index][BCOMP] * pContext->pShared->pixel.bScale)) << pContext->pShared->pixel.bShift );
-
-	    /* Find the pixel. Invert y for Windows. */
-	    pBuffer = (UCHAR *)pddsd2->lpSurface + (FLIP(pContext->pShared->dwHeight,y[index]) * pddsd2->lPitch) + (x[index]*pContext->pShared->pixel.cb);
-	    memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	  }
-	}
-   }
-   else
-   {
-	for( index = 0; index < n; index++ )
-	{
-	  /* Pack the color components. */
-	  dwColor =  ( ((DWORD)((float)rgba[index][RCOMP] * pContext->pShared->pixel.rScale)) << pContext->pShared->pixel.rShift );
-	  dwColor |= ( ((DWORD)((float)rgba[index][GCOMP] * pContext->pShared->pixel.gScale)) << pContext->pShared->pixel.gShift );
-	  dwColor |= ( ((DWORD)((float)rgba[index][BCOMP] * pContext->pShared->pixel.bScale)) << pContext->pShared->pixel.bShift );
-
-	  /* Find the pixel. Invert y for Windows. */
-	  pBuffer = (UCHAR *)pddsd2->lpSurface + (FLIP(pContext->pShared->dwHeight,y[index]) * pddsd2->lPitch) + (x[index]*pContext->pShared->pixel.cb);
-	  memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	}
-   }
-
-   /* Giver back. */
-   UnlockHAL( pContext->pShared, TRUE );
-}
-/*===========================================================================*/
-/*  This proc (as all others) has been written for the general case. I use   */
-/* the PIXELINFO structure to pack the pixel from RGB24 to whatever the Off- */
-/* Screen render surface uses.  The color is solved once from the current    */
-/* color components.  The alpha is ignored as Mesa is doing it in SW.        */
-/*===========================================================================*/
-/* RETURN:                                                                   */ 
-/*===========================================================================*/
-void WPixelsRGBAMono( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte mask[] )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DDSURFACEDESC2 *pddsd2;
-   UCHAR          *pBuffer;
-   int            index;
-   DWORD          dwColor;
-
-   /* Get the surface pointer and the pitch. */
-   pddsd2 = LockHAL( pContext->pShared, TRUE );
-
-   /* Solve the color once only. I don't uses the alpha. */
-   dwColor =  ( ((DWORD)((float)pContext->rCurrent * pContext->pShared->pixel.rScale)) << pContext->pShared->pixel.rShift );
-   dwColor |= ( ((DWORD)((float)pContext->gCurrent * pContext->pShared->pixel.gScale)) << pContext->pShared->pixel.gShift );
-   dwColor |= ( ((DWORD)((float)pContext->bCurrent * pContext->pShared->pixel.bScale)) << pContext->pShared->pixel.bShift );
-
-   if ( mask ) 
-   {
-	/* We store the surface pointer as a UCHAR so that pixel.cb (count in btyles) will work for all. */
-	for( index = 0; index < n; index++ )
-	{
-	  if ( mask[index] )
-	  {
-	    /* Find the pixel. Invert y for Windows. */
-	    pBuffer = (UCHAR *)pddsd2->lpSurface + (FLIP(pContext->pShared->dwHeight,y[index]) * pddsd2->lPitch) + (x[index]*pContext->pShared->pixel.cb);
-	    memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	  }
-	}
-   }
-   else
-   {
-	/* We store the surface pointer as a UCHAR so that pixel.cb (count in btyles) will work for all. */
-	for( index = 0; index < n; index++ )
-	{
-	  /* Find the pixel. Invert y for Windows. */
-	  pBuffer = (UCHAR *)pddsd2->lpSurface + (FLIP(pContext->pShared->dwHeight,y[index]) * pddsd2->lPitch) + (x[index]*pContext->pShared->pixel.cb);
-	  memcpy( pBuffer, &dwColor, pContext->pShared->pixel.cb );
-	}
-   }
-
-   /* Giver back. */
-   UnlockHAL( pContext->pShared, TRUE );
-}
-/*===========================================================================*/
-/*  This proc isn't written for speed rather its to handle the general case. */
-/* I grab each pixel from the surface and unpack the info using the PIXELINFO*/
-/* structure that was generated from the OffScreen surface pixelformat.  The */
-/* function will not fill in the alpha value as Mesa I have Mesa allocate its*/
-/* own alpha channel when the context was created.  I did this as I didn't   */
-/* feel that it was worth the effort to try and get HW to work (bus bound).  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-void RSpanRGBA( const GLcontext* ctx, GLuint n, GLint x, GLint y, GLubyte rgba[][4] )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DDSURFACEDESC2 *pddsd2;
-   UCHAR          *pBuffer;
-   int            index;
-   DWORD          *pdwColor;
-
-   /* Get the surface pointer and the pitch. */
-   pddsd2 = LockHAL( pContext->pShared, TRUE );
-
-   /* Find the start of the span. Invert y for Windows. */
-   pBuffer = (UCHAR *)pddsd2->lpSurface + 
-	                 (FLIP(pContext->pShared->dwHeight,y) * pddsd2->lPitch) + 
-	                 (x*pContext->pShared->pixel.cb);
-
-   /* We store the surface pointer as a UCHAR so that pixel.cb (count in btyles) will work for all. */
-   for( index = 0; index < n; index++, pBuffer += pContext->pShared->pixel.cb )
-   {
-	pdwColor = (DWORD *)pBuffer;
-	rgba[index][RCOMP] = (GLubyte)((float)((*pdwColor & pContext->pShared->pixel.dwRMask) >> pContext->pShared->pixel.rShift) / pContext->pShared->pixel.rScale);
-	rgba[index][GCOMP] = (GLubyte)((float)((*pdwColor & pContext->pShared->pixel.dwGMask) >> pContext->pShared->pixel.gShift) / pContext->pShared->pixel.gScale);
-	rgba[index][BCOMP] = (GLubyte)((float)((*pdwColor & pContext->pShared->pixel.dwBMask) >> pContext->pShared->pixel.bShift) / pContext->pShared->pixel.bScale);
-   }
-
-   /* Giver back. */
-   UnlockHAL( pContext->pShared, TRUE );
-}
-/*===========================================================================*/
-/*  This proc isn't written for speed rather its to handle the general case. */
-/* I grab each pixel from the surface and unpack the info using the PIXELINFO*/
-/* structure that was generated from the OffScreen surface pixelformat.  The */
-/* function will not fill in the alpha value as Mesa I have Mesa allocate its*/
-/* own alpha channel when the context was created.  I did this as I didn't   */
-/* feel that it was worth the effort to try and get HW to work (bus bound).  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-void RPixelsRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], GLubyte rgba[][4], const GLubyte mask[] )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   DDSURFACEDESC2 *pddsd2;
-   int            index;
-   DWORD          *pdwColor;
-
-   /* Get the surface pointer and the pitch. */
-   pddsd2 = LockHAL( pContext->pShared, TRUE );
-
-   if ( mask )
-   {
-	/* We store the surface pointer as a UCHAR so that pixel.cb (count in btyles) will work for all. */
-	for( index = 0; index < n; index++ )
-	{
-	  if ( mask[index] )
-	  {
-	    /* Find the start of the pixel. Invert y for Windows. */
-	    pdwColor = (DWORD *)((UCHAR *)pddsd2->lpSurface + (FLIP(pContext->pShared->dwHeight,y[index]) * pddsd2->lPitch) + (x[index]*pContext->pShared->pixel.cb));
-	    rgba[index][RCOMP] = (GLubyte)((float)((*pdwColor & pContext->pShared->pixel.dwRMask) >> pContext->pShared->pixel.rShift) / pContext->pShared->pixel.rScale);
-	    rgba[index][GCOMP] = (GLubyte)((float)((*pdwColor & pContext->pShared->pixel.dwGMask) >> pContext->pShared->pixel.gShift) / pContext->pShared->pixel.gScale);
-	    rgba[index][BCOMP] = (GLubyte)((float)((*pdwColor & pContext->pShared->pixel.dwBMask) >> pContext->pShared->pixel.bShift) / pContext->pShared->pixel.bScale);
-	  }
-	}
-   }
-   else
-   {
-	/* We store the surface pointer as a UCHAR so that pixel.cb (count in btyles) will work for all. */
-	for( index = 0; index < n; index++ )
-	{
-	  /* Find the start of the pixel. Invert y for Windows. */
-	  pdwColor = (DWORD *)((UCHAR *)pddsd2->lpSurface + (FLIP(pContext->pShared->dwHeight,y[index]) * pddsd2->lPitch) + (x[index]*pContext->pShared->pixel.cb));
-	  rgba[index][RCOMP] = (GLubyte)((float)((*pdwColor & pContext->pShared->pixel.dwRMask) >> pContext->pShared->pixel.rShift) / pContext->pShared->pixel.rScale);
-	  rgba[index][GCOMP] = (GLubyte)((float)((*pdwColor & pContext->pShared->pixel.dwGMask) >> pContext->pShared->pixel.gShift) / pContext->pShared->pixel.gScale);
-	  rgba[index][BCOMP] = (GLubyte)((float)((*pdwColor & pContext->pShared->pixel.dwBMask) >> pContext->pShared->pixel.bShift) / pContext->pShared->pixel.bScale);
-	}
-   }
-
-   /* Giver back. */
-   UnlockHAL( pContext->pShared, TRUE );
-}
diff --git a/src/mesa/drivers/d3d/DEBUG.C b/src/mesa/drivers/d3d/DEBUG.C
deleted file mode 100644
index 79e273903a..0000000000
--- a/src/mesa/drivers/d3d/DEBUG.C
+++ /dev/null
@@ -1,143 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include "Debug.h"
-/*===========================================================================*/
-/* Global variables.                                                         */
-/*===========================================================================*/
-DWORD	g_DBGMask = DBG_ALL_ERROR;
-/*===========================================================================*/
-/*  This is your basic DPF function with printf like support.  The function  */
-/* also works with a global debug mask variable.  I have written support that*/
-/* allows for the user's enviroment variable space to be read and set the    */
-/* masks.  This is done when the dll starts and is only in the debug version.*/
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-void _cdecl DebugPrint( int mask, char *pszFormat, ... )
-{
-  char	buffer[512];
-  va_list	args;
-
-  /* A mask of 0 will always pass. Easy to remeber. */
-  if ( (mask == 0) || (mask & g_DBGMask) ) 
-  {
-    va_start( args, pszFormat );
-
-    if ( mask & DBG_ALL_ERROR ) 
-	 OutputDebugString( "MesaD3D: (ERROR)" ); 
-    else
-	 OutputDebugString( "MesaD3D: " ); 
-
-    vsprintf( buffer, pszFormat, args );
-    strcat( buffer, "\n" );
-    OutputDebugString( buffer );
-
-    va_end( args );
-  }
-}
-/*===========================================================================*/
-/*  This call reads the users enviroment variables and sets any debug mask   */
-/* that they have set to TRUE.  Now the value must be "TRUE".                */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-void	ReadDBGEnv( void )
-{
-  g_DBGMask = DBG_ALL_ERROR;
-
-#define IS_VAR_SET(v)	if ( getenv( # v ) && !strcmp(getenv( # v ),"TRUE") ) g_DBGMask |= v;
-  
-  IS_VAR_SET( DBG_FUNC );
-  IS_VAR_SET( DBG_STATES );
-
-  IS_VAR_SET( DBG_CNTX_INFO );
-  IS_VAR_SET( DBG_CNTX_WARN );
-  IS_VAR_SET( DBG_CNTX_PROFILE );
-  IS_VAR_SET( DBG_CNTX_ERROR );
-  IS_VAR_SET( DBG_CNTX_ALL );
-
-  IS_VAR_SET( DBG_PRIM_INFO );
-  IS_VAR_SET( DBG_PRIM_WARN );
-  IS_VAR_SET( DBG_PRIM_PROFILE );
-  IS_VAR_SET( DBG_PRIM_ERROR );
-  IS_VAR_SET( DBG_PRIM_ALL );
-
-  IS_VAR_SET( DBG_TXT_INFO );
-  IS_VAR_SET( DBG_TXT_WARN );
-  IS_VAR_SET( DBG_TXT_PROFILE );
-  IS_VAR_SET( DBG_TXT_ERROR );
-  IS_VAR_SET( DBG_TXT_ALL );
-
-  IS_VAR_SET( DBG_ALL_INFO );
-  IS_VAR_SET( DBG_ALL_WARN );
-  IS_VAR_SET( DBG_ALL_PROFILE );
-  IS_VAR_SET( DBG_ALL_ERROR );
-  IS_VAR_SET( DBG_ALL );
-
-#undef IS_VAR_SET
-}
-/*===========================================================================*/
-/*  This function will take a pointer to a DDSURFACEDESC2 structure & display*/
-/* the parsed information using a DPF call.                                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-void	DebugPixelFormat( char *pszSurfaceName, DDPIXELFORMAT *pddpf )
-{
-  char	buffer[256];
-
-  /* Parse the flag type and write the string equivalent. */
-  if ( pddpf->dwFlags & DDPF_ALPHA )
-	strcat( buffer, "DDPF_ALPHA " );
-  if ( pddpf->dwFlags & DDPF_ALPHAPIXELS )
-	strcat( buffer, "DDPF_ALPHAPIXELS " );
-  if ( pddpf->dwFlags & DDPF_ALPHAPREMULT )
-	strcat( buffer, "DDPF_ALPHAPREMULT " );
-  if ( pddpf->dwFlags & DDPF_BUMPLUMINANCE )
-	strcat( buffer, "DDPF_BUMPLUMINANCE " );
-  if ( pddpf->dwFlags & DDPF_BUMPDUDV )
-	strcat( buffer, "DDPF_BUMPDUDV " );
-  if ( pddpf->dwFlags & DDPF_COMPRESSED )
-	strcat( buffer, "DDPF_COMPRESSED " );
-  if ( pddpf->dwFlags & DDPF_FOURCC )
-	strcat( buffer, "DDPF_FOURCC " );
-  if ( pddpf->dwFlags & DDPF_LUMINANCE )
-	strcat( buffer, "DDPF_LUMINANCE " );
-  if ( pddpf->dwFlags & DDPF_PALETTEINDEXED1 )
-	strcat( buffer, "DDPF_PALETTEINDEXED1 " );
-  if ( pddpf->dwFlags & DDPF_PALETTEINDEXED2 )
-	strcat( buffer, "DDPF_PALETTEINDEXED2 " );
-  if ( pddpf->dwFlags & DDPF_PALETTEINDEXED4 )
-	strcat( buffer, "DDPF_PALETTEINDEXED4 " );
-  if ( pddpf->dwFlags & DDPF_PALETTEINDEXED8 )
-	strcat( buffer, "DDPF_PALETTEINDEXED8 " );
-  if ( pddpf->dwFlags & DDPF_PALETTEINDEXEDTO8 )
-	strcat( buffer, "DDPF_PALETTEINDEXEDTO8 " );
-  if ( pddpf->dwFlags & DDPF_RGB )
-	strcat( buffer, "DDPF_RGB  " );
-  if ( pddpf->dwFlags & DDPF_RGBTOYUV )
-	strcat( buffer, "DDPF_RGBTOYUV  " );
-  if ( pddpf->dwFlags & DDPF_STENCILBUFFER )
-	strcat( buffer, "DDPF_STENCILBUFFER  " );
-  if ( pddpf->dwFlags & DDPF_YUV )
-	strcat( buffer, "DDPF_YUV  " );
-  if ( pddpf->dwFlags & DDPF_ZBUFFER )
-	strcat( buffer, "DDPF_ZBUFFER  " );
-  if ( pddpf->dwFlags & DDPF_ZPIXELS )
-	strcat( buffer, "DDPF_ZPIXELS  " );
-
-  DPF(( (DBG_TXT_INFO|DBG_CNTX_INFO),"%s", buffer ));
-}
-
-
-
-
-
diff --git a/src/mesa/drivers/d3d/DEBUG.H b/src/mesa/drivers/d3d/DEBUG.H
deleted file mode 100644
index daeeb72278..0000000000
--- a/src/mesa/drivers/d3d/DEBUG.H
+++ /dev/null
@@ -1,90 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#ifndef _DEBUG_H
-#define _DEBUG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*===========================================================================*/
-/* Includes.                                                                 */
-/*===========================================================================*/
-#include 
-#include 
-#include 
-#include 
-#include "D3DShared.h"
-/*===========================================================================*/
-/* Magic numbers.                                                            */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Macros defines.                                                           */
-/*===========================================================================*/
-#define DBG_FUNC                        0x00000001
-#define DBG_STATES              0x00000002
-
-#define DBG_CNTX_INFO           0x00000010
-#define DBG_CNTX_WARN           0x00000020
-#define DBG_CNTX_PROFILE        0x00000040
-#define DBG_CNTX_ERROR          0x00000080
-#define DBG_CNTX_ALL            0x000000F0
-
-#define DBG_PRIM_INFO           0x00000100
-#define DBG_PRIM_WARN           0x00000200
-#define DBG_PRIM_PROFILE        0x00000400
-#define DBG_PRIM_ERROR          0x00000800
-#define DBG_PRIM_ALL            0x00000F00
-
-#define DBG_TXT_INFO            0x00001000
-#define DBG_TXT_WARN            0x00002000
-#define DBG_TXT_PROFILE 0x00004000
-#define DBG_TXT_ERROR           0x00008000
-#define DBG_TXT_ALL             0x0000F000
-
-#define DBG_ALL_INFO            0x11111110
-#define DBG_ALL_WARN            0x22222220
-#define DBG_ALL_PROFILE 0x44444440
-#define DBG_ALL_ERROR           0x88888880
-#define DBG_ALL                 0xFFFFFFFF
-
-#ifdef D3D_DEBUG
-#       define  DPF(arg)                        DebugPrint arg 
-#       define  RIP(pH,msg,err) OutputDebugString(msg); \
-							OutputDebugString(err); \
-							OutputDebugString("\n"); \
-							FatalShutDown(pH)
-#else
-#       define  DPF(arg)
-#       define  RIP(pH,msg,err) FatalShutDown(pH)
-#endif
-/*===========================================================================*/
-/* Type defines.                                                             */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Function prototypes.                                                      */
-/*===========================================================================*/
-extern void ReadDBGEnv( void );
-extern void _cdecl DebugPrint( int mask, char *pszFormat, ... );
-extern void DebugPixelFormat( char *pszSurfaceName, DDPIXELFORMAT *pddpf );
-/*===========================================================================*/
-/* Global variables.                                                         */
-/*===========================================================================*/
-extern DWORD    g_DBGMask;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
-
diff --git a/src/mesa/drivers/d3d/DbgEnv.bat b/src/mesa/drivers/d3d/DbgEnv.bat
deleted file mode 100644
index acea045856..0000000000
--- a/src/mesa/drivers/d3d/DbgEnv.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-SET DBG_FUNC=FALSE
-
-SET DBG_CNTX_INFO=TRUE
-SET DBG_CNTX_WARN=TRUE
-SET DBG_CNTX_PROFILE=FALSE
-SET DBG_CNTX_ERROR=TRUE
-SET DBG_CNTX_ALL=TRUE
-
-SET DBG_PRIM_INFO=FALSE
-SET DBG_PRIM_WARN=FALSE
-SET DBG_PRIM_PROFILE=FALSE
-SET DBG_PRIM_ERROR=TRUE
-SET DBG_PRIM_ALL=FALSE
-
-SET DBG_TXT_INFO=FALSE
-SET DBG_TXT_WARN=TRUE
-SET DBG_TXT_PROFILE=FALSE
-SET DBG_TXT_ERROR=TRUE
-SET DBG_TXT_ALL=FALSE
-
-SET DBG_ALL_INFO=FALSE
-SET DBG_ALL_WARN=TRUE
-SET DBG_ALL_PROFILE=FALSE
-SET DBG_ALL_ERROR=TRUE
-SET DBG_ALL=FALSE
diff --git a/src/mesa/drivers/d3d/MAKEFILE b/src/mesa/drivers/d3d/MAKEFILE
deleted file mode 100644
index 6aa88f3cef..0000000000
--- a/src/mesa/drivers/d3d/MAKEFILE
+++ /dev/null
@@ -1,101 +0,0 @@
-##############################################################################
-# 
-# Mesa-3.0 Makefile for DirectX 6 Driver                             
-#
-# By Leigh McRae
-#
-# http://www.altsoftware.com/
-#
-# Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved     
-##############################################################################
-NAME=
-TARGET= WGL Driver (D3DHAL)
-
-D3D_DIR=$(MAKEDIR)\D3D
-TARGET_DIR=e:\WinNT\System32
-TEMP_DIR=c:\Temp
-
-SPACE=-
-LINKER=link.exe
-
-INCLUDE=$(SDKROOT)\include;$(INCLUDE)
-LIB=$(SDKROOT)\lib;$(LIB)
-##############################################################################
-CFLAGS  = /c /nologo /W1 /G5 /I..\ /I..\..\Include \
-		/D "_WIN32" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__"  /D "MESAD3D"
-CPPFLAGS= /c /nologo /W1 /G5 /I..\ /I..\..\Include \
-		/D "_WIN32" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__"  /D "MESAD3D"
-
-!IF "$(DEBUG)" == "1"
-
-CFLAGS   = /MTd /Od /Z7 /Yd /D "_DEBUG" /D "D3D_DEBUG" $(CFLAGS)
-CPPFLAGS = /MTd /Od /Z7 /Yd /D "_DEBUG" /D "D3D_DEBUG" $(CPPFLAGS)
-BUILD_TYPE=debug
-
-!ELSE
-
-CFLAGS   = /MT /Ox /D "NDEBUG" $(CFLAGS)
-CPPFLAGS = /MT /Ox /D "NDEBUG" $(CPPFLAGS)
-BUILD_TYPE=release
-
-!ENDIF
-##############################################################################
-SRCS_WGL = wgl.c D3Dvbrender.c DDrawPROCS.c NULLProcs.c Debug.c
-SRCS_HAL = D3DInit.cpp D3DRaster.cpp D3DTextureMgr.cpp D3DUtils.cpp D3DCaps.cpp
-OBJS_WGL = $(SRCS_WGL:.c=.obj)
-OBJS_HAL = $(SRCS_HAL:.cpp=.obj)
-
-WINLIBS = kernel32.lib user32.lib gdi32.lib oldnames.lib 
-DXLIBS = 
-LIBS = $(WINLIBS) $(DXLIBS) 
-###############################################################################
-# Primary Targets                                                             #
-###############################################################################
-
-default: header WGL HAL footer
-
-all: default 
-
-WGL : $(OBJS_WGL) 
-        
-HAL : $(OBJS_HAL)
-
-install : forceit
-	@echo $(SPACE)
-	@echo ========================================
-	@echo Install files created.
-	@echo ========================================
-
-        
-###############################################################################
-# Secondary Targets                                                           #
-###############################################################################
-
-clean:
-	@echo ========================================
-	@echo Cleaning $(TARGET)
-	@del *.obj 
-	@del *.dep 
-	@del *.exp 
-	@del *.ncb
-	@del *.plg
-	@del *.lib
-	@echo ========================================
-
-header:
-	@echo ============================================================
-	@echo Building $(TARGET)  ($(BUILD_TYPE) version)
-	@echo ============================================================
-	@echo $(SPACE)
-
-footer:
-	@echo $(SPACE)
-	@echo ============================================================
-	@echo DONE building $(TARGET)  ($(BUILD_TYPE) version)
-	@echo ============================================================
-
-forceit:
-
-
-
-
diff --git a/src/mesa/drivers/d3d/NULLProcs.h b/src/mesa/drivers/d3d/NULLProcs.h
deleted file mode 100644
index f0bbd2162d..0000000000
--- a/src/mesa/drivers/d3d/NULLProcs.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#ifndef NULL_MESA_PROCS_INC
-#define NULL_MESA_PROCS_INC
-/*===========================================================================*/
-/* Includes.                                                                 */
-/*===========================================================================*/
-#include "matrix.h"
-#include "context.h"
-#include "types.h"
-#include "vb.h"
-/*===========================================================================*/
-/* Macros.                                                                   */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Magic numbers.                                                            */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Type defines.                                                             */
-/*===========================================================================*/
-void NULLSetColor( GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a );
-void NULLClearColor( GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a );
-GLboolean NULLSetBuffer( GLcontext *ctx, GLenum mode );
-void NULLGetBufferSize( GLcontext *ctx, GLuint *width, GLuint *height );
-GLbitfield NULLClearBuffers( GLcontext *ctx, GLbitfield m, GLboolean a, GLint x, GLint y, GLint w, GLint h );
-void NULLWrSpRGB( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte r[][3], const GLubyte m[] );
-void NULLWrSpRGBA( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte r[][4], const GLubyte m[] );
-void NULLWrSpRGBAMono( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte m[] );
-void NULLWrPiRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte r[][4], const GLubyte m[] );
-void NULLWrPiRGBAMono( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte m[] );
-void NULLReSpRGBA( const GLcontext* ctx, GLuint n, GLint x, GLint y, GLubyte r[][4] );
-void NULLRePiRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], GLubyte r[][4], const GLubyte m[] );
-/*===========================================================================*/
-/* Extern function prototypes.                                               */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Global variables.                                                         */
-/*===========================================================================*/
-
-#endif
-
diff --git a/src/mesa/drivers/d3d/NullProcs.c b/src/mesa/drivers/d3d/NullProcs.c
deleted file mode 100644
index d6fb598074..0000000000
--- a/src/mesa/drivers/d3d/NullProcs.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 DirectX 6 Driver                                                 */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#ifndef NULL_MESA_PROCS_INC
-#define NULL_MESA_PROCS_INC
-/*===========================================================================*/
-/* Includes.                                                                 */
-/*===========================================================================*/
-#include "matrix.h"
-#include "context.h"
-#include "mtypes.h"
-#include "vb.h"
-/*===========================================================================*/
-/* Macros.                                                                   */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Magic numbers.                                                            */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Type defines.                                                             */
-/*===========================================================================*/
-void NULLSetColor( GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a );
-void NULLClearColor( GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a );
-GLboolean NULLSetBuffer( GLcontext *ctx, GLframebuffer *buffer, GLuint bit );
-void NULLGetBufferSize( GLcontext *ctx, GLuint *width, GLuint *height );
-GLbitfield NULLClearBuffers( GLcontext *ctx, GLbitfield m, GLboolean a, GLint x, GLint y, GLint w, GLint h );
-void NULLWrSpRGB( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte r[][3], const GLubyte m[] );
-void NULLWrSpRGBA( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte r[][4], const GLubyte m[] );
-void NULLWrSpRGBAMono( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte m[] );
-void NULLWrPiRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte r[][4], const GLubyte m[] );
-void NULLWrPiRGBAMono( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte m[] );
-void NULLReSpRGBA( const GLcontext* ctx, GLuint n, GLint x, GLint y, GLubyte r[][4] );
-void NULLRePiRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], GLubyte r[][4], const GLubyte m[] );
-/*===========================================================================*/
-/* Extern function prototypes.                                               */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Global variables.                                                         */
-/*===========================================================================*/
-
-#endif
-
diff --git a/src/mesa/drivers/d3d/OPENGL32.DEF b/src/mesa/drivers/d3d/OPENGL32.DEF
deleted file mode 100644
index bc0304da33..0000000000
--- a/src/mesa/drivers/d3d/OPENGL32.DEF
+++ /dev/null
@@ -1,442 +0,0 @@
-;===========================================================================
-;                                                                           
-; Mesa-3.0 DirectX 6 Driver                                       
-;                                                                           
-; By Leigh McRae                                                            
-;                                                                           
-; http://www.altsoftware.com/                                               
-;                                                                           
-; Copyright (c) 1999-1998  alt.software inc.  All Rights Reserved           
-;===========================================================================
-NAME OpenGL32.DLL
-DESCRIPTION "Mesa-3.0 DX6 Driver Version 0.5"
-
-EXPORTS
-	DllMain
-	glAccum
-	glAlphaFunc
-	glAreTexturesResident
-	glAreTexturesResidentEXT
-	glArrayElement
-	glArrayElementEXT
-	glBegin
-	glBindTexture
-	glBindTextureEXT
-	glBitmap
-	glBlendColorEXT
-	glBlendEquationEXT
-	glBlendFunc
-	glCallList
-	glCallLists
-	glClear
-	glClearAccum
-	glClearColor
-	glClearDepth
-	glClearIndex
-	glClearStencil
-	glClipPlane
-	glColor3b
-	glColor3bv
-	glColor3d
-	glColor3dv
-	glColor3f
-	glColor3fv
-	glColor3i
-	glColor3iv
-	glColor3s
-	glColor3sv
-	glColor3ub
-	glColor3ubv
-	glColor3ui
-	glColor3uiv
-	glColor3us
-	glColor3usv
-	glColor4b
-	glColor4bv
-	glColor4d
-	glColor4dv
-	glColor4f
-	glColor4fv
-	glColor4i
-	glColor4iv
-	glColor4s
-	glColor4sv
-	glColor4ub
-	glColor4ubv
-	glColor4ui
-	glColor4uiv
-	glColor4us
-	glColor4usv
-	glColorMask
-	glColorMaterial
-	glColorPointer
-	glColorPointerEXT
-	glColorSubTableEXT
-	glColorTableEXT
-	glCopyPixels
-	glCopyTexImage1D
-	glCopyTexImage2D
-	glCopyTexSubImage1D
-	glCopyTexSubImage2D
-	glCopyTexSubImage3DEXT
-	glCullFace
-	glDeleteLists
-	glDeleteTextures
-	glDeleteTexturesEXT
-	glDepthFunc
-	glDepthMask
-	glDepthRange
-	glDisable
-	glDisableClientState
-	glDrawArrays
-	glDrawArraysEXT
-	glDrawBuffer
-	glDrawElements
-	glDrawPixels
-	glEdgeFlag
-	glEdgeFlagPointer
-	glEdgeFlagPointerEXT
-	glEdgeFlagv
-	glEnable
-	glEnableClientState
-	glEnd
-	glEndList
-	glEvalCoord1d
-	glEvalCoord1dv
-	glEvalCoord1f
-	glEvalCoord1fv
-	glEvalCoord2d
-	glEvalCoord2dv
-	glEvalCoord2f
-	glEvalCoord2fv
-	glEvalMesh1
-	glEvalMesh2
-	glEvalPoint1
-	glEvalPoint2
-	glFeedbackBuffer
-	glFinish
-	glFlush
-	glFogf
-	glFogfv
-	glFogi
-	glFogiv
-	glFrontFace
-	glFrustum
-	glGenLists
-	glGenTextures
-	glGenTexturesEXT
-	glGetBooleanv
-	glGetClipPlane
-	glGetColorTableEXT
-	glGetColorTableParameterfvEXT
-	glGetColorTableParameterivEXT
-	glGetDoublev
-	glGetError
-	glGetFloatv
-	glGetIntegerv
-	glGetLightfv
-	glGetLightiv
-	glGetMapdv
-	glGetMapfv
-	glGetMapiv
-	glGetMaterialfv
-	glGetMaterialiv
-	glGetPixelMapfv
-	glGetPixelMapuiv
-	glGetPixelMapusv
-	glGetPointerv
-	glGetPointervEXT
-	glGetPolygonStipple
-	glGetString
-	glGetTexEnvfv
-	glGetTexEnviv
-	glGetTexGendv
-	glGetTexGenfv
-	glGetTexGeniv
-	glGetTexImage
-	glGetTexLevelParameterfv
-	glGetTexLevelParameteriv
-	glGetTexParameterfv
-	glGetTexParameteriv
-	glHint
-	glIndexd
-	glIndexdv
-	glIndexf
-	glIndexfv
-	glIndexi
-	glIndexiv
-	glIndexMask
-	glIndexPointer
-	glIndexPointerEXT
-	glIndexs
-	glIndexsv
-	glIndexub
-	glIndexubv
-	glInitNames
-	glInterleavedArrays
-	glIsEnabled
-	glIsList
-	glIsTexture
-	glIsTextureEXT
-	glLightf
-	glLightfv
-	glLighti
-	glLightiv
-	glLightModelf
-	glLightModelfv
-	glLightModeli
-	glLightModeliv
-	glLineStipple
-	glLineWidth
-	glListBase
-	glLoadIdentity
-	glLoadMatrixd
-	glLoadMatrixf
-	glLoadName
-	glLogicOp
-	glMap1d
-	glMap1f
-	glMap2d
-	glMap2f
-	glMapGrid1d
-	glMapGrid1f
-	glMapGrid2d
-	glMapGrid2f
-	glMaterialf
-	glMaterialfv
-	glMateriali
-	glMaterialiv
-	glMatrixMode
-	glMultMatrixd
-	glMultMatrixf
-	glNewList
-	glNormal3b
-	glNormal3bv
-	glNormal3d
-	glNormal3dv
-	glNormal3f
-	glNormal3fv
-	glNormal3i
-	glNormal3iv
-	glNormal3s
-	glNormal3sv
-	glNormalPointer
-	glNormalPointerEXT
-	glOrtho
-	glPassThrough
-	glPixelMapfv
-	glPixelMapuiv
-	glPixelMapusv
-	glPixelStoref
-	glPixelStorei
-	glPixelTransferf
-	glPixelTransferi
-	glPixelZoom
-	glPointParameterfEXT
-	glPointParameterfvEXT
-	glPointSize
-	glPolygonMode
-	glPolygonOffset
-	glPolygonOffsetEXT
-	glPolygonStipple
-	glPopAttrib
-	glPopClientAttrib
-	glPopMatrix
-	glPopName
-	glPrioritizeTextures
-	glPrioritizeTexturesEXT
-	glPushAttrib
-	glPushClientAttrib
-	glPushMatrix
-	glPushName
-	glRasterPos2d
-	glRasterPos2dv
-	glRasterPos2f
-	glRasterPos2fv
-	glRasterPos2i
-	glRasterPos2iv
-	glRasterPos2s
-	glRasterPos2sv
-	glRasterPos3d
-	glRasterPos3dv
-	glRasterPos3f
-	glRasterPos3fv
-	glRasterPos3i
-	glRasterPos3iv
-	glRasterPos3s
-	glRasterPos3sv
-	glRasterPos4d
-	glRasterPos4dv
-	glRasterPos4f
-	glRasterPos4fv
-	glRasterPos4i
-	glRasterPos4iv
-	glRasterPos4s
-	glRasterPos4sv
-	glReadBuffer
-	glReadPixels
-	glRectd
-	glRectdv
-	glRectf
-	glRectfv
-	glRecti
-	glRectiv
-	glRects
-	glRectsv
-	glRenderMode
-	glResizeBuffersMESA
-	glRotated
-	glRotatef
-	glScaled
-	glScalef
-	glScissor
-	glSelectBuffer
-	glShadeModel
-	glStencilFunc
-	glStencilMask
-	glStencilOp
-	glTexCoord1d
-	glTexCoord1dv
-	glTexCoord1f
-	glTexCoord1fv
-	glTexCoord1i
-	glTexCoord1iv
-	glTexCoord1s
-	glTexCoord1sv
-	glTexCoord2d
-	glTexCoord2dv
-	glTexCoord2f
-	glTexCoord2fv
-	glTexCoord2i
-	glTexCoord2iv
-	glTexCoord2s
-	glTexCoord2sv
-	glTexCoord3d
-	glTexCoord3dv
-	glTexCoord3f
-	glTexCoord3fv
-	glTexCoord3i
-	glTexCoord3iv
-	glTexCoord3s
-	glTexCoord3sv
-	glTexCoord4d
-	glTexCoord4dv
-	glTexCoord4f
-	glTexCoord4fv
-	glTexCoord4i
-	glTexCoord4iv
-	glTexCoord4s
-	glTexCoord4sv
-	glTexCoordPointer
-	glTexCoordPointerEXT
-	glTexEnvf
-	glTexEnvfv
-	glTexEnvi
-	glTexEnviv
-	glTexGend
-	glTexGendv
-	glTexGenf
-	glTexGenfv
-	glTexGeni
-	glTexGeniv
-	glTexImage1D
-	glTexImage2D
-	glTexImage3DEXT
-	glTexParameterf
-	glTexParameterfv
-	glTexParameteri
-	glTexParameteriv
-	glTexSubImage1D
-	glTexSubImage2D
-	glTexSubImage3DEXT
-	glTranslated
-	glTranslatef
-	glVertex2d
-	glVertex2dv
-	glVertex2f
-	glVertex2fv
-	glVertex2i
-	glVertex2iv
-	glVertex2s
-	glVertex2sv
-	glVertex3d
-	glVertex3dv
-	glVertex3f
-	glVertex3fv
-	glVertex3i
-	glVertex3iv
-	glVertex3s
-	glVertex3sv
-	glVertex4d
-	glVertex4dv
-	glVertex4f
-	glVertex4fv
-	glVertex4i
-	glVertex4iv
-	glVertex4s
-	glVertex4sv
-	glVertexPointer
-	glVertexPointerEXT
-	glViewport
-	glWindowPos2dMESA
-	glWindowPos2dvMESA
-	glWindowPos2fMESA
-	glWindowPos2fvMESA
-	glWindowPos2iMESA
-	glWindowPos2ivMESA
-	glWindowPos2sMESA
-	glWindowPos2svMESA
-	glWindowPos3dMESA
-	glWindowPos3dvMESA
-	glWindowPos3fMESA
-	glWindowPos3fvMESA
-	glWindowPos3iMESA
-	glWindowPos3ivMESA
-	glWindowPos3sMESA
-	glWindowPos3svMESA
-	glWindowPos4dMESA
-	glWindowPos4dvMESA
-	glWindowPos4fMESA
-	glWindowPos4fvMESA
-	glWindowPos4iMESA
-	glWindowPos4ivMESA
-	glWindowPos4sMESA
-	glWindowPos4svMESA
-;    WMesaCreateContext
-;    WMesaDestroyContext
-;    WMesaMakeCurrent
-;    WMesaPaletteChange
-;    WMesaSwapBuffers
-;    OSMesaCreateContext
-;    OSMesaDestroyContext
-;    OSMesaMakeCurrent
-;    OSMesaGetCurrentContext
-;    OSMesaPixelStore
-;    OSMesaGetIntegerv
-;    OSMesaGetDepthBuffer
-	wglCopyContext
-	wglCreateContext
-	wglCreateLayerContext
-	wglDeleteContext
-;	wglDescribeLayerPlane
-	wglGetCurrentContext
-	wglGetCurrentDC
-;	wglGetLayerPaletteEntries
-	wglGetProcAddress
-	wglMakeCurrent
-;	wglRealizeLayerPalette
-;	wglSetLayerPaletteEntries
-	wglShareLists
-	wglSwapLayerBuffers
-	wglUseFontBitmapsA
-	wglUseFontBitmapsW
-	wglUseFontOutlinesA
-	wglUseFontOutlinesW
-	wglChoosePixelFormat
-	wglDescribePixelFormat
-	wglGetPixelFormat
-	wglSetPixelFormat
-	wglSwapBuffers
-    
-
-
diff --git a/src/mesa/drivers/d3d/WGL.C b/src/mesa/drivers/d3d/WGL.C
deleted file mode 100644
index 170d094ed4..0000000000
--- a/src/mesa/drivers/d3d/WGL.C
+++ /dev/null
@@ -1,1262 +0,0 @@
-/*===========================================================================*/
-/*                                                                           */
-/* Mesa-3.0 Makefile for DirectX 6                                           */
-/*                                                                           */
-/* By Leigh McRae                                                            */
-/*                                                                           */
-/* http://www.altsoftware.com/                                               */
-/*                                                                           */
-/* Copyright (c) 1998-1997  alt.software inc.  All Rights Reserved           */
-/*===========================================================================*/
-#include "D3DMesa.h"
-/*===========================================================================*/
-/* Window managment.                                                         */
-/*===========================================================================*/
-static BOOL    InitOpenGL( HINSTANCE hInst );
-static BOOL    TermOpenGL( HINSTANCE hInst );
-static BOOL     ResizeContext( GLcontext *ctx );
-static BOOL    MakeCurrent( D3DMESACONTEXT *pContext );
-static void    DestroyContext( D3DMESACONTEXT *pContext );
-static BOOL    UnBindWindow( D3DMESACONTEXT *pContext );
-LONG APIENTRY  wglMonitorProc( HWND hwnd, UINT message, UINT wParam, LONG lParam );
-/*===========================================================================*/
-/* Mesa hooks.                                                               */
-/*===========================================================================*/
-static void SetupDDPointers( GLcontext *ctx );
-static void SetupSWDDPointers( GLcontext *ctx );
-static void SetupHWDDPointers( GLcontext *ctx );
-static void SetupNULLDDPointers( GLcontext *ctx );
-static const char *RendererString( void );
-
-/* State Management hooks. */
-static void       SetColor( GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a );
-static void       ClearColor( GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a );
-static GLboolean SetBuffer( GLcontext *ctx, GLenum buffer );
-
-/* Window Management hooks. */
-static void GetBufferSize( GLcontext *ctx, GLuint *width, GLuint *height );
-static void SetViewport( GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h );
-static void Flush( GLcontext *ctx );
-
-/* Span rendering hooks. */
-void WSpanRGB( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte rgb[][3], const GLubyte mask[] );
-void WSpanRGBA( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] );
-void WSpanRGBAMono( const GLcontext* ctx, GLuint n, GLint x, GLint y, const GLubyte mask[] );
-void WPixelsRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte rgba[][4], const GLubyte mask[] );
-void WPixelsRGBAMono( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], const GLubyte mask[] );
-void RSpanRGBA( const GLcontext* ctx, GLuint n, GLint x, GLint y, GLubyte rgba[][4] );
-void RPixelsRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y[], GLubyte rgba[][4], const GLubyte mask[] );
-GLbitfield ClearBuffers( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height );
-
-/* Primitve rendering hooks. */
-GLboolean  RenderVertexBuffer( GLcontext *ctx, GLboolean allDone );
-void             RenderOneTriangle( GLcontext *ctx, GLuint v1, GLuint v2, GLuint v3, GLuint pv );
-void     RenderOneLine( GLcontext *ctx, GLuint v1, GLuint v2, GLuint pv );
-GLbitfield ClearBuffersD3D( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height );
-
-/* Texture Management hooks. */
-static void TextureBind( GLcontext *ctx, GLenum target, struct gl_texture_object *tObj );
-static void TextureLoad( GLcontext *ctx, GLenum target, struct gl_texture_object *tObj, GLint level, GLint internalFormat, const struct gl_texture_image *image );
-static void TextureSubImage( GLcontext *ctx, GLenum target, struct gl_texture_object *tObj, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLint internalFormat, const struct gl_texture_image *image );
-/*===========================================================================*/
-/* Global variables.                                                         */
-/*===========================================================================*/
-D3DMESACONTEXT *pD3DCurrent,     
-	       *pD3DDefault;     /* Thin support context. */
-
-struct __extensions__   ext[] = {
-
-    { (PROC)glPolygonOffsetEXT,        "glPolygonOffsetEXT"       },
-    { (PROC)glBlendEquationEXT,        "glBlendEquationEXT"       },
-    { (PROC)glBlendColorEXT,           "glBlendColorExt"          },
-    { (PROC)glVertexPointerEXT,        "glVertexPointerEXT"       },
-    { (PROC)glNormalPointerEXT,        "glNormalPointerEXT"       },
-    { (PROC)glColorPointerEXT,         "glColorPointerEXT"        },
-    { (PROC)glIndexPointerEXT,         "glIndexPointerEXT"        },
-    { (PROC)glTexCoordPointerEXT,      "glTexCoordPointer"        },
-    { (PROC)glEdgeFlagPointerEXT,      "glEdgeFlagPointerEXT"     },
-    { (PROC)glGetPointervEXT,          "glGetPointervEXT"         },
-    { (PROC)glArrayElementEXT,         "glArrayElementEXT"        },
-    { (PROC)glDrawArraysEXT,           "glDrawArrayEXT"           },
-    { (PROC)glAreTexturesResidentEXT,  "glAreTexturesResidentEXT" },
-    { (PROC)glBindTextureEXT,          "glBindTextureEXT"         },
-    { (PROC)glDeleteTexturesEXT,       "glDeleteTexturesEXT"      },
-    { (PROC)glGenTexturesEXT,          "glGenTexturesEXT"         },
-    { (PROC)glIsTextureEXT,            "glIsTextureEXT"           },
-    { (PROC)glPrioritizeTexturesEXT,   "glPrioritizeTexturesEXT"  },
-    { (PROC)glCopyTexSubImage3DEXT,    "glCopyTexSubImage3DEXT"   },
-    { (PROC)glTexImage3DEXT,           "glTexImage3DEXT"          },
-    { (PROC)glTexSubImage3DEXT,        "glTexSubImage3DEXT"       },
-};
-
-int             qt_ext = sizeof(ext) / sizeof(ext[0]);
-float   g_DepthScale,
-	  g_MaxDepth;
-/*===========================================================================*/
-/*  When a process loads this DLL we will setup the linked list for context  */
-/* management and create a default context that will support the API until   */
-/* the user creates and binds thier own.  This THIN default context is useful*/
-/* to have around.                                                           */
-/*  When the process terminates we will clean up all resources here.         */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-BOOL APIENTRY   DllMain( HINSTANCE hInst, DWORD reason, LPVOID reserved )
-{
-  switch( reason ) 
-  {
-    case DLL_PROCESS_ATTACH:
-	 return InitOpenGL( hInst );
-
-    case DLL_PROCESS_DETACH:
-	 return TermOpenGL( hInst );
-  }     
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  The first thing we do when this dll is hit is connect to the dll that has*/
-/* handles all the DirectX 6 rendering.  I decided to use another dll as DX6 */
-/* is all C++ and Mesa-3.0 is C (thats a good thing).  This way I can write  */
-/* the DX6 in C++ and Mesa-3.0 in C without having to worry about linkage.   */
-/* I feel this is easy and better then using static wrappers as it is likely */
-/* faster and it allows me to just develope the one without compiling the    */
-/* other.                                                                    */
-/*  NOTE that at this point we don't have much other than a very thin context*/
-/* that will support the API calls only to the point of not causing the app  */
-/* to crash from the API table being empty.                                  */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-static BOOL  InitOpenGL( HINSTANCE hInst )
-{
-  /* Allocate and clear the default context. */
-  pD3DDefault = (PD3DMESACONTEXT)ALLOC( sizeof(D3DMESACONTEXT) );
-  if ( pD3DDefault == NULL )
-    return FALSE;
-  memset( pD3DDefault, 0, sizeof(D3DMESACONTEXT) );
-
-  /*  Clear the D3D vertex buffer so that values not used will be zero.  This */
-  /* save me from some redundant work.                                        */
-  memset( &D3DTLVertices, 0, sizeof(D3DTLVertices) );
-
-  /*  Update the link.  We uses a circular list so that it is easy to  */
-  /* add and search.  This context will also be used for head and tail.*/
-  pD3DDefault->next = pD3DDefault;
-
-  /*========================================================================*/
-  /* Do all core Mesa stuff.                                                */
-  /*========================================================================*/
-  pD3DDefault->gl_visual = _mesa_create_visual( TRUE,
-						FALSE,      /* db_flag */
-						GL_FALSE,   /* stereo */
-						8,8,8,8,    /* r, g, b, a bits */
-						0,          /* index bits */
-						16,         /* depth_bits */
-						8,          /* stencil_bits */
-						8,8,8,8,    /* accum_bits */
-                                                1 );
-
-  if ( pD3DDefault->gl_visual == NULL)  
-  {
-    FREE( pD3DDefault );
-    return FALSE;
-  }
-
-  /* Allocate a new Mesa context */
-  pD3DDefault->gl_ctx = _mesa_create_context( pD3DDefault->gl_visual, NULL, pD3DDefault, GL_TRUE );
-  if ( pD3DDefault->gl_ctx == NULL ) 
-  {
-    _mesa_destroy_visual( pD3DDefault->gl_visual );
-    FREE( pD3DDefault );
-    return FALSE;
-  }
-
-  /* Allocate a new Mesa frame buffer */
-  pD3DDefault->gl_buffer = _mesa_create_framebuffer( pD3DDefault->gl_visual );
-  if ( pD3DDefault->gl_buffer == NULL )
-  {
-    _mesa_destroy_visual( pD3DDefault->gl_visual );
-    _mesa_destroy_context( pD3DDefault->gl_ctx );
-    FREE( pD3DDefault );
-    return FALSE;
-  }
-  SetupDDPointers( pD3DDefault->gl_ctx );
-  _mesa_make_current( pD3DDefault->gl_ctx, pD3DDefault->gl_buffer );
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  This function will create a new D3D context but will not create the D3D  */
-/* surfaces or even an instance of D3D (see at GetBufferSize). The only stuff*/
-/* done here is the internal Mesa stuff and some Win32 handles.              */
-/*===========================================================================*/
-/* RETURN: casted pointer to the context, NULL.                              */
-/*===========================================================================*/
-HGLRC APIENTRY wglCreateContext( HDC hdc )
-{
-  D3DMESACONTEXT        *pNewContext;
-  DWORD                 dwCoopFlags = DDSCL_NORMAL;
-  RECT                  rectClient;
-  POINT                 pt;
-
-  /* ALLOC and clear the new context. */
-  pNewContext = (PD3DMESACONTEXT)ALLOC( sizeof(D3DMESACONTEXT) );
-  if ( pNewContext == NULL )
-  {
-    SetLastError( 0 );
-    return (HGLRC)NULL;
-  }
-  memset( pNewContext, 0, sizeof(D3DMESACONTEXT) );
-
-  /*========================================================================*/
-  /* Do all core Mesa stuff.                                                */
-  /*========================================================================*/
-
-  /* TODO: support more then one visual. */
-  pNewContext->gl_visual = _mesa_create_visual( TRUE,
-                                                TRUE,       /* db_flag */
-                                                GL_FALSE,   /* stereo */
-                                                8,8,8,8,    /* r, g, b, a bits */
-                                                0,          /* index bits */
-                                                16,         /* depth_bits */
-                                                8,          /* stencil_bits */
-                                                16,16,16,16,/* accum_bits */
-                                                1 );
-  if ( pNewContext->gl_visual == NULL) 
-  {
-    FREE( pNewContext );
-    SetLastError( 0 );
-    return (HGLRC)NULL;
-  }
-
-  /* Allocate a new Mesa context */
-  pNewContext->gl_ctx = _mesa_create_context( pNewContext->gl_visual, NULL, pNewContext, GL_TRUE );
-  if ( pNewContext->gl_ctx == NULL ) 
-  {
-    _mesa_destroy_visual( pNewContext->gl_visual );
-    FREE( pNewContext );
-    SetLastError( 0 );
-    return (HGLRC)NULL;
-  }
-
-  /* Allocate a new Mesa frame buffer */
-  pNewContext->gl_buffer = _mesa_create_framebuffer( pNewContext->gl_visual );
-  if ( pNewContext->gl_buffer == NULL )
-  {
-    _mesa_destroy_visual( pNewContext->gl_visual );
-    _mesa_destroy_context( pNewContext->gl_ctx );
-    FREE( pNewContext );
-    SetLastError( 0 );
-    return (HGLRC)NULL;
-  }
-
-  /*========================================================================*/
-  /* Do all the driver stuff.                                               */
-  /*========================================================================*/
-  pNewContext->hdc  = hdc;
-  pNewContext->next = pD3DDefault->next;
-  pD3DDefault->next = pNewContext; /* Add to circular list. */
-
-  /* Create the HAL for the new context. */
-  pNewContext->pShared = InitHAL( WindowFromDC(hdc) );
-
-  return (HGLRC)pNewContext;
-}
-/*===========================================================================*/
-/*  This is a wrapper function that is supported by MakeCurrent.             */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-BOOL APIENTRY  wglMakeCurrent( HDC hdc, HGLRC hglrc )
-{
-   return MakeCurrent((D3DMESACONTEXT *)hglrc);
-}
-/*===========================================================================*/
-/*  MakeCurrent will unbind whatever context is current (if any) & then bind */
-/* the supplied context.  A context that is bound has it's window proc hooked*/
-/* with the wglMonitorProc and the context pointer is saved in pD3DCurrent.    */
-/* Once the context is bound we update the Mesa-3.0 hooks (SetDDPointers) and*/
-/* the viewport (Mesa-.30 and DX6).                                          */
-/*                                                                           */
-/* TODO: this function can't fail.                                           */
-/*===========================================================================*/
-/* RETURN: TRUE                                                              */
-/*===========================================================================*/
-static BOOL MakeCurrent( D3DMESACONTEXT *pContext )
-{
-   D3DMESACONTEXT *pNext;
-
-   /*====================================================================*/
-   /* This is a special case that is a request to have no context bound. */
-   /*====================================================================*/
-   if ( pContext == NULL )
-   {
-	/* Walk the whole list. We start and end at the Default context. */
-	for( pNext = pD3DDefault->next; pNext != pD3DDefault; pNext = pNext->next )
-	  UnBindWindow( pNext );
-      
-	return TRUE;
-   }
-
-   /*=================================================*/
-   /* Make for a fast redundant use of this function. */
-   /*=================================================*/
-   if ( pD3DCurrent == pContext )
-      return TRUE;
-
-   /*=============================*/
-   /* Unbind the current context. */
-   /*=============================*/
-   UnBindWindow( pD3DCurrent );
-
-   /*=====================================*/
-   /* Let Mesa-3.0 we have a new context. */
-   /*=====================================*/
-   SetupDDPointers( pContext->gl_ctx );
-   _mesa_make_current( pContext->gl_ctx, pContext->gl_buffer );
-
-   /*  We are done so set the internal current context. */
-   if ( pContext != pD3DDefault )
-   {
-	ResizeContext( pContext->gl_ctx );
-	pContext->hOldProc = (WNDPROC)GetWindowLong( pContext->pShared->hwnd, GWL_WNDPROC );
-	SetWindowLong( pContext->pShared->hwnd, GWL_WNDPROC, (LONG)wglMonitorProc );
-   }
-   pD3DCurrent = pContext;
-
-   return TRUE;
-}
-/*===========================================================================*/
-/*  This function will only return the current window size.  I have re-done  */   
-/* this function so that it doesn't check the current size and react to it as*/   
-/* I should be able to have all the react code in the WM_SIZE message.  The  */   
-/* old version would check the current window size and create/resize the HAL */   
-/* surfaces if they have changed.  I needed to delay the creation if the     */   
-/* surfaces because sometimes I wouldn't have a window size so this is where */   
-/* I delayed it.  If you are reading this then all went ok!                  */   
-/*  The default context will return a zero sized window and I'm not sure if  */
-/* this is ok at this point (TODO).                                          */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void GetBufferSize( GLcontext *ctx, GLuint *width, GLuint *height )
-{
-  D3DMESACONTEXT        *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-
-  /* Fall through for the default because that is one of the uses for it. */
-  if ( pContext == pD3DDefault )
-  {
-    *width  = 0;
-    *height = 0;
-  }
-  else
-  {
-    *width  = pContext->pShared->dwWidth;
-    *height = pContext->pShared->dwHeight;
-  }
-}
-/*===========================================================================*/
-/*                                                                           */
-/*                                                                           */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static BOOL ResizeContext( GLcontext *ctx )
-{
-  D3DMESACONTEXT        *pContext = (D3DMESACONTEXT *)ctx->DriverCtx,
-		    *pCurrentTemp;
-  RECT                  rectClient;
-  POINT                 pt;
-  DWORD                 dwWidth,
-		    dwHeight;
-  static BOOL           bDDrawLock = FALSE;
-
-  /* Make sure we have some values. */
-  if ( (pContext->hdc == NULL ) || 
-	  (pContext->pShared->hwnd != WindowFromDC(pContext->hdc)) ||
-       (pContext == pD3DDefault) )
-    return FALSE;
-
-  /* Having problems with DDraw sending resize messages before I was done. */
-  if( bDDrawLock == TRUE )
-    return FALSE;
-
-  // TODO: don't think I need this anymore.
-  pCurrentTemp = pD3DCurrent;
-  pD3DCurrent = pD3DDefault;
-  bDDrawLock = TRUE;
-
-  /* Get the current window dimentions. */
-  UpdateScreenPosHAL( pContext->pShared );
-  dwWidth  = pContext->pShared->rectW.right - pContext->pShared->rectW.left;
-  dwHeight = pContext->pShared->rectW.bottom - pContext->pShared->rectW.top;
-
-  /* Is the size of the OffScreen Render different? */
-  if ( (dwWidth != pContext->pShared->dwWidth) || (dwHeight != pContext->pShared->dwHeight) )
-  {
-    /* Create all the D3D surfaces and device. */
-    CreateHAL( pContext->pShared );
-
-    /*  I did this so that software rendering would still work as */
-    /* I don't need to scale the z values twice.                  */
-    g_DepthScale        = (pContext->pShared->bHardware) ? 1.0 : ((float)0x00FFFFFF);
-    g_MaxDepth          = (pContext->pShared->bHardware) ? 1.0 : ((float)0x00FFFFFF);
-    gl_DepthRange( pContext->gl_ctx, ctx->Viewport.Near, ctx->Viewport.Far );
-
-    /* Make sure we have a viewport. */
-    gl_Viewport( pContext->gl_ctx, 0, 0, dwWidth, dwHeight );
-
-    /* Update Mesa as we might have changed from SW <-> HW. */
-    SetupDDPointers( pContext->gl_ctx );
-    _mesa_make_current( pContext->gl_ctx, pContext->gl_buffer );
-
-    /*  If we are in HW we need to load the current texture if there is one already. */
-    //    if ( (ctx->Texture.Set[ctx->Texture.CurrentSet].Current != NULL) &&
-    //      (pContext->pShared->bHardware == TRUE) )
-    //    {
-    //   CreateTMgrHAL( pContext->pShared,
-    //                           ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Name,
-    //                           0,     
-    //                           ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Format,
-    //                           (RECT *)NULL,
-    //                           ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Width,
-    //                           ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Height,
-    //                           TM_ACTION_BIND,
-    //                           (void *)ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Data );
-    //    }
-  }
-
-  // TODO: don't think I need this anymore.
-  pD3DCurrent = pCurrentTemp;
-  bDDrawLock = FALSE;
-
-  return TRUE;
-}
-
-/*===========================================================================*
-/*  This function will Blt the render buffer to the PRIMARY surface. I repeat*/
-/* this code for the other SwapBuffer like functions and the flush (didn't   */
-/* want the function calling overhead).  Thsi could have been a macro...     */
-/*                                                                           */
-/* TODO: there are some problems with viewport/scissoring.                   */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-BOOL APIENTRY  wglSwapBuffers( HDC hdc )
-{
-  /* Fall through for the default because that is one of the uses for it. */
-  if ( pD3DCurrent == pD3DDefault )
-    return FALSE;
-
-  SwapBuffersHAL( pD3DCurrent->pShared );
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  Same as wglSwapBuffers.                                                  */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-BOOL APIENTRY  SwapBuffers( HDC hdc )
-{
-  /* Fall through for the default because that is one of the uses for it. */
-  if ( pD3DCurrent == pD3DDefault )
-    return FALSE;
-
-  SwapBuffersHAL( pD3DCurrent->pShared );
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  This should be ok as none of the SwapBuffers will cause a redundant Blt  */
-/* as none of my Swap functions will call flush.  This should also allow     */
-/* sinlge buffered applications to work (not really worried though).  Some   */
-/* applications may flush then swap but then this is there fault IMHO.       */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void Flush( GLcontext *ctx )
-{
-  /* Fall through for the default because that is one of the uses for it. */
-  if ( pD3DCurrent == pD3DDefault )
-    return;
-
-  SwapBuffersHAL( pD3DCurrent->pShared );
-}
-/*===========================================================================*/
-/*  For now this function will ignore the supplied PF. If I'm going to allow */
-/* the user to choice the mode and device at startup I'm going to have to do */
-/* something different.                                                      */
-/*                                                                           */
-/* TODO: use the linked list of modes to build a pixel format to be returned */
-/*      to the caller.                                                       */
-/*===========================================================================*/
-/* RETURN: 1.                                                                */
-/*===========================================================================*/
-int APIENTRY   wglChoosePixelFormat( HDC hdc, CONST PIXELFORMATDESCRIPTOR *ppfd )
-{
-   return 1;
-}
-/*===========================================================================*/
-/*  See wglChoosePixelFormat.                                                */
-/*===========================================================================*/
-/* RETURN: 1.                                                                */
-/*===========================================================================*/
-int APIENTRY   ChoosePixelFormat( HDC hdc, CONST PIXELFORMATDESCRIPTOR *ppfd )
-{
-  return wglChoosePixelFormat(hdc,ppfd);
-}
-/*===========================================================================*/
-/*  This function (for now) returns a static PF everytime.  This is just to  */
-/* allow things to continue.                                                 */
-/*===========================================================================*/
-/* RETURN: 1.                                                                */
-/*===========================================================================*/
-int APIENTRY   wglDescribePixelFormat( HDC hdc, int iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR ppfd )
-{
-   static PIXELFORMATDESCRIPTOR  pfd = 
-   {
-      sizeof(PIXELFORMATDESCRIPTOR),   /* size */
-      1,                               /* version */
-      PFD_SUPPORT_OPENGL |
-      PFD_DRAW_TO_WINDOW |
-      PFD_DOUBLEBUFFER,                /* support double-buffering */
-      PFD_TYPE_RGBA,                   /* color type */
-      16,                              /* prefered color depth */
-      0, 0, 0, 0, 0, 0,                /* color bits (ignored) */
-      0,                               /* no alpha buffer */
-      0,                               /* alpha bits (ignored) */
-      0,                               /* no accumulation buffer */
-      0, 0, 0, 0,                      /* accum bits (ignored) */
-      16,                              /* depth buffer */
-      0,                               /* no stencil buffer */
-      0,                               /* no auxiliary buffers */
-      PFD_MAIN_PLANE,                  /* main layer */
-      0,                               /* reserved */
-      0, 0, 0,                         /* no layer, visible, damage masks */
-   };
-
-   /* Return the address of this static PF if one was requested. */
-   if ( ppfd != NULL )
-      memcpy( ppfd, &pfd, sizeof(PIXELFORMATDESCRIPTOR) );
-
-  return 1;
-}
-/*===========================================================================*/
-/*  See wglDescribePixelFormat.                                              */
-/*===========================================================================*/
-/* RETURN: 1.                                                                */
-/*===========================================================================*/
-int APIENTRY   DescribePixelFormat( HDC hdc, int iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR ppfd )
-{
-  return wglDescribePixelFormat(hdc,iPixelFormat,nBytes,ppfd);
-}
-/*===========================================================================*/
-/*  This function will always return 1 for now.  Just to allow for support.  */
-/*===========================================================================*/
-/* RETURN: 1.                                                                */
-/*===========================================================================*/
-int APIENTRY   wglGetPixelFormat( HDC hdc )
-{
-   return 1;
-}
-/*===========================================================================*/
-/*  See wglGetPixelFormat.                                                   */
-/*===========================================================================*/
-/* RETURN: 1.                                                                */
-/*===========================================================================*/
-int APIENTRY   GetPixelFormat( HDC hdc )
-{
-   return wglGetPixelFormat(hdc);
-}
-/*===========================================================================*/
-/*  This will aways work for now.                                            */
-/*===========================================================================*/
-/* RETURN: TRUE.                                                             */
-/*===========================================================================*/
-BOOL APIENTRY  wglSetPixelFormat( HDC hdc, int iPixelFormat, CONST PIXELFORMATDESCRIPTOR *ppfd )
-{
-   return TRUE;
-}
-/*===========================================================================*/
-/*  See wglSetPixelFormat.                                                   */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-BOOL APIENTRY  SetPixelFormat( HDC hdc, int iPixelFormat, CONST PIXELFORMATDESCRIPTOR *ppfd )
-{
-   return wglSetPixelFormat(hdc,iPixelFormat,ppfd);
-}
-/*===========================================================================*/
-/*  This is a wrapper function that is supported by my own internal function.*/
-/* that takes my own D3D Mesa context structure.  This so I can reuse the    */
-/* function (no need for speed).                                             */
-/*===========================================================================*/
-/* RETURN: TRUE.                                                             */
-/*===========================================================================*/
-BOOL APIENTRY  wglDeleteContext( HGLRC hglrc )
-{
-   DestroyContext( (D3DMESACONTEXT *)hglrc );
-
-   return TRUE;
-}
-/*===========================================================================*/
-/*  Simple getter function that uses a cast.                                 */
-/*===========================================================================*/
-/* RETURN: casted pointer to the context, NULL.                              */
-/*===========================================================================*/
-HGLRC APIENTRY wglGetCurrentContext( VOID )
-{
-   return (pD3DCurrent) ? (HGLRC)pD3DCurrent : (HGLRC)NULL;
-}
-/*===========================================================================*/
-/* No support.                                                               */
-/*===========================================================================*/
-/* RETURN: FALSE.                                                            */
-/*===========================================================================*/
-BOOL APIENTRY  wglCopyContext( HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask )
-{
-   SetLastError( 0 );
-   return FALSE;
-}
-/*===========================================================================*/
-/* No support.                                                               */
-/*===========================================================================*/
-/* RETURN: NULL.                                                             */
-/*===========================================================================*/
-HGLRC APIENTRY wglCreateLayerContext( HDC hdc,int iLayerPlane )
-{
-   SetLastError( 0 );
-   return (HGLRC)NULL;
-}
-/*===========================================================================*/
-/*  Simple getter function.                                                  */
-/*===========================================================================*/
-/* RETURN: FALSE.                                                            */
-/*===========================================================================*/
-HDC APIENTRY   wglGetCurrentDC( VOID )
-{
-   return (pD3DCurrent) ? pD3DCurrent->hdc : (HDC)NULL;
-}
-/*===========================================================================*/
-/*  Simply call that searches the supported extensions for a match & returns */
-/* the pointer to the function that lends support.                           */
-/*===========================================================================*/
-/* RETURN: pointer to API call, NULL.                                        */
-/*===========================================================================*/
-PROC APIENTRY  wglGetProcAddress( LPCSTR lpszProc )
-{
-   int   index;
-
-   for( index = 0; index < qt_ext; index++ )
-      if( !strcmp(lpszProc,ext[index].name) )
-	 return ext[index].proc;
-
-   SetLastError( 0 );
-   return NULL;
-}
-/*===========================================================================*/
-/*  No support.                                                              */
-/*===========================================================================*/
-/* RETURN: FALSE.                                                            */
-/*===========================================================================*/
-BOOL APIENTRY  wglShareLists( HGLRC hglrc1, HGLRC hglrc2 )
-{
-   SetLastError( 0 );
-   return FALSE;
-}
-/*===========================================================================*/
-/*  No support.                                                              */
-/*===========================================================================*/
-/* RETURN: FALSE.                                                            */
-/*===========================================================================*/
-BOOL APIENTRY  wglUseFontBitmaps( HDC fontDevice, DWORD firstChar, DWORD numChars, DWORD listBase )
-{
-   SetLastError( 0 );
-   return FALSE;
-}
-/*===========================================================================*/
-/*  No support.                                                              */
-/*===========================================================================*/
-/* RETURN: FALSE.                                                            */
-/*===========================================================================*/
-BOOL APIENTRY  wglUseFontBitmapsW( HDC hdc,DWORD first,DWORD count,DWORD listBase )
-{
-   SetLastError( 0 );
-   return FALSE;
-}
-/*===========================================================================*/
-/*  No support.                                                              */
-/*===========================================================================*/
-/* RETURN: FALSE.                                                            */
-/*===========================================================================*/
-BOOL APIENTRY  wglUseFontOutlinesA( HDC hdc, DWORD first, DWORD count, DWORD listBase, FLOAT deviation, FLOAT extrusion, int format, LPGLYPHMETRICSFLOAT lpgmf )
-{
-   SetLastError( 0 );
-   return FALSE;
-}
-/*===========================================================================*/
-/*  No support.                                                              */
-/*===========================================================================*/
-/* RETURN: FALSE.                                                            */
-/*===========================================================================*/
-BOOL APIENTRY  wglUseFontOutlinesW( HDC hdc,DWORD first,DWORD count, DWORD listBase,FLOAT deviation, FLOAT extrusion,int format, LPGLYPHMETRICSFLOAT lpgmf )
-{
-   SetLastError( 0 );
-   return FALSE ;
-}
-/*===========================================================================*/
-/*  No support.                                                              */
-/*===========================================================================*/
-/* RETURN: FALSE.                                                            */
-/*===========================================================================*/
-BOOL APIENTRY  wglSwapLayerBuffers( HDC hdc, UINT fuPlanes )
-{
-   SetLastError( 0 );
-   return FALSE;
-}
-/*===========================================================================*/
-/*  This function will be hooked into the window that has been bound.  Right */
-/* now it is used to track the window size and position.  Also the we clean  */
-/* up the currrent context when the window is close/destroyed.               */
-/*                                                                           */
-/* TODO: there might be something wrong here as some games (Heretic II) don't*/
-/*      track the window quit right.                                         */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-LONG APIENTRY  wglMonitorProc( HWND hwnd, UINT message, UINT wParam, LONG lParam )
-{
-  WNDPROC       hOldProc;
-  GLint width,
-	  height;
-
-  switch( message ) 
-  {
-//      case WM_PAINT:
-//        break;
-//      case WM_ACTIVATE:
-//         break;
-//      case WM_SHOWWINDOW:
-//         break;
-
-    case UM_FATALSHUTDOWN:
-	 /* Support the API until we die... */
-	 MakeCurrent( pD3DDefault );
-	 break;
-
-    case WM_MOVE:
-    case WM_DISPLAYCHANGE:
-    case WM_SIZE:
-	 ResizeContext( pD3DCurrent->gl_ctx );
-	 break;
-
-    case WM_CLOSE:
-    case WM_DESTROY:
-	 /* Support the API until we die... */
-	 hOldProc = pD3DCurrent->hOldProc;
-	 DestroyContext( pD3DCurrent );
-	 return (hOldProc)(hwnd,message,wParam,lParam);
-  }
-
-  return (pD3DCurrent->hOldProc)(hwnd,message,wParam,lParam);
-}
-
-/**********************************************************************/
-/*****              Miscellaneous device driver funcs             *****/
-/**********************************************************************/
-
-/*===========================================================================*/
-/*  Not reacting to this as I'm only supporting drawing to the back buffer   */
-/* right now.                                                                */
-/*===========================================================================*/
-/* RETURN: TRUE.                                                             */
-/*===========================================================================*/
-static GLboolean SetBuffer( GLcontext *ctx, GLenum buffer )
-{
-   if (buffer == GL_BACK_LEFT)
-      return GL_TRUE;
-   else
-      return GL_FALSE;
-}
-/*===========================================================================*/
-/*  This proc will be called by Mesa when the viewport has been set.  So if  */
-/* we have a context and it isn't the default then we should let D3D know of */
-/* the change.                                                               */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void SetViewport( GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-   RECT           rect;
-
-   /* Make sure we can set a viewport. */
-   if ( pContext->pShared && (pContext != pD3DDefault) )
-   {
-	 // TODO: might be needed.
-     UpdateScreenPosHAL( pContext->pShared );
-	rect.left   = x;
-	rect.right  = x + w;
-	rect.top    = y;
-	rect.bottom = y + h;
-
-	// TODO: shared struct should make this call smaller
-     SetViewportHAL( pContext->pShared, &rect, 0.0F, 1.0F );
-   }
-}
-/*===========================================================================*/
-/*  This function could be better I guess but I decided just to grab the four*/
-/* components and store then seperately.  Makes it easier to use IMHO.       */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void ClearColor( GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-
-   pContext->aClear = a;
-   pContext->bClear = b;
-   pContext->gClear = g;
-   pContext->rClear = r;
-}
-/*===========================================================================*/
-/*  This function could be better I guess but I decided just to grab the four*/
-/* components and store then seperately.  Makes it easier to use IMHO.       */
-/* (is there an echo in here?)                                               */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void SetColor( GLcontext *ctx, GLubyte r, GLubyte g, GLubyte b, GLubyte a )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-
-   pContext->aCurrent = a;
-   pContext->bCurrent = b;
-   pContext->gCurrent = g;
-   pContext->rCurrent = r;
-}
-/*===========================================================================*/
-/*                                                                           */
-/*                                                                           */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static const char *RendererString( void )
-{
-  static char pszRender[64];
-
-  strcpy( pszRender, "altD3D " );
-
-  if ( pD3DCurrent->pShared->bHardware )
-    strcat( pszRender, "(HW)");
-  else
-    strcat( pszRender, "(SW)");
-
-  return (const char *)pszRender;
-}
-/*===========================================================================*/
-/*  This function will choose which set of pointers Mesa will use based on   */
-/* whether we hard using hardware or software.  I have added another set of  */
-/* pointers that will do nothing but stop the API from crashing.             */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void SetupDDPointers( GLcontext *ctx )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-
-   // TODO: write a generic NULL support for the span render. 
-   if ( pContext->pShared && pContext->pShared->bHardware )
-   {
-	ctx->Driver.UpdateState = SetupHWDDPointers;
-   }
-   else if ( pContext == pD3DDefault )
-   {
-	ctx->Driver.UpdateState = SetupNULLDDPointers;
-   }
-   else
-   {
-	ctx->Driver.UpdateState = SetupSWDDPointers;
-   }
-}
-/*===========================================================================*/
-/*  This function will populate all the Mesa driver hooks. This version of   */
-/* hooks will do nothing but support the API when we don't have a valid      */
-/* context bound.  This is mostly for applications that don't behave right   */
-/* and also to help exit as clean as possable when we have a FatalError.     */
-/*===========================================================================*/
-/* RETURN: pointer to the specific function.                                 */
-/*===========================================================================*/
-static void SetupNULLDDPointers( GLcontext *ctx )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-
-   /* Initialize all the pointers in the DD struct.  Do this whenever */
-   /* a new context is made current or we change buffers via set_buffer! */
-   ctx->Driver.UpdateState          = SetupNULLDDPointers;
-
-   /* State management hooks. */
-   ctx->Driver.Color                = NULLSetColor;
-   ctx->Driver.ClearColor           = NULLClearColor;
-   ctx->Driver.Clear                = NULLClearBuffers;
-   ctx->Driver.SetBuffer            = NULLSetBuffer;
-
-   /* Window management hooks. */
-   ctx->Driver.GetBufferSize        = NULLGetBufferSize;
-
-   /* Primitive rendering hooks. */
-   ctx->Driver.TriangleFunc         = NULL;
-   ctx->Driver.RenderVB             = NULL;
-
-   /* Pixel/span writing functions: */
-   ctx->Driver.WriteRGBASpan        = NULLWrSpRGBA;
-   ctx->Driver.WriteRGBSpan         = NULLWrSpRGB;
-   ctx->Driver.WriteMonoRGBASpan    = NULLWrSpRGBAMono;
-   ctx->Driver.WriteRGBAPixels      = NULLWrPiRGBA;
-   ctx->Driver.WriteMonoRGBAPixels  = NULLWrPiRGBAMono;
-
-   /* Pixel/span reading functions: */
-   ctx->Driver.ReadRGBASpan         = NULLReSpRGBA;
-   ctx->Driver.ReadRGBAPixels       = NULLRePiRGBA;
-
-   /* Misc. hooks. */
-   ctx->Driver.RendererString    = RendererString;
-}
-/*===========================================================================*/
-/*  This function will populate all the Mesa driver hooks. There are two of  */
-/* these functions.  One if we have hardware support and one is there is only*/
-/* software.  These functions will be called by Mesa and by the wgl.c when we*/
-/* have resized (or created) the buffers.  The thing is that if a window gets*/
-/* resized we may loose hardware support or gain it...                       */
-/*===========================================================================*/
-/* RETURN: pointer to the specific function.                                 */
-/*===========================================================================*/
-static void SetupSWDDPointers( GLcontext *ctx )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-
-   /* Initialize all the pointers in the DD struct.  Do this whenever */
-   /* a new context is made current or we change buffers via set_buffer! */
-   ctx->Driver.UpdateState          = SetupSWDDPointers;
-
-   /* State management hooks. */
-   ctx->Driver.Color                = SetColor;
-   ctx->Driver.ClearColor           = ClearColor;
-   ctx->Driver.Clear                = ClearBuffers;
-   ctx->Driver.SetBuffer            = SetBuffer;
-
-   /* Window management hooks. */
-   ctx->Driver.GetBufferSize        = GetBufferSize;
-   ctx->Driver.Viewport             = SetViewport;
-
-   /* Primitive rendering hooks. */
-   ctx->Driver.TriangleFunc         = NULL;
-   ctx->Driver.RenderVB             = NULL;
-
-   /* Texture management hooks. */
-
-   /* Pixel/span writing functions: */
-   ctx->Driver.WriteRGBASpan        = WSpanRGBA;
-   ctx->Driver.WriteRGBSpan         = WSpanRGB;
-   ctx->Driver.WriteMonoRGBASpan    = WSpanRGBAMono;
-   ctx->Driver.WriteRGBAPixels      = WPixelsRGBA;
-   ctx->Driver.WriteMonoRGBAPixels  = WPixelsRGBAMono;
-
-   /* Pixel/span reading functions: */
-   ctx->Driver.ReadRGBASpan         = RSpanRGBA;
-   ctx->Driver.ReadRGBAPixels       = RPixelsRGBA;
-
-   /* Misc. hooks. */
-   ctx->Driver.Flush                = Flush;
-   ctx->Driver.RendererString    = RendererString;
-}
-/*===========================================================================*/
-/*  This function will populate all the Mesa driver hooks. There are two of  */
-/* these functions.  One if we have hardware support and one is there is only*/
-/* software.  These functions will be called by Mesa and by the wgl.c when we*/
-/* have resized (or created) the buffers.  The thing is that if a window gets*/
-/* resized we may loose hardware support or gain it...                       */
-/*===========================================================================*/
-/* RETURN: pointer to the specific function.                                 */
-/*===========================================================================*/
-static void SetupHWDDPointers( GLcontext *ctx )
-{
-   D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-
-   /* Initialize all the pointers in the DD struct.  Do this whenever */
-   /* a new context is made current or we change buffers via set_buffer! */
-   ctx->Driver.UpdateState          = SetupHWDDPointers;
-
-   /* State management hooks. */
-   ctx->Driver.Color                = SetColor;
-   ctx->Driver.ClearColor           = ClearColor;
-   ctx->Driver.Clear                = ClearBuffersD3D;
-   ctx->Driver.SetBuffer            = SetBuffer;
-
-   /* Window management hooks. */
-   ctx->Driver.GetBufferSize        = GetBufferSize;
-   ctx->Driver.Viewport             = SetViewport;
-
-   /* Primitive rendering hooks. */
-   ctx->Driver.TriangleFunc         = RenderOneTriangle;
-   ctx->Driver.LineFunc                          = RenderOneLine;
-   ctx->Driver.RenderVB             = RenderVertexBuffer;
-
-   /* Pixel/span writing functions: */
-   ctx->Driver.WriteRGBASpan        = WSpanRGBA;
-   ctx->Driver.WriteRGBSpan         = WSpanRGB;
-   ctx->Driver.WriteMonoRGBASpan    = WSpanRGBAMono;
-   ctx->Driver.WriteRGBAPixels      = WPixelsRGBA;
-   ctx->Driver.WriteMonoRGBAPixels  = WPixelsRGBAMono;
-
-   /* Pixel/span reading functions: */
-   ctx->Driver.ReadRGBASpan         = RSpanRGBA;
-   ctx->Driver.ReadRGBAPixels       = RPixelsRGBA;
-
-   /* Texture management hooks. */
-   //   ctx->Driver.BindTexture          = TextureBind;
-   ctx->Driver.TexImage             = TextureLoad;
-   ctx->Driver.TexSubImage          = TextureSubImage;
-
-   /* Misc. hooks. */
-   ctx->Driver.Flush                = Flush;
-   ctx->Driver.RendererString    = RendererString;
-}
-/*===========================================================================*/
-/*  This function will release all resources used by the DLL.  Every context */
-/* will be clobbered by releaseing all driver desources and then freeing the */
-/* context memory.  Most all the work is done in DestroyContext.             */
-/*===========================================================================*/
-/* RETURN: TRUE.                                                             */
-/*===========================================================================*/
-static BOOL  TermOpenGL( HINSTANCE hInst )
-{
-  D3DMESACONTEXT *pTmp,
-		 *pNext;
-
-  /* Just incase we are still getting paint msg. */
-  MakeCurrent( pD3DDefault );
-
-  /* Walk the list until we get back to the default context. */
-  for( pTmp = pD3DDefault->next; pTmp != pD3DDefault; pTmp = pNext )
-  {
-    pNext = pTmp->next;
-    DestroyContext( pTmp );
-  }
-  DestroyContext( pD3DDefault );
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  This function is an internal function that will clean up all the Mesa    */
-/* context bound to this D3D context.  Also any D3D stuff that this context  */
-/* uses will be unloaded.                                                    */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-static void DestroyContext( D3DMESACONTEXT *pContext )
-{
-  D3DMESACONTEXT        *pTmp;
-
-  /* Walk the list until we find the context before this one. */
-  for( pTmp = pD3DDefault; pTmp && (pTmp->next != pContext); pTmp = pTmp->next )
-    if ( pTmp == pTmp->next )
-	 break;
-
-  /* If we never found it it must already be deleted. */
-  if ( pTmp->next != pContext )
-    return;
-
-  /* Make sure we are not using this context. */
-  if ( pContext == pD3DCurrent )
-    MakeCurrent( pD3DDefault );
-
-   /* Free the Mesa stuff. */
-   if ( pContext->gl_visual ) 
-   {
-      _mesa_destroy_visual( pContext->gl_visual );
-      pContext->gl_visual = NULL;
-   }
-   if ( pContext->gl_buffer ) 
-   {
-      _mesa_destroy_framebuffer( pContext->gl_buffer );
-      pContext->gl_buffer = NULL;
-   }
-   if ( pContext->gl_ctx )    
-   {
-      _mesa_destroy_context( pContext->gl_ctx );
-      pContext->gl_ctx = NULL;
-   }
-
-   /* Now dump the D3D. */
-   if ( pContext->pShared )
-	TermHAL( pContext->pShared );
-
-   /* Update the previous context's link. */
-   pTmp->next = pContext->next;
-
-   /* Gonzo. */
-   FREE( pContext );
-}
-/*===========================================================================*/
-/*  This function will pull the supplied context away from Win32.  Basicly it*/
-/* will remove the hook from the window Proc.                                */
-/*                                                                           */
-/* TODO: might want to serialize this stuff...                               */
-/*===========================================================================*/
-/* RETURN: TRUE, FALSE.                                                      */
-/*===========================================================================*/
-static BOOL UnBindWindow( D3DMESACONTEXT *pContext )
-{
-  if ( pContext == NULL )
-    return FALSE;
-
-  if ( pContext == pD3DDefault )
-    return TRUE;
-
-  /* Make sure we always have a context bound. */
-  if ( pContext == pD3DCurrent )
-    pD3DCurrent = pD3DDefault;
-
-  SetWindowLong( pContext->pShared->hwnd, GWL_WNDPROC, (LONG)pContext->hOldProc );
-  pContext->hOldProc   = NULL;
-
-  return TRUE;
-}
-/*===========================================================================*/
-/*  There are two cases that allow for a faster clear when we know that the  */
-/* whole buffer is cleared and that there is no clipping.                    */
-/*===========================================================================*/
-/* RETURN: the original mask with the bits cleared that represents the buffer*
-/* or buffers we just cleared.                                               */
-/*===========================================================================*/
-GLbitfield ClearBuffersD3D( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height )
-{
-  D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  DWORD          dwFlags = 0;
-
-  if ( mask & GL_COLOR_BUFFER_BIT )
-  {
-    dwFlags |= D3DCLEAR_TARGET;
-    mask &= ~GL_COLOR_BUFFER_BIT;
-  }
-  if ( mask & GL_DEPTH_BUFFER_BIT )
-  {
-    dwFlags |= D3DCLEAR_ZBUFFER;
-    mask &= ~GL_DEPTH_BUFFER_BIT;
-  }
-  if ( dwFlags == 0 )
-    return mask;
-
-  ClearHAL( pContext->pShared, 
-		  dwFlags, 
-		  all, 
-		  x, y, 
-		  width, height, 
-		  ((pContext->aClear<<24) | (pContext->rClear<<16) | (pContext->gClear<<8) | (pContext->bClear)), 
-		  ctx->Depth.Clear, 
-		  0 );
-
-  return mask;
-}
-
-
-
-/*===========================================================================*/
-/*  TEXTURE MANAGER: ok here is how I did textures.  Mesa-3.0 will keep track*/
-/* of all the textures for us.  So this means that at anytime we can go to   */
-/* the Mesa context and get the current texture.  With this in mind this is  */
-/* what I did.  I really don't care about what textures get or are loaded    */
-/* until I actually have to draw a tri that is textured.  At this point I    */
-/* must have the texture so I demand the texture by destorying all other     */
-/* texture surfaces if need be and load the current one.  This allows for the*/
-/* best preformance on low memory cards as time is not wasted loading and    */
-/* unload textures.                                                          */
-/*===========================================================================*/
-
-
-
-
-
-/*===========================================================================*/
-/*  TextureLoad will try and create a D3D surface from the supplied texture  */
-/* object if its level 0 (first).  The surface will be fully filled with the */
-/* texture.                                                                  */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void TextureLoad( GLcontext *ctx, GLenum target, struct gl_texture_object *tObj, GLint level, GLint internalFormat, const struct gl_texture_image *image )
-{
-  D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-
-  /* TODO: only doing first LOD. */
-  if ( (ctx->DriverCtx == NULL) || (level != 0) )
-    return;
-
-  CreateTMgrHAL( pContext->pShared, 
-			  tObj->Name, 
-			  level,
-			  tObj->Image[level]->Format,
-			  (RECT *)NULL,
-			  tObj->Image[level]->Width, 
-			  tObj->Image[level]->Height,
-			  TM_ACTION_LOAD,
-			  (void *)tObj->Image[level]->Data );
-}
-/*===========================================================================*/
-/*  TextureBind make sure that the texture is on the card.  Thats it.        */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void TextureBind( GLcontext *ctx, GLenum target, struct gl_texture_object *tObj )
-{
-  D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-
-  /* TODO: only doing first LOD. */
-  if ( (tObj->Image[0] == NULL) || (ctx->DriverCtx == NULL) )
-    return;
-
-  CreateTMgrHAL( pContext->pShared, 
-			  tObj->Name, 
-			  0,
-			  tObj->Image[0]->Format,
-			  (RECT *)NULL,
-			  tObj->Image[0]->Width, 
-			  tObj->Image[0]->Height,
-			  TM_ACTION_BIND,
-			  (void *)tObj->Image[0]->Data );
-}
-/*===========================================================================*/
-/*  TextureSubImage will make sure that the texture being updated is updated */
-/* if its on the card.                                                       */
-/*===========================================================================*/
-/* RETURN:                                                                   */
-/*===========================================================================*/
-static void TextureSubImage( GLcontext *ctx, GLenum target, struct gl_texture_object *tObj, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLint internalFormat, const struct gl_texture_image *image )
-{
-  D3DMESACONTEXT *pContext = (D3DMESACONTEXT *)ctx->DriverCtx;
-  RECT           rect;
-
-  /* TODO: only doing first LOD. */
-  if ( (ctx->DriverCtx == NULL) || (level > 0) )
-    return;
-
-  /* Create a dirty rectangle structure. */
-  rect.left   = xoffset;
-  rect.right  = xoffset + width;
-  rect.top    = yoffset;
-  rect.bottom = yoffset + height;
-  
-  CreateTMgrHAL( pContext->pShared, 
-			  tObj->Name, 
-			  0,
-			  tObj->Image[0]->Format, 
-			  &rect,
-			  tObj->Image[0]->Width, 
-			  tObj->Image[0]->Height,
-			  TM_ACTION_UPDATE,
-			  (void *)tObj->Image[0]->Data );
-}
-
diff --git a/src/mesa/drivers/d3d/d3dText.h b/src/mesa/drivers/d3d/d3dText.h
deleted file mode 100644
index 9ff0650518..0000000000
--- a/src/mesa/drivers/d3d/d3dText.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef D3D_TEXT_H
-#define D3D_TEXT_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*===========================================================================*/
-/* Includes.                                                                 */
-/*===========================================================================*/
-#include 
-#include 
-#include 
-/*===========================================================================*/
-/* Magic numbers.                                                            */
-/*===========================================================================*/
-#define	D3DLTEXT_BITSUSED		0xFFFFFFFF
-#define	MAX_VERTICES			700  // (14*40) 14 per character, 40 characters
-/*===========================================================================*/
-/* Macros defines.                                                           */
-/*===========================================================================*/
-/*===========================================================================*/
-/* Type defines.                                                             */
-/*===========================================================================*/
-typedef struct _d3dText_metrics
-{
-  float		   	fntYScale,
-                    fntXScale;
-
-  int		   	fntXSpacing,
-	               fntYSpacing;
-
-  DWORD			dwColor;
-  LPDIRECT3DDEVICE3 lpD3DDevice;
-
-} D3DFONTMETRICS, *PD3DFONTMETRICS;
-/*===========================================================================*/
-/* Function prototypes.                                                      */
-/*===========================================================================*/
-extern BOOL InitD3DText( void );
-extern void d3dTextDrawCharacter( char *c, int x, int y, PD3DFONTMETRICS pfntMetrics );
-extern void d3dTextDrawString( char *pszString, int x, int y, PD3DFONTMETRICS pfntMetrics );
-/*===========================================================================*/
-/* Global variables.                                                         */
-/*===========================================================================*/
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-- 
cgit v1.2.3


From a9e36696837b2c31ecee4017a0adffbd987c1eff Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg 
Date: Thu, 25 Feb 2010 16:17:04 -0500
Subject: Remove remaining miniglx references

---
 configs/linux-solo             |  54 ----
 docs/MiniGLX.html              | 534 ------------------------------------
 doxygen/Makefile               |   3 +-
 doxygen/miniglx.doxy           | 179 ------------
 include/GL/miniglx.h           | 482 ---------------------------------
 progs/miniglx/.gitignore       |   6 -
 progs/miniglx/Makefile         |  61 -----
 progs/miniglx/glfbdevtest.c    | 477 --------------------------------
 progs/miniglx/manytex.c        | 381 --------------------------
 progs/miniglx/miniglxsample.c  | 128 ---------
 progs/miniglx/miniglxtest.c    | 272 -------------------
 progs/miniglx/sample_server.c  | 111 --------
 progs/miniglx/sample_server2.c | 228 ----------------
 progs/miniglx/texline.c        | 267 ------------------
 src/glut/mini/Makefile         | 103 -------
 src/glut/mini/bitmap.c         |  56 ----
 src/glut/mini/callback.c       | 152 -----------
 src/glut/mini/color.c          |  46 ----
 src/glut/mini/globals.c        |  61 -----
 src/glut/mini/glut.pc.in       |  13 -
 src/glut/mini/init.c           |  59 ----
 src/glut/mini/internal.h       |  78 ------
 src/glut/mini/menu.c           |  86 ------
 src/glut/mini/models.c         | 598 -----------------------------------------
 src/glut/mini/overlay.c        |  60 -----
 src/glut/mini/state.c          |  70 -----
 src/glut/mini/teapot.c         | 212 ---------------
 src/glut/mini/window.c         | 273 -------------------
 28 files changed, 1 insertion(+), 5049 deletions(-)
 delete mode 100644 configs/linux-solo
 delete mode 100644 docs/MiniGLX.html
 delete mode 100644 doxygen/miniglx.doxy
 delete mode 100644 include/GL/miniglx.h
 delete mode 100644 progs/miniglx/.gitignore
 delete mode 100644 progs/miniglx/Makefile
 delete mode 100644 progs/miniglx/glfbdevtest.c
 delete mode 100644 progs/miniglx/manytex.c
 delete mode 100644 progs/miniglx/miniglxsample.c
 delete mode 100644 progs/miniglx/miniglxtest.c
 delete mode 100644 progs/miniglx/sample_server.c
 delete mode 100644 progs/miniglx/sample_server2.c
 delete mode 100644 progs/miniglx/texline.c
 delete mode 100644 src/glut/mini/Makefile
 delete mode 100644 src/glut/mini/bitmap.c
 delete mode 100644 src/glut/mini/callback.c
 delete mode 100644 src/glut/mini/color.c
 delete mode 100644 src/glut/mini/globals.c
 delete mode 100644 src/glut/mini/glut.pc.in
 delete mode 100644 src/glut/mini/init.c
 delete mode 100644 src/glut/mini/internal.h
 delete mode 100644 src/glut/mini/menu.c
 delete mode 100644 src/glut/mini/models.c
 delete mode 100644 src/glut/mini/overlay.c
 delete mode 100644 src/glut/mini/state.c
 delete mode 100644 src/glut/mini/teapot.c
 delete mode 100644 src/glut/mini/window.c

(limited to 'docs')

diff --git a/configs/linux-solo b/configs/linux-solo
deleted file mode 100644
index 247a2d489a..0000000000
--- a/configs/linux-solo
+++ /dev/null
@@ -1,54 +0,0 @@
-# Configuration for linux-solo: Linux DRI hardware drivers for fbdev
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-solo
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-WARN_FLAGS = -Wall -Wundef
-OPT_FLAGS  = -O3 -g
-PIC_FLAGS  = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-# DRM and pciaccess
-LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
-LIBDRM_LIB = $(shell pkg-config --libs libdrm)
-PCIACCESS_CFLAGS = $(shell pkg-config --cflags pciaccess)
-PCIACCESS_LIB = $(shell pkg-config --libs pciaccess)
-
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE -DHAVE_POSIX_MEMALIGN \
-	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DHAVE_ALIAS
-
-CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-	$(ASM_FLAGS) -std=c99 -ffast-math 
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MESA_ASM_SOURCES = 
-
-# Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR) $(PCIACCESS_LIB)
-GL_LIB_DEPS = -lm -lpthread -ldl
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
-
-# Directories
-SRC_DIRS = glx/mini gallium mesa glu glut/mini glew
-DRIVER_DIRS = dri
-PROGRAM_DIRS = miniglx
-
-#DRI_DIRS = ffb gamma sis savage tdfx unichrome fb
-DRI_DIRS = i810 i915tex i915 mach64 mga r128 r200 radeon
diff --git a/docs/MiniGLX.html b/docs/MiniGLX.html
deleted file mode 100644
index e7ebae6851..0000000000
--- a/docs/MiniGLX.html
+++ /dev/null
@@ -1,534 +0,0 @@
-
-
-
-  Mini GLX Specification
-
-
-
      
-
      Mini GLX Specification
      
-
      
-
      
-
      Tungsten Graphics, Inc.
      
-
      
-January 20, 2003
      
-
      
-
      
-
      
-
       Copyright © 2002-2003 by Tungsten Graphics, Inc., Cedar Park,
-Texas. All Rights Reserved. 
      
-
      
-Permission is granted to make and distribute verbatim copies of this
-document provided the copyright notice and this permission notice are
-preserved on all copies.
      
-
      
-
      
-
      1. Introduction
      
-
      The Mini GLX interface facilitates OpenGL rendering on embedded
-devices. The interface is a subset of the GLX interface, plus a minimal
-set of Xlib-like functions.
      
-
      Programs written to the Mini GLX specification should run unchanged
-on systems with the X Window System and the GLX extension. The intention
-is to allow flexibility for prototyping and testing.
      
-
      This document serves as both the reference guide and programming
-guide for Mini GLX.
      
-
      
-
      
-
      2. Mini GLX Concepts
      
-
      The OpenGL specification does not describe how OpenGL rendering
-contexts and drawing surfaces (i.e. the frame buffer) are created and
-managed. Rather, this is handled by an OpenGL window system interface,
-such as Mini GLX.
      
-
      There are three main datatypes or resources managed by Mini GLX. The
-resources and their corresponding GLX or Xlib data types are:
      
-
-  
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-    
-      
-      
-    
-  
-
      ResourceData type
      pixel formatsX Visual and XVisualInfo
      drawing surfacesX Window or GLXDrawable
      rendering contextsGLXContext
      
-
      Pixel formats or X Visuals describe the per-pixel attributes of the
-frame buffer.  For example, bits per color component, Z buffer size,
-stencil size, TrueColor vs PseudoColor, etc.
      
-
      Drawing surfaces or X Windows typically describe a spatial
-allocation of the frame buffer (i.e. the position and size of a
-rectangular region of pixels).  Since MiniGLX doesn't really support a
-window system, the window is effectively the entire frame buffer.
      
-
      A rendering context represents the current OpenGL state such as
-current drawing color, line width, blending mode, texture parameters,
-etc. Several rendering contexts can be created but only one can be in
-use at any given time.
      
-
      The Mini GLX interface provides all the functions needed for
-choosing pixel formats, create drawing surfaces, creating rendering
-contexts and binding rendering contexts to drawing surfaces.
      
-
      
-
      
-
      3. Using Mini GLX
      
-
      To use the Mini GLX interface in your application, include the
-GL/miniglx.h header file at compile time:
      
-
      	#include <GL/miniglx.h>
      
-  
      
-Applications should link with libGL.so (i.e. gcc
-myprogram.o -lGL -o myprogram).  libGL.so implements the
-MiniGLX API functions and, in turn, loads a hardware-specific device
-driver (such as radeon_dri.so) at runtime.  The
-environment variable LIBGL_DRIVERS_PATH should name the
-directory where these modules are located.
      
-
      
-The remainder of this section describes the MiniGLX API functions.
      
-
      
-
      3.1 Initialization
      
-
      The XOpenDisplay function is used to initialize the graphics system:
      
-
      
-  
      Display *XOpenDisplay(const char *displayname)
      
-
      
-
      The displayName parameter is currently ignored in Mini
-GLX. It is recommended that NULL be passed as thedisplayName
-parameter.
      
-
      If XOpenDisplay is able to initialize the graphics system a pointer
-to a Display will be returned.  Otherwise, NULL will be returned.
      
-
      3.2 Choosing a Visual
      
-
      A visual (i.e. pixel format) must be chosen before a drawing surface
-or rendering context can be created.  This is done with the
-glXChooseVisual function:
      
-
      
-  
      XVisualInfo *glXChooseVisual(Display *dpy, int screen, const int *attribList)
      
-
      
-
      dpy is a pointer to the display returned by
-XOpenDisplay. 
      
-
      screen is currently ignored by Mini GLX and should be
-zero. 
      
-
      attribList is a list of GLX attributes which describe
-the desired pixel format.  It is terminated by the token None.
-The attributes are as follows:
      
-
      
-  
      
-    
      GLX_USE_GL
      
-    
      This attribute should always be present in order to maintain
-compatibility with GLX.
      
-    
      GLX_RGBA
      
-    
      If present, only RGBA pixel formats will be considered.
-Otherwise, only color index formats are considered.
      
-    
      GLX_DOUBLEBUFFER
      
-    
      if present, only double-buffered pixel formats will	be chosen.
      
-    
      GLX_RED_SIZE n
      
-    
      Must be followed by a non-negative integer indicating the
-minimum number of bits per red pixel component that is acceptable.
      
-    
      GLX_GREEN_SIZE n
      
-    
      Must be followed by a non-negative integer indicating the
-minimum number of bits per green pixel component that is acceptable.
      
-    
      GLX_BLUE_SIZE n
      
-    
      Must be followed by a non-negative integer indicating the
-minimum number of bits per blue pixel component that is acceptable.
      
-    
      GLX_ALPHA_SIZE n
      
-    
      Must be followed by a non-negative integer indicating the
-minimum number of bits per alpha pixel component that is acceptable.
      
-    
      GLX_STENCIL_SIZE n
      
-    
      Must be followed by a non-negative integer indicating the
-minimum number of bits per stencil value that is acceptable.
      
-    
      None
      
-    
      This token is used to terminate the attribute list.
      
-  
      
-
      
-
      glXChooseVisual will return a pointer to an XVisualInfo object which
-most closely matches the requirements of the attribute list.  If there
-is no visual which matches the request, NULL will be returned.
      
-
      Note that visuals with accumulation buffers and depth buffers are
-not available.
      
-
      
-
      
-
      3.3 Creating a Drawing Surface
      
-
      Drawing surfaces are created as X windows.  For Mini GLX,
-windows are full-screen; they cover the entire frame buffer.
- Also, Mini GLX imposes a limit of one window.  A second window
-cannot be created until the first one is destroyed.
      
-
      3.3.1 Window Creation
      
-
      The XCreateWindow function is used to create a drawing surface:
      
-
      
-  
      Window XCreateWindow( Display *display,
                            Window parent,
                            int x, int y,
                            unsigned int width, unsigned int height,
                            unsigned int borderWidth,
                            int depth,
                            unsigned int class,
                            Visual *visual,
                            unsigned long valuemask,
                            XSetWindowAttributes *attributes )
      
-
      
-
      The parameters are as follows:
      
-
      
-  
      
-    
      display
      
-    
      A Display pointer, as returned by XOpenDisplay.
      
-    
      parent
      
-    
      The parent window for the new window.  For Mini GLX, this
-should beRootWindow(dpy, 0).
      
-    
      x, y
      
-    
      The position of the window.  For Mini GLX, both values should
-be zero.
      
-    
      width, height
      
-    
      The size of the window.  For Mini GLX, this specifies the
-desired screen size such as 1024, 768 or 1280, 1024.
      
-    
      borderWidth
      
-    
      This parameter should be zero.
      
-    
      depth
      
-    
      The pixel depth for the window.  For Mini GLX this should be
-the depth found in the XVisualInfo object returned by glxChooseVisual.
      
-    
      class
      
-    
      The window class.  For Mini GLX this value should be InputOutput.
      
-    
      visual
      
-    
      This parameter should be the visual field of the XVisualInfo
-object returned by glxChooseVisual.
      
-    
      valuemask
      
-    
      This parameter indicates which fields of the XSetWindowAttributes
-are to be used. For Mini GLX this is typically the bitmaskCWBackPixel
-| CWBorderPixel | CWColormap.
      
-    
      attributes
      
-    
      Initial window attributes. Of the fields in the XSetWindowAttributes
-structure, thebackground_pixel, border_pixel
-and colormap fields should be set.  See the discussion
-below regarding colormaps.
      
-  
      
-
      
-
      XCreateWindow will return a window handle if it succeeds
-or zero if it fails.
      
-
      3.3.2 Window Mapping
      
-
      To display the window the XMapWindow function must be called:
      
-
      
-  
      void XMapWindow(Display *dpy, Window w)
      
-
      
-
      This function does nothing in Mini GLX but is required for Xlib/GLX
-compatibility
      
-
      3.3.3 Colormaps
      
-
      
-
      Xlib requires specification of a colormap when creating a window.
- For purposes of interoperability, Mini GLX requires this as well,
-though the colormap is not actually used.  The XCreateColormap
-function is used to create a colormap:
      
-
      Colormap XCreateColormap(Display *dpy, Window window,
-Visual *visual, int alloc)
      
-  
      
-
      The parameters are as follows:
      
-
      
-
      
-  
      
-    
      dpy
      
-    
      The display handle as returned by XOpenDisplay.
      
-    
      window
      
-    
       This parameter is ignored by Mini GLX but should be the value
-returned by the RootWindow(dpy, 0) macro.
      
-    
      
-    
      visual
      
-    
      This parameter is ignored by Mini GLX but should be the visual
-field of the XVisualInfo object returned by glXChooseVisual. 
      
-    
      alloc
      
-    
      This parameter is ignored by Mini GLX but should be set to AllocNone.
      
-  
      
-
      
-
      
-
      3.4 Creating a Rendering Context
      
-
      An OpenGL rendering context is created with the glXCreateContext
-function:
      
-
      
-  
      GLXContext glXCreateContext(Display *dpy, XVisualInfo *visInfo, GLXContext shareList, Bool direct)
      
-
      
-
      The parameters are as follows:
      
-
      
-  
      
-    
      dpy
      
-    
      The display handle as returned by XOpenDisplay.
      
-    
      visInfo
      
-    
      The visual as returned by glXChooseVisual.
      
-    
      shareList
      
-    
      If non-zero, texture objects and display lists are shared with
-the named rendering context. If zero, texture objects and display lists
-will (initially) be private to this context. They may be shared when a
-subsequent context is created.
      
-    
      direct
      
-    
      Specifies whether direct or indirect rendering is desired. For
-Mini GLX this value is ignored but it should be set to True.
      
-  
      
-
      
-
      glXCreateContext will return a GLXContext handle if it
-succeeds or zero if it fails due to invalid parameter or insufficient
-resources.
      
-
      
-
      
-
      3.5 Binding a Rendering Context
      
-
      The final step before beginning OpenGL rendering is to bind (i.e.
-activate) a rendering context and drawing surface with the
-glXMakeCurrent function:
      
-
      
-  
      Bool glXMakeCurrent(Display *dpy, GLXDrawable drawable, GLXContext ctx)
      
-
      
-
      The parameters are as follows:
      
-
      
-  
      
-    
      dpy
      
-    
      The display handle, as returned by XOpenDisplay.
      
-    
      drawable
      
-    
      The window or drawable to bind to the rendering context. This
-should be the value returned by XCreateWindow.
      
-    
      ctx
      
-    
      The rendering context to bind, as returned by glXCreateContext.
      
-  
      
-
      
-
      If glXMakeCurrent succeeds True is returned.  Otherwise False is
-returned to indicate an invalid display, window or context parameter.
      
-
      After the rendering context has been bound to the drawing surface
-OpenGL rendering can begin.
      
-
      The current rendering context may be unbound by calling
-glXMakeCurrent with the window and context parameters set to zero.
      
-
      An application may create any number of rendering contexts and bind
-them as needed. Note that binding a rendering context is generally not a
-light-weight operation.  Most simple OpenGL applications create
-only one rendering context.
      
-
      
-
      
-
      3.6 Color Buffer Swapping
      
-
      A double buffered window has two color buffers: a front buffer and a
-back buffer.  Normally, rendering is directed to the back buffer while
-the front buffer is displayed.  When rendering of a frame is finished
-the front and back buffers are swapped to provide the illusion of
-instanteous screen updates.
      
-
      The color buffers for a particular window (i.e. drawable) may be
-swapped with the glXSwapBuffers command:
      
-
      
-  
      void glXSwapBuffers(Display *dpy, GLXDrawable drawable)
      
-
      
-Any pending rendering commands will be completed before the buffer swap
-takes place.
      
-
      
-Calling glXSwapBuffers on a window which is single-buffered has no
-effect.
      
-
      
-
      3.7 Releasing Resources
      
-
      3.7.1 Releasing Rendering Contexts
      
-
      A rendering context may be destroyed by calling glXDestroyContext:
      
-
      
-  
      void glXDestroyContext(Display *dpy, GLXContext ctx)
      
-
      
-
      3.7.2 Releasing Windows
      
-
      A window may be destroyed by calling XDestroyWindow:
      
-
      
-  
      void XDestroyWindow(Display *dpy, Window window)
      
-
      
-
      3.7.3 Releasing Visuals
      
-
      An XVisualInfo object may be freed by calling XFree:
      
-
      
-  
      void XFree(void *data)
      
-
      
-
      3.7.4 Releasing Colormaps
      
-
      A colormap may be freed by calling XFreeColormap:
      
-
      
-  
      void XFreeColormap(Display *dpy, Colormap colormap)
      
-
      
-
      3.7.4 Releasing Display Resources
      
-
      When the application is about to exit, the resources associated with
-the graphics system can be released by calling XCloseDisplay:
      
-
      
-  
      void XCloseDisplay(Display *dpy)
      
-
      
-
      The display handle becomes invalid at this point.
      
-
      
-
      
-
      3.8 Query Functions
      
-
      3.8.1 Querying Available Visuals
      
-A list of all available visuals can be obtained with the XGetVisualInfo
-function:
      
-
      
-
      XVisualInfo
-*XGetVisualInfo(Display *dpy, long vinfo_mask, XVisualInfo
-*vinfo_template, int *nitems_return)
      
-
      
-
      
-The parameters are as follows:
      
-
      
-  
      
-    
      dpy
      
-    
      The display handle, as returned by XOpenDisplay.
      
-    
      vinfo_mask
      
-    
      A bitmask indicating which fields of the vinfo_template are to
-be matched.  The value must be VisualScreenMask.
      
-    
      vinfo_template
      
-    
      A template whose fields indicate which visual attributes must
-be matched by the results.  The screen field of this structure must
-be zero.
      
-    
      nitems_return
      
-    
      Returns the number of visuals returned. 
      
-  
      
-
      
-The return value is the address of an array of all available visuals.
      
-
      
-An example of using XGetVisualInfo to get all available visuals follows:
      
-
      
-
      XVisualInfo visTemplate, *results;
      
-int numVisuals;
      
-Display *dpy = XOpenDisplay(NULL);
      
-visTemplate.screen = 0;
      
-results = XGetVisualInfo(dpy, VisualScreenMask, &visTemplate,
-&numVisuals);
      
-
      
-
      
-
      3.8.2 Querying Visual Attributes
      
-
      The GLX attributes of an X visual may be queried with the
-glXGetConfig function:
      
-
      
-  
      int glXGetConfig(Display *dpy, XVisualInfo *vis, int attribute, int *value)
      
-
      
-
      The parameters are as follows:
      
-
      
-  
      
-    
      dpy
      
-    
      The display handle, as returned by XOpenDisplay.
      
-    
      vis
      
-    
      The visual, as returned by glXChooseVisual.
      
-    
      attribute
      
-    
      The attribute to query.  The attributes are listed below.
      
-    
      value
      
-    
      Pointer to an integer in which the result of the query will be
-stored. 
      
-  
      
-
      
-
      The return value will be zero if no error occurs.
- GLX_INVALID_ATTRIBUTE will be returned if the attribute
-parameter is invalid.  GLX_BAD_VISUAL will be returned
-if the XVisualInfo parameter is invalid.
      
-
      The following attributes may be queried:
      
-
      
-  
      
-    
      GLX_USE_GL
      
-    
      The result will be True or False to
-indicate if OpenGL rendering is supported with the visual.  Mini GLX
-always return True.
      
-    
      GLX_RGBA
      
-    
      The result will be True for RGBA visuals or False
-for color index visuals.
      
-    
      GLX_DOUBLEBUFFER
      
-    
      The result will be True if the visual has two
-color buffers or False if the visual has one color buffer.
      
-    
      GLX_RED_SIZE
      
-    
      The result will be the number of red bits per pixel.
      
-    
      GLX_GREEN_SIZE
      
-    
      The result will be the number of green bits per pixel.
      
-    
      GLX_BLUE_SIZE
      
-    
      The result will be the number of blue bits per pixel.
      
-    
      GLX_ALPHA_SIZE
      
-    
      The result will be the number of alpha bits per pixel.
      
-    
      GLX_DEPTH_SIZE
      
-    
      The result will be the number of bits per Z value.
      
-    
      GLX_STENCIL_SIZE
      
-    
      The result will be the number of bits per stencil value.
      
-      
      
-    
      
-  
      
-
      
-
      3.8.3 Querying the Current Rendering Context
      
-
      The current rendering context can be queried with
-glXGetCurrentContext: 
      
-
      
-  
      GLXContext glXGetCurrentContext(void)
      
-
      
-
      Zero will be returned if no context is currently bound.
      
-
      
-
      
-
      3.8.4 Querying the Current Drawable
      
-
      The current drawable (i.e. window or drawing surface) can be queried
-with glXGetCurrentDrawable:
      
-
      
-  
      GLXDrawable glXGetCurrentDrawable(void)
      
-
      
-
      Zero will be returned if no drawable is currently bound.
      
-
      
-
      
-
      3.8.5 Function Address Queries
      
-
      The glXGetProcAddress function will return the address of any
-available OpenGL or Mini GLX function:
      
-
      
-  
      void *glXGetProcAddress(const GLubyte *procName)
      
-
      
-
      If procName is a valid function name, a pointer to that
-function will be returned.  Otherwise, NULL will be returned.
      
-
      The purpose of glXGetProcAddress is to facilitate using future
-extensions to OpenGL or Mini GLX.  If a future version of the library
-adds new extension functions they'll be accessible via
-glXGetProcAddress. The alternative is to hard-code calls to the new
-functions in the application but doing so will prevent linking the
-application with older versions of the library.
      
-
      
-
      
-
      3.9 Versioning
      
-The Mini GLX version can be queried at run time with glXQueryVersion:
-
      
-  
      Bool glXQueryVersion(Display *dpy, int *major, int *minor)
      
-
      
-
      major will be set to the major version number andminor
-will be set to the minor version number.True will be
-returned if the function succeeds. False will be returned
-if the function fails due to invalid parameters. The dpy
-argument is currently ignored, but should be the value returned by
-XOpenDisplay.
      
-
      At compile time, the Mini GLX interface version can be tested with
-the MINI_GLX_VERSION_1_x preprocessor tokens. For example, if
-version 1.0 of Mini GLX is supported, then MINI_GLX_VERSION_1_0
-will be defined. If version 1.1 of Mini GLX is supported, then
-MINI_GLX_VERSION_1_1 will be defined.
      
-
      At the time of writing the current Mini GLX version is 1.0.
      
-
      
-
      
-
      4.0 Interoperability with GLX and Xlib
      
-While Mini GLX strives to be compatible with GLX and Xlib there are
-some unavoidable differences which must be taken into consideration.
      
-
      4.1 Public vs Private Structures
      
-The structure of many X data types is public.  For example, the Display
-data type is defined as a structure in /usr/include/X11/Xlib.h and
-programmers may access any fields of that structure at will.  Mini
-GLX also defines a Display data type but its fields are hidden and not
-visiblein miniglx.h.  Duplicating the Xlib
-declaration for the Display data type in minigl.h would
-require defining a large number of other superfluous Xlib datatypes.
      
-
      
-Mini GLX users are discouraged from directly accessing the fields of
-Xlib data types to maximize portability - though this is unavoidable to
-some extent.  For example, the XVisualInfo and XSetWindowAtttributes
-data types must be completely public.
-
      4.2 Macros
      
-In some cases, Xlib defines macros which are meant to be used instead
-of direct structure accesses.  For example, the RootWindow(dpy,
-screen) macro returns the root window for a given screen on a
-given display.  Unfortunately, macros do nothing to aid in ABI
-compatibility since they are resolved at compile time instead of at
-link/run time.
      
-
      
-Mini GLX also defines a RootWindow macro since it's
-essential for creating windows.  But the implementation of this
-macro by Xlib and Mini GLX is completely different.
      
-
      4.3 Summary
      
-Because Xlib and Mini GLX define data types and macros differently,
-Mini GLX applications must be recompiled when retargeting Mini GLX or
-native Xlib/GLX.  That is, applications can't simply be re-linked
-because of ABI incompatibilities.
      
-
      
-Nevertheless, the fact that Mini GLX programs can be recompiled for
-Xlib and GLX increases portability and flexibility for testing and
-prototyping.
      
-
      
-
      5.0 Example Program
      
-
      This section shows an example program which uses the Mini GLX
-interface. The program simply draws several frames of a rotating square.
      
-
      
-
      The program may be compiled for use with Xlib/GLX or Mini GLX by
-setting the USE_MINIGLX token to 0 or 1, respectively.
- Note that the only difference is the header files which are
-included.
      
-
      
-
       
      
-

      #define USE_MINIGLX 1  /* 1 = use Mini GLX, 0 = use Xlib/GLX */

      #include <stdio.h>
      #include <stdlib.h>
      #include <GL/gl.h>

      #if USE_MINIGLX
      #include <GL/miniglx.h>
      #else
      #include <GL/glx.h>
      #include <X11/Xlib.h>
      #endif

      /*
       * Create a simple double-buffered RGBA window.
       */
      static Window
      MakeWindow(Display * dpy, unsigned int width, unsigned int height)
      {
         int visAttributes[] = {
            GLX_RGBA,
            GLX_RED_SIZE, 1,
            GLX_GREEN_SIZE, 1,
            GLX_BLUE_SIZE, 1,
            GLX_DOUBLEBUFFER,
            None
         };
         XSetWindowAttributes attr;
         unsigned long attrMask;
         Window root;
         Window win;
         GLXContext ctx;
         XVisualInfo *visinfo;

         root = RootWindow(dpy, 0);

         /* Choose GLX visual / pixel format */
         visinfo = glXChooseVisual(dpy, 0, visAttributes);
         if (!visinfo) {
            printf("Error: couldn't get an RGB, Double-buffered visual\n");
            exit(1);
         }

         /* Create the window */
         attr.background_pixel = 0;
         attr.border_pixel = 0;
         attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
         attrMask = CWBackPixel | CWBorderPixel | CWColormap;
         win = XCreateWindow(dpy, root, 0, 0, width, height,
      		       0, visinfo->depth, InputOutput,
      		       visinfo->visual, attrMask, &attr);
         if (!win) {
            printf("Error: XCreateWindow failed\n");
            exit(1);
         }

         /* Display the window */
         XMapWindow(dpy, win);

         /* Create GLX rendering context */
         ctx = glXCreateContext(dpy, visinfo, NULL, True);
         if (!ctx) {
            printf("Error: glXCreateContext failed\n");
            exit(1);
         }

         /* Bind the rendering context and window */
         glXMakeCurrent(dpy, win, ctx);

         return win;
      }


      /*
       * Draw a few frames of a rotating square.
       */
      static void
      DrawFrames(Display * dpy, Window win)
      {
         int angle;
         glShadeModel(GL_FLAT);
         glClearColor(0.5, 0.5, 0.5, 1.0);
         for (angle = 0; angle < 360; angle += 10) {
            glClear(GL_COLOR_BUFFER_BIT);
            glColor3f(1.0, 1.0, 0.0);
            glPushMatrix();
            glRotatef(angle, 0, 0, 1);
            glRectf(-0.8, -0.8, 0.8, 0.8);
            glPopMatrix();
            glXSwapBuffers(dpy, win);
         }
      }


      int
      main(int argc, char *argv[])
      {
         Display *dpy;
         Window win;

         dpy = XOpenDisplay(NULL);
         if (!dpy) {
            printf("Error: XOpenDisplay failed\n");
            return 1;
         }

         win = MakeWindow(dpy, 300, 300);

         DrawFrames(dpy, win);

         return 0;
      }
      
-
      
-
-
diff --git a/doxygen/Makefile b/doxygen/Makefile
index 15ade4043b..120372e1da 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -22,8 +22,7 @@ full: $(FULL:.doxy=.tag)
 
 SUBSET = \
 	main.doxy \
-	math.doxy \
-	miniglx.doxy
+	math.doxy
 
 subset: $(SUBSET:.doxy=.tag)
 	$(foreach FILE,$(SUBSET),doxygen $(FILE);)
diff --git a/doxygen/miniglx.doxy b/doxygen/miniglx.doxy
deleted file mode 100644
index 61c376caf2..0000000000
--- a/doxygen/miniglx.doxy
+++ /dev/null
@@ -1,179 +0,0 @@
-# Doxyfile 0.1
-
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "MiniGLX"
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = 
-OUTPUT_LANGUAGE        = English
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-INTERNAL_DOCS          = YES
-STRIP_CODE_COMMENTS    = YES
-CASE_SENSE_NAMES       = YES
-SHORT_NAMES            = NO
-HIDE_SCOPE_NAMES       = NO
-VERBATIM_HEADERS       = NO
-SHOW_INCLUDE_FILES     = NO
-JAVADOC_AUTOBRIEF      = NO
-INHERIT_DOCS           = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 8
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-ALIASES                = 
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-OPTIMIZE_OUTPUT_FOR_C  = NO
-SHOW_USED_FILES        = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = YES
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = NO
-WARN_FORMAT            = 
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../src/glx/mini/ ../include/GL/miniglx.h
-FILE_PATTERNS          = *.h *.c
-RECURSIVE              = NO
-EXCLUDE                = ../src/glx/mini/glapi.c
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = miniglx
-HTML_HEADER            = header_subset.html
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = 
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = 
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = 
-MAN_EXTENSION          = 
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = ../include/
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES		= \
-			 core_subset.tag=../core_subset \
-                         math_subset.tag=../math_subset
-GENERATE_TAGFILE       = miniglx.tag
-ALLEXTERNALS           = NO
-PERL_PATH              = 
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = NO
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-TEMPLATE_RELATIONS     = YES
-HIDE_UNDOC_RELATIONS   = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-GRAPHICAL_HIERARCHY    = YES
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
-CGI_NAME               = 
-CGI_URL                = 
-DOC_URL                = 
-DOC_ABSPATH            = 
-BIN_ABSPATH            = 
-EXT_DOC_PATHS          = 
diff --git a/include/GL/miniglx.h b/include/GL/miniglx.h
deleted file mode 100644
index 8c6180be60..0000000000
--- a/include/GL/miniglx.h
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.1
- *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-/**
- * \file miniglx.h
- * \brief Mini GLX interface functions.
- * \author Brian Paul
- *
- * See comments miniglx.c for more information.
- */
-
-#ifndef MINIGLX_H
-#define MINIGLX_H
-
-#include 
-#include 
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- * \name Replacement Xlib/GLX types
- */
-/*@{*/
-/**
- * \brief Boolean type.
- * 
- * It can have the values #True or #False.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef int Bool;
-#endif
-typedef int MINI_Bool;
-
-/**
- * \brief Color map.
- *
- * Alias for private ::MiniGLXColormapRec structure.
- */
-typedef struct MiniGLXColormapRec *MINI_Colormap;
-#ifndef MINIGLX_NO_XTYPES
-typedef struct MiniGLXColormapRec *Colormap;
-#endif
-
-/**
- * \brief Window attributes.
- */
-typedef struct MiniGLXSetWindowAttributesRec {
-   int background_pixel; /**< \brief background pixel */
-   int border_pixel;     /**< \brief border pixel value */
-   MINI_Colormap colormap;    /**< \brief color map to be associated with window */
-   int event_mask;       /**< \brief set of events that should be saved */
-} XSetWindowAttributes;
-
-/**
- * \brief Visual.
- *
- * Alias for the private ::MiniGLXVisualRec structure.
- *
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXVisualRec Visual;
-
-/**
- * \brief Visual information.
- *
- * \sa \ref datatypes.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef unsigned long VisualID;
-#endif
-typedef unsigned long MINI_VisualID;
-typedef struct MiniGLXXVisualInfoRec {
-   Visual *visual;	/**< \brief pointer to the GLX Visual */
-   MINI_VisualID visualid;	/**< \brief visual ID */
-   int screen;		/**< \brief screen number */
-   int depth;		/**< \brief bit depth */
-#if defined(__cplusplus) || defined(c_plusplus)
-   int c_class;		/**< \brief class */
-#else
-   int class;		/**< \brief class */
-#endif
-   int bits_per_rgb;	/**< \brief total bits per pixel */
-} XVisualInfo;
-
-/**
- * \brief GLX Frame Buffer Configuration (for pbuffers)
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXFBConfigRec {
-   XVisualInfo *visInfo;
-} GLXFBConfig;
-
-
-/**
- * \brief Display handle.
- *
- * Alias for the private ::MiniGLXDisplayRec structure.
- *
- * \sa \ref datatypes.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef struct MiniGLXDisplayRec   Display;
-#endif
-typedef struct MiniGLXDisplayRec   MINI_Display;
-
-/**
- * \brief Window handle.
- *
- * Alias for the private ::MiniGLXWindowRec structure.
- *
- * \sa \ref datatypes.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef struct MiniGLXWindowRec   *Window;
-#endif
-typedef struct MiniGLXWindowRec   *MINI_Window;
-
-/**
- * \brief Drawable.
- *
- * Alias for the private ::MiniGLXWindowRec structure.
- * 
- * For Mini GLX only the full-screen window can be used as source and
- * destination in graphics operations.
- *
- * \sa \ref datatypes.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef struct MiniGLXWindowRec   *Drawable;
-#endif
-typedef struct MiniGLXWindowRec   *MINI_Drawable;
-
-/**
- * \brief GLX drawable.
- *
- * Alias for the private ::MiniGLXWindowRec structure.
- * 
- * Same as #Drawable.
- *
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXWindowRec   *GLXDrawable;
-
-/**
- * \brief GLX pbuffer.
- *
- * Alias for the private ::MiniGLXWindowRec structure.
- * 
- * Same as #Drawable.
- *
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXWindowRec   *GLXPbuffer;
-
-/**
- * \brief GLX context.
- * 
- * Alias for the private ::MiniGLXContext structure.
- *
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXContextRec  *GLXContext;
-/*@}*/
-
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window window;
-	int x, y;
-	int width, height;
-	int count;		/* if non-zero, at least this many more */
-} XExposeEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window parent;		/* parent of the window */
-        MINI_Window window;		/* window id of window created */
-	int x, y;		/* window location */
-	int width, height;	/* size of window */
-	int border_width;	/* border width */
-	MINI_Bool override_redirect;	/* creation should be overridden */
-} XCreateWindowEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window event;
-	MINI_Window window;
-} XDestroyWindowEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window event;
-	MINI_Window window;
-	MINI_Bool from_configure;
-} XUnmapEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window event;
-	MINI_Window window;
-	MINI_Bool override_redirect;	/* boolean, is override set... */
-} XMapEvent;
-
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window parent;
-	MINI_Window window;
-} XMapRequestEvent;
-
-typedef union _XEvent {
-        int type;		/* must not be changed; first element */
-	XExposeEvent xexpose;
-        XCreateWindowEvent xcreatewindow;
-	XDestroyWindowEvent xdestroywindow;
-	XUnmapEvent xunmap;
-	XMapEvent xmap;
-	XMapRequestEvent xmaprequest;
-	long pad[24];
-} XEvent;
-
-
-/**
- * \name Xlib constants
- */
-/*@{*/
-#define False                0
-#define True                 1
-#define None                 0
-#define AllocNone            0
-#define InputOutput          1
-#define ExposureMask         (1L<<15) 
-#define StructureNotifyMask  (1L<<17) 
-#define CWBackPixel          (1L<<1)
-#define CWBorderPixel        (1L<<3)
-#define CWEventMask          (1L<<11)
-#define CWColormap           (1L<<13)
-#define PseudoColor          3
-#define TrueColor            4
-#define VisualIDMask     0x1
-#define VisualScreenMask     0x2
-#define Expose		     12
-#define CreateNotify	     16
-#define DestroyNotify	     17
-#define UnmapNotify	     18
-#define MapNotify	     19
-#define MapRequest	     20
-
-/*@}*/
-
-/**
- * \name Standard GLX tokens
- */
-/*@{*/
-#define GLX_USE_GL		1
-#define GLX_BUFFER_SIZE		2
-#define GLX_LEVEL		3
-#define GLX_RGBA		4
-#define GLX_DOUBLEBUFFER	5
-#define GLX_STEREO		6
-#define GLX_AUX_BUFFERS		7
-#define GLX_RED_SIZE		8
-#define GLX_GREEN_SIZE		9
-#define GLX_BLUE_SIZE		10
-#define GLX_ALPHA_SIZE		11
-#define GLX_DEPTH_SIZE		12
-#define GLX_STENCIL_SIZE	13
-#define GLX_ACCUM_RED_SIZE	14
-#define GLX_ACCUM_GREEN_SIZE	15
-#define GLX_ACCUM_BLUE_SIZE	16
-#define GLX_ACCUM_ALPHA_SIZE	17
-#define GLX_BAD_ATTRIBUTE       1
-#define GLX_BAD_VISUAL          4
-/*@}*/
-
-
-/**
- * \name Unique to Mini GLX
- *
- * At compile time, the Mini GLX interface version can be tested with the
- * MINI_GLX_VERSION_1_x preprocessor tokens.
- *
- * \sa glXQueryVersion()
- */
-/*@{*/
-/** \brief Defined if version 1.0 of Mini GLX is supported. */
-#define MINI_GLX_VERSION_1_0    1
-/** \brief Defined if version 1.1 of Mini GLX is supported. */
-#define MINI_GLX_VERSION_1_1    1
-/*@}*/
-
-
-/**
- * \name Server-specific functions
- */
-extern MINI_Display *
-__miniglx_StartServer( const char *display_name );
-
-extern int
-__miniglx_Select( MINI_Display *dpy, int maxfd,
-		  fd_set *rfds, fd_set *wfds, fd_set *xfds,
-		  struct timeval *tv );
-
-
-/**
- * \name Simulated Xlib functions
- */
-/*@{*/
-extern MINI_Display *
-XOpenDisplay( const char *dpy_name );
-
-
-extern void
-XCloseDisplay( MINI_Display *display );
-
-extern MINI_Window
-XCreateWindow( MINI_Display *display, MINI_Window parent, int x, int y,
-               unsigned int width, unsigned int height,
-               unsigned int border_width, int depth, unsigned int winclass,
-               Visual *visual, unsigned long valuemask,
-               XSetWindowAttributes *attributes );
-
-extern int 
-XNextEvent(MINI_Display *display, XEvent *event_return);
-
-extern MINI_Bool 
-XCheckMaskEvent( MINI_Display *dpy, long event_mask, XEvent *event_return );
-
-/**
- * \brief Return the root window.
- * 
- * \param display the display handle. It is ignored by Mini GLX, but should be
- * the value returned by XOpenDisplay().
- * \param screen the screen number on the host server. It is ignored by Mini
- * GLX but should be zero.
- *
- * \return the root window. Always zero on Mini GLX.
- */
-#define RootWindow(display, screen) 0
-#define DefaultScreen(dpy)  0
-
-extern void
-XDestroyWindow( MINI_Display *display, MINI_Window w );
-
-extern void
-XMapWindow( MINI_Display *display, MINI_Window w );
-
-/* Should clients have access to this?
- */
-extern void
-XUnmapWindow( MINI_Display *display, MINI_Window w );
-
-extern MINI_Colormap
-XCreateColormap( MINI_Display *display, MINI_Window w, Visual *visual, int alloc );
-
-extern void
-XFreeColormap( MINI_Display *display, MINI_Colormap cmap );
-
-extern void
-XFree( void *data );
-
-extern XVisualInfo *
-XGetVisualInfo( MINI_Display *display, long vinfo_mask,
-                XVisualInfo *vinfo_template, int *nitems_return );
-/*@}*/
-
-
-
-/**
- * \name GLX functions
- */
-/*@{*/
-extern XVisualInfo*
-glXChooseVisual( MINI_Display *dpy, int screen, int *attribList );
-
-extern int
-glXGetConfig( MINI_Display *dpy, XVisualInfo *vis, int attrib, int *value );
-
-extern GLXContext
-glXCreateContext( MINI_Display *dpy, XVisualInfo *vis,
-                  GLXContext shareList, MINI_Bool direct );
-
-extern void
-glXDestroyContext( MINI_Display *dpy, GLXContext ctx );
-
-extern MINI_Bool
-glXMakeCurrent( MINI_Display *dpy, GLXDrawable drawable, GLXContext ctx);
-
-extern void
-glXSwapBuffers( MINI_Display *dpy, GLXDrawable drawable );
-
-extern GLXContext
-glXGetCurrentContext( void );
-
-extern GLXDrawable
-glXGetCurrentDrawable( void );
-
-extern void 
-(*glXGetProcAddress(const GLubyte *procname))( void );
-
-extern MINI_Bool
-glXQueryVersion( MINI_Display *dpy, int *major, int *minor );
-
-/* Added in MiniGLX 1.1 */
-extern GLXPbuffer
-glXCreatePbuffer( MINI_Display *dpy, GLXFBConfig config, const int *attribList );
-
-extern void
-glXDestroyPbuffer( MINI_Display *dpy, GLXPbuffer pbuf );
-
-extern GLXFBConfig *
-glXChooseFBConfig( MINI_Display *dpy, int screen, const int *attribList,
-                   int *nitems );
-
-extern XVisualInfo *
-glXGetVisualFromFBConfig( MINI_Display *dpy, GLXFBConfig config );
-
-extern void *glXAllocateMemoryMESA(Display *dpy, int scrn,
-				   size_t size, float readFreq,
-				   float writeFreq, float priority);
-
-extern void glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer);
-
-extern GLuint glXGetMemoryOffsetMESA( Display *dpy, int scrn,
-				      const void *pointer );
-/*@}*/
-
-extern void
-__glXScrEnableExtension( void *, const char * name );
-
-/*@}*/
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MINIGLX_H */
diff --git a/progs/miniglx/.gitignore b/progs/miniglx/.gitignore
deleted file mode 100644
index f630f591f6..0000000000
--- a/progs/miniglx/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-manytex
-miniglxsample
-miniglxtest
-sample_server
-sample_server2
-texline
diff --git a/progs/miniglx/Makefile b/progs/miniglx/Makefile
deleted file mode 100644
index e6f5fa558e..0000000000
--- a/progs/miniglx/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Makefile for miniglx demo programs
-
-TOP = ../..
-
-include $(TOP)/configs/current
-
-
-SOURCES = miniglxtest.c \
-	miniglxsample.c \
-	sample_server.c \
-	sample_server2.c \
-	manytex.c \
-	texline.c
-
-OBJECTS = $(SOURCES:.c=.o)
-
-PROGS = $(SOURCES:%.c=%)
-
-INCLUDES = \
-	-I. \
-	-I$(TOP)/include
-
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-
-
-##### RULES #####
-
-.SUFFIXES:
-.SUFFIXES: .c
-
-.c:
-	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
-
-.c.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@
-
-.S.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@
-
-
-##### TARGETS #####
-
-default:  depend $(PROGS)
-
-clean:
-	-rm -f $(PROGS)
-	-rm -f *.o
-
-
-depend: $(SOURCES)
-	rm -f depend
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
-
-
-# Emacs tags
-tags:
-	etags `find . -name \*.[ch]` `find ../include`
-
-
-include depend
diff --git a/progs/miniglx/glfbdevtest.c b/progs/miniglx/glfbdevtest.c
deleted file mode 100644
index d4efb96930..0000000000
--- a/progs/miniglx/glfbdevtest.c
+++ /dev/null
@@ -1,477 +0,0 @@
-
-/*
- * Test the GLFBDev interface.   Only tested with radeonfb driver!!!!
- */
-
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include "GL/glfbdev.h"
-
-#define DEFAULT_DEPTH 8
-
-static struct fb_fix_screeninfo FixedInfo;
-static struct fb_var_screeninfo VarInfo, OrigVarInfo;
-static int DesiredDepth = 0;
-static int OriginalVT = -1;
-static int ConsoleFD = -1;
-static int FrameBufferFD = -1;
-static caddr_t FrameBuffer = (caddr_t) -1;
-static caddr_t MMIOAddress = (caddr_t) -1;
-
-
-static void
-print_fixed_info(const struct fb_fix_screeninfo *fixed, const char *s)
-{
-   static const char *visuals[] = {
-      "MONO01", "MONO10", "TRUECOLOR", "PSEUDOCOLOR",
-      "DIRECTCOLOR", "STATIC_PSEUDOCOLOR"
-   };
-
-   printf("%s info -----------------------\n", s);
-   printf("id = %16s\n", fixed->id);
-   printf("smem_start = 0x%x\n", fixed->smem_start);
-   printf("smem_len = %d (0x%x)\n", fixed->smem_len, fixed->smem_len);
-   printf("type = 0x%x\n", fixed->type);
-   printf("type_aux = 0x%x\n", fixed->type_aux);
-   printf("visual = 0x%x (%s)\n", fixed->visual, visuals[fixed->visual]);
-   printf("xpanstep = %d\n", fixed->xpanstep);
-   printf("ypanstep = %d\n", fixed->ypanstep);
-   printf("ywrapstep = %d\n", fixed->ywrapstep);
-   printf("line_length = %d\n", fixed->line_length);
-   printf("mmio_start = 0x%x\n", fixed->mmio_start);
-   printf("mmio_len = %d (0x%x)\n", fixed->mmio_len, fixed->mmio_len);
-   printf("accel = 0x%x\n", fixed->accel);
-}
-
-
-static void
-print_var_info(const struct fb_var_screeninfo *var, const char *s)
-{
-   printf("%s info -----------------------\n", s);
-   printf("xres = %d\n", var->xres);
-   printf("yres = %d\n", var->yres);
-   printf("xres_virtual = %d\n", var->xres_virtual);
-   printf("yres_virtual = %d\n", var->yres_virtual);
-   printf("xoffset = %d\n", var->xoffset);
-   printf("yoffset = %d\n", var->yoffset);
-   printf("bits_per_pixel = %d\n", var->bits_per_pixel);
-   printf("grayscale = %d\n", var->grayscale);
-
-   printf("red.offset = %d  length = %d  msb_right = %d\n",
-          var->red.offset, var->red.length, var->red.msb_right);
-   printf("green.offset = %d  length = %d  msb_right = %d\n",
-          var->green.offset, var->green.length, var->green.msb_right);
-   printf("blue.offset = %d  length = %d  msb_right = %d\n",
-          var->blue.offset, var->blue.length, var->blue.msb_right);
-   printf("transp.offset = %d  length = %d  msb_right = %d\n",
-          var->transp.offset, var->transp.length, var->transp.msb_right);
-
-   printf("nonstd = %d\n", var->nonstd);
-   printf("activate = %d\n", var->activate);
-   printf("height = %d mm\n", var->height);
-   printf("width = %d mm\n", var->width);
-   printf("accel_flags = 0x%x\n", var->accel_flags);
-   printf("pixclock = %d\n", var->pixclock);
-   printf("left_margin = %d\n", var->left_margin);
-   printf("right_margin = %d\n", var->right_margin);
-   printf("upper_margin = %d\n", var->upper_margin);
-   printf("lower_margin = %d\n", var->lower_margin);
-   printf("hsync_len = %d\n", var->hsync_len);
-   printf("vsync_len = %d\n", var->vsync_len);
-   printf("sync = %d\n", var->sync);
-   printf("vmode = %d\n", var->vmode);
-}
-
-
-static void
-signal_handler(int signumber)
-{
-   signal(signumber, SIG_IGN); /* prevent recursion! */
-   fprintf(stderr, "error: got signal %d (exiting)\n", signumber);
-   exit(1);
-}
-
-
-static void
-initialize_fbdev( void )
-{
-   char ttystr[1000];
-   int fd, vtnumber, ttyfd;
-   int sz;
-
-   if (geteuid()) {
-      fprintf(stderr, "error: you need to be root\n");
-      exit(1);
-   }
-
-#if 1
-   /* open the framebuffer device */
-   FrameBufferFD = open("/dev/fb0", O_RDWR);
-   if (FrameBufferFD < 0) {
-      fprintf(stderr, "Error opening /dev/fb0: %s\n", strerror(errno));
-      exit(1);
-   }
-#endif
-
-   /* open /dev/tty0 and get the vt number */
-   if ((fd = open("/dev/tty0", O_WRONLY, 0)) < 0) {
-      fprintf(stderr, "error opening /dev/tty0\n");
-      exit(1);
-   }
-   if (ioctl(fd, VT_OPENQRY, &vtnumber) < 0 || vtnumber < 0) {
-      fprintf(stderr, "error: couldn't get a free vt\n");
-      exit(1);
-   }
-   close(fd);
-
-   /* open the console tty */
-   sprintf(ttystr, "/dev/tty%d", vtnumber);  /* /dev/tty1-64 */
-   ConsoleFD = open(ttystr, O_RDWR | O_NDELAY, 0);
-   if (ConsoleFD < 0) {
-      fprintf(stderr, "error couldn't open console fd\n");
-      exit(1);
-   }
-
-   /* save current vt number */
-   {
-      struct vt_stat vts;
-      if (ioctl(ConsoleFD, VT_GETSTATE, &vts) == 0)
-         OriginalVT = vts.v_active;
-   }
-
-   /* disconnect from controlling tty */
-   ttyfd = open("/dev/tty", O_RDWR);
-   if (ttyfd >= 0) {
-      ioctl(ttyfd, TIOCNOTTY, 0);
-      close(ttyfd);
-   }
-
-   /* some magic to restore the vt when we exit */
-   {
-      struct vt_mode vt;
-      if (ioctl(ConsoleFD, VT_ACTIVATE, vtnumber) != 0)
-         printf("ioctl VT_ACTIVATE: %s\n", strerror(errno));
-      if (ioctl(ConsoleFD, VT_WAITACTIVE, vtnumber) != 0)
-         printf("ioctl VT_WAITACTIVE: %s\n", strerror(errno));
-
-      if (ioctl(ConsoleFD, VT_GETMODE, &vt) < 0) {
-         fprintf(stderr, "error: ioctl VT_GETMODE: %s\n", strerror(errno));
-         exit(1);
-      }
-
-      vt.mode = VT_PROCESS;
-      vt.relsig = SIGUSR1;
-      vt.acqsig = SIGUSR1;
-      if (ioctl(ConsoleFD, VT_SETMODE, &vt) < 0) {
-         fprintf(stderr, "error: ioctl(VT_SETMODE) failed: %s\n",
-                 strerror(errno));
-         exit(1);
-      }
-   }
-
-   /* go into graphics mode */
-   if (ioctl(ConsoleFD, KDSETMODE, KD_GRAPHICS) < 0) {
-      fprintf(stderr, "error: ioctl(KDSETMODE, KD_GRAPHICS) failed: %s\n",
-              strerror(errno));
-      exit(1);
-   }
-
-
-#if 0
-   /* open the framebuffer device */
-   FrameBufferFD = open("/dev/fb0", O_RDWR);
-   if (FrameBufferFD < 0) {
-      fprintf(stderr, "Error opening /dev/fb0: %s\n", strerror(errno));
-      exit(1);
-   }
-#endif
-
-   /* Get the fixed screen info */
-   if (ioctl(FrameBufferFD, FBIOGET_FSCREENINFO, &FixedInfo)) {
-      fprintf(stderr, "error: ioctl(FBIOGET_FSCREENINFO) failed: %s\n",
-              strerror(errno));
-      exit(1);
-   }
-
-   print_fixed_info(&FixedInfo, "Fixed");
-
-
-  /* get the variable screen info */
-   if (ioctl(FrameBufferFD, FBIOGET_VSCREENINFO, &OrigVarInfo)) {
-      fprintf(stderr, "error: ioctl(FBIOGET_VSCREENINFO) failed: %s\n",
-              strerror(errno));
-      exit(1);
-   }
-
-   print_var_info(&OrigVarInfo, "Orig Var");
-
-   /* operate on a copy */
-   VarInfo = OrigVarInfo;
-
-   /* set the depth, resolution, etc */
-   DesiredDepth = 32;
-   if (DesiredDepth)
-      VarInfo.bits_per_pixel = DesiredDepth;
-
-   if (VarInfo.bits_per_pixel == 16) {
-      VarInfo.red.offset = 11;
-      VarInfo.green.offset = 5;
-      VarInfo.blue.offset = 0;
-      VarInfo.red.length = 5;
-      VarInfo.green.length = 6;
-      VarInfo.blue.length = 5;
-      VarInfo.transp.offset = 0;
-      VarInfo.transp.length = 0;
-   }
-   else if (VarInfo.bits_per_pixel == 32) {
-      VarInfo.red.offset = 16;
-      VarInfo.green.offset = 8;
-      VarInfo.blue.offset = 0;
-      VarInfo.transp.offset = 24;
-      VarInfo.red.length = 8;
-      VarInfo.green.length = 8;
-      VarInfo.blue.length = 8;
-      VarInfo.transp.length = 8;
-   }
-   /* timing values taken from /etc/fb.modes (1280x1024 @ 75Hz) */
-   VarInfo.xres_virtual = VarInfo.xres = 1280;
-   VarInfo.yres_virtual = VarInfo.yres = 1024;
-   VarInfo.pixclock = 7408;
-   VarInfo.left_margin = 248;
-   VarInfo.right_margin = 16;
-   VarInfo.upper_margin = 38;
-   VarInfo.lower_margin = 1;
-   VarInfo.hsync_len = 144;
-   VarInfo.vsync_len = 3;
-
-   VarInfo.xoffset = 0;
-   VarInfo.yoffset = 0;
-   VarInfo.nonstd = 0;
-   VarInfo.vmode &= ~FB_VMODE_YWRAP; /* turn off scrolling */
-
-   /* set new variable screen info */
-   if (ioctl(FrameBufferFD, FBIOPUT_VSCREENINFO, &VarInfo)) {
-      fprintf(stderr, "ioctl(FBIOPUT_VSCREENINFO failed): %s\n",
-              strerror(errno));
-      exit(1);
-   }
-
-   print_var_info(&VarInfo, "New Var");
-
-   if (FixedInfo.visual != FB_VISUAL_TRUECOLOR &&
-       FixedInfo.visual != FB_VISUAL_DIRECTCOLOR) {
-      fprintf(stderr, "non-TRUE/DIRECT-COLOR visuals (0x%x) not supported by this demo.\n", FixedInfo.visual);
-      exit(1);
-   }
-
-   /* initialize colormap */
-   if (FixedInfo.visual == FB_VISUAL_DIRECTCOLOR) {
-      struct fb_cmap cmap;
-      unsigned short red[256], green[256], blue[256];
-      int i;
-
-      /* we're assuming 256 entries here */
-      printf("initializing directcolor colormap\n");
-      cmap.start = 0;
-      cmap.len = 256;
-      cmap.red   = red;
-      cmap.green = green;
-      cmap.blue  = blue;
-      cmap.transp = NULL;
-      for (i = 0; i < cmap.len; i++) {
-         red[i] = green[i] = blue[i] = (i << 8) | i;
-      }
-      if (ioctl(FrameBufferFD, FBIOPUTCMAP, (void *) &cmap) < 0) {
-         fprintf(stderr, "ioctl(FBIOPUTCMAP) failed [%d]\n", i);
-      }
-   }
-
-   /*
-    * fbdev says the frame buffer is at offset zero, and the mmio region
-    * is immediately after.
-    */
-
-   /* mmap the framebuffer into our address space */
-   FrameBuffer = (caddr_t) mmap(0, /* start */
-                                FixedInfo.smem_len, /* bytes */
-                                PROT_READ | PROT_WRITE, /* prot */
-                                MAP_SHARED, /* flags */
-                                FrameBufferFD, /* fd */
-                                0 /* offset */);
-   if (FrameBuffer == (caddr_t) - 1) {
-      fprintf(stderr, "error: unable to mmap framebuffer: %s\n",
-              strerror(errno));
-      exit(1);
-   }
-   printf("FrameBuffer = %p\n", FrameBuffer);
-
-#if 1
-   /* mmap the MMIO region into our address space */
-   MMIOAddress = (caddr_t) mmap(0, /* start */
-                                FixedInfo.mmio_len, /* bytes */
-                                PROT_READ | PROT_WRITE, /* prot */
-                                MAP_SHARED, /* flags */
-                                FrameBufferFD, /* fd */
-                                FixedInfo.smem_len /* offset */);
-   if (MMIOAddress == (caddr_t) - 1) {
-      fprintf(stderr, "error: unable to mmap mmio region: %s\n",
-              strerror(errno));
-   }
-   printf("MMIOAddress = %p\n", MMIOAddress);
-
-   /* try out some simple MMIO register reads */
-   if (1)
-   {
-      typedef unsigned int CARD32;
-      typedef unsigned char CARD8;
-#define RADEON_CONFIG_MEMSIZE               0x00f8
-#define RADEON_MEM_SDRAM_MODE_REG           0x0158
-#define MMIO_IN32(base, offset) \
-	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset))
-#define INREG(addr)         MMIO_IN32(MMIOAddress, addr)
-      int sz, type;
-      const char *typeStr[] = {"SDR", "DDR", "64-bit SDR"};
-      sz = INREG(RADEON_CONFIG_MEMSIZE);
-      type = INREG(RADEON_MEM_SDRAM_MODE_REG);
-      printf("RADEON_CONFIG_MEMSIZE = %d (%d MB)\n", sz, sz / 1024 / 1024);
-      printf("RADEON_MEM_SDRAM_MODE_REG >> 30 = %d (%s)\n",
-             type >> 30, typeStr[type>>30]);
-   }
-#endif
-
-}
-
-
-static void
-shutdown_fbdev( void )
-{
-   struct vt_mode VT;
-
-   printf("cleaning up...\n");
-   /* restore original variable screen info */
-   if (ioctl(FrameBufferFD, FBIOPUT_VSCREENINFO, &OrigVarInfo)) {
-      fprintf(stderr, "ioctl(FBIOPUT_VSCREENINFO failed): %s\n",
-              strerror(errno));
-      exit(1);
-   }
-
-   munmap(MMIOAddress, FixedInfo.mmio_len);
-   munmap(FrameBuffer, FixedInfo.smem_len);
-   close(FrameBufferFD);
-
-   /* restore text mode */
-   ioctl(ConsoleFD, KDSETMODE, KD_TEXT);
-
-   /* set vt */
-   if (ioctl(ConsoleFD, VT_GETMODE, &VT) != -1) {
-      VT.mode = VT_AUTO;
-      ioctl(ConsoleFD, VT_SETMODE, &VT);
-   }
-
-   /* restore original vt */
-   if (OriginalVT >= 0) {
-      ioctl(ConsoleFD, VT_ACTIVATE, OriginalVT);
-      OriginalVT = -1;
-   }
-
-   close(ConsoleFD);
-}
-
-
-static void
-gltest( void )
-{
-   static const int attribs[] = {
-      GLFBDEV_DOUBLE_BUFFER,
-      GLFBDEV_DEPTH_SIZE, 16,
-      GLFBDEV_NONE
-   };
-   GLFBDevContextPtr ctx;
-   GLFBDevBufferPtr buf;
-   GLFBDevVisualPtr vis;
-   int bytes, r, g, b, a;
-   float ang;
-
-   printf("GLFBDEV_VENDOR = %s\n", glFBDevGetString(GLFBDEV_VENDOR));
-   printf("GLFBDEV_VERSION = %s\n", glFBDevGetString(GLFBDEV_VERSION));
-
-   /* framebuffer size */
-   bytes = VarInfo.xres_virtual * VarInfo.yres_virtual * VarInfo.bits_per_pixel / 8;
-
-   vis = glFBDevCreateVisual( &FixedInfo, &VarInfo, attribs );
-   assert(vis);
-
-   buf = glFBDevCreateBuffer( &FixedInfo, &VarInfo, vis, FrameBuffer, NULL, bytes );
-   assert(buf);
-
-   ctx = glFBDevCreateContext( vis, NULL );
-   assert(buf);
-
-   b = glFBDevMakeCurrent( ctx, buf, buf );
-   assert(b);
-
-   /*printf("GL_EXTENSIONS: %s\n", glGetString(GL_EXTENSIONS));*/
-   glGetIntegerv(GL_RED_BITS, &r);
-   glGetIntegerv(GL_GREEN_BITS, &g);
-   glGetIntegerv(GL_BLUE_BITS, &b);
-   glGetIntegerv(GL_ALPHA_BITS, &a);
-   printf("RED_BITS=%d GREEN_BITS=%d BLUE_BITS=%d ALPHA_BITS=%d\n",
-          r, g, b, a);
-
-   glClearColor(0.5, 0.5, 1.0, 0);
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glFrustum(-1, 1, -1, 1, 2, 30);
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-   glTranslatef(0, 0, -15);
-   glViewport(0, 0, VarInfo.xres_virtual, VarInfo.yres_virtual);
-   glEnable(GL_LIGHTING);
-   glEnable(GL_LIGHT0);
-   glEnable(GL_DEPTH_TEST);
-
-   for (ang = 0; ang <= 180; ang += 15) {
-      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-      glPushMatrix();
-      glRotatef(ang, 1, 0, 0);
-      glutSolidTorus(1, 3, 40, 20);
-      glPopMatrix();
-      glFBDevSwapBuffers(buf);
-   }
-
-   /* clean up */
-   b = glFBDevMakeCurrent( NULL, NULL, NULL);
-   assert(b);
-
-   glFBDevDestroyContext(ctx);
-   glFBDevDestroyBuffer(buf);
-   glFBDevDestroyVisual(vis);
-}
-
-
-int
-main( int argc, char *argv[] )
-{
-   signal(SIGUSR1, signal_handler);  /* exit if someone tries a vt switch */
-   signal(SIGSEGV, signal_handler);  /* catch segfaults */
-
-   initialize_fbdev();
-   gltest();
-   shutdown_fbdev();
-
-   return 0;
-}
diff --git a/progs/miniglx/manytex.c b/progs/miniglx/manytex.c
deleted file mode 100644
index 74b06649f6..0000000000
--- a/progs/miniglx/manytex.c
+++ /dev/null
@@ -1,381 +0,0 @@
-
-/*
- * test handling of many texture maps
- * Also tests texture priority and residency.
- *
- * Brian Paul
- * August 2, 2000
- */
-
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-
-static GLint NumTextures = 20;
-static GLuint *TextureID = NULL;
-static GLint *TextureWidth = NULL, *TextureHeight = NULL;
-static GLboolean *TextureResidency = NULL;
-static GLint TexWidth = 128, TexHeight = 128;
-static GLfloat Zrot = 0;
-static GLboolean Anim = GL_TRUE;
-static GLint WinWidth = 500, WinHeight = 400;
-static GLboolean MipMap = GL_FALSE;
-static GLboolean LinearFilter = GL_FALSE;
-static GLboolean RandomSize = GL_FALSE;
-static GLint Rows, Columns;
-static GLint LowPriorityCount = 0;
-
-
-static void Idle( void )
-{
-   Zrot += 1.0;
-   glutPostRedisplay();
-}
-
-
-static void Display( void )
-{
-   GLfloat spacing = WinWidth / Columns;
-   GLfloat size = spacing * 0.4;
-   GLint i;
-
-   /* test residency */
-   if (0)
-   {
-      GLboolean b;
-      GLint i, resident;
-      b = glAreTexturesResident(NumTextures, TextureID, TextureResidency);
-      if (b) {
-         printf("all resident\n");
-      }
-      else {
-         resident = 0;
-         for (i = 0; i < NumTextures; i++) {
-            if (TextureResidency[i]) {
-               resident++;
-            }
-         }
-         printf("%d of %d texture resident\n", resident, NumTextures);
-      }
-   }
-
-   /* render the textured quads */
-   glClear( GL_COLOR_BUFFER_BIT );
-   for (i = 0; i < NumTextures; i++) {
-      GLint row = i / Columns;
-      GLint col = i % Columns;
-      GLfloat x = col * spacing + spacing * 0.5;
-      GLfloat y = row * spacing + spacing * 0.5;
-
-      GLfloat maxDim = (TextureWidth[i] > TextureHeight[i])
-         ? TextureWidth[i] : TextureHeight[i];
-      GLfloat w = TextureWidth[i] / maxDim;
-      GLfloat h = TextureHeight[i] / maxDim;
-
-      glPushMatrix();
-         glTranslatef(x, y, 0.0);
-         glRotatef(Zrot, 0, 0, 1);
-         glScalef(size, size, 1);
-
-         glBindTexture(GL_TEXTURE_2D, TextureID[i]);
-         glBegin(GL_POLYGON);
-#if 0
-         glTexCoord2f(0, 0);  glVertex2f(-1, -1);
-         glTexCoord2f(1, 0);  glVertex2f( 1, -1);
-         glTexCoord2f(1, 1);  glVertex2f( 1,  1);
-         glTexCoord2f(0, 1);  glVertex2f(-1,  1);
-#else
-         glTexCoord2f(0, 0);  glVertex2f(-w, -h);
-         glTexCoord2f(1, 0);  glVertex2f( w, -h);
-         glTexCoord2f(1, 1);  glVertex2f( w,  h);
-         glTexCoord2f(0, 1);  glVertex2f(-w,  h);
-#endif
-         glEnd();
-      glPopMatrix();
-   }
-
-   glutSwapBuffers();
-}
-
-
-static void Reshape( int width, int height )
-{
-   WinWidth = width;
-   WinHeight = height;
-   glViewport( 0, 0, width, height );
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glOrtho(0, width, 0, height, -1, 1);
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-}
-
-
-/*
- * Return a random int in [min, max].
- */
-static int RandomInt(int min, int max)
-{
-   int i = rand();
-   int j = i % (max - min + 1);
-   return min + j;
-}
-
-
-
-static void Init( void )
-{
-   GLint i;
-
-   if (RandomSize) {
-      printf("Creating %d %s random-size textures, ", NumTextures,
-             MipMap ? "Mipmapped" : "non-Mipmapped");
-   }
-   else {
-      printf("Creating %d %s %d x %d textures, ", NumTextures,
-             MipMap ? "Mipmapped" : "non-Mipmapped",
-             TexWidth, TexHeight);
-   }
-
-   if (LinearFilter) {
-      printf("bilinear filtering\n");
-   }
-   else {
-      printf("nearest filtering\n");
-   }
-
-
-   /* compute number of rows and columns of rects */
-   {
-      GLfloat area = (GLfloat) (WinWidth * WinHeight) / (GLfloat) NumTextures;
-      GLfloat edgeLen = sqrt(area);
-
-      Columns = WinWidth / edgeLen;
-      Rows = (NumTextures + Columns - 1) / Columns;
-      printf("Rows: %d  Cols: %d\n", Rows, Columns);
-   }
-
-
-   if (!TextureID) {
-      TextureID = (GLuint *) malloc(sizeof(GLuint) * NumTextures);
-      assert(TextureID);
-      glGenTextures(NumTextures, TextureID);
-   }
-
-   if (!TextureResidency) {
-      TextureResidency = (GLboolean *) malloc(sizeof(GLboolean) * NumTextures);
-      assert(TextureResidency);
-   }
-
-   if (!TextureWidth) {
-      TextureWidth = (GLint *) malloc(sizeof(GLint) * NumTextures);
-      assert(TextureWidth);
-   }
-   if (!TextureHeight) {
-      TextureHeight = (GLint *) malloc(sizeof(GLint) * NumTextures);
-      assert(TextureHeight);
-   }
-
-   for (i = 0; i < NumTextures; i++) {
-      GLubyte color[4];
-      GLubyte *texImage;
-      GLint j, row, col;
-
-      row = i / Columns;
-      col = i % Columns;
-
-      glBindTexture(GL_TEXTURE_2D, TextureID[i]);
-
-      if (i < LowPriorityCount)
-         glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, 0.5F);
-
-      if (RandomSize) {
-#if 0
-         int k = (glutGet(GLUT_ELAPSED_TIME) % 7) + 2;
-         TexWidth  = 1 << k;
-         TexHeight = 1 << k;
-#else
-         TexWidth = 1 << RandomInt(2, 7);
-         TexHeight = 1 << RandomInt(2, 7);
-         printf("Random size of %3d: %d x %d\n", i, TexWidth, TexHeight);
-#endif
-      }
-
-      TextureWidth[i] = TexWidth;
-      TextureHeight[i] = TexHeight;
-
-      texImage = (GLubyte*) malloc(4 * TexWidth * TexHeight * sizeof(GLubyte));
-      assert(texImage);
-
-      /* determine texture color */
-      color[0] = (GLint) (255.0 * ((float) col / (Columns - 1)));
-      color[1] = 127;
-      color[2] = (GLint) (255.0 * ((float) row / (Rows - 1)));
-      color[3] = 255;
-
-      /* fill in solid-colored teximage */
-      for (j = 0; j < TexWidth * TexHeight; j++) {
-         texImage[j*4+0] = color[0];
-         texImage[j*4+1] = color[1];
-         texImage[j*4+2] = color[2];
-         texImage[j*4+3] = color[3];
-     }
-
-      if (MipMap) {
-         GLint level = 0;
-         GLint w = TexWidth, h = TexHeight;
-         while (1) {
-            glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, w, h, 0,
-                         GL_RGBA, GL_UNSIGNED_BYTE, texImage);
-            if (w == 1 && h == 1)
-               break;
-            if (w > 1)
-               w /= 2;
-            if (h > 1)
-               h /= 2;
-            level++;
-            /*printf("%d: %d x %d\n", level, w, h);*/
-         }
-         if (LinearFilter) {
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-                            GL_LINEAR_MIPMAP_LINEAR);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-         }
-         else {
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-                            GL_NEAREST_MIPMAP_NEAREST);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-         }
-      }
-      else {
-         /* Set corners to white */
-         int k = 0;
-         texImage[k+0] = texImage[k+1] = texImage[k+2] = texImage[k+3] = 255;
-         k = (TexWidth - 1) * 4;
-         texImage[k+0] = texImage[k+1] = texImage[k+2] = texImage[k+3] = 255;
-         k = (TexWidth * TexHeight - TexWidth) * 4;
-         texImage[k+0] = texImage[k+1] = texImage[k+2] = texImage[k+3] = 255;
-         k = (TexWidth * TexHeight - 1) * 4;
-         texImage[k+0] = texImage[k+1] = texImage[k+2] = texImage[k+3] = 255;
-
-         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, TexWidth, TexHeight, 0,
-                      GL_RGBA, GL_UNSIGNED_BYTE, texImage);
-         if (LinearFilter) {
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-         }
-         else {
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-         }
-      }
-
-      free(texImage);
-   }
-
-   glEnable(GL_TEXTURE_2D);
-}
-
-
-static void Key( unsigned char key, int x, int y )
-{
-   const GLfloat step = 3.0;
-   (void) x;
-   (void) y;
-   switch (key) {
-      case 'a':
-         Anim = !Anim;
-         if (Anim)
-            glutIdleFunc(Idle);
-         else
-            glutIdleFunc(NULL);
-         break;
-      case 's':
-         Idle();
-         break;
-      case 'z':
-         Zrot -= step;
-         break;
-      case 'Z':
-         Zrot += step;
-         break;
-      case ' ':
-         Init();
-         break;
-      case 27:
-         exit(0);
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-int main( int argc, char *argv[] )
-{
-   GLint i;
-
-   glutInit( &argc, argv );
-   glutInitWindowPosition( 0, 0 );
-   glutInitWindowSize( WinWidth, WinHeight );
-   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
-   glutCreateWindow(argv[0]);
-   glutReshapeFunc( Reshape );
-   glutKeyboardFunc( Key );
-   glutDisplayFunc( Display );
-   if (Anim)
-      glutIdleFunc(Idle);
-
-   for (i = 1; i < argc; i++) {
-      if (strcmp(argv[i], "-n") == 0) {
-         NumTextures = atoi(argv[i+1]);
-         if (NumTextures <= 0) {
-            printf("Error, bad number of textures\n");
-            return 1;
-         }
-         i++;
-      }
-      else if (strcmp(argv[i], "-mipmap") == 0) {
-         MipMap = GL_TRUE;
-      }
-      else if (strcmp(argv[i], "-linear") == 0) {
-         LinearFilter = GL_TRUE;
-      }
-      else if (strcmp(argv[i], "-size") == 0) {
-         TexWidth = atoi(argv[i+1]);
-         TexHeight = atoi(argv[i+2]);
-         assert(TexWidth >= 1);
-         assert(TexHeight >= 1);
-         i += 2;
-      }
-      else if (strcmp(argv[i], "-randomsize") == 0) {
-         RandomSize = GL_TRUE;
-      }
-      else if (strcmp(argv[i], "-lowpri") == 0) {
-         LowPriorityCount = atoi(argv[i+1]);
-         i++;
-      }
-      else {
-         printf("Usage:\n");
-         printf("  manytex [options]\n");
-         printf("Options:\n");
-         printf("  -n \n");
-         printf("  -size    - specify texture size\n");
-         printf("  -randomsize  - use random size textures\n");
-         printf("  -mipmap      - generate mipmaps\n");
-         printf("  -linear      - use linear filtering instead of nearest\n");
-         printf("  -lowpri   - Set lower priority on  textures\n");
-         return 0;
-      }
-   }
-
-   Init();
-
-   glutMainLoop();
-
-   return 0;
-}
diff --git a/progs/miniglx/miniglxsample.c b/progs/miniglx/miniglxsample.c
deleted file mode 100644
index d4d6729f93..0000000000
--- a/progs/miniglx/miniglxsample.c
+++ /dev/null
@@ -1,128 +0,0 @@
-
-#define USE_MINIGLX 1  /* 1 = use Mini GLX, 0 = use Xlib/GLX */
-
-#include 
-#include 
-#include 
-#include 
-
-#if USE_MINIGLX
-#include 
-#else
-#include 
-#include 
-#endif
-
-static void _subset_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
-{
-   glBegin( GL_QUADS );
-   glVertex2f( x1, y1 );
-   glVertex2f( x2, y1 );
-   glVertex2f( x2, y2 );
-   glVertex2f( x1, y2 );
-   glEnd();
-}
-
-
-/*
- * Create a simple double-buffered RGBA window.
- */
-static Window
-MakeWindow(Display * dpy, unsigned int width, unsigned int height)
-{
-   int visAttributes[] = {
-      GLX_RGBA,
-      GLX_RED_SIZE, 1,
-      GLX_GREEN_SIZE, 1,
-      GLX_BLUE_SIZE, 1,
-      GLX_DOUBLEBUFFER,
-      None
-   };
-   XSetWindowAttributes attr;
-   unsigned long attrMask;
-   Window root;
-   Window win;
-   GLXContext ctx;
-   XVisualInfo *visinfo;
-
-   root = RootWindow(dpy, 0);
-
-   /* Choose GLX visual / pixel format */
-   visinfo = glXChooseVisual(dpy, 0, visAttributes);
-   if (!visinfo) {
-      printf("Error: couldn't get an RGB, Double-buffered visual\n");
-      exit(1);
-   }
-
-   /* Create the window */
-   attr.background_pixel = 0;
-   attr.border_pixel = 0;
-   attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
-   attrMask = CWBackPixel | CWBorderPixel | CWColormap;
-   win = XCreateWindow(dpy, root, 0, 0, width, height,
-		       0, visinfo->depth, InputOutput,
-		       visinfo->visual, attrMask, &attr);
-   if (!win) {
-      printf("Error: XCreateWindow failed\n");
-      exit(1);
-   }
-
-   /* Display the window */
-   XMapWindow(dpy, win);
-
-   /* Create GLX rendering context */
-   ctx = glXCreateContext(dpy, visinfo, NULL, True);
-   if (!ctx) {
-      printf("Error: glXCreateContext failed\n");
-      exit(1);
-   }
-
-   /* Bind the rendering context and window */
-   glXMakeCurrent(dpy, win, ctx);
-
-   glViewport(0, 0, width, height);
-
-   return win;
-}
-
-
-/*
- * Draw a few frames of a rotating square.
- */
-static void
-DrawFrames(Display * dpy, Window win)
-{
-   int angle;
-   glShadeModel(GL_FLAT);
-   glClearColor(0.5, 0.5, 0.5, 1.0);
-   for (angle = 0; angle < 360; angle += 10) {
-      glClear(GL_COLOR_BUFFER_BIT);
-      glColor3f(1.0, 1.0, 0.0);
-      glPushMatrix();
-      glRotatef(angle, 0, 0, 1);
-      _subset_Rectf(-0.8, -0.8, 0.8, 0.8);
-      glPopMatrix();
-      glXSwapBuffers(dpy, win);
-      sleep(1);
-   }
-}
-
-
-int
-main(int argc, char *argv[])
-{
-   Display *dpy;
-   Window win;
-
-   dpy = XOpenDisplay(NULL);
-   if (!dpy) {
-      printf("Error: XOpenDisplay failed\n");
-      return 1;
-   }
-
-   win = MakeWindow(dpy, 300, 300);
-
-   DrawFrames(dpy, win);
-
-   return 0;
-}
diff --git a/progs/miniglx/miniglxtest.c b/progs/miniglx/miniglxtest.c
deleted file mode 100644
index 85c25be4ed..0000000000
--- a/progs/miniglx/miniglxtest.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Test the mini GLX interface.
- */
-
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#define USE_MINI_GLX 1
-#if USE_MINI_GLX
-#include 
-#else
-#include 
-#endif
-
-static GLXContext ctx;
-
-static GLuint NumFrames = 100;
-static GLuint NumDisplays = 1;
-static GLboolean Texture = GL_FALSE;
-static GLboolean SingleBuffer = GL_FALSE;
-static GLboolean Sleeps = GL_TRUE;
-
-
-static void
-rect(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
-{
-   glBegin(GL_QUADS);
-   glTexCoord2f(0, 0);  glColor3f(0, 0, 1);  glVertex2f(x1, y1);
-   glTexCoord2f(1, 0);  glColor3f(1, 0, 0);  glVertex2f(x2, y1);
-   glTexCoord2f(1, 1);  glColor3f(0, 1, 0);  glVertex2f(x2, y2);
-   glTexCoord2f(0, 1);  glColor3f(0, 0, 0);  glVertex2f(x1, y2);
-   glEnd();
-}
-
-
-static void
-redraw(Display *dpy, Window w, int rot)
-{
-   GLfloat a;
-
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-   glPushMatrix();
-      glRotatef(rot, 0, 0, 1);
-      glScalef(.5, .5, .5);
-      for (a = 0.0; a < 360.0; a += 30.0) {
-         glPushMatrix();
-            glRotatef(a, 0, 0, 1);
-            glRotatef(40, 1, 0, 0);
-            glColor3f(a / 360.0, 1-a/360.0, 0);
-            rect(0.3, -0.25, 1.5, 0.25);
-         glPopMatrix();
-      }
-   glPopMatrix();
-
-   if (SingleBuffer)
-      glFlush();
-   else 
-      glXSwapBuffers(dpy, w); 
-}
-
-
-static Window
-make_window(Display *dpy, unsigned int width, unsigned int height)
-{
-   int attrib_single[] = { GLX_RGBA,
-                           GLX_RED_SIZE, 1,
-                           GLX_GREEN_SIZE, 1,
-                           GLX_BLUE_SIZE, 1,
-                           GLX_DEPTH_SIZE, 1,
-                           None };
-   int attrib_double[] = { GLX_RGBA,
-                           GLX_RED_SIZE, 1,
-                           GLX_GREEN_SIZE, 1,
-                           GLX_BLUE_SIZE, 1,
-                           GLX_DEPTH_SIZE, 1,
-                           GLX_DOUBLEBUFFER, 
-                           None };
-   int *attrib = SingleBuffer ? attrib_single : attrib_double;
-   int scrnum = 0;
-   XSetWindowAttributes attr;
-   unsigned long mask;
-   Window root;
-   Window win;
-   XVisualInfo *visinfo;
-
-   root = RootWindow(dpy, scrnum);
-
-   if (!(visinfo = glXChooseVisual(dpy, scrnum, attrib))) {
-      printf("Error: couldn't get an RGB, Double-buffered visual\n");
-      exit(1);
-   }
-
-   if (!(ctx = glXCreateContext(dpy, visinfo, NULL, True))) {
-      printf("Error: glXCreateContext failed\n");
-      exit(1);
-   }
-
-   /* window attributes */
-   attr.background_pixel = 0;
-   attr.border_pixel = 0;
-   attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
-   attr.event_mask = StructureNotifyMask | ExposureMask;
-   mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
-
-   win = XCreateWindow(dpy, root, 0, 0, width, height,
-		        0, visinfo->depth, InputOutput,
-		        visinfo->visual, mask, &attr);
-   if (!win) {
-      printf("Error: XCreateWindow failed\n");
-      exit(1);
-   }
-
-   glXMakeCurrent(dpy, win, ctx);
-
-   glViewport(0, 0, width, height);
-
-   return win;
-}
-
-
-static void
-event_loop(Display *dpy, Window win)
-{
-   int i;
-
-   printf("Drawing %d frames\n", NumFrames);
-
-   for (i = 0; i < NumFrames; i++) {
-      redraw(dpy, win, -i*2);
-      if (Sleeps) {
-         usleep(20000);
-      }
-   }
-}
-
-
-static int
-runtest(void)
-{
-   Display *dpy;
-   Window win;
-
-   dpy = XOpenDisplay(NULL);
-   if (!dpy) {
-      printf("Error: XOpenDisplay failed\n");
-      return 1;
-   }
-
-   win = make_window(dpy, 800, 600);
-
-   srand(getpid());
-
-   /* init GL state */
-   glClearColor(0.5, 0.5, 0.5, 1.0);
-   glEnable(GL_DEPTH_TEST);
-   if (Texture) {
-      GLubyte image[16][16][4];
-      GLint i, j;
-      for (i = 0; i < 16; i++) {
-         for (j = 0; j < 16; j++) {
-            if (((i / 2) ^ (j / 2)) & 1) {
-               image[i][j][0] = 255;
-               image[i][j][1] = 255;
-               image[i][j][2] = 255;
-               image[i][j][3] = 255;
-            }
-            else {
-               image[i][j][0] = 128;
-               image[i][j][1] = 128;
-               image[i][j][2] = 128;
-               image[i][j][3] = 128;
-            }
-         }
-      }
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0,
-                   GL_RGBA, GL_UNSIGNED_BYTE, image);
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-      glEnable(GL_TEXTURE_2D);
-   }
-   if (SingleBuffer) {
-      glDrawBuffer(GL_FRONT); 
-      glReadBuffer(GL_FRONT); 
-   }
-   else {
-      glDrawBuffer(GL_BACK);
-   }
-
-   XMapWindow(dpy, win);
-
-   /* wait for window to get mapped */
-   {
-      XEvent e;
-      while (1) {
-	 XNextEvent(dpy, &e);
-	 if (e.type == MapNotify && e.xmap.window == win) {
-	    break;
-	 }
-      }
-   }
-
-   event_loop(dpy, win);
-
-   glXDestroyContext(dpy, ctx);
-   XDestroyWindow(dpy, win);
-
-   XCloseDisplay(dpy);
-
-   return 0;
-}
-
-
-static void
-usage(void)
-{
-   printf("Usage:\n");
-   printf("  -f N   render N frames (default %d)\n", NumFrames);
-   printf("  -d N   do N display cycles\n");
-   printf("  -t     texturing\n");
-   printf("  -s     single buffering\n");
-   printf("  -n     no usleep() delay\n");
-}
-
-
-static void
-parse_args(int argc, char *argv[])
-{
-   int i;
-   for (i = 1; i < argc; i++) {
-      if (strcmp(argv[i], "-f") == 0) {
-         NumFrames = atoi(argv[i + 1]);
-         i++;
-      }
-      else if (strcmp(argv[i], "-d") == 0) {
-         NumDisplays = atoi(argv[i + 1]);
-         i++;
-      }
-      else if (strcmp(argv[i], "-n") == 0) {
-         Sleeps = GL_FALSE;
-      }
-      else if (strcmp(argv[i], "-s") == 0) {
-         SingleBuffer = GL_TRUE;
-      }
-      else if (strcmp(argv[i], "-t") == 0) {
-         Texture = GL_TRUE;
-      }
-      else {
-         usage();
-         exit(1);
-      }
-   }
-}
-
-
-int
-main(int argc, char *argv[])
-{
-   int i;
-
-   parse_args(argc, argv);
-
-   for (i = 0; i < NumDisplays; i++) {
-      if (runtest() != 0)
-	 break;
-   }
-
-   return 0;
-}
diff --git a/progs/miniglx/sample_server.c b/progs/miniglx/sample_server.c
deleted file mode 100644
index 62456eca25..0000000000
--- a/progs/miniglx/sample_server.c
+++ /dev/null
@@ -1,111 +0,0 @@
-
-/*
- * Sample server that just keeps first available window mapped.
- */
-
-
-#include 
-#include 
-#include 
-#include 
-
-struct client {
-   struct client *next;
-   Window windowid;
-   int mappable;
-};
-
-struct client *clients = 0, *mapped_client = 0;
-
-
-static struct client *find_client( Window id )
-{
-   struct client *c;
-
-   for (c = clients ; c ; c = c->next)
-      if (c->windowid == id)
-	 return c;
-
-   return 0;
-}
-
-int main( int argc, char *argv[] )
-{
-   Display *dpy;
-   XEvent ev;
-
-   dpy = __miniglx_StartServer(NULL);
-   if (!dpy) {
-      fprintf(stderr, "Error: __miniglx_StartServer failed\n");
-      return 1;
-   }
-
-   while (XNextEvent( dpy, &ev )) {
-      struct client *c;
-
-      switch (ev.type) {
-      case MapRequest:
-	 fprintf(stderr, "MapRequest\n");
-	 c = find_client(ev.xmaprequest.window);
-	 if (!c) break;
-	 c->mappable = True;
-	 break;
-
-      case UnmapNotify:
-	 fprintf(stderr, "UnmapNotify\n");
-	 c = find_client(ev.xunmap.window);
-	 if (!c) break;
-	 c->mappable = False;
-	 if (c == mapped_client)
-	    mapped_client = 0;
-	 break;
-
-      case CreateNotify: 
-	 fprintf(stderr, "CreateNotify\n");
-	 c = malloc(sizeof(*c));
-	 c->next = clients;
-	 c->windowid = ev.xcreatewindow.window;
-	 c->mappable = False;
-	 clients = c;
-	 break;
-
-      case DestroyNotify:
-	 fprintf(stderr, "DestroyNotify\n");
-	 c = find_client(ev.xdestroywindow.window);
-	 if (!c) break;
-	 if (c == clients)
-	    clients = c->next;
-	 else {
-	    struct client *t;
-	    for (t = clients ; t->next != c ; t = t->next)
-	       ;
-	    t->next = c->next;
-	 }
-
-	 if (c == mapped_client) 
-	    mapped_client = 0;
-
-	 free(c);
-	 break;
-
-      default:
-	 break;
-      }
-
-      /* Search for first mappable client if none already mapped.
-       */
-      if (!mapped_client) {
-	 for (c = clients ; c ; c = c->next) {
-	    if (c->mappable) {
-	       XMapWindow( dpy, c->windowid );
-	       mapped_client = c;
-	       break;
-	    }
-	 }
-      }
-   }
-
-   XCloseDisplay( dpy );
-
-   return 0;
-}
diff --git a/progs/miniglx/sample_server2.c b/progs/miniglx/sample_server2.c
deleted file mode 100644
index efd382a6d9..0000000000
--- a/progs/miniglx/sample_server2.c
+++ /dev/null
@@ -1,228 +0,0 @@
-
-/*
- * Sample server that just keeps first available window mapped.
- * 
- * It also reads and echos anything that happens on stdin as an
- * example of tracking events from sources other than miniglx clients.
- * 
- * It reads & writes without blocking, so that eg. piping a lot of
- * text to stdin and then hitting 'ctrl-S' on the output stream won't
- * cause it to stop handling miniglx events.
- *
- * See select_tut in the linux manual pages for a good overview of the 
- * select(2) system call.
- */
-
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-struct client {
-   struct client *next;
-   Window windowid;
-   int mappable;
-};
-
-struct client *clients = 0, *mapped_client = 0;
-
-#define BUFSZ 4096
-char rbuf[BUFSZ];
-int rbuf_count;
-
-
-static struct client *find_client( Window id )
-{
-   struct client *c;
-
-   for (c = clients ; c ; c = c->next)
-      if (c->windowid == id)
-	 return c;
-
-   return 0;
-}
-
-int main( int argc, char *argv[] )
-{
-   Display *dpy;
-   XEvent ev;
-   int autostart = 0;
-
-   if (argc == 2 && strcmp(argv[1], "-autostart") == 0)
-      autostart = 1;
-
-   dpy = __miniglx_StartServer(NULL);
-   if (!dpy) {
-      fprintf(stderr, "Error: __miniglx_StartServer failed\n");
-      return 1;
-   }
-
-   /* How is vt switching communicated through the XNextEvent interface?
-    */
-   while (1) {
-      int r, n;
-      struct timeval tv;
-      fd_set rfds, wfds;
-      int bored = 0;
-
-      FD_ZERO(&rfds);
-      FD_ZERO(&wfds);
-      tv.tv_sec = 1;
-      tv.tv_usec = 0;
-
-      if (rbuf_count) {
-	 FD_SET( 1, &wfds );	/* notify when we can write out buffer */
-	 n = 1;
-      }
-      else {
-	 FD_SET( 0, &rfds );	/* else notify when new data to read */
-	 n = 0;
-      }
-
-      /* __miniglx_Select waits until any of these file groups becomes
-       * readable/writable/etc (like regular select), until timeout
-       * expires (like regular select), until a signal is received
-       * (like regular select) or until an event is available for
-       * XCheckMaskEvent().
-       */
-      r = __miniglx_Select( dpy, n+1, &rfds, &wfds, 0, &tv );
-
-      /* This can happen if select() is interrupted by a signal:
-       */
-      if (r < 0 && errno != EINTR && errno != EAGAIN) {
-	 perror ("select()");
-	 exit (1);
-      }
-
-      if (tv.tv_sec == 0 && tv.tv_usec == 0)
-	 bored = 1;
-
-      /* Check and handle events on our local file descriptors
-       */
-      if (FD_ISSET( 0, &rfds )) {
-	 /* Something on stdin */	 
-	 assert(rbuf_count == 0);
-	 r = read(0, rbuf, BUFSZ);	 
-	 if (r < 1) {
-	    perror("read");	
-	    abort();
-	 }
-	 rbuf_count = r;
-      }
-
-      if (FD_ISSET( 1, &wfds )) {
-	 /* Can write to stdout */
-	 assert(rbuf_count > 0);
-	 r = write(1, rbuf, rbuf_count);	 
-	 if (r < 1) {
-	    perror("write");
-	    abort();
-	 }
-	 rbuf_count -= r;
-	 if (rbuf_count) 
-	    memmove(rbuf + r, rbuf, rbuf_count);
-      }
-
-
-      /* Check and handle events generated by miniglx:
-       */
-      while (XCheckMaskEvent( dpy, ~0, &ev )) {
-	 struct client *c;
-	 bored = 0;
-
-	 fprintf(stderr, "Received event %d\n", ev.type);
-
-	 switch (ev.type) {
-	 case CreateNotify: 
-	    fprintf(stderr, "CreateNotify -- new client\n");
-	    c = malloc(sizeof(*c));
-	    c->next = clients;
-	    c->windowid = ev.xcreatewindow.window;
-	    c->mappable = False;
-	    clients = c;
-	    break;
-
-	 case DestroyNotify:
-	    fprintf(stderr, "DestroyNotify\n");
-	    c = find_client(ev.xdestroywindow.window);
-	    if (!c) break;
-	    if (c == clients)
-	       clients = c->next;
-	    else {
-	       struct client *t;
-	       for (t = clients ; t->next != c ; t = t->next)
-		  ;
-	       t->next = c->next;
-	    }
-
-	    if (c == mapped_client) 
-	       mapped_client = 0;
-
-	    free(c);
-	    break;
-
-	 case MapRequest:
-	    fprintf(stderr, "MapRequest\n");
-	    c = find_client(ev.xmaprequest.window);
-	    if (!c) break;
-	    c->mappable = True;
-	    break;
-
-	 case UnmapNotify:
-	    fprintf(stderr, "UnmapNotify\n");
-	    c = find_client(ev.xunmap.window);
-	    if (!c) break;
-	    c->mappable = False;
-	    if (c == mapped_client)
-	       mapped_client = 0;
-	    break;
-
-	 default:
-	    break;
-	 }
-      }
-
-
-      /* Search for first mappable client if none already mapped.
-       */
-      if (!mapped_client) {
-	 struct client *c;
-	 for (c = clients ; c ; c = c->next) {
-	    if (c->mappable) {
-	       XMapWindow( dpy, c->windowid );
-	       mapped_client = c;
-	       break;
-	    }
-	 }
-	 if (!clients && autostart) {
-	    system("nohup ./texline &");
-	    system("nohup ./manytex &");
-	 }
-      }
-      else if (bored) {
-	 struct client *c;
-	 /* bored of mapped client now, let's try & find another one */
-	 for (c = mapped_client->next ; c && !c->mappable ; c = c->next)
-	    ;
-	 if (!c)
-	    for (c = clients ; c && !c->mappable ; c = c->next)
-	       ;
-	 if (c && c != mapped_client) {
-	    XUnmapWindow( dpy, mapped_client->windowid );
-	    XMapWindow( dpy, c->windowid );
-	    mapped_client = c;
-	 }
-	 else 
-	    fprintf(stderr, "I'm bored!\n");
-      }
-   }
-
-   XCloseDisplay( dpy );
-
-   return 0;
-}
diff --git a/progs/miniglx/texline.c b/progs/miniglx/texline.c
deleted file mode 100644
index 098077f247..0000000000
--- a/progs/miniglx/texline.c
+++ /dev/null
@@ -1,267 +0,0 @@
-
-/*
- * Test textured lines.
- *
- * Brian Paul
- * September 2000
- */
-
-
-#include 
-#include 
-#include 
-#include 
-#include "../util/readtex.c"   /* I know, this is a hack. */
-
-#define TEXTURE_FILE "../images/girl.rgb"
-
-static GLboolean Antialias = GL_FALSE;
-static GLboolean Animate = GL_FALSE;
-static GLint Texture = 1;
-static GLboolean Stipple = GL_FALSE;
-static GLfloat LineWidth = 1.0;
-
-static GLfloat Xrot = -60.0, Yrot = 0.0, Zrot = 0.0;
-static GLfloat DYrot = 1.0;
-static GLboolean Points = GL_FALSE;
-static GLfloat Scale = 1.0;
-
-static void Idle( void )
-{
-   if (Animate) {
-      Zrot += DYrot;
-      glutPostRedisplay();
-   }
-}
-
-
-static void Display( void )
-{
-   GLfloat x, y, s, t;
-
-   glClear( GL_COLOR_BUFFER_BIT );
-
-   glPushMatrix();
-   glRotatef(Xrot, 1.0, 0.0, 0.0);
-   glRotatef(Yrot, 0.0, 1.0, 0.0);
-   glRotatef(Zrot, 0.0, 0.0, 1.0);
-   glScalef(Scale, Scale, Scale);
-
-   if (Texture)
-      glColor3f(1, 1, 1);
-
-   if (Points) {
-      glBegin(GL_POINTS);
-      for (t = 0.0; t <= 1.0; t += 0.025) {
-         for (s = 0.0; s <= 1.0; s += 0.025) {
-            x = s * 2.0 - 1.0;
-            y = t * 2.0 - 1.0;
-            if (!Texture)
-               glColor3f(1, 0, 1);
-            glMultiTexCoord2fARB(GL_TEXTURE1_ARB, t, s);
-            glTexCoord2f(s, t);
-            glVertex2f(x, y);
-         }
-      }
-      glEnd();
-   }
-   else {
-      glBegin(GL_LINES);
-      for (t = 0.0; t <= 1.0; t += 0.025) {
-         x = t * 2.0 - 1.0;
-         if (!Texture)
-            glColor3f(1, 0, 1);
-         glTexCoord2f(t, 0.0);
-         glMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0.0, t);
-         glVertex2f(x, -1.0);
-         if (!Texture)
-            glColor3f(0, 1, 0);
-         glTexCoord2f(t, 1.0);
-         glMultiTexCoord2fARB(GL_TEXTURE1_ARB, 1.0, t);
-         glVertex2f(x, 1.0);
-      }
-      glEnd();
-   }
-
-   glPopMatrix();
-
-   glutSwapBuffers();
-}
-
-
-static void Reshape( int width, int height )
-{
-   GLfloat ar = (float) width / height;
-   glViewport( 0, 0, width, height );
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glFrustum( -ar, ar, -1.0, 1.0, 10.0, 100.0 );
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-   glTranslatef( 0.0, 0.0, -12.0 );
-}
-
-
-static void Key( unsigned char key, int x, int y )
-{
-   (void) x;
-   (void) y;
-   switch (key) {
-      case 'a':
-         Antialias = !Antialias;
-         if (Antialias) {
-            glEnable(GL_LINE_SMOOTH);
-            glEnable(GL_POINT_SMOOTH);
-            glEnable(GL_BLEND);
-            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-         }
-         else {
-            glDisable(GL_LINE_SMOOTH);
-            glDisable(GL_POINT_SMOOTH);
-            glDisable(GL_BLEND);
-         }
-         break;
-      case 't':
-         Texture++;
-         if (Texture > 2)
-            Texture = 0;
-         if (Texture == 0) {
-            glActiveTextureARB(GL_TEXTURE0_ARB);
-            glDisable(GL_TEXTURE_2D);
-            glActiveTextureARB(GL_TEXTURE1_ARB);
-            glDisable(GL_TEXTURE_2D);
-         }
-         else if (Texture == 1) {
-            glActiveTextureARB(GL_TEXTURE0_ARB);
-            glEnable(GL_TEXTURE_2D);
-            glActiveTextureARB(GL_TEXTURE1_ARB);
-            glDisable(GL_TEXTURE_2D);
-         }
-         else {
-            glActiveTextureARB(GL_TEXTURE0_ARB);
-            glEnable(GL_TEXTURE_2D);
-            glActiveTextureARB(GL_TEXTURE1_ARB);
-            glEnable(GL_TEXTURE_2D);
-         }
-         break;
-      case 'w':
-         LineWidth -= 0.25;
-         if (LineWidth < 0.25)
-            LineWidth = 0.25;
-         glLineWidth(LineWidth);
-         glPointSize(LineWidth);
-         break;
-      case 'W':
-         LineWidth += 0.25;
-         if (LineWidth > 8.0)
-            LineWidth = 8.0;
-         glLineWidth(LineWidth);
-         glPointSize(LineWidth);
-         break;
-      case 'p':
-         Points = !Points;
-         break;
-      case 's':
-         Stipple = !Stipple;
-         if (Stipple)
-            glEnable(GL_LINE_STIPPLE);
-         else
-            glDisable(GL_LINE_STIPPLE);
-         break;
-      case ' ':
-         Animate = !Animate;
-         if (Animate)
-            glutIdleFunc(Idle);
-         else
-            glutIdleFunc(NULL);
-         break;
-      case 27:
-         exit(0);
-         break;
-   }
-   printf("LineWidth, PointSize = %f\n", LineWidth);
-   glutPostRedisplay();
-}
-
-
-static void SpecialKey( int key, int x, int y )
-{
-   float step = 3.0;
-   (void) x;
-   (void) y;
-
-   switch (key) {
-      case GLUT_KEY_UP:
-         Xrot += step;
-         break;
-      case GLUT_KEY_DOWN:
-         Xrot -= step;
-         break;
-      case GLUT_KEY_LEFT:
-         Yrot += step;
-         break;
-      case GLUT_KEY_RIGHT:
-         Yrot -= step;
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-static void Init( int argc, char *argv[] )
-{
-   GLuint u;
-   for (u = 0; u < 2; u++) {
-      glActiveTextureARB(GL_TEXTURE0_ARB + u);
-      glBindTexture(GL_TEXTURE_2D, 10+u);
-      if (u == 0)
-         glEnable(GL_TEXTURE_2D);
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-      if (u == 0)
-         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-      else
-         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_ADD);
-
-      glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-      if (!LoadRGBMipmaps(TEXTURE_FILE, GL_RGB)) {
-         printf("Error: couldn't load texture image\n");
-         exit(1);
-      }
-   }
-
-   glLineStipple(1, 0xff);
-
-   if (argc > 1 && strcmp(argv[1], "-info")==0) {
-      printf("GL_RENDERER   = %s\n", (char *) glGetString(GL_RENDERER));
-      printf("GL_VERSION    = %s\n", (char *) glGetString(GL_VERSION));
-      printf("GL_VENDOR     = %s\n", (char *) glGetString(GL_VENDOR));
-      printf("GL_EXTENSIONS = %s\n", (char *) glGetString(GL_EXTENSIONS));
-   }
-}
-
-
-int main( int argc, char *argv[] )
-{
-   glutInit( &argc, argv );
-   glutInitWindowSize( 400, 300 );
-
-   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
-
-   glutCreateWindow(argv[0] );
-
-   Init(argc, argv);
-
-   glutReshapeFunc( Reshape );
-   glutKeyboardFunc( Key );
-   glutSpecialFunc( SpecialKey );
-   glutDisplayFunc( Display );
-   if (Animate)
-      glutIdleFunc( Idle );
-
-   glutMainLoop();
-   return 0;
-}
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
deleted file mode 100644
index b82a758d2c..0000000000
--- a/src/glut/mini/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-# subset glut
-
-TOP = ../../..
-include $(TOP)/configs/current
-
-MARK = $(TOP)/src/glut/glx
-
-GLUT_MAJOR = 3
-GLUT_MINOR = 7
-GLUT_TINY = 1
-
-INCLUDES = -I$(TOP)/include -I$(MARK)
-
-CORE_SOURCES = \
-	bitmap.c \
-	callback.c \
-	color.c \
-	globals.c \
-	init.c \
-	menu.c \
-	models.c \
-	overlay.c \
-	state.c \
-	teapot.c \
-	window.c
-
-
-MARK_SOURCES = \
-	$(MARK)/glut_8x13.c \
-	$(MARK)/glut_9x15.c \
-	$(MARK)/glut_hel10.c \
-	$(MARK)/glut_hel12.c \
-	$(MARK)/glut_hel18.c \
-	$(MARK)/glut_tr10.c \
-	$(MARK)/glut_tr24.c
-
-SOURCES = $(CORE_SOURCES)  $(MARK_SOURCES)
-
-OBJECTS =  $(SOURCES:.c=.o)
-
-
-##### RULES #####
-
-.c.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-default: depend $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
-
-
-# Make the library
-$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-	$(MKLIB) -o $(GLUT_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
-		$(GLUT_LIB_DEPS) -install $(TOP)/$(LIB_DIR) \
-		$(MKLIB_OPTIONS) $(OBJECTS)
-
-
-# Run 'make -f Makefile.solo dep' to update the dependencies if you change
-# what's included by any source file.
-depend: $(SOURCES) 
-	rm -f depend
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
-
-# Emacs tags
-tags:
-	etags `find . -name \*.[ch]` `find ../include`
-
-
-# glut pkgconfig file
-pcedit = sed \
-	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
-	-e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
-	-e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
-	-e 's,@VERSION@,$(GLUT_MAJOR).$(GLUT_MINOR).$(GLUT_TINY),' \
-	-e 's,@GLUT_PC_REQ_PRIV@,$(GLUT_PC_REQ_PRIV),' \
-	-e 's,@GLUT_PC_LIB_PRIV@,$(GLUT_PC_LIB_PRIV),' \
-	-e 's,@GLUT_PC_CFLAGS@,$(GLUT_PC_CFLAGS),' \
-	-e 's,@GLUT_LIB@,$(GLUT_LIB),'
-glut.pc: glut.pc.in
-	$(pcedit) $< > $@
-
-install: glut.pc
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-	$(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
-	$(MINSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_LIB_DIR)
-	$(INSTALL) -m 644 glut.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-
-
-# Remove .o and backup files
-clean: depend
-	-rm -f depend depend.bak
-	-rm -f *.o *~ *.o *~ *.so *.pc libglut.so.3.7
-
-include depend
diff --git a/src/glut/mini/bitmap.c b/src/glut/mini/bitmap.c
deleted file mode 100644
index 55a031af0a..0000000000
--- a/src/glut/mini/bitmap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-
-/* Copyright (c) Mark J. Kilgard, 1994. */
-
-/* This program is freely distributable without licensing fees
-   and is provided without guarantee or warrantee expressed or
-   implied. This program is -not- in the public domain. */
-
-#include "glutbitmap.h"
-
-void APIENTRY 
-glutBitmapCharacter(GLUTbitmapFont font, int c)
-{
-  const BitmapCharRec *ch;
-  BitmapFontPtr fontinfo;
-  GLfloat swapbytes, lsbfirst, rowlength;
-  GLfloat skiprows, skippixels, alignment;
-
-#if defined(_WIN32)
-  fontinfo = (BitmapFontPtr) __glutFont(font);
-#else
-  fontinfo = (BitmapFontPtr) font;
-#endif
-
-  if (c < fontinfo->first ||
-    c >= fontinfo->first + fontinfo->num_chars)
-    return;
-  ch = fontinfo->ch[c - fontinfo->first];
-  if (ch) {
-    /* Save current modes. */
-/*     glGetFloatv(GL_UNPACK_SWAP_BYTES, &swapbytes); */
-/*     glGetFloatv(GL_UNPACK_LSB_FIRST, &lsbfirst); */
-/*     glGetFloatv(GL_UNPACK_ROW_LENGTH, &rowlength); */
-/*     glGetFloatv(GL_UNPACK_SKIP_ROWS, &skiprows); */
-/*     glGetFloatv(GL_UNPACK_SKIP_PIXELS, &skippixels); */
-       glGetFloatv(GL_UNPACK_ALIGNMENT, &alignment); 
-    /* Little endian machines (DEC Alpha for example) could
-       benefit from setting GL_UNPACK_LSB_FIRST to GL_TRUE
-       instead of GL_FALSE, but this would require changing the
-       generated bitmaps too. */
-/*     glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE); */
-/*     glPixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE); */
-/*     glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); */
-/*     glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); */
-/*     glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0); */
-     glPixelStorei(GL_UNPACK_ALIGNMENT, 1); 
-    glBitmap(ch->width, ch->height, ch->xorig, ch->yorig,
-      ch->advance, 0, ch->bitmap);
-    /* Restore saved modes. */
-/*     glPixelStorei(GL_UNPACK_SWAP_BYTES, swapbytes); */
-/*     glPixelStorei(GL_UNPACK_LSB_FIRST, (int)lsbfirst); */
-/*     glPixelStorei(GL_UNPACK_ROW_LENGTH, (int)rowlength); */
-/*     glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows); */
-/*     glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippixels); */
-     glPixelStorei(GL_UNPACK_ALIGNMENT, (int)alignment); 
-  }
-}
diff --git a/src/glut/mini/callback.c b/src/glut/mini/callback.c
deleted file mode 100644
index d4e3101cc0..0000000000
--- a/src/glut/mini/callback.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.4
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * DOS/DJGPP glut driver v1.0 for Mesa 4.0
- *
- *  Copyright (C) 2002 - Borca Daniel
- *  Email : dborca@yahoo.com
- *  Web   : http://www.geocities.com/dborca
- */
-
-
-#include "GL/glut.h"
-#include "internal.h"
-
-
-void APIENTRY glutDisplayFunc (void (GLUTCALLBACK *func) (void))
-{
- display_func = func;
-}
-
-
-void APIENTRY glutReshapeFunc (void (GLUTCALLBACK *func) (int width, int height))
-{
- reshape_func = func;
-}
-
-
-void APIENTRY glutKeyboardFunc (void (GLUTCALLBACK *func) (unsigned char key, int x, int y))
-{
- keyboard_func = func;
-}
-
-
-void APIENTRY glutMouseFunc (void (GLUTCALLBACK *func) (int button, int state, int x, int y))
-{
- mouse_func = func;
-}
-
-
-void APIENTRY glutMotionFunc (void (GLUTCALLBACK *func) (int x, int y))
-{
- motion_func = func;
-}
-
-
-void APIENTRY glutPassiveMotionFunc (void (GLUTCALLBACK *func) (int x, int y))
-{
- passive_motion_func = func;
-}
-
-
-void APIENTRY glutEntryFunc (void (GLUTCALLBACK *func) (int state))
-{
- entry_func = func;
-}
-
-
-void APIENTRY glutVisibilityFunc (void (GLUTCALLBACK *func) (int state))
-{
- visibility_func = func;
-}
-
-
-void APIENTRY glutIdleFunc (void (GLUTCALLBACK *func) (void))
-{
- idle_func = func;
-}
-
-
-void APIENTRY glutTimerFunc (unsigned int millis, void (GLUTCALLBACK *func) (int value), int value)
-{
-}
-
-
-void APIENTRY glutMenuStateFunc (void (GLUTCALLBACK *func) (int state))
-{
- menu_state_func = func;
-}
-
-
-void APIENTRY glutSpecialFunc (void (GLUTCALLBACK *func) (int key, int x, int y))
-{
- special_func = func;
-}
-
-
-void APIENTRY glutSpaceballMotionFunc (void (GLUTCALLBACK *func) (int x, int y, int z))
-{
-}
-
-
-void APIENTRY glutSpaceballRotateFunc (void (GLUTCALLBACK *func) (int x, int y, int z))
-{
-}
-
-
-void APIENTRY glutSpaceballButtonFunc (void (GLUTCALLBACK *func) (int button, int state))
-{
-}
-
-
-void APIENTRY glutButtonBoxFunc (void (GLUTCALLBACK *func) (int button, int state))
-{
-}
-
-
-void APIENTRY glutDialsFunc (void (GLUTCALLBACK *func) (int dial, int value))
-{
-}
-
-
-void APIENTRY glutTabletMotionFunc (void (GLUTCALLBACK *func) (int x, int y))
-{
-}
-
-
-void APIENTRY glutTabletButtonFunc (void (GLUTCALLBACK *func) (int button, int state, int x, int y))
-{
-}
-
-
-void APIENTRY glutMenuStatusFunc (void (GLUTCALLBACK *func) (int status, int x, int y))
-{
-}
-
-
-void APIENTRY glutOverlayDisplayFunc (void (GLUTCALLBACK *func) (void))
-{
-}
-
-
-void APIENTRY glutWindowStatusFunc (void (GLUTCALLBACK *func) (int state))
-{
-}
diff --git a/src/glut/mini/color.c b/src/glut/mini/color.c
deleted file mode 100644
index b53c5b669e..0000000000
--- a/src/glut/mini/color.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.4
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * DOS/DJGPP glut driver v1.0 for Mesa 4.0
- *
- *  Copyright (C) 2002 - Borca Daniel
- *  Email : dborca@yahoo.com
- *  Web   : http://www.geocities.com/dborca
- */
-
-
-#include "GL/glut.h"
-
-
-void APIENTRY glutSetColor (int ndx, GLfloat red, GLfloat green, GLfloat blue)
-{
-}
-
-
-GLfloat APIENTRY glutGetColor (int ndx, int component)
-{
- return 0.0;
-}
-
-
-void APIENTRY glutCopyColormap (int win)
-{
-}
diff --git a/src/glut/mini/globals.c b/src/glut/mini/globals.c
deleted file mode 100644
index 76db53c695..0000000000
--- a/src/glut/mini/globals.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.4
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * DOS/DJGPP glut driver v1.0 for Mesa 4.0
- *
- *  Copyright (C) 2002 - Borca Daniel
- *  Email : dborca@yahoo.com
- *  Web   : http://www.geocities.com/dborca
- */
-
-
-#include "GL/glut.h"
-#include "internal.h"
-
-GLenum    g_display_mode = 0;
-GLuint    g_width        = DEFAULT_WIDTH;
-GLuint    g_height       = DEFAULT_HEIGHT;
-GLint     g_mouse        = GL_FALSE;
-GLboolean g_redisplay    = GL_FALSE;
-GLint     g_xpos         = 0;
-GLint     g_ypos         = 0;
-
-void (GLUTCALLBACK *display_func) (void)                              = 0;
-void (GLUTCALLBACK *reshape_func) (int width, int height)             = 0;
-void (GLUTCALLBACK *keyboard_func) (unsigned char key, int x, int y)  = 0;
-void (GLUTCALLBACK *mouse_func) (int button, int state, int x, int y) = 0;
-void (GLUTCALLBACK *motion_func) (int x, int y)                       = 0;
-void (GLUTCALLBACK *passive_motion_func) (int x, int y)               = 0;
-void (GLUTCALLBACK *entry_func) (int state)                           = 0;
-void (GLUTCALLBACK *visibility_func) (int state)                      = 0;
-void (GLUTCALLBACK *idle_func) (void)                                 = 0;
-void (GLUTCALLBACK *menu_state_func) (int state)                      = 0;
-void (GLUTCALLBACK *special_func) (int key, int x, int y)             = 0;
-void (GLUTCALLBACK *spaceball_motion_func) (int x, int y, int z)      = 0;
-void (GLUTCALLBACK *spaceball_rotate_func) (int x, int y, int z)      = 0;
-void (GLUTCALLBACK *spaceball_button_func) (int button, int state)    = 0;
-void (GLUTCALLBACK *button_box_func) (int button, int state)          = 0;
-void (GLUTCALLBACK *dials_func) (int dial, int value)                 = 0;
-void (GLUTCALLBACK *tablet_motion_func) (int x, int y)                = 0;
-void (GLUTCALLBACK *tabled_button_func) (int button, int state, int x, int y) = 0;
-void (GLUTCALLBACK *menu_status_func) (int status, int x, int y)      = 0;
-void (GLUTCALLBACK *overlay_display_func) (void)                      = 0;
-void (GLUTCALLBACK *window_status_func) (int state)                   = 0;
diff --git a/src/glut/mini/glut.pc.in b/src/glut/mini/glut.pc.in
deleted file mode 100644
index 151dd0b802..0000000000
--- a/src/glut/mini/glut.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@INSTALL_DIR@
-exec_prefix=${prefix}
-libdir=@INSTALL_LIB_DIR@
-includedir=@INSTALL_INC_DIR@
-
-Name: glut
-Description: Mesa OpenGL Utility Toolkit library
-Requires: gl glu
-Requires.private: @GLUT_PC_REQ_PRIV@
-Version: @VERSION@
-Libs: -L${libdir} -l@GLUT_LIB@
-Libs.private: @GLUT_PC_LIB_PRIV@
-Cflags: -I${includedir} @GLUT_PC_CFLAGS@
diff --git a/src/glut/mini/init.c b/src/glut/mini/init.c
deleted file mode 100644
index 5588db9aba..0000000000
--- a/src/glut/mini/init.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  4.0
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * DOS/DJGPP glut driver v1.0 for Mesa 4.0
- *
- *  Copyright (C) 2002 - Borca Daniel
- *  Email : dborca@yahoo.com
- *  Web   : http://www.geocities.com/dborca
- */
-
-
-#include "GL/glut.h"
-#include "internal.h"
-
-
-void APIENTRY glutInit (int *argcp, char **argv)
-{
- glutGet(GLUT_ELAPSED_TIME);
-}
-
-
-void APIENTRY glutInitDisplayMode (unsigned int mode)
-{
- g_display_mode = mode;
-}
-
-
-void APIENTRY glutInitWindowPosition (int x, int y)
-{
- g_xpos = x;
- g_ypos = y;
-}
-
-
-void APIENTRY glutInitWindowSize (int width, int height)
-{
- g_width  = width;
- g_height = height;
-}
-
-
diff --git a/src/glut/mini/internal.h b/src/glut/mini/internal.h
deleted file mode 100644
index ccd12e54af..0000000000
--- a/src/glut/mini/internal.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  4.0
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * DOS/DJGPP glut driver v1.0 for Mesa 4.0
- *
- *  Copyright (C) 2002 - Borca Daniel
- *  Email : dborca@yahoo.com
- *  Web   : http://www.geocities.com/dborca
- */
-
- 
-#ifndef INTERNAL_H_included
-#define INTERNAL_H_included
-
-
-#include "GL/glut.h"
-/* #include "pc_hw/pc_hw.h" */
-
-
-#define MAX_WINDOWS    4
-
-#define DEFAULT_WIDTH  640
-#define DEFAULT_HEIGHT 480
-#define DEFAULT_BPP    16
-
-#define DEPTH_SIZE   16
-#define STENCIL_SIZE 8
-#define ACCUM_SIZE   16
-
-extern GLenum    g_display_mode;
-extern GLuint    g_width;
-extern GLuint    g_height;
-extern GLint     g_mouse;
-extern GLboolean g_redisplay;
-extern GLint     g_xpos;
-extern GLint     g_ypos;
-
-extern void (GLUTCALLBACK *display_func) (void);
-extern void (GLUTCALLBACK *reshape_func) (int width, int height);
-extern void (GLUTCALLBACK *keyboard_func) (unsigned char key, int x, int y);
-extern void (GLUTCALLBACK *mouse_func) (int button, int state, int x, int y);
-extern void (GLUTCALLBACK *motion_func) (int x, int y);
-extern void (GLUTCALLBACK *passive_motion_func) (int x, int y);
-extern void (GLUTCALLBACK *entry_func) (int state);
-extern void (GLUTCALLBACK *visibility_func) (int state);
-extern void (GLUTCALLBACK *idle_func) (void);
-extern void (GLUTCALLBACK *menu_state_func) (int state);
-extern void (GLUTCALLBACK *special_func) (int key, int x, int y);
-extern void (GLUTCALLBACK *spaceball_motion_func) (int x, int y, int z);
-extern void (GLUTCALLBACK *spaceball_rotate_func) (int x, int y, int z);
-extern void (GLUTCALLBACK *spaceball_button_func) (int button, int state);
-extern void (GLUTCALLBACK *button_box_func) (int button, int state);
-extern void (GLUTCALLBACK *dials_func) (int dial, int value);
-extern void (GLUTCALLBACK *tablet_motion_func) (int x, int y);
-extern void (GLUTCALLBACK *tabled_button_func) (int button, int state, int x, int y);
-extern void (GLUTCALLBACK *menu_status_func) (int status, int x, int y);
-extern void (GLUTCALLBACK *overlay_display_func) (void);
-extern void (GLUTCALLBACK *window_status_func) (int state);
-
-#endif
diff --git a/src/glut/mini/menu.c b/src/glut/mini/menu.c
deleted file mode 100644
index 3c571647b1..0000000000
--- a/src/glut/mini/menu.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.4
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * DOS/DJGPP glut driver v1.0 for Mesa 4.0
- *
- *  Copyright (C) 2002 - Borca Daniel
- *  Email : dborca@yahoo.com
- *  Web   : http://www.geocities.com/dborca
- */
-
-
-#include "GL/glut.h"
-
-
-int APIENTRY glutCreateMenu (void (GLUTCALLBACK *func) (int))
-{
- return 0;
-}
-
-void APIENTRY glutDestroyMenu (int menu)
-{
-}
-
-
-int APIENTRY glutGetMenu (void)
-{
- return 0;
-}
-
-
-void APIENTRY glutSetMenu (int menu)
-{
-}
-
-
-void APIENTRY glutAddMenuEntry (const char *label, int value)
-{
-}
-
-
-void APIENTRY glutAddSubMenu (const char *label, int submenu)
-{
-}
-
-
-void APIENTRY glutChangeToMenuEntry (int item, const char *label, int value)
-{
-}
-
-
-void APIENTRY glutChangeToSubMenu (int item, const char *label, int submenu)
-{
-}
-
-
-void APIENTRY glutRemoveMenuItem (int item)
-{
-}
-
-
-void APIENTRY glutAttachMenu (int button)
-{
-}
-
-
-void APIENTRY glutDetachMenu (int button)
-{
-}
diff --git a/src/glut/mini/models.c b/src/glut/mini/models.c
deleted file mode 100644
index 3f955b88ff..0000000000
--- a/src/glut/mini/models.c
+++ /dev/null
@@ -1,598 +0,0 @@
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1997. */
-
-/**
-(c) Copyright 1993, Silicon Graphics, Inc.
-
-ALL RIGHTS RESERVED
-
-Permission to use, copy, modify, and distribute this software
-for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that
-both the copyright notice and this permission notice appear in
-supporting documentation, and that the name of Silicon
-Graphics, Inc. not be used in advertising or publicity
-pertaining to distribution of the software without specific,
-written prior permission.
-
-THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU
-"AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR
-OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN NO
-EVENT SHALL SILICON GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE
-ELSE FOR ANY DIRECT, SPECIAL, INCIDENTAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER,
-INCLUDING WITHOUT LIMITATION, LOSS OF PROFIT, LOSS OF USE,
-SAVINGS OR REVENUE, OR THE CLAIMS OF THIRD PARTIES, WHETHER OR
-NOT SILICON GRAPHICS, INC.  HAS BEEN ADVISED OF THE POSSIBILITY
-OF SUCH LOSS, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-ARISING OUT OF OR IN CONNECTION WITH THE POSSESSION, USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-US Government Users Restricted Rights
-
-Use, duplication, or disclosure by the Government is subject to
-restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
-(c)(1)(ii) of the Rights in Technical Data and Computer
-Software clause at DFARS 252.227-7013 and/or in similar or
-successor clauses in the FAR or the DOD or NASA FAR
-Supplement.  Unpublished-- rights reserved under the copyright
-laws of the United States.  Contractor/manufacturer is Silicon
-Graphics, Inc., 2011 N.  Shoreline Blvd., Mountain View, CA
-94039-7311.
-
-OpenGL(TM) is a trademark of Silicon Graphics, Inc.
-*/
-
-#include 
-#include 
-#include 
-#include "GL/glut.h"
-
-/* Some  files do not define M_PI... */
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-static GLUquadricObj *quadObj;
-
-#define QUAD_OBJ_INIT() { if(!quadObj) initQuadObj(); }
-
-static void
-initQuadObj(void)
-{
-  quadObj = gluNewQuadric();
-/*  if (!quadObj)
-    __glutFatalError("out of memory."); */
-}
-
-/* CENTRY */
-void APIENTRY
-glutWireSphere(GLdouble radius, GLint slices, GLint stacks)
-{
-  QUAD_OBJ_INIT();
-  gluQuadricDrawStyle(quadObj, GLU_LINE);
-  gluQuadricNormals(quadObj, GLU_SMOOTH);
-  /* If we ever changed/used the texture or orientation state
-     of quadObj, we'd need to change it to the defaults here
-     with gluQuadricTexture and/or gluQuadricOrientation. */
-  gluSphere(quadObj, radius, slices, stacks);
-}
-
-void APIENTRY
-glutSolidSphere(GLdouble radius, GLint slices, GLint stacks)
-{
-  QUAD_OBJ_INIT();
-  gluQuadricDrawStyle(quadObj, GLU_FILL);
-  gluQuadricNormals(quadObj, GLU_SMOOTH);
-  /* If we ever changed/used the texture or orientation state
-     of quadObj, we'd need to change it to the defaults here
-     with gluQuadricTexture and/or gluQuadricOrientation. */
-  gluSphere(quadObj, radius, slices, stacks);
-}
-
-void APIENTRY
-glutWireCone(GLdouble base, GLdouble height,
-  GLint slices, GLint stacks)
-{
-  QUAD_OBJ_INIT();
-  gluQuadricDrawStyle(quadObj, GLU_LINE);
-  gluQuadricNormals(quadObj, GLU_SMOOTH);
-  /* If we ever changed/used the texture or orientation state
-     of quadObj, we'd need to change it to the defaults here
-     with gluQuadricTexture and/or gluQuadricOrientation. */
-  gluCylinder(quadObj, base, 0.0, height, slices, stacks);
-}
-
-void APIENTRY
-glutSolidCone(GLdouble base, GLdouble height,
-  GLint slices, GLint stacks)
-{
-  QUAD_OBJ_INIT();
-  gluQuadricDrawStyle(quadObj, GLU_FILL);
-  gluQuadricNormals(quadObj, GLU_SMOOTH);
-  /* If we ever changed/used the texture or orientation state
-     of quadObj, we'd need to change it to the defaults here
-     with gluQuadricTexture and/or gluQuadricOrientation. */
-  gluCylinder(quadObj, base, 0.0, height, slices, stacks);
-}
-
-/* ENDCENTRY */
-
-static void
-drawBox(GLfloat size, GLenum type)
-{
-  static GLfloat n[6][3] =
-  {
-    {-1.0, 0.0, 0.0},
-    {0.0, 1.0, 0.0},
-    {1.0, 0.0, 0.0},
-    {0.0, -1.0, 0.0},
-    {0.0, 0.0, 1.0},
-    {0.0, 0.0, -1.0}
-  };
-  static GLint faces[6][4] =
-  {
-    {0, 1, 2, 3},
-    {3, 2, 6, 7},
-    {7, 6, 5, 4},
-    {4, 5, 1, 0},
-    {5, 6, 2, 1},
-    {7, 4, 0, 3}
-  };
-  GLfloat v[8][3];
-  GLint i;
-
-  v[0][0] = v[1][0] = v[2][0] = v[3][0] = -size / 2;
-  v[4][0] = v[5][0] = v[6][0] = v[7][0] = size / 2;
-  v[0][1] = v[1][1] = v[4][1] = v[5][1] = -size / 2;
-  v[2][1] = v[3][1] = v[6][1] = v[7][1] = size / 2;
-  v[0][2] = v[3][2] = v[4][2] = v[7][2] = -size / 2;
-  v[1][2] = v[2][2] = v[5][2] = v[6][2] = size / 2;
-
-  for (i = 5; i >= 0; i--) {
-    glBegin(type);
-    glNormal3fv(&n[i][0]);
-    glVertex3fv(&v[faces[i][0]][0]);
-    glVertex3fv(&v[faces[i][1]][0]);
-    glVertex3fv(&v[faces[i][2]][0]);
-    glVertex3fv(&v[faces[i][3]][0]);
-    glEnd();
-  }
-}
-
-/* CENTRY */
-void APIENTRY
-glutWireCube(GLdouble size)
-{
-  drawBox(size, GL_LINE_LOOP);
-}
-
-void APIENTRY
-glutSolidCube(GLdouble size)
-{
-  drawBox(size, GL_QUADS);
-}
-
-/* ENDCENTRY */
-
-static void
-doughnut(GLfloat r, GLfloat R, GLint nsides, GLint rings)
-{
-  int i, j;
-  GLfloat theta, phi, theta1;
-  GLfloat cosTheta, sinTheta;
-  GLfloat cosTheta1, sinTheta1;
-  GLfloat ringDelta, sideDelta;
-
-  ringDelta = 2.0 * M_PI / rings;
-  sideDelta = 2.0 * M_PI / nsides;
-
-  theta = 0.0;
-  cosTheta = 1.0;
-  sinTheta = 0.0;
-  for (i = rings - 1; i >= 0; i--) {
-    theta1 = theta + ringDelta;
-    cosTheta1 = cos(theta1);
-    sinTheta1 = sin(theta1);
-    glBegin(GL_QUAD_STRIP);
-    phi = 0.0;
-    for (j = nsides; j >= 0; j--) {
-      GLfloat cosPhi, sinPhi, dist;
-
-      phi += sideDelta;
-      cosPhi = cos(phi);
-      sinPhi = sin(phi);
-      dist = R + r * cosPhi;
-
-      glNormal3f(cosTheta1 * cosPhi, -sinTheta1 * cosPhi, sinPhi);
-      glVertex3f(cosTheta1 * dist, -sinTheta1 * dist, r * sinPhi);
-      glNormal3f(cosTheta * cosPhi, -sinTheta * cosPhi, sinPhi);
-      glVertex3f(cosTheta * dist, -sinTheta * dist,  r * sinPhi);
-    }
-    glEnd();
-    theta = theta1;
-    cosTheta = cosTheta1;
-    sinTheta = sinTheta1;
-  }
-}
-
-/* CENTRY */
-void APIENTRY
-glutWireTorus(GLdouble innerRadius, GLdouble outerRadius,
-  GLint nsides, GLint rings)
-{
-  glPushAttrib(GL_POLYGON_BIT);
-  glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-  doughnut(innerRadius, outerRadius, nsides, rings);
-  glPopAttrib();
-}
-
-void APIENTRY
-glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius,
-  GLint nsides, GLint rings)
-{
-  doughnut(innerRadius, outerRadius, nsides, rings);
-}
-
-/* ENDCENTRY */
-
-static GLfloat dodec[20][3];
-
-static void
-initDodecahedron(void)
-{
-  GLfloat alpha, beta;
-
-  alpha = sqrt(2.0 / (3.0 + sqrt(5.0)));
-  beta = 1.0 + sqrt(6.0 / (3.0 + sqrt(5.0)) -
-    2.0 + 2.0 * sqrt(2.0 / (3.0 + sqrt(5.0))));
-  /* *INDENT-OFF* */
-  dodec[0][0] = -alpha; dodec[0][1] = 0; dodec[0][2] = beta;
-  dodec[1][0] = alpha; dodec[1][1] = 0; dodec[1][2] = beta;
-  dodec[2][0] = -1; dodec[2][1] = -1; dodec[2][2] = -1;
-  dodec[3][0] = -1; dodec[3][1] = -1; dodec[3][2] = 1;
-  dodec[4][0] = -1; dodec[4][1] = 1; dodec[4][2] = -1;
-  dodec[5][0] = -1; dodec[5][1] = 1; dodec[5][2] = 1;
-  dodec[6][0] = 1; dodec[6][1] = -1; dodec[6][2] = -1;
-  dodec[7][0] = 1; dodec[7][1] = -1; dodec[7][2] = 1;
-  dodec[8][0] = 1; dodec[8][1] = 1; dodec[8][2] = -1;
-  dodec[9][0] = 1; dodec[9][1] = 1; dodec[9][2] = 1;
-  dodec[10][0] = beta; dodec[10][1] = alpha; dodec[10][2] = 0;
-  dodec[11][0] = beta; dodec[11][1] = -alpha; dodec[11][2] = 0;
-  dodec[12][0] = -beta; dodec[12][1] = alpha; dodec[12][2] = 0;
-  dodec[13][0] = -beta; dodec[13][1] = -alpha; dodec[13][2] = 0;
-  dodec[14][0] = -alpha; dodec[14][1] = 0; dodec[14][2] = -beta;
-  dodec[15][0] = alpha; dodec[15][1] = 0; dodec[15][2] = -beta;
-  dodec[16][0] = 0; dodec[16][1] = beta; dodec[16][2] = alpha;
-  dodec[17][0] = 0; dodec[17][1] = beta; dodec[17][2] = -alpha;
-  dodec[18][0] = 0; dodec[18][1] = -beta; dodec[18][2] = alpha;
-  dodec[19][0] = 0; dodec[19][1] = -beta; dodec[19][2] = -alpha;
-  /* *INDENT-ON* */
-
-}
-
-#define DIFF3(_a,_b,_c) { \
-    (_c)[0] = (_a)[0] - (_b)[0]; \
-    (_c)[1] = (_a)[1] - (_b)[1]; \
-    (_c)[2] = (_a)[2] - (_b)[2]; \
-}
-
-static void
-crossprod(GLfloat v1[3], GLfloat v2[3], GLfloat prod[3])
-{
-  GLfloat p[3];         /* in case prod == v1 or v2 */
-
-  p[0] = v1[1] * v2[2] - v2[1] * v1[2];
-  p[1] = v1[2] * v2[0] - v2[2] * v1[0];
-  p[2] = v1[0] * v2[1] - v2[0] * v1[1];
-  prod[0] = p[0];
-  prod[1] = p[1];
-  prod[2] = p[2];
-}
-
-static void
-normalize(GLfloat v[3])
-{
-  GLfloat d;
-
-  d = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-  if (d == 0.0) {
-/*    __glutWarning("normalize: zero length vector"); */
-    v[0] = d = 1.0;
-  }
-  d = 1 / d;
-  v[0] *= d;
-  v[1] *= d;
-  v[2] *= d;
-}
-
-static void
-pentagon(int a, int b, int c, int d, int e, GLenum shadeType)
-{
-  GLfloat n0[3], d1[3], d2[3];
-
-  DIFF3(dodec[a], dodec[b], d1);
-  DIFF3(dodec[b], dodec[c], d2);
-  crossprod(d1, d2, n0);
-  normalize(n0);
-
-  glBegin(shadeType);
-  glNormal3fv(n0);
-  glVertex3fv(&dodec[a][0]);
-  glVertex3fv(&dodec[b][0]);
-  glVertex3fv(&dodec[c][0]);
-  glVertex3fv(&dodec[d][0]);
-  glVertex3fv(&dodec[e][0]);
-  glEnd();
-}
-
-static void
-dodecahedron(GLenum type)
-{
-  static int inited = 0;
-
-  if (inited == 0) {
-    inited = 1;
-    initDodecahedron();
-  }
-  pentagon(0, 1, 9, 16, 5, type);
-  pentagon(1, 0, 3, 18, 7, type);
-  pentagon(1, 7, 11, 10, 9, type);
-  pentagon(11, 7, 18, 19, 6, type);
-  pentagon(8, 17, 16, 9, 10, type);
-  pentagon(2, 14, 15, 6, 19, type);
-  pentagon(2, 13, 12, 4, 14, type);
-  pentagon(2, 19, 18, 3, 13, type);
-  pentagon(3, 0, 5, 12, 13, type);
-  pentagon(6, 15, 8, 10, 11, type);
-  pentagon(4, 17, 8, 15, 14, type);
-  pentagon(4, 12, 5, 16, 17, type);
-}
-
-/* CENTRY */
-void APIENTRY
-glutWireDodecahedron(void)
-{
-  dodecahedron(GL_LINE_LOOP);
-}
-
-void APIENTRY
-glutSolidDodecahedron(void)
-{
-  dodecahedron(GL_TRIANGLE_FAN);
-}
-
-/* ENDCENTRY */
-
-static void
-recorditem(GLfloat * n1, GLfloat * n2, GLfloat * n3,
-  GLenum shadeType)
-{
-  GLfloat q0[3], q1[3];
-
-  DIFF3(n1, n2, q0);
-  DIFF3(n2, n3, q1);
-  crossprod(q0, q1, q1);
-  normalize(q1);
-
-  glBegin(shadeType);
-  glNormal3fv(q1);
-  glVertex3fv(n1);
-  glVertex3fv(n2);
-  glVertex3fv(n3);
-  glEnd();
-}
-
-static void
-subdivide(GLfloat * v0, GLfloat * v1, GLfloat * v2,
-  GLenum shadeType)
-{
-  int depth;
-  GLfloat w0[3], w1[3], w2[3];
-  GLfloat l;
-  int i, j, k, n;
-
-  depth = 1;
-  for (i = 0; i < depth; i++) {
-    for (j = 0; i + j < depth; j++) {
-      k = depth - i - j;
-      for (n = 0; n < 3; n++) {
-        w0[n] = (i * v0[n] + j * v1[n] + k * v2[n]) / depth;
-        w1[n] = ((i + 1) * v0[n] + j * v1[n] + (k - 1) * v2[n])
-          / depth;
-        w2[n] = (i * v0[n] + (j + 1) * v1[n] + (k - 1) * v2[n])
-          / depth;
-      }
-      l = sqrt(w0[0] * w0[0] + w0[1] * w0[1] + w0[2] * w0[2]);
-      w0[0] /= l;
-      w0[1] /= l;
-      w0[2] /= l;
-      l = sqrt(w1[0] * w1[0] + w1[1] * w1[1] + w1[2] * w1[2]);
-      w1[0] /= l;
-      w1[1] /= l;
-      w1[2] /= l;
-      l = sqrt(w2[0] * w2[0] + w2[1] * w2[1] + w2[2] * w2[2]);
-      w2[0] /= l;
-      w2[1] /= l;
-      w2[2] /= l;
-      recorditem(w1, w0, w2, shadeType);
-    }
-  }
-}
-
-static void
-drawtriangle(int i, GLfloat data[][3], int ndx[][3],
-  GLenum shadeType)
-{
-  GLfloat *x0, *x1, *x2;
-
-  x0 = data[ndx[i][0]];
-  x1 = data[ndx[i][1]];
-  x2 = data[ndx[i][2]];
-  subdivide(x0, x1, x2, shadeType);
-}
-
-/* octahedron data: The octahedron produced is centered at the
-   origin and has radius 1.0 */
-static GLfloat odata[6][3] =
-{
-  {1.0, 0.0, 0.0},
-  {-1.0, 0.0, 0.0},
-  {0.0, 1.0, 0.0},
-  {0.0, -1.0, 0.0},
-  {0.0, 0.0, 1.0},
-  {0.0, 0.0, -1.0}
-};
-
-static int ondex[8][3] =
-{
-  {0, 4, 2},
-  {1, 2, 4},
-  {0, 3, 4},
-  {1, 4, 3},
-  {0, 2, 5},
-  {1, 5, 2},
-  {0, 5, 3},
-  {1, 3, 5}
-};
-
-static void
-octahedron(GLenum shadeType)
-{
-  int i;
-
-  for (i = 7; i >= 0; i--) {
-    drawtriangle(i, odata, ondex, shadeType);
-  }
-}
-
-/* CENTRY */
-void APIENTRY
-glutWireOctahedron(void)
-{
-  octahedron(GL_LINE_LOOP);
-}
-
-void APIENTRY
-glutSolidOctahedron(void)
-{
-  octahedron(GL_TRIANGLES);
-}
-
-/* ENDCENTRY */
-
-/* icosahedron data: These numbers are rigged to make an
-   icosahedron of radius 1.0 */
-
-#define X .525731112119133606
-#define Z .850650808352039932
-
-static GLfloat idata[12][3] =
-{
-  {-X, 0, Z},
-  {X, 0, Z},
-  {-X, 0, -Z},
-  {X, 0, -Z},
-  {0, Z, X},
-  {0, Z, -X},
-  {0, -Z, X},
-  {0, -Z, -X},
-  {Z, X, 0},
-  {-Z, X, 0},
-  {Z, -X, 0},
-  {-Z, -X, 0}
-};
-
-static int index[20][3] =
-{
-  {0, 4, 1},
-  {0, 9, 4},
-  {9, 5, 4},
-  {4, 5, 8},
-  {4, 8, 1},
-  {8, 10, 1},
-  {8, 3, 10},
-  {5, 3, 8},
-  {5, 2, 3},
-  {2, 7, 3},
-  {7, 10, 3},
-  {7, 6, 10},
-  {7, 11, 6},
-  {11, 0, 6},
-  {0, 1, 6},
-  {6, 1, 10},
-  {9, 0, 11},
-  {9, 11, 2},
-  {9, 2, 5},
-  {7, 2, 11},
-};
-
-static void
-icosahedron(GLenum shadeType)
-{
-  int i;
-
-  for (i = 19; i >= 0; i--) {
-    drawtriangle(i, idata, index, shadeType);
-  }
-}
-
-/* CENTRY */
-void APIENTRY
-glutWireIcosahedron(void)
-{
-  icosahedron(GL_LINE_LOOP);
-}
-
-void APIENTRY
-glutSolidIcosahedron(void)
-{
-  icosahedron(GL_TRIANGLES);
-}
-
-/* ENDCENTRY */
-
-/* tetrahedron data: */
-
-#define T       1.73205080756887729
-
-static GLfloat tdata[4][3] =
-{
-  {T, T, T},
-  {T, -T, -T},
-  {-T, T, -T},
-  {-T, -T, T}
-};
-
-static int tndex[4][3] =
-{
-  {0, 1, 3},
-  {2, 1, 0},
-  {3, 2, 0},
-  {1, 2, 3}
-};
-
-static void
-tetrahedron(GLenum shadeType)
-{
-  int i;
-
-  for (i = 3; i >= 0; i--)
-    drawtriangle(i, tdata, tndex, shadeType);
-}
-
-/* CENTRY */
-void APIENTRY
-glutWireTetrahedron(void)
-{
-  tetrahedron(GL_LINE_LOOP);
-}
-
-void APIENTRY
-glutSolidTetrahedron(void)
-{
-  tetrahedron(GL_TRIANGLES);
-}
-
-/* ENDCENTRY */
diff --git a/src/glut/mini/overlay.c b/src/glut/mini/overlay.c
deleted file mode 100644
index fc8a8e5b0d..0000000000
--- a/src/glut/mini/overlay.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.4
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * DOS/DJGPP glut driver v1.0 for Mesa 4.0
- *
- *  Copyright (C) 2002 - Borca Daniel
- *  Email : dborca@yahoo.com
- *  Web   : http://www.geocities.com/dborca
- */
-
-
-#include "GL/glut.h"
-
-
-void APIENTRY glutEstablishOverlay (void)
-{
-}
-
-
-void APIENTRY glutRemoveOverlay (void)
-{
-}
-
-
-void APIENTRY glutUseLayer (GLenum layer)
-{
-}
-
-
-void APIENTRY glutPostOverlayRedisplay (void)
-{
-}
-
-
-void APIENTRY glutShowOverlay (void)
-{
-}
-
-
-void APIENTRY glutHideOverlay (void)
-{
-}
diff --git a/src/glut/mini/state.c b/src/glut/mini/state.c
deleted file mode 100644
index 81aefc53bd..0000000000
--- a/src/glut/mini/state.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.4
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * DOS/DJGPP glut driver v1.0 for Mesa 4.0
- *
- *  Copyright (C) 2002 - Borca Daniel
- *  Email : dborca@yahoo.com
- *  Web   : http://www.geocities.com/dborca
- */
-
-
-#include "GL/glut.h"
-#include 
-
-
-#define TIMEDELTA(dest, src1, src2) {				\
-   if(((dest).tv_usec = (src1).tv_usec - (src2).tv_usec) < 0) {	\
-      (dest).tv_usec += 1000000;				\
-      (dest).tv_sec = (src1).tv_sec - (src2).tv_sec - 1;	\
-   } else {							\
-      (dest).tv_sec = (src1).tv_sec - (src2).tv_sec;		\
-   }								\
-}
-
-int APIENTRY glutGet (GLenum type)
-{
-   
-   switch (type) {
-   case GLUT_WINDOW_RGBA:
-      return 1;
-   case GLUT_ELAPSED_TIME: {
-      static int inited = 0;
-      static struct timeval elapsed, beginning, now;
-      if (!inited) {
-	 gettimeofday(&beginning, 0);
-	 inited = 1;
-      }
-      gettimeofday(&now, 0);
-      TIMEDELTA(elapsed, now, beginning);
-      /* Return elapsed milliseconds. */
-      return (int) ((elapsed.tv_sec * 1000) + (elapsed.tv_usec / 1000));
-   }
-   default:
-      return 0;
-   }
-}
-
-
-int APIENTRY glutDeviceGet (GLenum type)
-{
- return 0;
-}
diff --git a/src/glut/mini/teapot.c b/src/glut/mini/teapot.c
deleted file mode 100644
index aa96fcbbbd..0000000000
--- a/src/glut/mini/teapot.c
+++ /dev/null
@@ -1,212 +0,0 @@
-
-/* Copyright (c) Mark J. Kilgard, 1994. */
-
-/**
-(c) Copyright 1993, Silicon Graphics, Inc.
-
-ALL RIGHTS RESERVED
-
-Permission to use, copy, modify, and distribute this software
-for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that
-both the copyright notice and this permission notice appear in
-supporting documentation, and that the name of Silicon
-Graphics, Inc. not be used in advertising or publicity
-pertaining to distribution of the software without specific,
-written prior permission.
-
-THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU
-"AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR
-OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN NO
-EVENT SHALL SILICON GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE
-ELSE FOR ANY DIRECT, SPECIAL, INCIDENTAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER,
-INCLUDING WITHOUT LIMITATION, LOSS OF PROFIT, LOSS OF USE,
-SAVINGS OR REVENUE, OR THE CLAIMS OF THIRD PARTIES, WHETHER OR
-NOT SILICON GRAPHICS, INC.  HAS BEEN ADVISED OF THE POSSIBILITY
-OF SUCH LOSS, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-ARISING OUT OF OR IN CONNECTION WITH THE POSSESSION, USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-US Government Users Restricted Rights
-
-Use, duplication, or disclosure by the Government is subject to
-restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
-(c)(1)(ii) of the Rights in Technical Data and Computer
-Software clause at DFARS 252.227-7013 and/or in similar or
-successor clauses in the FAR or the DOD or NASA FAR
-Supplement.  Unpublished-- rights reserved under the copyright
-laws of the United States.  Contractor/manufacturer is Silicon
-Graphics, Inc., 2011 N.  Shoreline Blvd., Mountain View, CA
-94039-7311.
-
-OpenGL(TM) is a trademark of Silicon Graphics, Inc.
-*/
-
-#include 
-#include 
-#include "GL/glut.h"
-
-/* Rim, body, lid, and bottom data must be reflected in x and
-   y; handle and spout data across the y axis only.  */
-
-static int patchdata[][16] =
-{
-    /* rim */
-  {102, 103, 104, 105, 4, 5, 6, 7, 8, 9, 10, 11,
-    12, 13, 14, 15},
-    /* body */
-  {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-    24, 25, 26, 27},
-  {24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 35, 36,
-    37, 38, 39, 40},
-    /* lid */
-  {96, 96, 96, 96, 97, 98, 99, 100, 101, 101, 101,
-    101, 0, 1, 2, 3,},
-  {0, 1, 2, 3, 106, 107, 108, 109, 110, 111, 112,
-    113, 114, 115, 116, 117},
-    /* bottom */
-  {118, 118, 118, 118, 124, 122, 119, 121, 123, 126,
-    125, 120, 40, 39, 38, 37},
-    /* handle */
-  {41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-    53, 54, 55, 56},
-  {53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
-    28, 65, 66, 67},
-    /* spout */
-  {68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-    80, 81, 82, 83},
-  {80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-    92, 93, 94, 95}
-};
-/* *INDENT-OFF* */
-
-static float cpdata[][3] =
-{
-    {0.2, 0, 2.7}, {0.2, -0.112, 2.7}, {0.112, -0.2, 2.7}, {0,
-    -0.2, 2.7}, {1.3375, 0, 2.53125}, {1.3375, -0.749, 2.53125},
-    {0.749, -1.3375, 2.53125}, {0, -1.3375, 2.53125}, {1.4375,
-    0, 2.53125}, {1.4375, -0.805, 2.53125}, {0.805, -1.4375,
-    2.53125}, {0, -1.4375, 2.53125}, {1.5, 0, 2.4}, {1.5, -0.84,
-    2.4}, {0.84, -1.5, 2.4}, {0, -1.5, 2.4}, {1.75, 0, 1.875},
-    {1.75, -0.98, 1.875}, {0.98, -1.75, 1.875}, {0, -1.75,
-    1.875}, {2, 0, 1.35}, {2, -1.12, 1.35}, {1.12, -2, 1.35},
-    {0, -2, 1.35}, {2, 0, 0.9}, {2, -1.12, 0.9}, {1.12, -2,
-    0.9}, {0, -2, 0.9}, {-2, 0, 0.9}, {2, 0, 0.45}, {2, -1.12,
-    0.45}, {1.12, -2, 0.45}, {0, -2, 0.45}, {1.5, 0, 0.225},
-    {1.5, -0.84, 0.225}, {0.84, -1.5, 0.225}, {0, -1.5, 0.225},
-    {1.5, 0, 0.15}, {1.5, -0.84, 0.15}, {0.84, -1.5, 0.15}, {0,
-    -1.5, 0.15}, {-1.6, 0, 2.025}, {-1.6, -0.3, 2.025}, {-1.5,
-    -0.3, 2.25}, {-1.5, 0, 2.25}, {-2.3, 0, 2.025}, {-2.3, -0.3,
-    2.025}, {-2.5, -0.3, 2.25}, {-2.5, 0, 2.25}, {-2.7, 0,
-    2.025}, {-2.7, -0.3, 2.025}, {-3, -0.3, 2.25}, {-3, 0,
-    2.25}, {-2.7, 0, 1.8}, {-2.7, -0.3, 1.8}, {-3, -0.3, 1.8},
-    {-3, 0, 1.8}, {-2.7, 0, 1.575}, {-2.7, -0.3, 1.575}, {-3,
-    -0.3, 1.35}, {-3, 0, 1.35}, {-2.5, 0, 1.125}, {-2.5, -0.3,
-    1.125}, {-2.65, -0.3, 0.9375}, {-2.65, 0, 0.9375}, {-2,
-    -0.3, 0.9}, {-1.9, -0.3, 0.6}, {-1.9, 0, 0.6}, {1.7, 0,
-    1.425}, {1.7, -0.66, 1.425}, {1.7, -0.66, 0.6}, {1.7, 0,
-    0.6}, {2.6, 0, 1.425}, {2.6, -0.66, 1.425}, {3.1, -0.66,
-    0.825}, {3.1, 0, 0.825}, {2.3, 0, 2.1}, {2.3, -0.25, 2.1},
-    {2.4, -0.25, 2.025}, {2.4, 0, 2.025}, {2.7, 0, 2.4}, {2.7,
-    -0.25, 2.4}, {3.3, -0.25, 2.4}, {3.3, 0, 2.4}, {2.8, 0,
-    2.475}, {2.8, -0.25, 2.475}, {3.525, -0.25, 2.49375},
-    {3.525, 0, 2.49375}, {2.9, 0, 2.475}, {2.9, -0.15, 2.475},
-    {3.45, -0.15, 2.5125}, {3.45, 0, 2.5125}, {2.8, 0, 2.4},
-    {2.8, -0.15, 2.4}, {3.2, -0.15, 2.4}, {3.2, 0, 2.4}, {0, 0,
-    3.15}, {0.8, 0, 3.15}, {0.8, -0.45, 3.15}, {0.45, -0.8,
-    3.15}, {0, -0.8, 3.15}, {0, 0, 2.85}, {1.4, 0, 2.4}, {1.4,
-    -0.784, 2.4}, {0.784, -1.4, 2.4}, {0, -1.4, 2.4}, {0.4, 0,
-    2.55}, {0.4, -0.224, 2.55}, {0.224, -0.4, 2.55}, {0, -0.4,
-    2.55}, {1.3, 0, 2.55}, {1.3, -0.728, 2.55}, {0.728, -1.3,
-    2.55}, {0, -1.3, 2.55}, {1.3, 0, 2.4}, {1.3, -0.728, 2.4},
-    {0.728, -1.3, 2.4}, {0, -1.3, 2.4}, {0, 0, 0}, {1.425,
-    -0.798, 0}, {1.5, 0, 0.075}, {1.425, 0, 0}, {0.798, -1.425,
-    0}, {0, -1.5, 0.075}, {0, -1.425, 0}, {1.5, -0.84, 0.075},
-    {0.84, -1.5, 0.075}
-};
-
-static float tex[2][2][2] =
-{
-  { {0, 0},
-    {1, 0}},
-  { {0, 1},
-    {1, 1}}
-};
-
-/* *INDENT-ON* */
-
-static void
-teapot(GLint grid, GLdouble scale, GLenum type)
-{
-  float p[4][4][3], q[4][4][3], r[4][4][3], s[4][4][3];
-  long i, j, k, l;
-
-  glPushAttrib(GL_ENABLE_BIT | GL_EVAL_BIT);
-  glEnable(GL_AUTO_NORMAL);
-  glEnable(GL_NORMALIZE);
-  glEnable(GL_MAP2_VERTEX_3);
-  glEnable(GL_MAP2_TEXTURE_COORD_2);
-  glPushMatrix();
-  glRotatef(270.0, 1.0, 0.0, 0.0);
-  glScalef(0.5 * scale, 0.5 * scale, 0.5 * scale);
-  glTranslatef(0.0, 0.0, -1.5);
-  for (i = 0; i < 10; i++) {
-    for (j = 0; j < 4; j++) {
-      for (k = 0; k < 4; k++) {
-        for (l = 0; l < 3; l++) {
-          p[j][k][l] = cpdata[patchdata[i][j * 4 + k]][l];
-          q[j][k][l] = cpdata[patchdata[i][j * 4 + (3 - k)]][l];
-          if (l == 1)
-            q[j][k][l] *= -1.0;
-          if (i < 6) {
-            r[j][k][l] =
-              cpdata[patchdata[i][j * 4 + (3 - k)]][l];
-            if (l == 0)
-              r[j][k][l] *= -1.0;
-            s[j][k][l] = cpdata[patchdata[i][j * 4 + k]][l];
-            if (l == 0)
-              s[j][k][l] *= -1.0;
-            if (l == 1)
-              s[j][k][l] *= -1.0;
-          }
-        }
-      }
-    }
-    glMap2f(GL_MAP2_TEXTURE_COORD_2, 0, 1, 2, 2, 0, 1, 4, 2,
-      &tex[0][0][0]);
-    glMap2f(GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4,
-      &p[0][0][0]);
-    glMapGrid2f(grid, 0.0, 1.0, grid, 0.0, 1.0);
-    glEvalMesh2(type, 0, grid, 0, grid);
-    glMap2f(GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4,
-      &q[0][0][0]);
-    glEvalMesh2(type, 0, grid, 0, grid);
-    if (i < 6) {
-      glMap2f(GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4,
-        &r[0][0][0]);
-      glEvalMesh2(type, 0, grid, 0, grid);
-      glMap2f(GL_MAP2_VERTEX_3, 0, 1, 3, 4, 0, 1, 12, 4,
-        &s[0][0][0]);
-      glEvalMesh2(type, 0, grid, 0, grid);
-    }
-  }
-  glPopMatrix();
-  glPopAttrib();
-}
-
-/* CENTRY */
-void APIENTRY 
-glutSolidTeapot(GLdouble scale)
-{
-  teapot(7, scale, GL_FILL);
-}
-
-void APIENTRY 
-glutWireTeapot(GLdouble scale)
-{
-  teapot(10, scale, GL_LINE);
-}
-
-/* ENDCENTRY */
diff --git a/src/glut/mini/window.c b/src/glut/mini/window.c
deleted file mode 100644
index 5a59e64de6..0000000000
--- a/src/glut/mini/window.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  4.1
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * DOS/DJGPP glut driver v1.2 for Mesa 4.1
- *
- *  Copyright (C) 2002 - Borca Daniel
- *  Email : dborca@yahoo.com
- *  Web   : http://www.geocities.com/dborca
- */
-
-
-#include 
-#include 
-#include "GL/glut.h"
-#include "internal.h"
-
-#define USE_MINI_GLX 1
-#if USE_MINI_GLX
-#include "GL/miniglx.h"
-#else
-#include 
-#endif
-
-
-
-static GLXContext context = 0;
-static Window win;
-static XVisualInfo *visinfo = 0;
-static Display *dpy = 0;
-
-
-int APIENTRY glutCreateWindow (const char *title)
-{
-   XSetWindowAttributes attr;
-   unsigned long mask;
-   GLXContext ctx;
-   int scrnum = 0;
-   Window root = RootWindow( dpy, scrnum );
-
-   if (win)
-      return 0;
-
-   if (!dpy) {
-      dpy = XOpenDisplay(NULL);
-      if (!dpy) {
-	 printf("Error: XOpenDisplay failed\n");
-	 exit(1);
-      }
-   }
-
-   if (!visinfo) {
-      int attrib[] = {GLX_RGBA,
-		      GLX_RED_SIZE, 1,
-		      GLX_GREEN_SIZE, 1,
-		      GLX_BLUE_SIZE, 1,
-		      GLX_DEPTH_SIZE, 1,
-		      GLX_DOUBLEBUFFER, 
-		      None };
-
-    
-      visinfo = glXChooseVisual( dpy, scrnum, attrib );
-      if (!visinfo) {
-	 printf("Error: couldn't get an RGB, Double-buffered visual\n");
-	 exit(1);
-      }
-   }
-
-   /* window attributes */
-   attr.background_pixel = 0;
-   attr.border_pixel = 0;
-   attr.colormap = XCreateColormap( dpy, root, visinfo->visual, AllocNone);
-   attr.event_mask = StructureNotifyMask | ExposureMask;
-   mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
-
-   win = XCreateWindow( dpy, root, g_xpos, g_ypos, g_width, g_height,
-		        0, visinfo->depth, InputOutput,
-		        visinfo->visual, mask, &attr );
-   if (!win) {
-      printf("Error: XCreateWindow failed\n");
-      exit(1);
-   }
-
-   ctx = glXCreateContext( dpy, visinfo, NULL, True );
-   if (!ctx) {
-      printf("Error: glXCreateContext failed\n");
-      exit(1);
-   }
-
-   if (!glXMakeCurrent( dpy, win, ctx )) {
-      printf("Error: glXMakeCurrent failed\n");
-      exit(1);
-   }
-
-   if (!(g_display_mode & GLUT_DOUBLE))
-      glDrawBuffer( GL_FRONT );
-      
-
-   XMapWindow( dpy, win );
-
-#if !USE_MINI_GLX
-   {
-      XEvent e;
-      while (1) {
-	 XNextEvent( dpy, &e );
-	 if (e.type == MapNotify && e.xmap.window == win) {
-	    break;
-	 }
-      }
-   }
-#endif
-
-   return 1;
-}
-
-
-int APIENTRY glutCreateSubWindow (int win, int x, int y, int width, int height)
-{
-   return GL_FALSE;
-}
-
-
-void APIENTRY glutDestroyWindow (int idx)
-{
-   if (dpy && win)
-      XDestroyWindow( dpy, win );
-
-   if (dpy) 
-      XCloseDisplay( dpy );
-
-   win = 0;
-   dpy = 0;
-}
-
-
-void APIENTRY glutPostRedisplay (void)
-{
- g_redisplay = GL_TRUE;
-}
-
-
-void APIENTRY glutSwapBuffers (void)
-{
-/*  if (g_mouse) pc_scare_mouse(); */
-   if (dpy && win) glXSwapBuffers( dpy, win );
-/*  if (g_mouse) pc_unscare_mouse(); */
-}
-
-
-int APIENTRY glutGetWindow (void)
-{
-   return 0;
-}
-
-
-void APIENTRY glutSetWindow (int win)
-{
-}
-
-
-void APIENTRY glutSetWindowTitle (const char *title)
-{
-}
-
-
-void APIENTRY glutSetIconTitle (const char *title)
-{
-}
-
-
-void APIENTRY glutPositionWindow (int x, int y)
-{
-}
-
-
-void APIENTRY glutReshapeWindow (int width, int height)
-{
-}
-
-
-void APIENTRY glutPopWindow (void)
-{
-}
-
-
-void APIENTRY glutPushWindow (void)
-{
-}
-
-
-void APIENTRY glutIconifyWindow (void)
-{
-}
-
-
-void APIENTRY glutShowWindow (void)
-{
-}
-
-
-void APIENTRY glutHideWindow (void)
-{
-}
-
-void APIENTRY glutMainLoop (void)
-{
-   GLboolean idle;
-   GLboolean have_event;
-   XEvent evt;
-   int visible = 0;
-
-   glutPostRedisplay();
-   if (reshape_func) reshape_func(g_width, g_height);
-
-   while (GL_TRUE) {
-      idle = GL_TRUE;
-
-
-      if (visible && idle_func) 
-	 have_event = XCheckMaskEvent( dpy, ~0, &evt );
-      else 
-	 have_event = XNextEvent( dpy, &evt );
-
-      if (have_event) {
-	 idle = GL_FALSE;
-	 switch(evt.type) {
-	 case MapNotify:
-	    if (visibility_func) {
-	       visibility_func(GLUT_VISIBLE);
-	    }
-	    visible = 1;
-	    break;
-	 case UnmapNotify:
-	    if (visibility_func) {
-	       visibility_func(GLUT_NOT_VISIBLE);
-	    }
-	    visible = 0;
-	    break;
-	 case Expose:
-	    g_redisplay = 1;
-	    break;
-	 }
-      }
-
-      if (visible && g_redisplay && display_func) {
-	 idle        = GL_FALSE;
-	 g_redisplay = GL_FALSE;
-
-	 display_func();
-      }
-
-      if (visible && idle && idle_func) {
-	 idle_func();
-      }
-   }
-}
-- 
cgit v1.2.3


From 70d5c48341bd2cd36ac89540bd4de44834b50bf6 Mon Sep 17 00:00:00 2001
From: Brian Paul 
Date: Thu, 25 Feb 2010 19:50:09 -0700
Subject: docs: GL_EXT_texture_array updates

---
 docs/GL3.txt           | 2 +-
 docs/relnotes-7.8.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/GL3.txt b/docs/GL3.txt
index df3fd74549..889edefbce 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -20,7 +20,7 @@ Framebuffer objects (GL_EXT_framebuffer_object)       DONE
 Half-float                                            some infrastructure done
 Multisample blit                                      DONE
 Non-normalized Integer texture/framebuffer formats    not started
-1D/2D Texture arrays                                  mostly done
+1D/2D Texture arrays                                  core Mesa, swrast done
 Packed depth/stencil formats                          DONE
 Per-buffer blend and masks (GL_EXT_draw_buffers2)     DONE
 GL_EXT_texture_compression_rgtc                       not started
diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html
index e94cb7e696..ae9b8f5bba 100644
--- a/docs/relnotes-7.8.html
+++ b/docs/relnotes-7.8.html
@@ -37,6 +37,7 @@ tbd
 
    • GL_NV_conditional_render extension (swrast driver only)
 
    • GL_EXT_draw_buffers2 extension (swrast and i965 driver only)
 
    • GL_ARB_fragment_coord_conventions extension (for swrast, i965, and Gallium drivers)
+
    • GL_EXT_texture_array extension (swrast driver only)
 
    • Much improved support for EGL in Mesa
 
    • New state trackers for OpenGL ES 1.1 and 2.0
 
    • Dedicated documentation for Gallium
-- 
cgit v1.2.3


From d7e6e879fdfb1a4e3125237d117f68025dfa0d72 Mon Sep 17 00:00:00 2001
From: George Sapountzis 
Date: Mon, 1 Mar 2010 17:28:55 +0200
Subject: glapi: drop SOLARIS_THREADS

It seems that SOLARIS_THREADS is not used and does not work.
---
 docs/dispatch.html                  |  2 +-
 src/mesa/glapi/gen/gl_x86-64_asm.py |  2 +-
 src/mesa/glapi/gen/gl_x86_asm.py    |  2 +-
 src/mesa/glapi/glthread.c           | 68 -------------------------------------
 src/mesa/glapi/glthread.h           | 35 ++-----------------
 src/mesa/x86-64/glapi_x86-64.S      |  2 +-
 src/mesa/x86/glapi_x86.S            |  2 +-
 7 files changed, 7 insertions(+), 106 deletions(-)

(limited to 'docs')

diff --git a/docs/dispatch.html b/docs/dispatch.html
index 0c54a84675..e5587c1a29 100644
--- a/docs/dispatch.html
+++ b/docs/dispatch.html
@@ -199,7 +199,7 @@ few preprocessor defines.
      
 
    • If GLX_USE_TLS is defined, method #4 is used.
      • 
 
    • If PTHREADS is defined, method #3 is used.
      • 
 
    • If any of PTHREADS,
-SOLARIS_THREADS, WIN32_THREADS, or BEOS_THREADS
+WIN32_THREADS, or BEOS_THREADS
 is defined, method #2 is used.
      • 
 
    • If none of the preceeding are defined, method #1 is used.
      • 
 
    
diff --git a/src/mesa/glapi/gen/gl_x86-64_asm.py b/src/mesa/glapi/gen/gl_x86-64_asm.py
index 31c1a2b93a..8ac57ab7eb 100644
--- a/src/mesa/glapi/gen/gl_x86-64_asm.py
+++ b/src/mesa/glapi/gen/gl_x86-64_asm.py
@@ -138,7 +138,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 		print '#  define GL_PREFIX(n) GLNAME(CONCAT(gl,n))'
 		print '# endif'
 		print ''
-		print '#if defined(PTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
+		print '#if defined(PTHREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
 		print '#  define THREADS'
 		print '#endif'
 		print ''
diff --git a/src/mesa/glapi/gen/gl_x86_asm.py b/src/mesa/glapi/gen/gl_x86_asm.py
index d210f3a248..a48724ee61 100644
--- a/src/mesa/glapi/gen/gl_x86_asm.py
+++ b/src/mesa/glapi/gen/gl_x86_asm.py
@@ -79,7 +79,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 		print '#define GLOBL_FN(x) GLOBL x'
 		print '#endif'
 		print ''
-		print '#if defined(PTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
+		print '#if defined(PTHREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
 		print '#  define THREADS'
 		print '#endif'
 		print ''
diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c
index 15401d730e..17b6bb2b6a 100644
--- a/src/mesa/glapi/glthread.c
+++ b/src/mesa/glapi/glthread.c
@@ -115,74 +115,6 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
 
 
 
-/*
- * Solaris/Unix International Threads -- Use only if POSIX threads
- *   aren't available on your Unix platform.  Solaris 2.[34] are examples
- *   of platforms where this is the case.  Be sure to use -mt and/or
- *   -D_REENTRANT when compiling.
- */
-#ifdef SOLARIS_THREADS
-#define USE_LOCK_FOR_KEY	/* undef this to try a version without
-				   lock for the global key... */
-
-PUBLIC unsigned long
-_glthread_GetID(void)
-{
-   abort();   /* XXX not implemented yet */
-   return (unsigned long) 0;
-}
-
-
-void
-_glthread_InitTSD(_glthread_TSD *tsd)
-{
-   if ((errno = mutex_init(&tsd->keylock, 0, NULL)) != 0 ||
-      (errno = thr_keycreate(&(tsd->key), free)) != 0) {
-      perror(INIT_TSD_ERROR);
-      exit(-1);
-   }
-   tsd->initMagic = INIT_MAGIC;
-}
-
-
-void *
-_glthread_GetTSD(_glthread_TSD *tsd)
-{
-   void* ret;
-   if (tsd->initMagic != INIT_MAGIC) {
-      _glthread_InitTSD(tsd);
-   }
-#ifdef USE_LOCK_FOR_KEY
-   mutex_lock(&tsd->keylock);
-   thr_getspecific(tsd->key, &ret);
-   mutex_unlock(&tsd->keylock);
-#else
-   if ((errno = thr_getspecific(tsd->key, &ret)) != 0) {
-      perror(GET_TSD_ERROR);
-      exit(-1);
-   }
-#endif
-   return ret;
-}
-
-
-void
-_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
-{
-   if (tsd->initMagic != INIT_MAGIC) {
-      _glthread_InitTSD(tsd);
-   }
-   if ((errno = thr_setspecific(tsd->key, ptr)) != 0) {
-      perror(SET_TSD_ERROR);
-      exit(-1);
-   }
-}
-
-#undef USE_LOCK_FOR_KEY
-#endif /* SOLARIS_THREADS */
-
-
-
 /*
  * Win32 Threads.  The only available option for Windows 95/NT.
  * Be sure that you compile using the Multithreaded runtime, otherwise
diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h
index 389c24204b..e5193aaf98 100644
--- a/src/mesa/glapi/glthread.h
+++ b/src/mesa/glapi/glthread.h
@@ -64,7 +64,7 @@
 #define GLTHREAD_H
 
 
-#if defined(PTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
+#if defined(PTHREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
 #ifndef THREADS
 #define THREADS
 #endif
@@ -149,38 +149,7 @@ typedef unsigned int _glthread_Cond;
 #define _glthread_COND_BROADCAST(cond) \
   ASSERT(0);
 
-#endif
-
-
-/*
- * Solaris threads. Use only up to Solaris 2.4.
- * Solaris 2.5 and higher provide POSIX threads.
- * Be sure to compile with -mt on the Solaris compilers, or
- * use -D_REENTRANT if using gcc.
- */
-#ifdef SOLARIS_THREADS
-#include 
-
-typedef struct {
-   thread_key_t key;
-   mutex_t      keylock;
-   int          initMagic;
-} _glthread_TSD;
-
-typedef thread_t _glthread_Thread;
-
-typedef mutex_t _glthread_Mutex;
-
-/* XXX need to really implement mutex-related macros */
-#define _glthread_DECLARE_STATIC_MUTEX(name)  static _glthread_Mutex name = 0
-#define _glthread_INIT_MUTEX(name)  (void) name
-#define _glthread_DESTROY_MUTEX(name) (void) name
-#define _glthread_LOCK_MUTEX(name)  (void) name
-#define _glthread_UNLOCK_MUTEX(name)  (void) name
-
-#endif /* SOLARIS_THREADS */
-
-
+#endif /* PTHREADS */
 
 
 /*
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 4c9eab882b..bd5a657e19 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -45,7 +45,7 @@
 #  define GL_PREFIX(n) GLNAME(CONCAT(gl,n))
 # endif
 
-#if defined(PTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
+#if defined(PTHREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
 #  define THREADS
 #endif
 
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 13270ef35d..ae5dd2b0d1 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -52,7 +52,7 @@
 #define GLOBL_FN(x) GLOBL x
 #endif
 
-#if defined(PTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
+#if defined(PTHREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
 #  define THREADS
 #endif
 
-- 
cgit v1.2.3


From 21cc53c2bc1dbd2ddd8510f68215497ed3c2088e Mon Sep 17 00:00:00 2001
From: Ian Romanick 
Date: Wed, 3 Mar 2010 05:30:14 -0800
Subject: Note removal of color-index rendering in release notes.

---
 docs/relnotes-7.8.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html
index ae9b8f5bba..dabe0f2651 100644
--- a/docs/relnotes-7.8.html
+++ b/docs/relnotes-7.8.html
@@ -53,7 +53,7 @@ tbd
 
 
    Changes
    
 
      
-
    • TBD
+
    • Removed support for color-index rendering
      • 
 
    
 
 
-- 
cgit v1.2.3


From 7d7e2198ddc4d76c26cabceaadf1b477e3a69271 Mon Sep 17 00:00:00 2001
From: Ian Romanick 
Date: Wed, 3 Mar 2010 16:43:13 -0800
Subject: Note removal of pre-GCC 3.3.0 support in release notes.

---
 docs/relnotes-7.8.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs')

diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html
index dabe0f2651..552b25a5dc 100644
--- a/docs/relnotes-7.8.html
+++ b/docs/relnotes-7.8.html
@@ -54,6 +54,7 @@ tbd
 
    Changes
    
 
      
 
    • Removed support for color-index rendering
      • 
+
    • Removed support for GCC versions earlier than 3.3.0.
      • 
 
    
 
 
-- 
cgit v1.2.3


From 60fae3b0249b42dd8c2f5777ad5f933a9bbc50d2 Mon Sep 17 00:00:00 2001
From: Brian Paul 
Date: Fri, 5 Mar 2010 09:24:15 -0700
Subject: docs: document GL_APPLE_object_purgeable

---
 docs/relnotes-7.8.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs')

diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html
index 552b25a5dc..ebe3d498b5 100644
--- a/docs/relnotes-7.8.html
+++ b/docs/relnotes-7.8.html
@@ -38,6 +38,7 @@ tbd
 
  • GL_EXT_draw_buffers2 extension (swrast and i965 driver only)
 
  • GL_ARB_fragment_coord_conventions extension (for swrast, i965, and Gallium drivers)
 
  • GL_EXT_texture_array extension (swrast driver only)
+
  • GL_APPLE_object_purgeable extension (swrast and i945/i965 DRI drivers)
 
  • Much improved support for EGL in Mesa
 
  • New state trackers for OpenGL ES 1.1 and 2.0
 
  • Dedicated documentation for Gallium
-- 
cgit v1.2.3


From c781e2841a25aeecac2f9af1a31ce129a530d796 Mon Sep 17 00:00:00 2001
From: Brian Paul 
Date: Fri, 5 Mar 2010 17:32:07 -0700
Subject: docs: remove merge conflict garbage

---
 docs/relnotes.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'docs')

diff --git a/docs/relnotes.html b/docs/relnotes.html
index f1f95c5d3c..3e17a1e94e 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -13,7 +13,6 @@ The release notes summarize what's new or changed in each Mesa release.
 
    
 
 
      
-<<<<<<< HEAD:docs/relnotes.html
 
    • 7.8 release notes
 
    • 7.7.1 release notes
 
    • 7.7 release notes
-- 
cgit v1.2.3


From 67277a6d118e0e9f3dadf108990d8fa5fe8cb63b Mon Sep 17 00:00:00 2001
From: Brian Paul 
Date: Fri, 5 Mar 2010 17:36:34 -0700
Subject: docs: skeleton for 7.9 release notes

---
 docs/relnotes-7.9.html | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 docs/relnotes-7.9.html

(limited to 'docs')

diff --git a/docs/relnotes-7.9.html b/docs/relnotes-7.9.html
new file mode 100644
index 0000000000..f7d5016dc6
--- /dev/null
+++ b/docs/relnotes-7.9.html
@@ -0,0 +1,50 @@
+
+
+Mesa Release Notes
+
+
+
+
+
+
+
+
      Mesa 7.9 Release Notes / date TBD
      
+
+
      
+Mesa 7.9 is a new development release.
+People who are concerned with stability and reliability should stick
+with a previous release or wait for Mesa 7.9.1.
+
      
+
      
+Mesa 7.9 implements the OpenGL 2.1 API, but the version reported by
+glGetString(GL_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 2.1.
+
      
+
      
+See the Compiling/Installing page for prerequisites
+for DRI hardware acceleration.
+
      
+
+
+
      MD5 checksums
      
+
      +tbd
+
      
+
+
+
      New features
      
+
        
+
      
+
+
+
      Bug fixes
      
+
        
+
      
+
+
+
      Changes
      
+
        
+
      
+
+
+
-- 
cgit v1.2.3


From c4e0ae3907a3eeaf906a813814e20c4817b744ff Mon Sep 17 00:00:00 2001
From: José Fonseca 
Date: Wed, 10 Mar 2010 12:09:16 +0000
Subject: docs: Update new opengl32.dll target location.

---
 docs/install.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/install.html b/docs/install.html
index 5aea92e0b5..3962ea5c91 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -361,7 +361,7 @@ To build Mesa with SCons for Windows on Linux using the MinGW crosscompiler tool
 This will create:
 
      
 
        
-
      • build/windows-x86-debug/gallium/winsys/gdi/opengl32.dll — Mesa + Gallium + softpipe, binary compatible with Windows's opengl32.dll 
+
      • build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll — Mesa + Gallium + softpipe, binary compatible with Windows's opengl32.dll 
 
      • build/windows-x86-debug/glut/glx/glut32.dll
 
      • progs/build/windows-x86-debug/wgl/wglinfo.exe
 
      • progs/build/windows-x86-debug/trivial/tri.exe
-- 
cgit v1.2.3