Move the transform and lighting code to two new directories

	math:  Provides basic matrix and vector functionality that
               might be useful to multiple software t&l
	       implementations, and is used by core mesa to
	       manage the Model, Project, etc matrices.

	tnl:   The real transform & lighting code from core mesa,
	       including everything from glVertex3f through vertex
	       buffer handling, transformation, clipping, lighting
	       and handoff to a driver for rasterization.

The interfaces of these can be further tightened up, but the basic
splitting up of state and code move is done.

12 files changed, 43 insertions, 637 deletions

diff --git a/src/mesa/drivers/ggi/ggimesa.c b/src/mesa/drivers/ggi/ggimesa.c
index 125aefcfb67..764ccba803e 100644
--- a/src/mesa/drivers/ggi/ggimesa.c
+++ b/src/mesa/drivers/ggi/ggimesa.c
@@ -508,7 +508,7 @@ void GGIMesaSwapBuffers(void)
 {
 	GGIMESADPRINT_CORE("GGIMesaSwapBuffers\n");
 	
-	FLUSH_VB(GGIMesa->gl_ctx, "swap buffers");
+	_mesa_swapbuffers( GGIMesa->gl_ctx );
 	gl_ggiFlush(GGIMesa->gl_ctx);
 	
 	if (GGIMesa->gl_vis->DBflag)
diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index ea5f816258e..f3a6431aec5 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -43,579 +43,6 @@
  */
 
 
-/* fxapi.c - 3Dfx VooDoo/Mesa interface */
-
-
-/********************************************************************
- *
- * Function names:
- *  fxMesa....     (The driver API)
- *  fxDD....       (Mesa device driver functions)
- *  fxTM....       (Texture manager functions)
- *  fxSetup....    (Voodoo units setup functions)
- *  fx....         (Internal driver functions)
- *
- * Data type names:
- *  fxMesa....     (Public driver data types)
- *  tfx....        (Private driver data types)
- *
- ********************************************************************
- *
- * V0.30 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - introduced a new MESA_GLX_FX related behavior
- *         - the Glide fog table was built in a wrong way (using
- *           gu* Glide function). Added the code for building the
- *           table following the OpenGL specs. Thanks to Steve Baker
- *           for highlighting the problem.
- *         - fixed few problems in my and Keith's fxDDClear code
- *         - merged my code with the Keith's one
- *         - used the new BlendFunc Mesa device driver function 
- *         - used the new AlphaFunc Mesa device driver function 
- *         - used the new Enable Mesa device driver function 
- *         - fixed a bug related to fog in the Mesa core. Fog
- *           were applied two times: at vertex level and at fragment
- *           level (thanks to Steve Baker for reporting the problem)
- *         - glColorMask(GL_FALSE,GL_FALSE,GL_FALSE,GL_FALSE) now works
- *           (thanks to Jiri Pop for reporting the problem)
- *         - the driver works fine with OpenGL Unreal
- *         - fixed a bug in the Mesa core clipping code (related
- *           to the q texture coordinate)
- *         - introduced the support for the q texture coordinate
- *
- *         Keith Whitwell ([email protected])
- *         - optimized the driver and written all the new code
- *           required by the new Mesa-3.1 device driver API
- *           and by the new Mesa-3.1 core changes
- *         - written the cva support and many other stuff
- *
- *         Brian Paul ([email protected]) Avid Technology
- *         - fixed display list share bug for MESA_GLX_FX = window/fullscreen
- *         - fixed glClear/gl...Mask related problem
- *
- *         Bert Schoenwaelder ([email protected])
- *         - the driver is now able to sleep when waiting for the completation
- *           of multiple swapbuffer operations instead of wasting
- *           CPU time (NOTE: you must uncomment the lines in the
- *           fxMesaSwapBuffers function in order to enable this option)
- *
- *         Eero Pajarre ([email protected])
- *         - enabled the macro FLOAT_COLOR_TO_UBYTE_COLOR under
- *           windows
- *         - written an asm x86 optimized float->integer conversions
- *           for windows
- *
- *         Theodore Jump ([email protected])
- *         - fixed a small problem in the __wglMonitor function of the
- *           wgl emulator
- *         - written the in-window-rendering hack support for windows
- *           and Vooodoo1/2 cards
- *
- * V0.29 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - included in Mesa-3.0
- *         - now glGetString(GL_RENDERER) returns more information
- *           about the hardware configuration: "Mesa Glide <version>
- *           <Voodoo_Graphics|Voodoo_Rush|UNKNOWN> <num> CARD/<num> FB/
- *           <num> TM/<num> TMU/<NOSLI|SLI>"
- *           where: <num> CARD is the card used for the current context,
- *           <num> FB is the number of MB for the framebuffer,
- *           <num> TM is the number of MB for the texture memory,
- *           <num> TMU is the number of TMU. You can try to run
- *           Mesa/demos/glinfo in order to have an example of the
- *           output
- *         - fixed a problem of the WGL emulator with the
- *           OpenGL Optimizer 1.1 (thanks to Erwin Coumans for
- *           the bug report)
- *         - fixed some bug in the fxwgl.c code (thanks to  
- *           Peter Pettersson for a patch and a bug report)
- *
- *         Theodore Jump ([email protected])
- *         - written the SST_DUALHEAD support in the WGL emulator
- *
- *         Daryll Strauss ([email protected])
- *         - fixed the Voodoo Rush support for the in window rendering
- *
- * V0.28 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - the only supported multitexture functions are GL_MODULATE
- *           for texture set 0 and GL_MODULATE for texture set 1. In
- *           all other cases, the driver falls back to pure software
- *           rendering
- *         - written the support for the new  GL_EXT_multitexture
- *         - written the DD_MAX_TEXTURE_COORD_SETS support in the
- *           fxDDGetParameteri() function
- *         - the driver falls back to pure software rendering when
- *           texture mapping function is GL_BLEND
- *
- * V0.27 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - inluded in the Mesa-3.0beta5
- *         - written a smal extension (GL_FXMESA_global_texture_lod_bias) in
- *           order to expose the LOD bias related Glide function
- *         - fixed a bug fxDDWriteMonoRGBAPixels()
- *         - the driver is now able to fallback to software rendering in
- *           any case not directly supported by the hardware
- *         - written the support for enabling/disabling dithering
- *         - the in-window-rendering hack now works with any X11 screen
- *           depth
- *         - fixed a problem related to color/depth/alpha buffer clears
- *         - fixed a problem when clearing buffer for a context with the
- *           alpha buffer
- *         - fixed a problem in the fxTMReloadSubMipMapLevel() function,
- *           I have forget a "break;" (thanks to Joe Waters for the bug report)
- *         - fixed a problem in the color format for the in window
- *           rendering hack
- *         - written the fxDDReadRGBAPixels function
- *         - written the fxDDDepthTestPixelsGeneric function
- *         - written the fxDDDepthTestSpanGeneric function
- *         - written the fxDDWriteMonoRGBAPixels function
- *         - written the fxDDWriteRGBAPixels function
- *         - removed the multitexture emulation code for Voodoo board
- *         with only one TMU
- *
- *         Chris Prince <[email protected]>
- *         - fixed a new bug in the wglUseFontBitmaps code
- *
- *         Ralf Knoesel ([email protected])
- *         - fixed a bug in the wglUseFontBitmaps code
- *
- *         Rune Hasvold ([email protected])
- *         - fixed a problem related to the aux usage in the fxBestResolution
- *           function
- *         - fixed the order of pixel formats in the WGL emulator
- *
- *         Fredrik Hubinette ([email protected])
- *         - the driver shutdown the Glide for most common signals
- *
- * V0.26 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - included in the Mesa-3.0beta4
- *         - fixed a problem related to a my optimization for the Rune's
- *           pixel-span optimization
- *         - fixed a problem related to fxDDSetNearFar() and ctx->ProjectionMatrixType
- *           (thanks to Ben "Ctrl-Alt-Delete" and the Raul Alonso's ssystem)
- *         - fixed a small bug in the Rune's pixel-span optimization
- *         - fixed a problem with GL_CCW (thanks to Curt Olson for and example
- *           of the problem)
- *         - grVertex setup code is now ready for the internal thread support
- *         - fixed a no used optimization with clipped vertices in
- *           grVertex setup code
- *         - fixed a problem in the GL_LIGHT_MODEL_TWO_SIDE support (thanks
- *           to Patrick H. Madden for a complete example of the bug)
- *
- *         Rune Hasvold ([email protected])
- *         - highly optimized the driver functions for writing pixel
- *           span (2-3 times faster !)
- *
- *         Axel W. Volley ([email protected]) Krauss-Maffei Wehrtechnik
- *         - written the fxDDReadDepthSpanFloat() and fxDDReadDepthSpanInt()
- *           functions
- *
- * V0.25 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - fixed a problem with Voodoo boards with only one TMU
- *         - fixed a bug in the fxMesaCreateContext()
- *         - now the GL_FRONT_AND_BACK works fine also with
- *           the alpha buffer and/or antialiasing
- *         - written the support for GL_FRONT_AND_BACK drawing but
- *           it doesn't works with the alpha buffer and/or antialiasing
- *         - fixed some bug in the Mesa core for glCopyTexSubImage
- *           and glCopyTexImage functions (thanks to Mike Connell
- *           for an example of the problem)
- *         - make some small optimizations in the Mesa core in order
- *           to save same driver call and state change for not very
- *           well written applications
- *         - introduced the NEW_DRVSTATE and make other optimizations
- *           for minimizing state changes
- *         - made a lot of optimizations in order to minimize state
- *           changes
- *         - it isn't more possible to create a context with the
- *           depth buffer and the stancil buffer (it isn't yet supported)
- *         - now the partial support for the Multitexture extension
- *           works with Quake2 for windows
- *         - vertex snap is not longer used for the Voodoo2 (FX_V2
- *           must be defined)
- *         - done a lot of cleanup in the fxsetup.c file
- *         - now the partial support for the Multitexture extension
- *           works with GLQuake for windows
- *
- *         Dieter Nuetzel ([email protected]) University of Hamburg
- *         - fixed a problem in the asm code for Linux of the fxvsetup.c file
- *           highlighted by the binutils-2.8.1.0.29. 'fildw' asm instruction
- *           changed in 'fild'
- *
- *         Kevin Hester ([email protected])
- *         - written the wglUseFontBitmaps() function in the WGL emulator
- *
- * V0.24 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - now the drive always uses per fragment fog
- *         - written a small optimization in the points drawing function
- *         - written the support for trilinear filtering with 2 TMUs
- *         - written the first partial support for the Multitexture extension.
- *           This task is quite hard because the color combine units work after
- *           the two texture combine units and not before as required by the 
- *           Multitexture extension
- *         - written a workaround in fxBestResolution() in order to solve a
- *           problem with bzflag (it asks for 1x1 window !)
- *         - changed the fxBestResolution() behavior. It now returns the larger
- *           screen resolution supported by the hardware (instead of 640x480)
- *           when it is unable to find an appropriate resolution that is large
- *           enough for the requested size 
- *         - the driver is now able to use also the texture memory attached to
- *           second TMU
- *         - the texture memory manager is now able to work with two TMUs and
- *           store texture maps in the memory attached to TMU0, TMU1 or to split
- *           the mimpmap levels across TMUs in order to support trilinear filtering
- *         - I have bought a Voodoo2 board !
- *         - the amount of frambuffer ram is now doubled when an SLI configuration
- *           is detected
- *         - solved a problem related to the fxDDTexParam() and fxTexInvalidate()
- *           functions (thanks to Rune Hasvold for highlighting the problem)
- *         - done some cleanup in the fxvsetup.c file, written
- *           the FXVSETUP_FUNC macro
- *         - done a lot of cleanup in data types and field names
- *
- *         Rune Hasvold ([email protected])
- *         - written the support for a right management of the auxiliary buffer.
- *           You can now use an 800x600 screen without the depth and alpha
- *           buffer
- *         - written the support for a new pixel format (without the depth
- *           and alpha buffer) in the WGL emulator
- *         - fixed a bug in the window version of the GLUT (it was ever asking
- *           for depth buffer)
- *
- * V0.23 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - included in the Mesa-3.0beta2 release
- *         - written the support for the OpenGL 1.2 GL_TEXTURE_BASE_LEVEL
- *           and GL_TEXTURE_MAX_LEVEL
- *         - rewritten several functions for a more clean support of texture
- *           mapping and in order to solve some bug
- *         - the accumulation buffer works (it is  bit slow beacuase it requires
- *           to read/write from/to the Voodoo frame buffer but it works)
- *         - fixed a bug in the fxDDReadRGBASpan driver function (the R and
- *           B channels were read in the wrong order). Thanks to Jason Heym
- *           for highlighting the problem
- *         - written the support for multiple contexts on multiple boards.
- *           you can now use the Mesa/Voodoo with multiple Voodoo Graphics
- *           boards (for example with multiple screens or an HMD)
- *         - the fxBestResolution() now check all available resolutions
- *           and it is able to check the amount of framebuffer memory
- *           before return a resolution
- *         - modified the GLX/X11 driver in order to support all the
- *           resolution available
- *         - changed all function names. They should be now a bit more
- *           readable
- *         - written the Glide grVertex setup code for two TMU or
- *           for Multitexture support with emulationa dn one TMU
- *         - written the support for the new Mesa driver
- *           function GetParametri
- *         - small optimization/clean up in the texbind() function
- *         - fixed a FPU precision problem for glOrtho and texture
- *           mapping (thanks to Antti Juhani Huovilainen for an example
- *           of the problem)
- *         - written some small SGI OpenGL emulation code for the wgl,
- *           the OpenGL Optimizer and Cosmo3D work fine under windows !
- *         - moved the point/line/triangle/quad support in the fxmesa7.c
- *         - fixed a bug in the clear_color_depth() (thanks to Henk Kok
- *           for an example of the problem)
- *         - written a small workaround for Linux GLQuake, it asks
- *           for the alpha buffer and the depth buffer at the some time
- *           (but it never uses the alpha buffer)
- *         - checked the antialiasing points, lines and polygons support.
- *           It works fine
- *         - written the support for standard OpenGL antialiasing using
- *           blending. Lines support works fine (tested with BZflag)
- *           while I have still to check the polygons and points support
- *         - written the support for the alpha buffer. The driver is now
- *           able to use the Voodoo auxiliary buffer as an alpha buffer
- *           instead of a depth buffer. Also all the OpenGL blending
- *           modes are now supported. But you can't request a context
- *           with an alpha buffer AND a depth buffer at the some time
- *           (this is an hardware limitation)
- *         - written the support for switching between the fullscreen
- *           rendering and the in-window-rendering hack on the fly
- *
- *         Rune Hasvold ([email protected])
- *         - fixed a bug in the texparam() function
- *
- *         Brian Paul ([email protected]) Avid Technology
- *         - sources accomodated for the new Mesa 3.0beta1
- *
- * V0.22 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - included with some v0.23 bug fix in the final release
- *           of the Mesa-2.6
- *         - written the support for the MESA_WGL_FX env. var. but
- *           not tested because I have only Voodoo Graphics boards
- *         - fixed a bug in the backface culling code
- *           (thanks to David Farrell for an example of the problem)
- *         - fixed the "Quake2 elevator" bug
- *         - GL_POLYGONS with 3/4 vertices are now drawn as
- *           GL_TRIANLGES/GL_QUADS (a small optimization for GLQuake)
- *         - fixed a bug in fxmesa6.h for GL_LINE_LOOP
- *         - fixed a NearFarStack bug in the Mesa when applications
- *           directly call glLoadMatrix to load a projection matrix 
- *         - done some cleanup in the fxmesa2.c file
- *         - the driver no longer translates the texture maps
- *           when the Mesa internal format and the Voodoo
- *           format are the some (usefull for 1 byte texture maps
- *           where the driver can directly use the Mesa texture
- *           map). Also the amount of used memory is halfed
- *         - fixed a bug for GL_DECAL and GL_RGBA
- *         - fixed a bug in the clear_color_depth()
- *         - tested the v0.22 with the Mesa-2.6beta2. Impressive
- *           performances improvement thanks to the new Josh's
- *           asm code (+10fps in the isosurf demo, +5fps in GLQuake
- *           TIMEREFRESH)
- *         - written a optimized version of the RenderVB Mesa driver
- *           function. The Voodoo driver is now able to upload polygons
- *           in the most common cases at a very good speed. Good
- *           performance improvement for large set of small polygons
- *         - optimized the asm code for setting up the color information
- *           in the Glide grVertex structure
- *         - fixed a bug in the fxmesa2.c asm code (the ClipMask[]
- *           wasn't working)
- *
- *         Josh Vanderhoof ([email protected])
- *         - removed the flush() function because it isn't required
- *         - limited the maximum number of swapbuffers in the Voodoo
- *           commands FIFO (controlled by the env. var. MESA_FX_SWAP_PENDING)
- *
- *         Holger Kleemiss ([email protected]) STN Atlas Elektronik GmbH
- *         - applied some patch for the Voodoo Rush
- *
- * V0.21 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - the driver is now able to take advantage of the ClipMask[],
- *           ClipOrMask and ClipAndMask information also under Windows
- *         - introduced a new function in the Mesa driver interface
- *           ClearColorAndDepth(). Now the glClear() function is
- *           2 times faster (!) when you have to clear the color buffer
- *           and the depth buffer at some time
- *         - written the first version of the fxRenderVB() driver
- *           function
- *         - optimized the glTexImage() path
- *         - removed the fxMesaTextureUsePalette() support
- *         - fixed a bug in the points support (thanks to David Farrell
- *           for an example of the problem)
- *         - written the optimized path for glSubTexImage(),
- *           introduced a new function in the Mesa driver interface
- *           TexSubImage(...)
- *         - fixed a bug for glColorMask and glDepthMask
- *         - the wbuffer is not more used. The Voodoo driver uses
- *           a standard 16bit zbuffer in all cases. It is more consistent
- *           and now GLQuake and GLQuake2test work also with a GL_ZTRICK 0
- *         - the driver is now able to take advantage of the ClipMask[],
- *           ClipOrMask and ClipAndMask information (under Linux);
- *         - rewritten the setup_fx_units() function, now the texture
- *           mapping support is compliant to the OpenGL specs (GL_BLEND
- *           support is still missing). The LinuxGLQuake console correctly
- *           fade in/out and transparent water of GLQuake2test works fine
- *         - written the support for the env. var. FX_GLIDE_SWAPINTERVAL
- *         - found a bug in the Mesa core. There is a roundup problem for
- *           color values out of the [0.0,1.0] range
- *
- *         Wonko <[email protected]>
- *         - fixed a Voodoo Rush related problem in the fxwgl.c
- *
- *         Daryll Strauss <[email protected]>
- *         - written the scissor test support
- *
- * V0.20 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - written the closetmmanger() function in order to free all the memory
- *           allocated by the Texture Memory Manager (it will be useful
- *           when the support for multiple contexts/boards will be ready)
- *         - now the Voodoo driver runs without printing any information,
- *           define the env. var. MESA_FX_INFO if you want to read some
- *           information about the hardware and some statistic
- *         - written a small workaround for the "GLQuake multiplayer white box bug"
- *           in the setup_fx_units() funxtions. I'm already rewriting
- *           this function because it is the source of nearly all the current
- *           Voodoo driver problems
- *         - fixed the GLQuake texture misalignment problem (the texture
- *           coordinates must be scaled between 0.0 and 256.0 and not
- *           between 0.0 and 255.0)
- *         - written the support for the GL_EXT_shared_texture_palette
- *         - some small change for supporting the automatic building of the
- *           OpenGL32.dll under the Windows platform
- *         - the redefinition of a mipmap level is now a LOT faster. This path
- *           is used by GLQuake for dynamic lighting with some call to glTexSubImage2D()
- *         - the texture memory is now managed a set of 2MB blocks so
- *           texture maps can't be allocated on a 2MB boundary. The new Pure3D
- *           needs this kind of support (and probably any other Voodoo Graphics
- *           board with more than 2MB of texture memory)
- *
- *         Brian Paul ([email protected]) Avid Technology
- *         - added write_monocolor_span(), fixed bug in write_color_span()
- *         - added test for stenciling in choosepoint/line/triangle functions
- *
- *         Joe Waters ([email protected]) Aegis
- *         - written the support for the env. var. SST_SCREENREFRESH
- *
- * V0.19 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - written the 3Dfx Global Palette extension for GLQuake
- *         - written the support for the GL_EXT_paletted_texture (it works only with GL_RGBA
- *           palettes and the alpha value is ignored ... this is a limitation of the
- *           the current Glide version and Voodoo hardware)
- *         - fixed the amount of memory allocated for 8bit textures
- *         - merged the under construction v0.19 driver with the Mesa 2.5
- *         - finally written the support for deleting textures
- *         - introduced a new powerful texture memory manager: the texture memory
- *           is used as a cache of the set of all defined texture maps. You can
- *           now define several MB of texture maps also with a 2MB of texture memory
- *           (the texture memory manager will do automatically all the swap out/swap in
- *           work). The new texture memory manager has also
- *           solved a lot of other bugs/no specs compliance/problems
- *           related to the texture memory usage. The texture
- *           manager code is inside the new fxmesa3.c file
- *         - broken the fxmesa.c file in two files (fxmesa1.c and fxmesa2.c)
- *           and done some code cleanup
- *         - now is possible to redefine texture mipmap levels already defined
- *         - fixed a problem with the amount of texture memory allocated for textures
- *           with not all mipmap levels defined
- *         - fixed a small problem with single buffer rendering
- *
- *         Brian Paul ([email protected]) Avid Technology
- *         - read/write_color_span() now use front/back buffer correctly
- *         - create GLvisual with 5,6,5 bits per pixel, not 8,8,8
- *         - removed a few ^M characters from fxmesa2.c file
- *
- * V0.18 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - the Mesa-2.4beta3 is finally using the driver quads support (the
- *           previous Mesa versions have never taken any advantage from the quads support !)
- *         - tested with the Glide 2.4 for Win
- *         - ported all asm code to Linux
- *         - ported the v0.18 to Linux (without asm code)
- *         - back to Linux !!!
- *         - optimized the SETUP macro (no more vertex snap for points and lines)
- *         - optimized the SETUP macro (added one argument)
- *         - the Mesa/Voodoo is now 20/30% for points, lines and small triangles !
- *         - performance improvement setting VBSIZE to 72 
- *         - the GrVertex texture code is now written in asm
- *         - the GrVertex zbuffer code is now written in asm
- *         - the GrVertex wbuffer code is now written in asm
- *         - the GrVertex gouraud code is now written in asm
- *         - the GrVertex snap code is now written in asm
- *         - changed the 8bit compressed texture maps in 8bit palette texture maps
- *           support (it has the some advantage of compressed texture maps without the
- *           problem of a fixed NCC table for all mipmap levels)
- *         - written the support for 8bit compressed texture maps (but texture maps with
- *           more than one mipmap level aren't working fine)
- *         - finnaly everthing is working fine in MesaQuake !
- *         - fixed a bug in the computation of texture mapping coordinates (I have found
- *           the bug thanks to MesaQuake !)
- *         - written the GL_REPLACE support (mainly for MesaQuake)
- *         - written the support for textures with not all mipmap levels defined
- *         - rewritten all the Texture memory stuff
- *         - written the MesaQuake support (define MESAQUAKE)
- *         - working with a ZBuffer if glOrtho or not int the default glDepthRange,
- *           otherwise working with the WBuffer
- *         written the glDepthRange support
- *
- *         Diego Picciani ([email protected]) Nova Computer s.r.l.
- *         - written the fxCloseHardware() and the fxQuaryHardware() (mainly
- *           for the VoodooWGL emulator)
- *
- *         Brian Paul ([email protected]) Avid Technology
- *         - implemented read/write_color_span() so glRead/DrawPixels() works
- *         - now needs Glide 2.3 or later.  Removed GLIDE_FULL_SCREEN and call to grSstOpen()
- *
- * V0.17 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - optimized the bitmap support (66% faster)
- *         - tested with the Mesa 2.3beta2
- *
- *         Diego Picciani ([email protected]) Nova Computer s.r.l.
- *         - solved a problem with the drawbitmap() and the Voodoo Rush
- *           (GR_ORIGIN_LOWER_LEFT did not work with the Stingray)
- *
- *         Brian Paul ([email protected]) Avid Technology
- *         - linux stuff
- *         - general code clean-up
- *         - added attribList parameter to fxMesaCreateContext()
- *         - single buffering works now
- *         - VB colors are now GLubytes, removed ColorShift stuff
- *
- *         Paul Metzger
- *         - linux stuff
- *
- * V0.16 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - written the quadfunc support (no performance improvement)
- *         - written the support for the new Mesa 2.3beta1 driver interface (Wow ! It is faaaster)
- *         - rewritten the glBitmap support for the Glide 2.3 (~35% slower !)
- *         - written the glBitmap support for the most common case (fonts)
- *
- *         Jack Palevich
- *         - Glide 2.3 porting
- *
- *         Diego Picciani ([email protected]) Nova Computer s.r.l.
- *         - extended the fxMesaCreateContext() and fxMesaCreateBestContext()
- *           functions in order to support also the Voodoo Rush
- *         - tested with the Hercules Stingray 128/3D (The rendering in a window works !)
- *
- * V0.15 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - written the GL_LUMINANCE_ALPHA support
- *         - written the GL_ALPHA support
- *         - written the GL_LUMINANCE support
- *         - now SETUP correctly set color for mono color sequences
- *         - written the 9x1,10x1,...,1x9,1x10,... texture map ratio support
- *         - written the no square texture map support
- *         - the fog table is no more rebuilt inside setup_fx_units() each time
- *
- *         Henri Fousse ([email protected]) Thomson Training & Simulation
- *         - written (not yet finished: no texture mapping) support for glOrtho
- *         - some change to setup functions
- *         - the fog support is now fully compatible with the standard OpenGL
- *         - rewritten several parts of the driver in order to take
- *           advantage of meshes (40% faster !!!)
- *
- * V0.14 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - now glAlphaFunc() works
- *         - now glDepthMask() works
- *         - solved a mipmap problem when using more than one texture
- *         - moved ti, texid and wscale inside the fxMesaContext (now we can
- *           easy support more ctx and more boards)
- *         - the management of the fxMesaContext was completly broken !
- *         - solved several problems about Alpha and texture Alpha
- *         - 4 (RGBA) texture channels supported
- *         - setting the default color to white
- *
- *         Henri Fousse ([email protected]) Thomson Training & Simulation
- *         - small change to fxMesaCreateContext() and fxMesaMakeCurrent()
- *         - written the fog support
- *         - setting the default clear color to black
- *         - written cleangraphics() for the onexit() function
- *         - written fxMesaCreateBestContext()
- *
- * V0.13 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - now glBlendFunc() works for all glBlendFunc without DST_ALPHA
- *           (because the alpha buffer is not yet implemented) 
- *         - now fxMesaCreateContext() accept resolution and refresh rate
- *         - fixed a bug for texture mapping: the w (alias z) must be set
- *           also without depth buffer
- *         - fixed a bug for texture image with width!=256
- *         - written texparam()
- *         - written all point, line and triangle functions for all possible supported
- *           contexts and the driver is slight faster with points, lines and small triangles
- *         - fixed a small bug in fx/fxmesa.h (glOrtho)
- *
- * V0.12 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - glDepthFunc supported
- *         - introduced a trick to discover the far plane distance
- *           (see fxMesaSetFar and fx/fxmesa.h)
- *         - now the wbuffer works with homogeneous coordinate (and it
- *           doesn't work with a glOrtho projection :)
- *         - solved several problems with homogeneous coordinate and texture mapping
- *         - fixed a bug in all line functions
- *         - fixed a clear framebuffer bug
- *         - solved a display list/teximg problem (but use
- *           glBindTexture: it is several times faster)
- *
- * V0.11 - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - introduced texture mapping support (not yet finished !)
- *         - tested with Mesa2.2b6
- *         - the driver is faster 
- *         - written glFlush/glFinish
- *         - the driver print a lot of info about the Glide lib
- *
- * v0.1  - David Bucciarelli ([email protected]) Humanware s.r.l.
- *         - Initial revision
- *
- */
-
-
 #ifdef HAVE_CONFIG_H
 #include "conf.h"
 #endif
@@ -686,13 +113,6 @@ fxMesaContext GLAPIENTRY fxMesaGetCurrentContext(void)
 }
 
 
-void GLAPIENTRY fxMesaSetNearFar(GLfloat n, GLfloat f)
-{
-  if(fxMesaCurrentCtx)
-    fxDDSetNearFar(fxMesaCurrentCtx->glCtx,n,f);
-}
-
-
 /*
  * The 3Dfx Global Palette extension for GLQuake.
  * More a trick than a real extesion, use the shared global
@@ -1294,7 +714,7 @@ void GLAPIENTRY fxMesaSwapBuffers(void)
   }
 
   if(fxMesaCurrentCtx) {
-   FLUSH_VB( fxMesaCurrentCtx->glCtx, "swap buffers" );
+     _mesa_swapbuffers( fxMesaCurrentCtx->glCtx );
 
     if(fxMesaCurrentCtx->haveDoubleBuffer) {
 
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index e70be6cd6b0..178fa192ac0 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -58,6 +58,7 @@
 #include "extensions.h"
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
+#include "tnl/tnl.h"
 
 /* These lookup table are used to extract RGB values in [0,255] from
  * 16-bit pixel values.
@@ -611,11 +612,6 @@ static void fxDDFinish(GLcontext *ctx)
 
 
 
-void fxDDSetNearFar(GLcontext *ctx, GLfloat n, GLfloat f)
-{
-   FX_CONTEXT(ctx)->new_state |= FX_NEW_FOG;
-   ctx->Driver.RenderStart = fxSetupFXUnits;
-}
 
 /* KW: Put the word Mesa in the render string because quakeworld
  * checks for this rather than doing a glGet(GL_MAX_TEXTURE_SIZE).
@@ -763,35 +759,28 @@ int fxDDInitFxMesaContext( fxMesaContext fxMesa )
 
    /* Initialize the software rasterizer and helper modules.
     */
+   fxMesa->glCtx->Driver.RegisterVB = fxDDRegisterVB;
+
    _swrast_CreateContext( fxMesa->glCtx );
    _swsetup_CreateContext( fxMesa->glCtx );
+   _tnl_CreateContext( fxMesa->glCtx );
+
+   fxSetupDDPointers(fxMesa->glCtx);
 
    /* Tell the software rasterizer to use pixel fog always.
     */
    _swrast_allow_vertex_fog( fxMesa->glCtx, GL_FALSE );
    _swrast_allow_pixel_fog( fxMesa->glCtx, GL_TRUE );
 
-   fxSetupDDPointers(fxMesa->glCtx);
    fxDDInitExtensions(fxMesa->glCtx);  
 
-   fxDDSetNearFar(fxMesa->glCtx,1.0,100.0);
-  
    FX_grGlideGetState((GrState*)fxMesa->state);
 
-   /* XXX Fix me: callback not registered when main VB is created.
-    */
-   if (fxMesa->glCtx->VB) 
-      fxDDRegisterVB( fxMesa->glCtx->VB );
-  
    /* XXX Fix me too: need to have the 'struct dd' prepared prior to
     * creating the context... The below is broken if you try to insert
     * new stages.  
     */
-   if (fxMesa->glCtx->NrPipelineStages)
-      fxMesa->glCtx->NrPipelineStages = fxDDRegisterPipelineStages( 
-	 fxMesa->glCtx->PipelineStage,
-	 fxMesa->glCtx->PipelineStage,
-	 fxMesa->glCtx->NrPipelineStages);
+   fxDDRegisterPipelineStages( fxMesa->glCtx );
 
    /* Run the config file */
    _mesa_context_initialize( fxMesa->glCtx );
@@ -936,6 +925,15 @@ static void fxDDUpdateDDPointers(GLcontext *ctx)
 
   _swrast_InvalidateState( ctx, new_state );
   _swsetup_InvalidateState( ctx, new_state );
+  _tnl_InvalidateState( ctx, new_state );
+
+  /* Recalculate fog table on projection matrix changes.  This used to
+   * be triggered by the NearFar callback.
+   */
+  if (new_state & _NEW_PROJECTION) {
+     FX_CONTEXT(ctx)->new_state |= FX_NEW_FOG;
+     ctx->Driver.RenderStart = fxSetupFXUnits;
+  }
 
   if (new_state & (_FX_NEW_IS_IN_HARDWARE |
 		   _FX_NEW_RENDERSTATE |
@@ -965,7 +963,6 @@ void fxSetupDDPointers(GLcontext *ctx)
     fprintf(stderr,"fxmesa: fxSetupDDPointers()\n");
   }
 
-  ctx->Driver.UpdateStateNotify = ~0;
   ctx->Driver.UpdateState=fxDDUpdateDDPointers;
 
   ctx->Driver.WriteDepthSpan=fxDDWriteDepthSpan;
@@ -975,8 +972,6 @@ void fxSetupDDPointers(GLcontext *ctx)
          
   ctx->Driver.GetString=fxDDGetString;
 
-  ctx->Driver.NearFar=fxDDSetNearFar;
-
   ctx->Driver.ClearIndex=NULL;
   ctx->Driver.ClearColor=fxDDClearColor;
   ctx->Driver.Clear=fxDDClear;
@@ -1009,8 +1004,6 @@ void fxSetupDDPointers(GLcontext *ctx)
   ctx->Driver.DeleteTexture=fxDDTexDel;
   ctx->Driver.UpdateTexturePalette=fxDDTexPalette;
 
-  ctx->Driver.RectFunc=NULL;
-
   ctx->Driver.AlphaFunc=fxDDAlphaFunc;
   ctx->Driver.BlendFunc=fxDDBlendFunc;
   ctx->Driver.DepthFunc=fxDDDepthFunc;
@@ -1026,8 +1019,6 @@ void fxSetupDDPointers(GLcontext *ctx)
   ctx->Driver.RegisterVB=fxDDRegisterVB;
   ctx->Driver.UnregisterVB=fxDDUnregisterVB;
 
-  ctx->Driver.RegisterPipelineStages = fxDDRegisterPipelineStages;
-
   if (!getenv("FX_NO_FAST")) 
       ctx->Driver.BuildPrecalcPipeline = fxDDBuildPrecalcPipeline; 
 
diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index 833abceb34f..04049f091fa 100644
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -62,14 +62,12 @@
 #include "mem.h"
 #include "texture.h"
 #include "types.h"
-#include "vb.h"
-#include "xform.h"
-#include "clip.h"
-#include "vbrender.h"
 
 #include "GL/fxmesa.h"
 #include "fxglidew.h"
 
+#include "math/m_vector.h"
+
 /* use gl/gl.h GLAPI/GLAPIENTRY/GLCALLBACK in place of
  * WINGDIAPI/APIENTRY/CALLBACK, these are defined in mesa gl/gl.h -
  * [email protected] 
@@ -476,7 +474,6 @@ extern int glbCurrentBoard;
 extern void fxPrintSetupFlags( const char *msg, GLuint flags );
 extern void fxSetupFXUnits(GLcontext *);
 extern void fxSetupDDPointers(GLcontext *);
-extern void fxDDSetNearFar(GLcontext *, GLfloat, GLfloat);
 
 extern void fxDDSetupInit(void);
 extern void fxDDCvaInit(void);
@@ -533,9 +530,7 @@ extern void fxDDPartialRasterSetup( struct vertex_buffer *VB );
 
 extern void fxDDDoRasterSetup( struct vertex_buffer *VB );
 
-extern GLuint fxDDRegisterPipelineStages( struct gl_pipeline_stage *out,
-					  const struct gl_pipeline_stage *in,
-					  GLuint nr );
+extern void fxDDRegisterPipelineStages( GLcontext *ctx );
 
 extern GLboolean fxDDBuildPrecalcPipeline( GLcontext *ctx );
 
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index 5d5cd112924..2cc6add1d28 100644
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -54,6 +54,8 @@
 #include "fxdrv.h"
 #include "enums.h"
 
+#include "tnl/t_context.h"
+
 static GLuint fxGetTexSetConfiguration(GLcontext *ctx,
 				struct gl_texture_object *tObj0,
 				struct gl_texture_object *tObj1);
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 39d256a77f3..74850556a76 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,4 +1,4 @@
-/* $Id: osmesa.c,v 1.30 2000/11/14 17:50:07 brianp Exp $ */
+/* $Id: osmesa.c,v 1.31 2000/11/16 21:05:38 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -311,11 +311,11 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
       {
 	 GLcontext *ctx = &osmesa->gl_ctx;
 
+	 ctx->Driver.RegisterVB = _swsetup_RegisterVB;
+
 	 _swrast_CreateContext( ctx );
 	 _swsetup_CreateContext( ctx );
-
-	 if (ctx->VB) 
-	    _swsetup_RegisterVB( ctx->VB );
+	 _tnl_CreateContext( ctx );
 	 
 	 osmesa_register_swrast_functions( ctx );
       }
@@ -1690,7 +1690,6 @@ static void osmesa_update_state( GLcontext *ctx )
    ASSERT((void *) osmesa == (void *) ctx->DriverCtx);
 
    ctx->Driver.GetString = get_string;
-   ctx->Driver.UpdateStateNotify = ~0;
    ctx->Driver.UpdateState = osmesa_update_state;
 
    ctx->Driver.SetDrawBuffer = set_draw_buffer;
@@ -1747,4 +1746,8 @@ static void osmesa_update_state( GLcontext *ctx )
    ctx->Driver.WriteMonoCIPixels = write_monoindex_pixels;
    ctx->Driver.ReadCI32Span = read_index_span;
    ctx->Driver.ReadCI32Pixels = read_index_pixels;
+
+   _swrast_InvalidateState( ctx, ctx->NewState );
+   _swsetup_InvalidateState( ctx, ctx->NewState );
+   _tnl_InvalidateState( ctx, ctx->NewState );
 }
diff --git a/src/mesa/drivers/svga/svgamesa.c b/src/mesa/drivers/svga/svgamesa.c
index daa660e434b..5163e08ece6 100644
--- a/src/mesa/drivers/svga/svgamesa.c
+++ b/src/mesa/drivers/svga/svgamesa.c
@@ -1,4 +1,4 @@
-/* $Id: svgamesa.c,v 1.7 2000/11/14 17:40:14 brianp Exp $ */
+/* $Id: svgamesa.c,v 1.8 2000/11/16 21:05:39 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -487,7 +487,7 @@ void SVGAMesaSwapBuffers( void )
    copy_buffer(SVGABuffer.BackBuffer);
 
 #ifndef DEV
-   FLUSH_VB( SVGAMesa->gl_ctx, "swap buffers" );
+   _mesa_swapbuffers( SVGAMesa->gl_ctx );
    if (SVGAMesa->gl_vis->DBflag) 
 #endif /* DEV */   
    {
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 9fa029cd485..f48da3bbfe5 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1,4 +1,4 @@
-/* $Id: xm_api.c,v 1.7 2000/11/14 17:40:15 brianp Exp $ */
+/* $Id: xm_api.c,v 1.8 2000/11/16 21:05:40 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -78,6 +78,7 @@
 #include "macros.h"
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
+#include "tnl/tnl.h"
 
 #ifndef GLX_NONE_EXT
 #define GLX_NONE_EXT 0x8000
@@ -1654,7 +1655,6 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
    c->pixelformat = v->dithered_pf;      /* Dithering is enabled by default */
 
    ctx->Driver.UpdateState = xmesa_update_state;
-   ctx->Driver.UpdateStateNotify = ~0;
 
 #if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
    c->driContextPriv = driContextPriv;
@@ -1664,14 +1664,11 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
     */
    xmesa_init_pointers( ctx );
 
-   if (ctx->VB) 
-      _swsetup_RegisterVB( ctx->VB );
-
-
    /* Initialize the software rasterizer and helper modules.
     */
    _swrast_CreateContext( ctx );
    _swsetup_CreateContext( ctx );
+   _tnl_CreateContext( ctx );
 
    xmesa_register_swrast_functions( ctx );
 
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index 81700b5a52f..21c984d310c 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -1,4 +1,4 @@
-/* $Id: xm_dd.c,v 1.5 2000/11/14 17:40:15 brianp Exp $ */
+/* $Id: xm_dd.c,v 1.6 2000/11/16 21:05:40 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -32,12 +32,12 @@
 #include "state.h"
 #include "depth.h"
 #include "macros.h"
-#include "vb.h"
 #include "types.h"
 #include "xmesaP.h"
 #include "extensions.h"
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
+#include "tnl/tnl.h"
 
 /*
  * Return the size (width,height of the current color buffer.
@@ -871,6 +871,7 @@ void xmesa_update_state( GLcontext *ctx )
     */
    _swrast_InvalidateState( ctx, ctx->NewState );
    _swsetup_InvalidateState( ctx, ctx->NewState );
+   _tnl_InvalidateState( ctx, ctx->NewState );
 
 
    /* setup pointers to front and back buffer clear functions */
diff --git a/src/mesa/drivers/x11/xm_line.c b/src/mesa/drivers/x11/xm_line.c
index 9b5386caa6e..0513d045abc 100644
--- a/src/mesa/drivers/x11/xm_line.c
+++ b/src/mesa/drivers/x11/xm_line.c
@@ -1,4 +1,4 @@
-/* $Id: xm_line.c,v 1.9 2000/11/14 17:40:15 brianp Exp $ */
+/* $Id: xm_line.c,v 1.10 2000/11/16 21:05:40 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -35,7 +35,6 @@
 #include "glxheader.h"
 #include "depth.h"
 #include "macros.h"
-#include "vb.h"
 #include "types.h"
 #include "xmesaP.h"
 
diff --git a/src/mesa/drivers/x11/xm_span.c b/src/mesa/drivers/x11/xm_span.c
index 18f7de4f385..0d4eaab1c6d 100644
--- a/src/mesa/drivers/x11/xm_span.c
+++ b/src/mesa/drivers/x11/xm_span.c
@@ -1,4 +1,4 @@
-/* $Id: xm_span.c,v 1.2 2000/11/14 17:40:15 brianp Exp $ */
+/* $Id: xm_span.c,v 1.3 2000/11/16 21:05:40 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -32,7 +32,6 @@
 #include "state.h"
 #include "depth.h"
 #include "macros.h"
-#include "vb.h"
 #include "types.h"
 #include "xmesaP.h"
 #include "extensions.h"
diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c
index a25d58092b8..0badaede8c6 100644
--- a/src/mesa/drivers/x11/xm_tri.c
+++ b/src/mesa/drivers/x11/xm_tri.c
@@ -1,4 +1,4 @@
-/* $Id: xm_tri.c,v 1.9 2000/11/14 17:40:15 brianp Exp $ */
+/* $Id: xm_tri.c,v 1.10 2000/11/16 21:05:40 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -35,7 +35,6 @@
 #include "glxheader.h"
 #include "depth.h"
 #include "macros.h"
-#include "vb.h"
 #include "types.h"
 #include "xmesaP.h"
 
@@ -1411,7 +1410,7 @@ static void flat_LOOKUP8_triangle( GLcontext *ctx,
 
 
 #ifdef DEBUG
-void
+static void
 _xmesa_print_triangle_func( swrast_tri_func triFunc )
 {
    printf("XMesa tri func = ");