6 files changed, 1739 insertions, 1845 deletions

diff --git a/mesalib/src/mesa/drivers/windows/gdi/InitCritSections.cpp b/mesalib/src/mesa/drivers/windows/gdi/InitCritSections.cpp
deleted file mode 100644
index 78e5f3851..000000000
--- a/mesalib/src/mesa/drivers/windows/gdi/InitCritSections.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "glapi.h"

-#include "glThread.h"

-

-#ifdef WIN32

-

-extern "C" _glthread_Mutex OneTimeLock;

-extern "C" _glthread_Mutex GenTexturesLock;

-

-extern "C" void FreeAllTSD(void);

-

-class _CriticalSectionInit

-{

-public:

-	static _CriticalSectionInit	m_inst;

-

-	_CriticalSectionInit()

-	{

-		_glthread_INIT_MUTEX(OneTimeLock);

-		_glthread_INIT_MUTEX(GenTexturesLock);

-	}

-

-	~_CriticalSectionInit()

-	{

-		_glthread_DESTROY_MUTEX(OneTimeLock);

-		_glthread_DESTROY_MUTEX(GenTexturesLock);

-		FreeAllTSD();

-	}

-};

-

-_CriticalSectionInit _CriticalSectionInit::m_inst;

-

-

-#endif /* WIN32 */

diff --git a/mesalib/src/mesa/drivers/windows/gdi/SConscript b/mesalib/src/mesa/drivers/windows/gdi/SConscript
new file mode 100644
index 000000000..10a7eeaa1
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gdi/SConscript
@@ -0,0 +1,38 @@
+Import('*')
+
+env = env.Clone()
+
+env.Prepend(CPPPATH = [
+    '#src/mapi',
+    '#src/mesa',
+])
+
+env.AppendUnique(CPPDEFINES = [
+    '_GDI32_', # prevent wgl* being declared __declspec(dllimport)
+    'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers 
+])
+if not env['gles']:
+    # prevent _glapi_* from being declared __declspec(dllimport)
+    env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
+
+env.Prepend(LIBS = [
+    glapi,
+    mesa,
+    glsl,
+    'gdi32',
+    'user32',
+    'kernel32',
+])
+
+sources = [
+    'mesa.def',
+    'wgl.c',
+    'wmesa.c',
+]
+
+mesagdi = env.SharedLibrary(
+    target = 'opengl32',
+    source = sources,
+)
+
+env.Alias('mesagdi', mesagdi)
diff --git a/mesalib/src/mesa/drivers/windows/gdi/mesa.def b/mesalib/src/mesa/drivers/windows/gdi/mesa.def
index b537b3460..fbf275609 100644
--- a/mesalib/src/mesa/drivers/windows/gdi/mesa.def
+++ b/mesalib/src/mesa/drivers/windows/gdi/mesa.def
@@ -1,963 +1,856 @@
-; DO NOT EDIT - This file generated automatically by mesadef.py script
-;DESCRIPTION 'Mesa (OpenGL work-alike) for Win32'
-VERSION 6.5
-;
-; Module definition file for Mesa (OPENGL32.DLL)
-;
-; Note: The OpenGL functions use the STDCALL
-; function calling convention.  Microsoft's
-; OPENGL32 uses this convention and so must the
-; Mesa OPENGL32 so that the Mesa DLL can be used
-; as a drop-in replacement.
-;
-; The linker exports STDCALL entry points with
-; 'decorated' names; e.g., _glBegin@0, where the
-; trailing number is the number of bytes of 
-; parameter data pushed onto the stack.  The
-; callee is responsible for popping this data
-; off the stack, usually via a RETF n instruction.
-;
-; However, the Microsoft OPENGL32.DLL does not export
-; the decorated names, even though the calling convention
-; is STDCALL.  So, this module definition file is
-; needed to force the Mesa OPENGL32.DLL to export the
-; symbols in the same manner as the Microsoft DLL.
-; Were it not for this problem, this file would not
-; be needed (for the gl* functions) since the entry
-; points are compiled with dllexport declspec.
-;
-; However, this file is still needed to export "internal"
-; Mesa symbols for the benefit of the OSMESA32.DLL.
-;
-EXPORTS
-	glNewList
-	glEndList
-	glCallList
-	glCallLists
-	glDeleteLists
-	glGenLists
-	glListBase
-	glBegin
-	glBitmap
-	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
-	glEdgeFlag
-	glEdgeFlagv
-	glEnd
-	glIndexd
-	glIndexdv
-	glIndexf
-	glIndexfv
-	glIndexi
-	glIndexiv
-	glIndexs
-	glIndexsv
-	glNormal3b
-	glNormal3bv
-	glNormal3d
-	glNormal3dv
-	glNormal3f
-	glNormal3fv
-	glNormal3i
-	glNormal3iv
-	glNormal3s
-	glNormal3sv
-	glRasterPos2d
-	glRasterPos2dv
-	glRasterPos2f
-	glRasterPos2fv
-	glRasterPos2i
-	glRasterPos2iv
-	glRasterPos2s
-	glRasterPos2sv
-	glRasterPos3d
-	glRasterPos3dv
-	glRasterPos3f
-	glRasterPos3fv
-	glRasterPos3i
-	glRasterPos3iv
-	glRasterPos3s
-	glRasterPos3sv
-	glRasterPos4d
-	glRasterPos4dv
-	glRasterPos4f
-	glRasterPos4fv
-	glRasterPos4i
-	glRasterPos4iv
-	glRasterPos4s
-	glRasterPos4sv
-	glRectd
-	glRectdv
-	glRectf
-	glRectfv
-	glRecti
-	glRectiv
-	glRects
-	glRectsv
-	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
-	glVertex2d
-	glVertex2dv
-	glVertex2f
-	glVertex2fv
-	glVertex2i
-	glVertex2iv
-	glVertex2s
-	glVertex2sv
-	glVertex3d
-	glVertex3dv
-	glVertex3f
-	glVertex3fv
-	glVertex3i
-	glVertex3iv
-	glVertex3s
-	glVertex3sv
-	glVertex4d
-	glVertex4dv
-	glVertex4f
-	glVertex4fv
-	glVertex4i
-	glVertex4iv
-	glVertex4s
-	glVertex4sv
-	glClipPlane
-	glColorMaterial
-	glCullFace
-	glFogf
-	glFogfv
-	glFogi
-	glFogiv
-	glFrontFace
-	glHint
-	glLightf
-	glLightfv
-	glLighti
-	glLightiv
-	glLightModelf
-	glLightModelfv
-	glLightModeli
-	glLightModeliv
-	glLineStipple
-	glLineWidth
-	glMaterialf
-	glMaterialfv
-	glMateriali
-	glMaterialiv
-	glPointSize
-	glPolygonMode
-	glPolygonStipple
-	glScissor
-	glShadeModel
-	glTexParameterf
-	glTexParameterfv
-	glTexParameteri
-	glTexParameteriv
-	glTexImage1D
-	glTexImage2D
-	glTexEnvf
-	glTexEnvfv
-	glTexEnvi
-	glTexEnviv
-	glTexGend
-	glTexGendv
-	glTexGenf
-	glTexGenfv
-	glTexGeni
-	glTexGeniv
-	glFeedbackBuffer
-	glSelectBuffer
-	glRenderMode
-	glInitNames
-	glLoadName
-	glPassThrough
-	glPopName
-	glPushName
-	glDrawBuffer
-	glClear
-	glClearAccum
-	glClearIndex
-	glClearColor
-	glClearStencil
-	glClearDepth
-	glStencilMask
-	glColorMask
-	glDepthMask
-	glIndexMask
-	glAccum
-	glDisable
-	glEnable
-	glFinish
-	glFlush
-	glPopAttrib
-	glPushAttrib
-	glMap1d
-	glMap1f
-	glMap2d
-	glMap2f
-	glMapGrid1d
-	glMapGrid1f
-	glMapGrid2d
-	glMapGrid2f
-	glEvalCoord1d
-	glEvalCoord1dv
-	glEvalCoord1f
-	glEvalCoord1fv
-	glEvalCoord2d
-	glEvalCoord2dv
-	glEvalCoord2f
-	glEvalCoord2fv
-	glEvalMesh1
-	glEvalPoint1
-	glEvalMesh2
-	glEvalPoint2
-	glAlphaFunc
-	glBlendFunc
-	glLogicOp
-	glStencilFunc
-	glStencilOp
-	glDepthFunc
-	glPixelZoom
-	glPixelTransferf
-	glPixelTransferi
-	glPixelStoref
-	glPixelStorei
-	glPixelMapfv
-	glPixelMapuiv
-	glPixelMapusv
-	glReadBuffer
-	glCopyPixels
-	glReadPixels
-	glDrawPixels
-	glGetBooleanv
-	glGetClipPlane
-	glGetDoublev
-	glGetError
-	glGetFloatv
-	glGetIntegerv
-	glGetLightfv
-	glGetLightiv
-	glGetMapdv
-	glGetMapfv
-	glGetMapiv
-	glGetMaterialfv
-	glGetMaterialiv
-	glGetPixelMapfv
-	glGetPixelMapuiv
-	glGetPixelMapusv
-	glGetPolygonStipple
-	glGetString
-	glGetTexEnvfv
-	glGetTexEnviv
-	glGetTexGendv
-	glGetTexGenfv
-	glGetTexGeniv
-	glGetTexImage
-	glGetTexParameterfv
-	glGetTexParameteriv
-	glGetTexLevelParameterfv
-	glGetTexLevelParameteriv
-	glIsEnabled
-	glIsList
-	glDepthRange
-	glFrustum
-	glLoadIdentity
-	glLoadMatrixf
-	glLoadMatrixd
-	glMatrixMode
-	glMultMatrixf
-	glMultMatrixd
-	glOrtho
-	glPopMatrix
-	glPushMatrix
-	glRotated
-	glRotatef
-	glScaled
-	glScalef
-	glTranslated
-	glTranslatef
-	glViewport
-	glArrayElement
-	glColorPointer
-	glDisableClientState
-	glDrawArrays
-	glDrawElements
-	glEdgeFlagPointer
-	glEnableClientState
-	glGetPointerv
-	glIndexPointer
-	glInterleavedArrays
-	glNormalPointer
-	glTexCoordPointer
-	glVertexPointer
-	glPolygonOffset
-	glCopyTexImage1D
-	glCopyTexImage2D
-	glCopyTexSubImage1D
-	glCopyTexSubImage2D
-	glTexSubImage1D
-	glTexSubImage2D
-	glAreTexturesResident
-	glBindTexture
-	glDeleteTextures
-	glGenTextures
-	glIsTexture
-	glPrioritizeTextures
-	glIndexub
-	glIndexubv
-	glPopClientAttrib
-	glPushClientAttrib
-	glBlendColor
-	glBlendEquation
-	glDrawRangeElements
-	glColorTable
-	glColorTableParameterfv
-	glColorTableParameteriv
-	glCopyColorTable
-	glGetColorTable
-	glGetColorTableParameterfv
-	glGetColorTableParameteriv
-	glColorSubTable
-	glCopyColorSubTable
-	glConvolutionFilter1D
-	glConvolutionFilter2D
-	glConvolutionParameterf
-	glConvolutionParameterfv
-	glConvolutionParameteri
-	glConvolutionParameteriv
-	glCopyConvolutionFilter1D
-	glCopyConvolutionFilter2D
-	glGetConvolutionFilter
-	glGetConvolutionParameterfv
-	glGetConvolutionParameteriv
-	glGetSeparableFilter
-	glSeparableFilter2D
-	glGetHistogram
-	glGetHistogramParameterfv
-	glGetHistogramParameteriv
-	glGetMinmax
-	glGetMinmaxParameterfv
-	glGetMinmaxParameteriv
-	glHistogram
-	glMinmax
-	glResetHistogram
-	glResetMinmax
-	glTexImage3D
-	glTexSubImage3D
-	glCopyTexSubImage3D
-	glActiveTextureARB
-	glClientActiveTextureARB
-	glMultiTexCoord1dARB
-	glMultiTexCoord1dvARB
-	glMultiTexCoord1fARB
-	glMultiTexCoord1fvARB
-	glMultiTexCoord1iARB
-	glMultiTexCoord1ivARB
-	glMultiTexCoord1sARB
-	glMultiTexCoord1svARB
-	glMultiTexCoord2dARB
-	glMultiTexCoord2dvARB
-	glMultiTexCoord2fARB
-	glMultiTexCoord2fvARB
-	glMultiTexCoord2iARB
-	glMultiTexCoord2ivARB
-	glMultiTexCoord2sARB
-	glMultiTexCoord2svARB
-	glMultiTexCoord3dARB
-	glMultiTexCoord3dvARB
-	glMultiTexCoord3fARB
-	glMultiTexCoord3fvARB
-	glMultiTexCoord3iARB
-	glMultiTexCoord3ivARB
-	glMultiTexCoord3sARB
-	glMultiTexCoord3svARB
-	glMultiTexCoord4dARB
-	glMultiTexCoord4dvARB
-	glMultiTexCoord4fARB
-	glMultiTexCoord4fvARB
-	glMultiTexCoord4iARB
-	glMultiTexCoord4ivARB
-	glMultiTexCoord4sARB
-	glMultiTexCoord4svARB
-	glLoadTransposeMatrixfARB
-	glLoadTransposeMatrixdARB
-	glMultTransposeMatrixfARB
-	glMultTransposeMatrixdARB
-	glSampleCoverageARB
-	glCompressedTexImage3DARB
-	glCompressedTexImage2DARB
-	glCompressedTexImage1DARB
-	glCompressedTexSubImage3DARB
-	glCompressedTexSubImage2DARB
-	glCompressedTexSubImage1DARB
-	glGetCompressedTexImageARB
-	glActiveTexture
-	glClientActiveTexture
-	glMultiTexCoord1d
-	glMultiTexCoord1dv
-	glMultiTexCoord1f
-	glMultiTexCoord1fv
-	glMultiTexCoord1i
-	glMultiTexCoord1iv
-	glMultiTexCoord1s
-	glMultiTexCoord1sv
-	glMultiTexCoord2d
-	glMultiTexCoord2dv
-	glMultiTexCoord2f
-	glMultiTexCoord2fv
-	glMultiTexCoord2i
-	glMultiTexCoord2iv
-	glMultiTexCoord2s
-	glMultiTexCoord2sv
-	glMultiTexCoord3d
-	glMultiTexCoord3dv
-	glMultiTexCoord3f
-	glMultiTexCoord3fv
-	glMultiTexCoord3i
-	glMultiTexCoord3iv
-	glMultiTexCoord3s
-	glMultiTexCoord3sv
-	glMultiTexCoord4d
-	glMultiTexCoord4dv
-	glMultiTexCoord4f
-	glMultiTexCoord4fv
-	glMultiTexCoord4i
-	glMultiTexCoord4iv
-	glMultiTexCoord4s
-	glMultiTexCoord4sv
-	glLoadTransposeMatrixf
-	glLoadTransposeMatrixd
-	glMultTransposeMatrixf
-	glMultTransposeMatrixd
-	glSampleCoverage
-	glCompressedTexImage3D
-	glCompressedTexImage2D
-	glCompressedTexImage1D
-	glCompressedTexSubImage3D
-	glCompressedTexSubImage2D
-	glCompressedTexSubImage1D
-	glGetCompressedTexImage
-	glBlendColorEXT
-	glPolygonOffsetEXT
-	glTexImage3DEXT
-	glTexSubImage3DEXT
-	glTexSubImage1DEXT
-	glTexSubImage2DEXT
-	glCopyTexImage1DEXT
-	glCopyTexImage2DEXT
-	glCopyTexSubImage1DEXT
-	glCopyTexSubImage2DEXT
-	glCopyTexSubImage3DEXT
-	glAreTexturesResidentEXT
-	glBindTextureEXT
-	glDeleteTexturesEXT
-	glGenTexturesEXT
-	glIsTextureEXT
-	glPrioritizeTexturesEXT
-	glArrayElementEXT
-	glColorPointerEXT
-	glDrawArraysEXT
-	glEdgeFlagPointerEXT
-	glGetPointervEXT
-	glIndexPointerEXT
-	glNormalPointerEXT
-	glTexCoordPointerEXT
-	glVertexPointerEXT
-	glBlendEquationEXT
-	glPointParameterfEXT
-	glPointParameterfvEXT
-	glPointParameterfARB
-	glPointParameterfvARB
-	glColorTableEXT
-	glGetColorTableEXT
-	glGetColorTableParameterivEXT
-	glGetColorTableParameterfvEXT
-	glLockArraysEXT
-	glUnlockArraysEXT
-	glDrawRangeElementsEXT
-	glSecondaryColor3bEXT
-	glSecondaryColor3bvEXT
-	glSecondaryColor3dEXT
-	glSecondaryColor3dvEXT
-	glSecondaryColor3fEXT
-	glSecondaryColor3fvEXT
-	glSecondaryColor3iEXT
-	glSecondaryColor3ivEXT
-	glSecondaryColor3sEXT
-	glSecondaryColor3svEXT
-	glSecondaryColor3ubEXT
-	glSecondaryColor3ubvEXT
-	glSecondaryColor3uiEXT
-	glSecondaryColor3uivEXT
-	glSecondaryColor3usEXT
-	glSecondaryColor3usvEXT
-	glSecondaryColorPointerEXT
-	glMultiDrawArraysEXT
-	glMultiDrawElementsEXT
-	glFogCoordfEXT
-	glFogCoordfvEXT
-	glFogCoorddEXT
-	glFogCoorddvEXT
-	glFogCoordPointerEXT
-	glBlendFuncSeparateEXT
-	glFlushVertexArrayRangeNV
-	glVertexArrayRangeNV
-	glCombinerParameterfvNV
-	glCombinerParameterfNV
-	glCombinerParameterivNV
-	glCombinerParameteriNV
-	glCombinerInputNV
-	glCombinerOutputNV
-	glFinalCombinerInputNV
-	glGetCombinerInputParameterfvNV
-	glGetCombinerInputParameterivNV
-	glGetCombinerOutputParameterfvNV
-	glGetCombinerOutputParameterivNV
-	glGetFinalCombinerInputParameterfvNV
-	glGetFinalCombinerInputParameterivNV
-	glResizeBuffersMESA
-	glWindowPos2dMESA
-	glWindowPos2dvMESA
-	glWindowPos2fMESA
-	glWindowPos2fvMESA
-	glWindowPos2iMESA
-	glWindowPos2ivMESA
-	glWindowPos2sMESA
-	glWindowPos2svMESA
-	glWindowPos3dMESA
-	glWindowPos3dvMESA
-	glWindowPos3fMESA
-	glWindowPos3fvMESA
-	glWindowPos3iMESA
-	glWindowPos3ivMESA
-	glWindowPos3sMESA
-	glWindowPos3svMESA
-	glWindowPos4dMESA
-	glWindowPos4dvMESA
-	glWindowPos4fMESA
-	glWindowPos4fvMESA
-	glWindowPos4iMESA
-	glWindowPos4ivMESA
-	glWindowPos4sMESA
-	glWindowPos4svMESA
-	glWindowPos2dARB
-	glWindowPos2fARB
-	glWindowPos2iARB
-	glWindowPos2sARB
-	glWindowPos2dvARB
-	glWindowPos2fvARB
-	glWindowPos2ivARB
-	glWindowPos2svARB
-	glWindowPos3dARB
-	glWindowPos3fARB
-	glWindowPos3iARB
-	glWindowPos3sARB
-	glWindowPos3dvARB
-	glWindowPos3fvARB
-	glWindowPos3ivARB
-	glWindowPos3svARB
-	glAreProgramsResidentNV
-	glBindProgramNV
-	glDeleteProgramsNV
-	glExecuteProgramNV
-	glGenProgramsNV
-	glGetProgramParameterdvNV
-	glGetProgramParameterfvNV
-	glGetProgramivNV
-	glGetProgramStringNV
-	glGetTrackMatrixivNV
-	glGetVertexAttribdvNV
-	glGetVertexAttribfvNV
-	glGetVertexAttribivNV
-	glGetVertexAttribPointervNV
-	glIsProgramNV
-	glLoadProgramNV
-	glProgramParameter4dNV
-	glProgramParameter4dvNV
-	glProgramParameter4fNV
-	glProgramParameter4fvNV
-	glProgramParameters4dvNV
-	glProgramParameters4fvNV
-	glRequestResidentProgramsNV
-	glTrackMatrixNV
-	glVertexAttribPointerNV
-	glVertexAttrib1dNV
-	glVertexAttrib1dvNV
-	glVertexAttrib1fNV
-	glVertexAttrib1fvNV
-	glVertexAttrib1sNV
-	glVertexAttrib1svNV
-	glVertexAttrib2dNV
-	glVertexAttrib2dvNV
-	glVertexAttrib2fNV
-	glVertexAttrib2fvNV
-	glVertexAttrib2sNV
-	glVertexAttrib2svNV
-	glVertexAttrib3dNV
-	glVertexAttrib3dvNV
-	glVertexAttrib3fNV
-	glVertexAttrib3fvNV
-	glVertexAttrib3sNV
-	glVertexAttrib3svNV
-	glVertexAttrib4dNV
-	glVertexAttrib4dvNV
-	glVertexAttrib4fNV
-	glVertexAttrib4fvNV
-	glVertexAttrib4sNV
-	glVertexAttrib4svNV
-	glVertexAttrib4ubNV
-	glVertexAttrib4ubvNV
-	glVertexAttribs1dvNV
-	glVertexAttribs1fvNV
-	glVertexAttribs1svNV
-	glVertexAttribs2dvNV
-	glVertexAttribs2fvNV
-	glVertexAttribs2svNV
-	glVertexAttribs3dvNV
-	glVertexAttribs3fvNV
-	glVertexAttribs3svNV
-	glVertexAttribs4dvNV
-	glVertexAttribs4fvNV
-	glVertexAttribs4svNV
-	glVertexAttribs4ubvNV
-	glPointParameteriNV
-	glPointParameterivNV
-	glFogCoordf
-	glFogCoordfv
-	glFogCoordd
-	glFogCoorddv
-	glFogCoordPointer
-	glMultiDrawArrays
-	glMultiDrawElements
-	glPointParameterf
-	glPointParameterfv
-	glPointParameteri
-	glPointParameteriv
-	glSecondaryColor3b
-	glSecondaryColor3bv
-	glSecondaryColor3d
-	glSecondaryColor3dv
-	glSecondaryColor3f
-	glSecondaryColor3fv
-	glSecondaryColor3i
-	glSecondaryColor3iv
-	glSecondaryColor3s
-	glSecondaryColor3sv
-	glSecondaryColor3ub
-	glSecondaryColor3ubv
-	glSecondaryColor3ui
-	glSecondaryColor3uiv
-	glSecondaryColor3us
-	glSecondaryColor3usv
-	glSecondaryColorPointer
-	glWindowPos2d
-	glWindowPos2dv
-	glWindowPos2f
-	glWindowPos2fv
-	glWindowPos2i
-	glWindowPos2iv
-	glWindowPos2s
-	glWindowPos2sv
-	glWindowPos3d
-	glWindowPos3dv
-	glWindowPos3f
-	glWindowPos3fv
-	glWindowPos3i
-	glWindowPos3iv
-	glWindowPos3s
-	glWindowPos3sv
-	glVertexAttrib1sARB
-	glVertexAttrib1fARB
-	glVertexAttrib1dARB
-	glVertexAttrib2sARB
-	glVertexAttrib2fARB
-	glVertexAttrib2dARB
-	glVertexAttrib3sARB
-	glVertexAttrib3fARB
-	glVertexAttrib3dARB
-	glVertexAttrib4sARB
-	glVertexAttrib4fARB
-	glVertexAttrib4dARB
-	glVertexAttrib4NubARB
-	glVertexAttrib1svARB
-	glVertexAttrib1fvARB
-	glVertexAttrib1dvARB
-	glVertexAttrib2svARB
-	glVertexAttrib2fvARB
-	glVertexAttrib2dvARB
-	glVertexAttrib3svARB
-	glVertexAttrib3fvARB
-	glVertexAttrib3dvARB
-	glVertexAttrib4bvARB
-	glVertexAttrib4svARB
-	glVertexAttrib4ivARB
-	glVertexAttrib4ubvARB
-	glVertexAttrib4usvARB
-	glVertexAttrib4uivARB
-	glVertexAttrib4fvARB
-	glVertexAttrib4dvARB
-	glVertexAttrib4NbvARB
-	glVertexAttrib4NsvARB
-	glVertexAttrib4NivARB
-	glVertexAttrib4NubvARB
-	glVertexAttrib4NusvARB
-	glVertexAttrib4NuivARB
-	glVertexAttribPointerARB
-	glEnableVertexAttribArrayARB
-	glDisableVertexAttribArrayARB
-	glProgramStringARB
-	glBindProgramARB
-	glDeleteProgramsARB
-	glGenProgramsARB
-	glIsProgramARB
-	glProgramEnvParameter4dARB
-	glProgramEnvParameter4dvARB
-	glProgramEnvParameter4fARB
-	glProgramEnvParameter4fvARB
-	glProgramLocalParameter4dARB
-	glProgramLocalParameter4dvARB
-	glProgramLocalParameter4fARB
-	glProgramLocalParameter4fvARB
-	glGetProgramEnvParameterdvARB
-	glGetProgramEnvParameterfvARB
-	glGetProgramLocalParameterdvARB
-	glGetProgramLocalParameterfvARB
-	glGetProgramivARB
-	glGetProgramStringARB
-	glGetVertexAttribdvARB
-	glGetVertexAttribfvARB
-	glGetVertexAttribivARB
-	glGetVertexAttribPointervARB
-	glProgramNamedParameter4fNV
-	glProgramNamedParameter4dNV
-	glProgramNamedParameter4fvNV
-	glProgramNamedParameter4dvNV
-	glGetProgramNamedParameterfvNV
-	glGetProgramNamedParameterdvNV
-	glBindBufferARB
-	glBufferDataARB
-	glBufferSubDataARB
-	glDeleteBuffersARB
-	glGenBuffersARB
-	glGetBufferParameterivARB
-	glGetBufferPointervARB
-	glGetBufferSubDataARB
-	glIsBufferARB
-	glMapBufferARB
-	glUnmapBufferARB
-	glGenQueriesARB
-	glDeleteQueriesARB
-	glIsQueryARB
-	glBeginQueryARB
-	glEndQueryARB
-	glGetQueryivARB
-	glGetQueryObjectivARB
-	glGetQueryObjectuivARB
-	glBindBuffer
-	glBufferData
-	glBufferSubData
-	glDeleteBuffers
-	glGenBuffers
-	glGetBufferParameteriv
-	glGetBufferPointerv
-	glGetBufferSubData
-	glIsBuffer
-	glMapBuffer
-	glUnmapBuffer
-	glGenQueries
-	glDeleteQueries
-	glIsQuery
-	glBeginQuery
-	glEndQuery
-	glGetQueryiv
-	glGetQueryObjectiv
-	glGetQueryObjectuiv
-;
-; WGL API
-	wglChoosePixelFormat
-	wglCopyContext
-	wglCreateContext
-	wglCreateLayerContext
-	wglDeleteContext
-	wglDescribeLayerPlane
-	wglDescribePixelFormat
-	wglGetCurrentContext
-	wglGetCurrentDC
-	wglGetLayerPaletteEntries
-	wglGetPixelFormat
-	wglGetProcAddress
-	wglMakeCurrent
-	wglRealizeLayerPalette
-	wglSetLayerPaletteEntries
-	wglSetPixelFormat
-	wglShareLists
-	wglSwapBuffers
-	wglSwapLayerBuffers
-	wglUseFontBitmapsA
-	wglUseFontBitmapsW
-	wglUseFontOutlinesA
-	wglUseFontOutlinesW
-	wglGetExtensionsStringARB
-;
-; Mesa internals - mostly for OSMESA
-	_vbo_CreateContext
-	_vbo_DestroyContext
-	_vbo_InvalidateState
-	_glapi_check_multithread
-	_glapi_get_context
-	_glapi_get_proc_address
-	_mesa_add_soft_renderbuffers
-	_mesa_add_renderbuffer
-	_mesa_check_conditional_render
-	_mesa_choose_tex_format
-	_mesa_create_framebuffer
-	_mesa_create_visual
-	_mesa_delete_array_object
-	_mesa_delete_program
-	_mesa_delete_texture_object
-	_mesa_destroy_framebuffer
-	_mesa_destroy_visual
-	_mesa_enable_1_3_extensions
-	_mesa_enable_1_4_extensions
-	_mesa_enable_1_5_extensions
-	_mesa_enable_2_0_extensions
-	_mesa_enable_2_1_extensions
-	_mesa_enable_sw_extensions
-	_mesa_error
-	_mesa_finish_render_texture
-	_mesa_framebuffer_renderbuffer
-	_mesa_free_context_data
-	_mesa_free_texture_image_data
-	_mesa_generate_mipmap
-	_mesa_get_compressed_teximage
-	_mesa_get_current_context
-	_mesa_get_teximage
-	_mesa_init_driver_functions
-	_mesa_init_glsl_driver_functions
-	_mesa_init_renderbuffer
-	_mesa_initialize_context
-	_mesa_make_current
-	_mesa_new_array_object
-	_mesa_new_framebuffer
-	_mesa_new_program
-	_mesa_new_renderbuffer
-	_mesa_new_soft_renderbuffer
-	_mesa_new_texture_image
-	_mesa_new_texture_object
-	_mesa_problem
-	_mesa_reference_renderbuffer
-	_mesa_remove_renderbuffer
-	_mesa_render_texture
-	_mesa_ResizeBuffersMESA
-	_mesa_resize_framebuffer
-	_mesa_store_compressed_teximage1d
-	_mesa_store_compressed_teximage2d
-	_mesa_store_compressed_teximage3d
-	_mesa_store_compressed_texsubimage1d
-	_mesa_store_compressed_texsubimage2d
-	_mesa_store_compressed_texsubimage3d
-	_mesa_store_teximage1d
-	_mesa_store_teximage2d
-	_mesa_store_teximage3d
-	_mesa_store_texsubimage1d
-	_mesa_store_texsubimage2d
-	_mesa_store_texsubimage3d
-	_mesa_test_proxy_teximage
-	_mesa_reference_framebuffer
-	_mesa_update_framebuffer_visual
-	_mesa_use_program
-	_mesa_Viewport
-	_mesa_meta_init
-	_mesa_meta_free
-	_mesa_meta_CopyColorSubTable
-	_mesa_meta_CopyColorTable
-	_mesa_meta_CopyConvolutionFilter1D
-	_mesa_meta_CopyConvolutionFilter2D
-	_mesa_meta_CopyTexImage1D
-	_mesa_meta_CopyTexImage2D
-	_mesa_meta_CopyTexSubImage1D
-	_mesa_meta_CopyTexSubImage2D
-	_mesa_meta_CopyTexSubImage3D
-	_swrast_Accum
-	_swrast_Bitmap
-	_swrast_BlitFramebuffer
-	_swrast_CopyPixels
-	_swrast_DrawPixels
-	_swrast_GetDeviceDriverReference
-	_swrast_Clear
-	_swrast_choose_line
-	_swrast_choose_triangle
-	_swrast_CreateContext
-	_swrast_DestroyContext
-	_swrast_exec_fragment_program
-	_swrast_InvalidateState
-	_swrast_ReadPixels
-	_swsetup_Wakeup
-	_swsetup_CreateContext
-	_swsetup_DestroyContext
-	_swsetup_InvalidateState
-	_tnl_CreateContext
-	_tnl_DestroyContext
-	_tnl_InvalidateState
-	_tnl_run_pipeline
-	_tnl_program_string
-	_tnl_RasterPos
+; DO NOT EDIT - This file generated automatically by mesadef.py script

+;DESCRIPTION 'Mesa (OpenGL work-alike) for Win32'

+VERSION 6.5

+;

+; Module definition file for Mesa (OPENGL32.DLL)

+;

+; Note: The OpenGL functions use the STDCALL

+; function calling convention.  Microsoft's

+; OPENGL32 uses this convention and so must the

+; Mesa OPENGL32 so that the Mesa DLL can be used

+; as a drop-in replacement.

+;

+; The linker exports STDCALL entry points with

+; 'decorated' names; e.g., _glBegin@0, where the

+; trailing number is the number of bytes of 

+; parameter data pushed onto the stack.  The

+; callee is responsible for popping this data

+; off the stack, usually via a RETF n instruction.

+;

+; However, the Microsoft OPENGL32.DLL does not export

+; the decorated names, even though the calling convention

+; is STDCALL.  So, this module definition file is

+; needed to force the Mesa OPENGL32.DLL to export the

+; symbols in the same manner as the Microsoft DLL.

+; Were it not for this problem, this file would not

+; be needed (for the gl* functions) since the entry

+; points are compiled with dllexport declspec.

+;

+EXPORTS

+	glNewList

+	glEndList

+	glCallList

+	glCallLists

+	glDeleteLists

+	glGenLists

+	glListBase

+	glBegin

+	glBitmap

+	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

+	glEdgeFlag

+	glEdgeFlagv

+	glEnd

+	glIndexd

+	glIndexdv

+	glIndexf

+	glIndexfv

+	glIndexi

+	glIndexiv

+	glIndexs

+	glIndexsv

+	glNormal3b

+	glNormal3bv

+	glNormal3d

+	glNormal3dv

+	glNormal3f

+	glNormal3fv

+	glNormal3i

+	glNormal3iv

+	glNormal3s

+	glNormal3sv

+	glRasterPos2d

+	glRasterPos2dv

+	glRasterPos2f

+	glRasterPos2fv

+	glRasterPos2i

+	glRasterPos2iv

+	glRasterPos2s

+	glRasterPos2sv

+	glRasterPos3d

+	glRasterPos3dv

+	glRasterPos3f

+	glRasterPos3fv

+	glRasterPos3i

+	glRasterPos3iv

+	glRasterPos3s

+	glRasterPos3sv

+	glRasterPos4d

+	glRasterPos4dv

+	glRasterPos4f

+	glRasterPos4fv

+	glRasterPos4i

+	glRasterPos4iv

+	glRasterPos4s

+	glRasterPos4sv

+	glRectd

+	glRectdv

+	glRectf

+	glRectfv

+	glRecti

+	glRectiv

+	glRects

+	glRectsv

+	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

+	glVertex2d

+	glVertex2dv

+	glVertex2f

+	glVertex2fv

+	glVertex2i

+	glVertex2iv

+	glVertex2s

+	glVertex2sv

+	glVertex3d

+	glVertex3dv

+	glVertex3f

+	glVertex3fv

+	glVertex3i

+	glVertex3iv

+	glVertex3s

+	glVertex3sv

+	glVertex4d

+	glVertex4dv

+	glVertex4f

+	glVertex4fv

+	glVertex4i

+	glVertex4iv

+	glVertex4s

+	glVertex4sv

+	glClipPlane

+	glColorMaterial

+	glCullFace

+	glFogf

+	glFogfv

+	glFogi

+	glFogiv

+	glFrontFace

+	glHint

+	glLightf

+	glLightfv

+	glLighti

+	glLightiv

+	glLightModelf

+	glLightModelfv

+	glLightModeli

+	glLightModeliv

+	glLineStipple

+	glLineWidth

+	glMaterialf

+	glMaterialfv

+	glMateriali

+	glMaterialiv

+	glPointSize

+	glPolygonMode

+	glPolygonStipple

+	glScissor

+	glShadeModel

+	glTexParameterf

+	glTexParameterfv

+	glTexParameteri

+	glTexParameteriv

+	glTexImage1D

+	glTexImage2D

+	glTexEnvf

+	glTexEnvfv

+	glTexEnvi

+	glTexEnviv

+	glTexGend

+	glTexGendv

+	glTexGenf

+	glTexGenfv

+	glTexGeni

+	glTexGeniv

+	glFeedbackBuffer

+	glSelectBuffer

+	glRenderMode

+	glInitNames

+	glLoadName

+	glPassThrough

+	glPopName

+	glPushName

+	glDrawBuffer

+	glClear

+	glClearAccum

+	glClearIndex

+	glClearColor

+	glClearStencil

+	glClearDepth

+	glStencilMask

+	glColorMask

+	glDepthMask

+	glIndexMask

+	glAccum

+	glDisable

+	glEnable

+	glFinish

+	glFlush

+	glPopAttrib

+	glPushAttrib

+	glMap1d

+	glMap1f

+	glMap2d

+	glMap2f

+	glMapGrid1d

+	glMapGrid1f

+	glMapGrid2d

+	glMapGrid2f

+	glEvalCoord1d

+	glEvalCoord1dv

+	glEvalCoord1f

+	glEvalCoord1fv

+	glEvalCoord2d

+	glEvalCoord2dv

+	glEvalCoord2f

+	glEvalCoord2fv

+	glEvalMesh1

+	glEvalPoint1

+	glEvalMesh2

+	glEvalPoint2

+	glAlphaFunc

+	glBlendFunc

+	glLogicOp

+	glStencilFunc

+	glStencilOp

+	glDepthFunc

+	glPixelZoom

+	glPixelTransferf

+	glPixelTransferi

+	glPixelStoref

+	glPixelStorei

+	glPixelMapfv

+	glPixelMapuiv

+	glPixelMapusv

+	glReadBuffer

+	glCopyPixels

+	glReadPixels

+	glDrawPixels

+	glGetBooleanv

+	glGetClipPlane

+	glGetDoublev

+	glGetError

+	glGetFloatv

+	glGetIntegerv

+	glGetLightfv

+	glGetLightiv

+	glGetMapdv

+	glGetMapfv

+	glGetMapiv

+	glGetMaterialfv

+	glGetMaterialiv

+	glGetPixelMapfv

+	glGetPixelMapuiv

+	glGetPixelMapusv

+	glGetPolygonStipple

+	glGetString

+	glGetTexEnvfv

+	glGetTexEnviv

+	glGetTexGendv

+	glGetTexGenfv

+	glGetTexGeniv

+	glGetTexImage

+	glGetTexParameterfv

+	glGetTexParameteriv

+	glGetTexLevelParameterfv

+	glGetTexLevelParameteriv

+	glIsEnabled

+	glIsList

+	glDepthRange

+	glFrustum

+	glLoadIdentity

+	glLoadMatrixf

+	glLoadMatrixd

+	glMatrixMode

+	glMultMatrixf

+	glMultMatrixd

+	glOrtho

+	glPopMatrix

+	glPushMatrix

+	glRotated

+	glRotatef

+	glScaled

+	glScalef

+	glTranslated

+	glTranslatef

+	glViewport

+	glArrayElement

+	glColorPointer

+	glDisableClientState

+	glDrawArrays

+	glDrawElements

+	glEdgeFlagPointer

+	glEnableClientState

+	glGetPointerv

+	glIndexPointer

+	glInterleavedArrays

+	glNormalPointer

+	glTexCoordPointer

+	glVertexPointer

+	glPolygonOffset

+	glCopyTexImage1D

+	glCopyTexImage2D

+	glCopyTexSubImage1D

+	glCopyTexSubImage2D

+	glTexSubImage1D

+	glTexSubImage2D

+	glAreTexturesResident

+	glBindTexture

+	glDeleteTextures

+	glGenTextures

+	glIsTexture

+	glPrioritizeTextures

+	glIndexub

+	glIndexubv

+	glPopClientAttrib

+	glPushClientAttrib

+	glBlendColor

+	glBlendEquation

+	glDrawRangeElements

+	glColorTable

+	glColorTableParameterfv

+	glColorTableParameteriv

+	glCopyColorTable

+	glGetColorTable

+	glGetColorTableParameterfv

+	glGetColorTableParameteriv

+	glColorSubTable

+	glCopyColorSubTable

+	glConvolutionFilter1D

+	glConvolutionFilter2D

+	glConvolutionParameterf

+	glConvolutionParameterfv

+	glConvolutionParameteri

+	glConvolutionParameteriv

+	glCopyConvolutionFilter1D

+	glCopyConvolutionFilter2D

+	glGetConvolutionFilter

+	glGetConvolutionParameterfv

+	glGetConvolutionParameteriv

+	glGetSeparableFilter

+	glSeparableFilter2D

+	glGetHistogram

+	glGetHistogramParameterfv

+	glGetHistogramParameteriv

+	glGetMinmax

+	glGetMinmaxParameterfv

+	glGetMinmaxParameteriv

+	glHistogram

+	glMinmax

+	glResetHistogram

+	glResetMinmax

+	glTexImage3D

+	glTexSubImage3D

+	glCopyTexSubImage3D

+	glActiveTextureARB

+	glClientActiveTextureARB

+	glMultiTexCoord1dARB

+	glMultiTexCoord1dvARB

+	glMultiTexCoord1fARB

+	glMultiTexCoord1fvARB

+	glMultiTexCoord1iARB

+	glMultiTexCoord1ivARB

+	glMultiTexCoord1sARB

+	glMultiTexCoord1svARB

+	glMultiTexCoord2dARB

+	glMultiTexCoord2dvARB

+	glMultiTexCoord2fARB

+	glMultiTexCoord2fvARB

+	glMultiTexCoord2iARB

+	glMultiTexCoord2ivARB

+	glMultiTexCoord2sARB

+	glMultiTexCoord2svARB

+	glMultiTexCoord3dARB

+	glMultiTexCoord3dvARB

+	glMultiTexCoord3fARB

+	glMultiTexCoord3fvARB

+	glMultiTexCoord3iARB

+	glMultiTexCoord3ivARB

+	glMultiTexCoord3sARB

+	glMultiTexCoord3svARB

+	glMultiTexCoord4dARB

+	glMultiTexCoord4dvARB

+	glMultiTexCoord4fARB

+	glMultiTexCoord4fvARB

+	glMultiTexCoord4iARB

+	glMultiTexCoord4ivARB

+	glMultiTexCoord4sARB

+	glMultiTexCoord4svARB

+	glLoadTransposeMatrixfARB

+	glLoadTransposeMatrixdARB

+	glMultTransposeMatrixfARB

+	glMultTransposeMatrixdARB

+	glSampleCoverageARB

+	glCompressedTexImage3DARB

+	glCompressedTexImage2DARB

+	glCompressedTexImage1DARB

+	glCompressedTexSubImage3DARB

+	glCompressedTexSubImage2DARB

+	glCompressedTexSubImage1DARB

+	glGetCompressedTexImageARB

+	glActiveTexture

+	glClientActiveTexture

+	glMultiTexCoord1d

+	glMultiTexCoord1dv

+	glMultiTexCoord1f

+	glMultiTexCoord1fv

+	glMultiTexCoord1i

+	glMultiTexCoord1iv

+	glMultiTexCoord1s

+	glMultiTexCoord1sv

+	glMultiTexCoord2d

+	glMultiTexCoord2dv

+	glMultiTexCoord2f

+	glMultiTexCoord2fv

+	glMultiTexCoord2i

+	glMultiTexCoord2iv

+	glMultiTexCoord2s

+	glMultiTexCoord2sv

+	glMultiTexCoord3d

+	glMultiTexCoord3dv

+	glMultiTexCoord3f

+	glMultiTexCoord3fv

+	glMultiTexCoord3i

+	glMultiTexCoord3iv

+	glMultiTexCoord3s

+	glMultiTexCoord3sv

+	glMultiTexCoord4d

+	glMultiTexCoord4dv

+	glMultiTexCoord4f

+	glMultiTexCoord4fv

+	glMultiTexCoord4i

+	glMultiTexCoord4iv

+	glMultiTexCoord4s

+	glMultiTexCoord4sv

+	glLoadTransposeMatrixf

+	glLoadTransposeMatrixd

+	glMultTransposeMatrixf

+	glMultTransposeMatrixd

+	glSampleCoverage

+	glCompressedTexImage3D

+	glCompressedTexImage2D

+	glCompressedTexImage1D

+	glCompressedTexSubImage3D

+	glCompressedTexSubImage2D

+	glCompressedTexSubImage1D

+	glGetCompressedTexImage

+	glBlendColorEXT

+	glPolygonOffsetEXT

+	glTexImage3DEXT

+	glTexSubImage3DEXT

+	glTexSubImage1DEXT

+	glTexSubImage2DEXT

+	glCopyTexImage1DEXT

+	glCopyTexImage2DEXT

+	glCopyTexSubImage1DEXT

+	glCopyTexSubImage2DEXT

+	glCopyTexSubImage3DEXT

+	glAreTexturesResidentEXT

+	glBindTextureEXT

+	glDeleteTexturesEXT

+	glGenTexturesEXT

+	glIsTextureEXT

+	glPrioritizeTexturesEXT

+	glArrayElementEXT

+	glColorPointerEXT

+	glDrawArraysEXT

+	glEdgeFlagPointerEXT

+	glGetPointervEXT

+	glIndexPointerEXT

+	glNormalPointerEXT

+	glTexCoordPointerEXT

+	glVertexPointerEXT

+	glBlendEquationEXT

+	glPointParameterfEXT

+	glPointParameterfvEXT

+	glPointParameterfARB

+	glPointParameterfvARB

+	glColorTableEXT

+	glGetColorTableEXT

+	glGetColorTableParameterivEXT

+	glGetColorTableParameterfvEXT

+	glLockArraysEXT

+	glUnlockArraysEXT

+	glDrawRangeElementsEXT

+	glSecondaryColor3bEXT

+	glSecondaryColor3bvEXT

+	glSecondaryColor3dEXT

+	glSecondaryColor3dvEXT

+	glSecondaryColor3fEXT

+	glSecondaryColor3fvEXT

+	glSecondaryColor3iEXT

+	glSecondaryColor3ivEXT

+	glSecondaryColor3sEXT

+	glSecondaryColor3svEXT

+	glSecondaryColor3ubEXT

+	glSecondaryColor3ubvEXT

+	glSecondaryColor3uiEXT

+	glSecondaryColor3uivEXT

+	glSecondaryColor3usEXT

+	glSecondaryColor3usvEXT

+	glSecondaryColorPointerEXT

+	glMultiDrawArraysEXT

+	glMultiDrawElementsEXT

+	glFogCoordfEXT

+	glFogCoordfvEXT

+	glFogCoorddEXT

+	glFogCoorddvEXT

+	glFogCoordPointerEXT

+	glBlendFuncSeparateEXT

+	glFlushVertexArrayRangeNV

+	glVertexArrayRangeNV

+	glCombinerParameterfvNV

+	glCombinerParameterfNV

+	glCombinerParameterivNV

+	glCombinerParameteriNV

+	glCombinerInputNV

+	glCombinerOutputNV

+	glFinalCombinerInputNV

+	glGetCombinerInputParameterfvNV

+	glGetCombinerInputParameterivNV

+	glGetCombinerOutputParameterfvNV

+	glGetCombinerOutputParameterivNV

+	glGetFinalCombinerInputParameterfvNV

+	glGetFinalCombinerInputParameterivNV

+	glResizeBuffersMESA

+	glWindowPos2dMESA

+	glWindowPos2dvMESA

+	glWindowPos2fMESA

+	glWindowPos2fvMESA

+	glWindowPos2iMESA

+	glWindowPos2ivMESA

+	glWindowPos2sMESA

+	glWindowPos2svMESA

+	glWindowPos3dMESA

+	glWindowPos3dvMESA

+	glWindowPos3fMESA

+	glWindowPos3fvMESA

+	glWindowPos3iMESA

+	glWindowPos3ivMESA

+	glWindowPos3sMESA

+	glWindowPos3svMESA

+	glWindowPos4dMESA

+	glWindowPos4dvMESA

+	glWindowPos4fMESA

+	glWindowPos4fvMESA

+	glWindowPos4iMESA

+	glWindowPos4ivMESA

+	glWindowPos4sMESA

+	glWindowPos4svMESA

+	glWindowPos2dARB

+	glWindowPos2fARB

+	glWindowPos2iARB

+	glWindowPos2sARB

+	glWindowPos2dvARB

+	glWindowPos2fvARB

+	glWindowPos2ivARB

+	glWindowPos2svARB

+	glWindowPos3dARB

+	glWindowPos3fARB

+	glWindowPos3iARB

+	glWindowPos3sARB

+	glWindowPos3dvARB

+	glWindowPos3fvARB

+	glWindowPos3ivARB

+	glWindowPos3svARB

+	glAreProgramsResidentNV

+	glBindProgramNV

+	glDeleteProgramsNV

+	glExecuteProgramNV

+	glGenProgramsNV

+	glGetProgramParameterdvNV

+	glGetProgramParameterfvNV

+	glGetProgramivNV

+	glGetProgramStringNV

+	glGetTrackMatrixivNV

+	glGetVertexAttribdvNV

+	glGetVertexAttribfvNV

+	glGetVertexAttribivNV

+	glGetVertexAttribPointervNV

+	glIsProgramNV

+	glLoadProgramNV

+	glProgramParameter4dNV

+	glProgramParameter4dvNV

+	glProgramParameter4fNV

+	glProgramParameter4fvNV

+	glProgramParameters4dvNV

+	glProgramParameters4fvNV

+	glRequestResidentProgramsNV

+	glTrackMatrixNV

+	glVertexAttribPointerNV

+	glVertexAttrib1dNV

+	glVertexAttrib1dvNV

+	glVertexAttrib1fNV

+	glVertexAttrib1fvNV

+	glVertexAttrib1sNV

+	glVertexAttrib1svNV

+	glVertexAttrib2dNV

+	glVertexAttrib2dvNV

+	glVertexAttrib2fNV

+	glVertexAttrib2fvNV

+	glVertexAttrib2sNV

+	glVertexAttrib2svNV

+	glVertexAttrib3dNV

+	glVertexAttrib3dvNV

+	glVertexAttrib3fNV

+	glVertexAttrib3fvNV

+	glVertexAttrib3sNV

+	glVertexAttrib3svNV

+	glVertexAttrib4dNV

+	glVertexAttrib4dvNV

+	glVertexAttrib4fNV

+	glVertexAttrib4fvNV

+	glVertexAttrib4sNV

+	glVertexAttrib4svNV

+	glVertexAttrib4ubNV

+	glVertexAttrib4ubvNV

+	glVertexAttribs1dvNV

+	glVertexAttribs1fvNV

+	glVertexAttribs1svNV

+	glVertexAttribs2dvNV

+	glVertexAttribs2fvNV

+	glVertexAttribs2svNV

+	glVertexAttribs3dvNV

+	glVertexAttribs3fvNV

+	glVertexAttribs3svNV

+	glVertexAttribs4dvNV

+	glVertexAttribs4fvNV

+	glVertexAttribs4svNV

+	glVertexAttribs4ubvNV

+	glPointParameteriNV

+	glPointParameterivNV

+	glFogCoordf

+	glFogCoordfv

+	glFogCoordd

+	glFogCoorddv

+	glFogCoordPointer

+	glMultiDrawArrays

+	glMultiDrawElements

+	glPointParameterf

+	glPointParameterfv

+	glPointParameteri

+	glPointParameteriv

+	glSecondaryColor3b

+	glSecondaryColor3bv

+	glSecondaryColor3d

+	glSecondaryColor3dv

+	glSecondaryColor3f

+	glSecondaryColor3fv

+	glSecondaryColor3i

+	glSecondaryColor3iv

+	glSecondaryColor3s

+	glSecondaryColor3sv

+	glSecondaryColor3ub

+	glSecondaryColor3ubv

+	glSecondaryColor3ui

+	glSecondaryColor3uiv

+	glSecondaryColor3us

+	glSecondaryColor3usv

+	glSecondaryColorPointer

+	glWindowPos2d

+	glWindowPos2dv

+	glWindowPos2f

+	glWindowPos2fv

+	glWindowPos2i

+	glWindowPos2iv

+	glWindowPos2s

+	glWindowPos2sv

+	glWindowPos3d

+	glWindowPos3dv

+	glWindowPos3f

+	glWindowPos3fv

+	glWindowPos3i

+	glWindowPos3iv

+	glWindowPos3s

+	glWindowPos3sv

+	glVertexAttrib1sARB

+	glVertexAttrib1fARB

+	glVertexAttrib1dARB

+	glVertexAttrib2sARB

+	glVertexAttrib2fARB

+	glVertexAttrib2dARB

+	glVertexAttrib3sARB

+	glVertexAttrib3fARB

+	glVertexAttrib3dARB

+	glVertexAttrib4sARB

+	glVertexAttrib4fARB

+	glVertexAttrib4dARB

+	glVertexAttrib4NubARB

+	glVertexAttrib1svARB

+	glVertexAttrib1fvARB

+	glVertexAttrib1dvARB

+	glVertexAttrib2svARB

+	glVertexAttrib2fvARB

+	glVertexAttrib2dvARB

+	glVertexAttrib3svARB

+	glVertexAttrib3fvARB

+	glVertexAttrib3dvARB

+	glVertexAttrib4bvARB

+	glVertexAttrib4svARB

+	glVertexAttrib4ivARB

+	glVertexAttrib4ubvARB

+	glVertexAttrib4usvARB

+	glVertexAttrib4uivARB

+	glVertexAttrib4fvARB

+	glVertexAttrib4dvARB

+	glVertexAttrib4NbvARB

+	glVertexAttrib4NsvARB

+	glVertexAttrib4NivARB

+	glVertexAttrib4NubvARB

+	glVertexAttrib4NusvARB

+	glVertexAttrib4NuivARB

+	glVertexAttribPointerARB

+	glEnableVertexAttribArrayARB

+	glDisableVertexAttribArrayARB

+	glProgramStringARB

+	glBindProgramARB

+	glDeleteProgramsARB

+	glGenProgramsARB

+	glIsProgramARB

+	glProgramEnvParameter4dARB

+	glProgramEnvParameter4dvARB

+	glProgramEnvParameter4fARB

+	glProgramEnvParameter4fvARB

+	glProgramLocalParameter4dARB

+	glProgramLocalParameter4dvARB

+	glProgramLocalParameter4fARB

+	glProgramLocalParameter4fvARB

+	glGetProgramEnvParameterdvARB

+	glGetProgramEnvParameterfvARB

+	glGetProgramLocalParameterdvARB

+	glGetProgramLocalParameterfvARB

+	glGetProgramivARB

+	glGetProgramStringARB

+	glGetVertexAttribdvARB

+	glGetVertexAttribfvARB

+	glGetVertexAttribivARB

+	glGetVertexAttribPointervARB

+	glProgramNamedParameter4fNV

+	glProgramNamedParameter4dNV

+	glProgramNamedParameter4fvNV

+	glProgramNamedParameter4dvNV

+	glGetProgramNamedParameterfvNV

+	glGetProgramNamedParameterdvNV

+	glBindBufferARB

+	glBufferDataARB

+	glBufferSubDataARB

+	glDeleteBuffersARB

+	glGenBuffersARB

+	glGetBufferParameterivARB

+	glGetBufferPointervARB

+	glGetBufferSubDataARB

+	glIsBufferARB

+	glMapBufferARB

+	glUnmapBufferARB

+	glGenQueriesARB

+	glDeleteQueriesARB

+	glIsQueryARB

+	glBeginQueryARB

+	glEndQueryARB

+	glGetQueryivARB

+	glGetQueryObjectivARB

+	glGetQueryObjectuivARB

+	glBindBuffer

+	glBufferData

+	glBufferSubData

+	glDeleteBuffers

+	glGenBuffers

+	glGetBufferParameteriv

+	glGetBufferPointerv

+	glGetBufferSubData

+	glIsBuffer

+	glMapBuffer

+	glUnmapBuffer

+	glGenQueries

+	glDeleteQueries

+	glIsQuery

+	glBeginQuery

+	glEndQuery

+	glGetQueryiv

+	glGetQueryObjectiv

+	glGetQueryObjectuiv

+;

+; WGL API

+	wglChoosePixelFormat

+	wglCopyContext

+	wglCreateContext

+	wglCreateLayerContext

+	wglDeleteContext

+	wglDescribeLayerPlane

+	wglDescribePixelFormat

+	wglGetCurrentContext

+	wglGetCurrentDC

+	wglGetLayerPaletteEntries

+	wglGetPixelFormat

+	wglGetProcAddress

+	wglMakeCurrent

+	wglRealizeLayerPalette

+	wglSetLayerPaletteEntries

+	wglSetPixelFormat

+	wglShareLists

+	wglSwapBuffers

+	wglSwapLayerBuffers

+	wglUseFontBitmapsA

+	wglUseFontBitmapsW

+	wglUseFontOutlinesA

+	wglUseFontOutlinesW

+	wglGetExtensionsStringARB

diff --git a/mesalib/src/mesa/drivers/windows/gdi/wgl.c b/mesalib/src/mesa/drivers/windows/gdi/wgl.c
index 8d8087067..fc2d937a1 100644
--- a/mesalib/src/mesa/drivers/windows/gdi/wgl.c
+++ b/mesalib/src/mesa/drivers/windows/gdi/wgl.c
@@ -1,707 +1,707 @@
-
-/*
- * 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.
- *
- */
-
-/*
- * File name 	: wgl.c
- * WGL stuff. Added by Oleg Letsinsky, ajl@ultersys.ru
- * Some things originated from the 3Dfx WGL functions
- */
-
-/* 
- * This file contains the implementation of the wgl* functions for
- * Mesa on Windows.  Since these functions are provided by Windows in
- * GDI/OpenGL, we must supply our versions that work with Mesa here.
- */
-
-
-/* We're essentially building part of GDI here, so define this so that
- * we get the right export linkage. */
-#ifdef __MINGW32__
-
-#include <stdarg.h>
-#include <windef.h>
-#include <wincon.h>
-#include <winbase.h>
-
-#  if defined(BUILD_GL32)
-#    define WINGDIAPI __declspec(dllexport)	
-#  else
-#    define __W32API_USE_DLLIMPORT__
-#  endif
-
-#include <wingdi.h>
-#include "GL/mesa_wgl.h"
-#include <stdlib.h>
-
-#else
-
-#define _GDI32_
-#include <windows.h>
-
-#endif
-#include "config.h"
-#include "glapi.h"
-#include "GL/wmesa.h"   /* protos for wmesa* functions */
-
-/*
- * Pixel Format Descriptors
- */
-
-/* Extend the PFD to include DB flag */
-struct __pixelformat__
-{
-    PIXELFORMATDESCRIPTOR pfd;
-    GLboolean doubleBuffered;
-};
-
-
-
-/* These are the PFD's supported by this driver. */
-struct __pixelformat__	pfd[] =
-{
-#if 0 
-    /* Double Buffer, alpha */
-    {	
-	{	
-	    sizeof(PIXELFORMATDESCRIPTOR),	1,
-	    PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|
-	    PFD_GENERIC_FORMAT|PFD_DOUBLEBUFFER|PFD_SWAP_COPY,
-	    PFD_TYPE_RGBA,
-	    24,	
-	    8, 0,	
-	    8, 8,	
-	    8, 16,	
-	    8, 24,
-	    0, 0, 0, 0, 0,	
-	    DEFAULT_SOFTWARE_DEPTH_BITS,	8,	
-	    0, 0, 0,	
-	    0, 0, 0 
-	},
-        GL_TRUE
-    },
-    /* Single Buffer, alpha */
-    {	
-	{	
-	    sizeof(PIXELFORMATDESCRIPTOR),	1,
-	    PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|
-	    PFD_GENERIC_FORMAT,
-	    PFD_TYPE_RGBA,
-	    24,	
-	    8, 0,	
-	    8, 8,	
-	    8, 16,	
-	    8, 24,
-	    0, 0, 0, 0,	0,	
-	    DEFAULT_SOFTWARE_DEPTH_BITS,	8,	
-	    0, 0, 0,	
-	    0, 0, 0
-	},
-        GL_FALSE
-    },
-#endif 
-    /* Double Buffer, no alpha */
-    {	
-	{	
-	    sizeof(PIXELFORMATDESCRIPTOR),	1,
-	    PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|
-	    PFD_GENERIC_FORMAT|PFD_DOUBLEBUFFER|PFD_SWAP_COPY,
-	    PFD_TYPE_RGBA,
-	    24,	
-	    8, 0,
-	    8, 8,
-	    8, 16,
-	    0, 0,
-	    0, 0, 0, 0,	0,
-	    DEFAULT_SOFTWARE_DEPTH_BITS,	8,	
-	    0, 0, 0, 
-	    0, 0, 0 
-	},
-        GL_TRUE
-    },
-    /* Single Buffer, no alpha */
-    {	
-	{
-	    sizeof(PIXELFORMATDESCRIPTOR),	1,
-	    PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|
-	    PFD_GENERIC_FORMAT,
-	    PFD_TYPE_RGBA,
-	    24,	
-	    8, 0,
-	    8, 8,
-	    8, 16,
-	    0, 0,
-	    0, 0, 0, 0,	0,
-	    DEFAULT_SOFTWARE_DEPTH_BITS,	8,	
-	    0, 0, 0,
-	    0, 0, 0 
-	},
-        GL_FALSE
-    },
-};
-
-int npfd = sizeof(pfd) / sizeof(pfd[0]);
-
-
-/*
- * Contexts
- */
-
-typedef struct {
-    WMesaContext ctx;
-} MesaWglCtx;
-
-#define MESAWGL_CTX_MAX_COUNT 20
-
-static MesaWglCtx wgl_ctx[MESAWGL_CTX_MAX_COUNT];
-
-static unsigned ctx_count = 0;
-static int ctx_current = -1;
-static unsigned curPFD = 0;
-
-static HDC CurrentHDC = 0;
-
-
-WINGDIAPI HGLRC GLAPIENTRY wglCreateContext(HDC hdc)
-{
-    int i = 0;
-    if (!ctx_count) {
-	for(i=0;i<MESAWGL_CTX_MAX_COUNT;i++) {
-	    wgl_ctx[i].ctx = NULL;
-	}
-    }
-    for( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ ) {
-        if ( wgl_ctx[i].ctx == NULL ) {
-            wgl_ctx[i].ctx = 
-		WMesaCreateContext(hdc, NULL, (GLboolean)GL_TRUE,
-				   (GLboolean) (pfd[curPFD-1].doubleBuffered ?
-                                   GL_TRUE : GL_FALSE), 
-				   (GLboolean)(pfd[curPFD-1].pfd.cAlphaBits ? 
-				   GL_TRUE : GL_FALSE) );
-            if (wgl_ctx[i].ctx == NULL)
-                break;
-            ctx_count++;
-            return ((HGLRC)wgl_ctx[i].ctx);
-        }
-    }
-    SetLastError(0);
-    return(NULL);
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglDeleteContext(HGLRC hglrc)
-{
-    int i;
-    for ( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ ) {
-    	if ( wgl_ctx[i].ctx == (WMesaContext) hglrc ){
-            WMesaMakeCurrent((WMesaContext) hglrc, NULL);
-            WMesaDestroyContext(wgl_ctx[i].ctx);
-            wgl_ctx[i].ctx = NULL;
-            ctx_count--;
-            return(TRUE);
-    	}
-    }
-    SetLastError(0);
-    return(FALSE);
-}
-
-WINGDIAPI HGLRC GLAPIENTRY wglGetCurrentContext(VOID)
-{
-    if (ctx_current < 0)
-	return 0;
-    else
-	return (HGLRC) wgl_ctx[ctx_current].ctx;
-}
-
-WINGDIAPI HDC GLAPIENTRY wglGetCurrentDC(VOID)
-{
-    return CurrentHDC;
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglMakeCurrent(HDC hdc, HGLRC hglrc)
-{
-    int i;
-    
-    CurrentHDC = hdc;
-
-    if (!hdc || !hglrc) {
-	WMesaMakeCurrent(NULL, NULL);
-	ctx_current = -1;
-	return TRUE;
-    }
-    
-    for ( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ ) {
-	if ( wgl_ctx[i].ctx == (WMesaContext) hglrc ) {
-	    WMesaMakeCurrent( (WMesaContext) hglrc, hdc );
-	    ctx_current = i;
-	    return TRUE;
-	}
-    }
-    return FALSE;
-}
-
-
-WINGDIAPI int GLAPIENTRY wglChoosePixelFormat(HDC hdc,
-					      CONST 
-					      PIXELFORMATDESCRIPTOR *ppfd)
-{
-    int		i,best = -1,bestdelta = 0x7FFFFFFF,delta;
-    (void) hdc;
-    
-    if(ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR) || ppfd->nVersion != 1)
-	{
-	    SetLastError(0);
-	    return(0);
-	}
-    for(i = 0; i < npfd;i++)
-	{
-	    delta = 0;
-	    if(
-		(ppfd->dwFlags & PFD_DRAW_TO_WINDOW) &&
-		!(pfd[i].pfd.dwFlags & PFD_DRAW_TO_WINDOW))
-		continue;
-	    if(
-		(ppfd->dwFlags & PFD_DRAW_TO_BITMAP) &&
-		!(pfd[i].pfd.dwFlags & PFD_DRAW_TO_BITMAP))
-		continue;
-	    if(
-		(ppfd->dwFlags & PFD_SUPPORT_GDI) &&
-		!(pfd[i].pfd.dwFlags & PFD_SUPPORT_GDI))
-		continue;
-	    if(
-		(ppfd->dwFlags & PFD_SUPPORT_OPENGL) &&
-		!(pfd[i].pfd.dwFlags & PFD_SUPPORT_OPENGL))
-		continue;
-	    if(
-		!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) &&
-		((ppfd->dwFlags & PFD_DOUBLEBUFFER) != 
-		 (pfd[i].pfd.dwFlags & PFD_DOUBLEBUFFER)))
-		continue;
-	    if(
-		!(ppfd->dwFlags & PFD_STEREO_DONTCARE) &&
-		((ppfd->dwFlags & PFD_STEREO) != 
-		 (pfd[i].pfd.dwFlags & PFD_STEREO)))
-		continue;
-	    if(ppfd->iPixelType != pfd[i].pfd.iPixelType)
-		delta++;
-	    if(ppfd->cAlphaBits != pfd[i].pfd.cAlphaBits)
-		delta++;
-	    if(delta < bestdelta)
-		{
-		    best = i + 1;
-		    bestdelta = delta;
-		    if(bestdelta == 0)
-			break;
-		}
-	}
-    if(best == -1)
-	{
-	    SetLastError(0);
-	    return(0);
-	}
-    return(best);
-}
-
-WINGDIAPI int GLAPIENTRY wglDescribePixelFormat(HDC hdc,
-					        int iPixelFormat,
-					        UINT nBytes,
-					        LPPIXELFORMATDESCRIPTOR ppfd)
-{
-    (void) hdc;
-    
-    if(ppfd == NULL)
-	return(npfd);
-    if(iPixelFormat < 1 || iPixelFormat > npfd || 
-       nBytes != sizeof(PIXELFORMATDESCRIPTOR))
-	{
-	    SetLastError(0);
-	    return(0);
-	}
-    *ppfd = pfd[iPixelFormat - 1].pfd;
-    return(npfd);
-}
-
-WINGDIAPI PROC GLAPIENTRY wglGetProcAddress(LPCSTR lpszProc)
-{
-    PROC p = (PROC) _glapi_get_proc_address((const char *) lpszProc);
-    if (p)
-	return p;
-    
-    SetLastError(0);
-    return(NULL);
-}
-
-WINGDIAPI int GLAPIENTRY wglGetPixelFormat(HDC hdc)
-{
-    (void) hdc;
-    if(curPFD == 0) {
-	SetLastError(0);
-	return(0);
-    }
-    return(curPFD);
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglSetPixelFormat(HDC hdc,int iPixelFormat,
-					const PIXELFORMATDESCRIPTOR *ppfd)
-{
-    (void) hdc;
-    
-    if(iPixelFormat < 1 || iPixelFormat > npfd || 
-       ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR)) {
-	SetLastError(0);
-	return(FALSE);
-    }
-    curPFD = iPixelFormat;
-    return(TRUE);
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglSwapBuffers(HDC hdc)
-{
-    WMesaSwapBuffers(hdc);
-    return TRUE;
-}
-
-static FIXED FixedFromDouble(double d)
-{
-   long l = (long) (d * 65536L);
-   return *(FIXED *) (void *) &l;
-}
-
-
-/*
-** This is cribbed from FX/fxwgl.c, and seems to implement support
-** for bitmap fonts where the wglUseFontBitmapsA() code implements
-** support for outline fonts.  In combination they hopefully give
-** fairly generic support for fonts.
-*/
-static BOOL wglUseFontBitmaps_FX(HDC fontDevice, DWORD firstChar,
-                                 DWORD numChars, DWORD listBase)
-{
-#define VERIFY(a) a
-    
-    TEXTMETRIC metric;
-    BITMAPINFO *dibInfo;
-    HDC bitDevice;
-    COLORREF tempColor;
-    int i;
-    
-    VERIFY(GetTextMetrics(fontDevice, &metric));
-    
-    dibInfo = (BITMAPINFO *) calloc(sizeof(BITMAPINFO) + sizeof(RGBQUAD), 1);
-    dibInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-    dibInfo->bmiHeader.biPlanes = 1;
-    dibInfo->bmiHeader.biBitCount = 1;
-    dibInfo->bmiHeader.biCompression = BI_RGB;
-    
-    bitDevice = CreateCompatibleDC(fontDevice);
-    
-    /* Swap fore and back colors so the bitmap has the right polarity */
-    tempColor = GetBkColor(bitDevice);
-    SetBkColor(bitDevice, GetTextColor(bitDevice));
-    SetTextColor(bitDevice, tempColor);
-    
-    /* Place chars based on base line */
-    VERIFY(SetTextAlign(bitDevice, TA_BASELINE) != GDI_ERROR ? 1 : 0);
-    
-    for(i = 0; i < (int)numChars; i++) {
-	SIZE size;
-	char curChar;
-	int charWidth,charHeight,bmapWidth,bmapHeight,numBytes,res;
-	HBITMAP bitObject;
-	HGDIOBJ origBmap;
-	unsigned char *bmap;
-	
-	curChar = (char)(i + firstChar);
-	
-	/* Find how high/wide this character is */
-	VERIFY(GetTextExtentPoint32(bitDevice, &curChar, 1, &size));
-	
-	/* Create the output bitmap */
-	charWidth = size.cx;
-	charHeight = size.cy;
-	/* Round up to the next multiple of 32 bits */
-	bmapWidth = ((charWidth + 31) / 32) * 32;   
-	bmapHeight = charHeight;
-	bitObject = CreateCompatibleBitmap(bitDevice,
-					   bmapWidth,
-					   bmapHeight);
-	/* VERIFY(bitObject); */
-	
-	/* Assign the output bitmap to the device */
-	origBmap = SelectObject(bitDevice, bitObject);
-	(void) VERIFY(origBmap);
-	
-	VERIFY( PatBlt( bitDevice, 0, 0, bmapWidth, bmapHeight,BLACKNESS ) );
-	
-	/* Use our source font on the device */
-	VERIFY(SelectObject(bitDevice, GetCurrentObject(fontDevice,OBJ_FONT)));
-	
-	/* Draw the character */
-	VERIFY(TextOut(bitDevice, 0, metric.tmAscent, &curChar, 1));
-	
-	/* Unselect our bmap object */
-	VERIFY(SelectObject(bitDevice, origBmap));
-	
-	/* Convert the display dependant representation to a 1 bit deep DIB */
-	numBytes = (bmapWidth * bmapHeight) / 8;
-	bmap = malloc(numBytes);
-	dibInfo->bmiHeader.biWidth = bmapWidth;
-	dibInfo->bmiHeader.biHeight = bmapHeight;
-	res = GetDIBits(bitDevice, bitObject, 0, bmapHeight, bmap,
-			dibInfo,
-			DIB_RGB_COLORS);
-	/* VERIFY(res); */
-	
-	/* Create the GL object */
-	glNewList(i + listBase, GL_COMPILE);
-	glBitmap(bmapWidth, bmapHeight, 0.0, (GLfloat)metric.tmDescent,
-		 (GLfloat)charWidth, 0.0,
-		 bmap);
-	glEndList();
-	/* CheckGL(); */
-	
-	/* Destroy the bmap object */
-	DeleteObject(bitObject);
-	
-	/* Deallocate the bitmap data */
-	free(bmap);
-    }
-    
-    /* Destroy the DC */
-    VERIFY(DeleteDC(bitDevice));
-    
-    free(dibInfo);
-    
-    return TRUE;
-#undef VERIFY
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglUseFontBitmapsA(HDC hdc, DWORD first,
-					     DWORD count, DWORD listBase)
-{
-    int i;
-    GLuint font_list;
-    DWORD size;
-    GLYPHMETRICS gm;
-    HANDLE hBits;
-    LPSTR lpBits;
-    MAT2 mat;
-    int  success = TRUE;
-    
-    if (count == 0)
-	return FALSE;
-    
-    font_list = listBase;
-    
-    mat.eM11 = FixedFromDouble(1);
-    mat.eM12 = FixedFromDouble(0);
-    mat.eM21 = FixedFromDouble(0);
-    mat.eM22 = FixedFromDouble(-1);
-    
-    memset(&gm,0,sizeof(gm));
-    
-    /*
-    ** If we can't get the glyph outline, it may be because this is a fixed
-    ** font.  Try processing it that way.
-    */
-    if( GetGlyphOutline(hdc, first, GGO_BITMAP, &gm, 0, NULL, &mat)
-	== GDI_ERROR ) {
-	return wglUseFontBitmaps_FX( hdc, first, count, listBase );
-    }
-    
-    /*
-    ** Otherwise process all desired characters.
-    */
-    for (i = 0; i < (int)count; i++) {
-	DWORD err;
-	
-	glNewList( font_list+i, GL_COMPILE );
-	
-	/* allocate space for the bitmap/outline */
-	size = GetGlyphOutline(hdc, first + i, GGO_BITMAP, 
-			       &gm, 0, NULL, &mat);
-	if (size == GDI_ERROR) {
-	    glEndList( );
-	    err = GetLastError();
-	    success = FALSE;
-	    continue;
-	}
-	
-	hBits  = GlobalAlloc(GHND, size+1);
-	lpBits = GlobalLock(hBits);
-	
-	err = 
-	    GetGlyphOutline(hdc,         /* handle to device context */
-			    first + i,   /* character to query */
-			    GGO_BITMAP,  /* format of data to return */
-			    &gm,         /* ptr to structure for metrics*/
-			    size,        /* size of buffer for data */
-			    lpBits,      /* pointer to buffer for data */
-			    &mat         /* pointer to transformation */
-			    /* matrix structure */
-		);
-	
-	if (err == GDI_ERROR) {
-	    GlobalUnlock(hBits);
-	    GlobalFree(hBits);
-	    
-	    glEndList( );
-	    err = GetLastError();
-	    success = FALSE;
-	    continue;
-	}
-	
-	glBitmap(gm.gmBlackBoxX,gm.gmBlackBoxY,
-		 (GLfloat)-gm.gmptGlyphOrigin.x,
-		 (GLfloat)gm.gmptGlyphOrigin.y,
-		 (GLfloat)gm.gmCellIncX,
-		 (GLfloat)gm.gmCellIncY,
-		 (const GLubyte * )lpBits);
-	
-	GlobalUnlock(hBits);
-	GlobalFree(hBits);
-	
-	glEndList( );
-    }
-    
-    return success;
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglShareLists(HGLRC hglrc1,
-					HGLRC hglrc2)
-{
-    WMesaShareLists((WMesaContext)hglrc1, (WMesaContext)hglrc2);
-    return(TRUE);
-}
-
-
-
-/* NOT IMPLEMENTED YET */
-WINGDIAPI BOOL GLAPIENTRY wglCopyContext(HGLRC hglrcSrc,
-					 HGLRC hglrcDst,
-					 UINT mask)
-{
-    (void) hglrcSrc; (void) hglrcDst; (void) mask;
-    return(FALSE);
-}
-
-WINGDIAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC hdc,
-						 int iLayerPlane)
-{
-    SetLastError(0);
-    if (iLayerPlane == 0)
-        return wglCreateContext( hdc );
-    return(NULL);
-}
-
-
-WINGDIAPI BOOL GLAPIENTRY wglUseFontBitmapsW(HDC hdc,
-					     DWORD first,
-					     DWORD count,
-					     DWORD listBase)
-{
-    (void) hdc; (void) first; (void) count; (void) listBase;
-    return FALSE;
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglUseFontOutlinesA(HDC hdc,
-					      DWORD first,
-					      DWORD count,
-					      DWORD listBase,
-					      FLOAT deviation,
-					      FLOAT extrusion,
-					      int format,
-					      LPGLYPHMETRICSFLOAT lpgmf)
-{
-    (void) hdc; (void) first; (void) count;
-    (void) listBase; (void) deviation; (void) extrusion; (void) format;
-    (void) lpgmf;
-    SetLastError(0);
-    return(FALSE);
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglUseFontOutlinesW(HDC hdc,
-					      DWORD first,
-					      DWORD count,
-					      DWORD listBase,
-					      FLOAT deviation,
-					      FLOAT extrusion,
-					      int format,
-					      LPGLYPHMETRICSFLOAT lpgmf)
-{
-    (void) hdc; (void) first; (void) count;
-    (void) listBase; (void) deviation; (void) extrusion; (void) format;
-    (void) lpgmf;
-    SetLastError(0);
-    return(FALSE);
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglDescribeLayerPlane(HDC hdc,
-						int iPixelFormat,
-						int iLayerPlane,
-						UINT nBytes,
-						LPLAYERPLANEDESCRIPTOR plpd)
-{
-    (void) hdc; (void) iPixelFormat; (void) iLayerPlane; 
-    (void) nBytes; (void) plpd;
-    SetLastError(0);
-    return(FALSE);
-}
-
-WINGDIAPI int GLAPIENTRY wglSetLayerPaletteEntries(HDC hdc,
-						   int iLayerPlane,
-						   int iStart,
-						   int cEntries,
-						   CONST COLORREF *pcr)
-{
-    (void) hdc; (void) iLayerPlane; (void) iStart; 
-    (void) cEntries; (void) pcr;
-    SetLastError(0);
-    return(0);
-}
-
-WINGDIAPI int GLAPIENTRY wglGetLayerPaletteEntries(HDC hdc,
-						   int iLayerPlane,
-						   int iStart,
-						   int cEntries,
-						   COLORREF *pcr)
-{
-    (void) hdc; (void) iLayerPlane; (void) iStart; (void) cEntries; (void) pcr;
-    SetLastError(0);
-    return(0);
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglRealizeLayerPalette(HDC hdc,
-						 int iLayerPlane,
-						 BOOL bRealize)
-{
-    (void) hdc; (void) iLayerPlane; (void) bRealize;
-    SetLastError(0);
-    return(FALSE);
-}
-
-WINGDIAPI BOOL GLAPIENTRY wglSwapLayerBuffers(HDC hdc,
-					      UINT fuPlanes)
-{
-    (void) hdc; (void) fuPlanes;
-    SetLastError(0);
-    return(FALSE);
-}
-
-WINGDIAPI const char * GLAPIENTRY wglGetExtensionsStringARB(HDC hdc)
-{
-    return "WGL_ARB_extensions_string";
-}
+

+/*

+ * 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.

+ *

+ */

+

+/*

+ * File name 	: wgl.c

+ * WGL stuff. Added by Oleg Letsinsky, ajl@ultersys.ru

+ * Some things originated from the 3Dfx WGL functions

+ */

+

+/* 

+ * This file contains the implementation of the wgl* functions for

+ * Mesa on Windows.  Since these functions are provided by Windows in

+ * GDI/OpenGL, we must supply our versions that work with Mesa here.

+ */

+

+

+/* We're essentially building part of GDI here, so define this so that

+ * we get the right export linkage. */

+#ifdef __MINGW32__

+

+#include <stdarg.h>

+#include <windef.h>

+#include <wincon.h>

+#include <winbase.h>

+

+#  if defined(BUILD_GL32)

+#    define WINGDIAPI __declspec(dllexport)	

+#  else

+#    define __W32API_USE_DLLIMPORT__

+#  endif

+

+#include <wingdi.h>

+#include "GL/mesa_wgl.h"

+#include <stdlib.h>

+

+#else

+

+#define _GDI32_

+#include <windows.h>

+

+#endif

+#include "main/config.h"

+#include "glapi/glapi.h"

+#include "GL/wmesa.h"   /* protos for wmesa* functions */

+

+/*

+ * Pixel Format Descriptors

+ */

+

+/* Extend the PFD to include DB flag */

+struct __pixelformat__

+{

+    PIXELFORMATDESCRIPTOR pfd;

+    GLboolean doubleBuffered;

+};

+

+

+

+/* These are the PFD's supported by this driver. */

+struct __pixelformat__	pfd[] =

+{

+#if 0 

+    /* Double Buffer, alpha */

+    {	

+	{	

+	    sizeof(PIXELFORMATDESCRIPTOR),	1,

+	    PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|

+	    PFD_GENERIC_FORMAT|PFD_DOUBLEBUFFER|PFD_SWAP_COPY,

+	    PFD_TYPE_RGBA,

+	    24,	

+	    8, 0,	

+	    8, 8,	

+	    8, 16,	

+	    8, 24,

+	    0, 0, 0, 0, 0,	

+	    DEFAULT_SOFTWARE_DEPTH_BITS,	8,	

+	    0, 0, 0,	

+	    0, 0, 0 

+	},

+        GL_TRUE

+    },

+    /* Single Buffer, alpha */

+    {	

+	{	

+	    sizeof(PIXELFORMATDESCRIPTOR),	1,

+	    PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|

+	    PFD_GENERIC_FORMAT,

+	    PFD_TYPE_RGBA,

+	    24,	

+	    8, 0,	

+	    8, 8,	

+	    8, 16,	

+	    8, 24,

+	    0, 0, 0, 0,	0,	

+	    DEFAULT_SOFTWARE_DEPTH_BITS,	8,	

+	    0, 0, 0,	

+	    0, 0, 0

+	},

+        GL_FALSE

+    },

+#endif 

+    /* Double Buffer, no alpha */

+    {	

+	{	

+	    sizeof(PIXELFORMATDESCRIPTOR),	1,

+	    PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|

+	    PFD_GENERIC_FORMAT|PFD_DOUBLEBUFFER|PFD_SWAP_COPY,

+	    PFD_TYPE_RGBA,

+	    24,	

+	    8, 0,

+	    8, 8,

+	    8, 16,

+	    0, 0,

+	    0, 0, 0, 0,	0,

+	    DEFAULT_SOFTWARE_DEPTH_BITS,	8,	

+	    0, 0, 0, 

+	    0, 0, 0 

+	},

+        GL_TRUE

+    },

+    /* Single Buffer, no alpha */

+    {	

+	{

+	    sizeof(PIXELFORMATDESCRIPTOR),	1,

+	    PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|

+	    PFD_GENERIC_FORMAT,

+	    PFD_TYPE_RGBA,

+	    24,	

+	    8, 0,

+	    8, 8,

+	    8, 16,

+	    0, 0,

+	    0, 0, 0, 0,	0,

+	    DEFAULT_SOFTWARE_DEPTH_BITS,	8,	

+	    0, 0, 0,

+	    0, 0, 0 

+	},

+        GL_FALSE

+    },

+};

+

+int npfd = sizeof(pfd) / sizeof(pfd[0]);

+

+

+/*

+ * Contexts

+ */

+

+typedef struct {

+    WMesaContext ctx;

+} MesaWglCtx;

+

+#define MESAWGL_CTX_MAX_COUNT 20

+

+static MesaWglCtx wgl_ctx[MESAWGL_CTX_MAX_COUNT];

+

+static unsigned ctx_count = 0;

+static int ctx_current = -1;

+static unsigned curPFD = 0;

+

+static HDC CurrentHDC = 0;

+

+

+WINGDIAPI HGLRC GLAPIENTRY wglCreateContext(HDC hdc)

+{

+    int i = 0;

+    if (!ctx_count) {

+	for(i=0;i<MESAWGL_CTX_MAX_COUNT;i++) {

+	    wgl_ctx[i].ctx = NULL;

+	}

+    }

+    for( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ ) {

+        if ( wgl_ctx[i].ctx == NULL ) {

+            wgl_ctx[i].ctx = 

+		WMesaCreateContext(hdc, NULL, (GLboolean)GL_TRUE,

+				   (GLboolean) (pfd[curPFD-1].doubleBuffered ?

+                                   GL_TRUE : GL_FALSE), 

+				   (GLboolean)(pfd[curPFD-1].pfd.cAlphaBits ? 

+				   GL_TRUE : GL_FALSE) );

+            if (wgl_ctx[i].ctx == NULL)

+                break;

+            ctx_count++;

+            return ((HGLRC)wgl_ctx[i].ctx);

+        }

+    }

+    SetLastError(0);

+    return(NULL);

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglDeleteContext(HGLRC hglrc)

+{

+    int i;

+    for ( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ ) {

+    	if ( wgl_ctx[i].ctx == (WMesaContext) hglrc ){

+            WMesaMakeCurrent((WMesaContext) hglrc, NULL);

+            WMesaDestroyContext(wgl_ctx[i].ctx);

+            wgl_ctx[i].ctx = NULL;

+            ctx_count--;

+            return(TRUE);

+    	}

+    }

+    SetLastError(0);

+    return(FALSE);

+}

+

+WINGDIAPI HGLRC GLAPIENTRY wglGetCurrentContext(VOID)

+{

+    if (ctx_current < 0)

+	return 0;

+    else

+	return (HGLRC) wgl_ctx[ctx_current].ctx;

+}

+

+WINGDIAPI HDC GLAPIENTRY wglGetCurrentDC(VOID)

+{

+    return CurrentHDC;

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglMakeCurrent(HDC hdc, HGLRC hglrc)

+{

+    int i;

+    

+    CurrentHDC = hdc;

+

+    if (!hdc || !hglrc) {

+	WMesaMakeCurrent(NULL, NULL);

+	ctx_current = -1;

+	return TRUE;

+    }

+    

+    for ( i = 0; i < MESAWGL_CTX_MAX_COUNT; i++ ) {

+	if ( wgl_ctx[i].ctx == (WMesaContext) hglrc ) {

+	    WMesaMakeCurrent( (WMesaContext) hglrc, hdc );

+	    ctx_current = i;

+	    return TRUE;

+	}

+    }

+    return FALSE;

+}

+

+

+WINGDIAPI int GLAPIENTRY wglChoosePixelFormat(HDC hdc,

+					      CONST 

+					      PIXELFORMATDESCRIPTOR *ppfd)

+{

+    int		i,best = -1,bestdelta = 0x7FFFFFFF,delta;

+    (void) hdc;

+    

+    if(ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR) || ppfd->nVersion != 1)

+	{

+	    SetLastError(0);

+	    return(0);

+	}

+    for(i = 0; i < npfd;i++)

+	{

+	    delta = 0;

+	    if(

+		(ppfd->dwFlags & PFD_DRAW_TO_WINDOW) &&

+		!(pfd[i].pfd.dwFlags & PFD_DRAW_TO_WINDOW))

+		continue;

+	    if(

+		(ppfd->dwFlags & PFD_DRAW_TO_BITMAP) &&

+		!(pfd[i].pfd.dwFlags & PFD_DRAW_TO_BITMAP))

+		continue;

+	    if(

+		(ppfd->dwFlags & PFD_SUPPORT_GDI) &&

+		!(pfd[i].pfd.dwFlags & PFD_SUPPORT_GDI))

+		continue;

+	    if(

+		(ppfd->dwFlags & PFD_SUPPORT_OPENGL) &&

+		!(pfd[i].pfd.dwFlags & PFD_SUPPORT_OPENGL))

+		continue;

+	    if(

+		!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) &&

+		((ppfd->dwFlags & PFD_DOUBLEBUFFER) != 

+		 (pfd[i].pfd.dwFlags & PFD_DOUBLEBUFFER)))

+		continue;

+	    if(

+		!(ppfd->dwFlags & PFD_STEREO_DONTCARE) &&

+		((ppfd->dwFlags & PFD_STEREO) != 

+		 (pfd[i].pfd.dwFlags & PFD_STEREO)))

+		continue;

+	    if(ppfd->iPixelType != pfd[i].pfd.iPixelType)

+		delta++;

+	    if(ppfd->cAlphaBits != pfd[i].pfd.cAlphaBits)

+		delta++;

+	    if(delta < bestdelta)

+		{

+		    best = i + 1;

+		    bestdelta = delta;

+		    if(bestdelta == 0)

+			break;

+		}

+	}

+    if(best == -1)

+	{

+	    SetLastError(0);

+	    return(0);

+	}

+    return(best);

+}

+

+WINGDIAPI int GLAPIENTRY wglDescribePixelFormat(HDC hdc,

+					        int iPixelFormat,

+					        UINT nBytes,

+					        LPPIXELFORMATDESCRIPTOR ppfd)

+{

+    (void) hdc;

+    

+    if(ppfd == NULL)

+	return(npfd);

+    if(iPixelFormat < 1 || iPixelFormat > npfd || 

+       nBytes != sizeof(PIXELFORMATDESCRIPTOR))

+	{

+	    SetLastError(0);

+	    return(0);

+	}

+    *ppfd = pfd[iPixelFormat - 1].pfd;

+    return(npfd);

+}

+

+WINGDIAPI PROC GLAPIENTRY wglGetProcAddress(LPCSTR lpszProc)

+{

+    PROC p = (PROC) _glapi_get_proc_address((const char *) lpszProc);

+    if (p)

+	return p;

+    

+    SetLastError(0);

+    return(NULL);

+}

+

+WINGDIAPI int GLAPIENTRY wglGetPixelFormat(HDC hdc)

+{

+    (void) hdc;

+    if(curPFD == 0) {

+	SetLastError(0);

+	return(0);

+    }

+    return(curPFD);

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglSetPixelFormat(HDC hdc,int iPixelFormat,

+					const PIXELFORMATDESCRIPTOR *ppfd)

+{

+    (void) hdc;

+    

+    if(iPixelFormat < 1 || iPixelFormat > npfd || 

+       ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR)) {

+	SetLastError(0);

+	return(FALSE);

+    }

+    curPFD = iPixelFormat;

+    return(TRUE);

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglSwapBuffers(HDC hdc)

+{

+    WMesaSwapBuffers(hdc);

+    return TRUE;

+}

+

+static FIXED FixedFromDouble(double d)

+{

+   long l = (long) (d * 65536L);

+   return *(FIXED *) (void *) &l;

+}

+

+

+/*

+** This is cribbed from FX/fxwgl.c, and seems to implement support

+** for bitmap fonts where the wglUseFontBitmapsA() code implements

+** support for outline fonts.  In combination they hopefully give

+** fairly generic support for fonts.

+*/

+static BOOL wglUseFontBitmaps_FX(HDC fontDevice, DWORD firstChar,

+                                 DWORD numChars, DWORD listBase)

+{

+#define VERIFY(a) a

+    

+    TEXTMETRIC metric;

+    BITMAPINFO *dibInfo;

+    HDC bitDevice;

+    COLORREF tempColor;

+    int i;

+    

+    VERIFY(GetTextMetrics(fontDevice, &metric));

+    

+    dibInfo = (BITMAPINFO *) calloc(sizeof(BITMAPINFO) + sizeof(RGBQUAD), 1);

+    dibInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

+    dibInfo->bmiHeader.biPlanes = 1;

+    dibInfo->bmiHeader.biBitCount = 1;

+    dibInfo->bmiHeader.biCompression = BI_RGB;

+    

+    bitDevice = CreateCompatibleDC(fontDevice);

+    

+    /* Swap fore and back colors so the bitmap has the right polarity */

+    tempColor = GetBkColor(bitDevice);

+    SetBkColor(bitDevice, GetTextColor(bitDevice));

+    SetTextColor(bitDevice, tempColor);

+    

+    /* Place chars based on base line */

+    VERIFY(SetTextAlign(bitDevice, TA_BASELINE) != GDI_ERROR ? 1 : 0);

+    

+    for(i = 0; i < (int)numChars; i++) {

+	SIZE size;

+	char curChar;

+	int charWidth,charHeight,bmapWidth,bmapHeight,numBytes,res;

+	HBITMAP bitObject;

+	HGDIOBJ origBmap;

+	unsigned char *bmap;

+	

+	curChar = (char)(i + firstChar);

+	

+	/* Find how high/wide this character is */

+	VERIFY(GetTextExtentPoint32(bitDevice, &curChar, 1, &size));

+	

+	/* Create the output bitmap */

+	charWidth = size.cx;

+	charHeight = size.cy;

+	/* Round up to the next multiple of 32 bits */

+	bmapWidth = ((charWidth + 31) / 32) * 32;   

+	bmapHeight = charHeight;

+	bitObject = CreateCompatibleBitmap(bitDevice,

+					   bmapWidth,

+					   bmapHeight);

+	/* VERIFY(bitObject); */

+	

+	/* Assign the output bitmap to the device */

+	origBmap = SelectObject(bitDevice, bitObject);

+	(void) VERIFY(origBmap);

+	

+	VERIFY( PatBlt( bitDevice, 0, 0, bmapWidth, bmapHeight,BLACKNESS ) );

+	

+	/* Use our source font on the device */

+	VERIFY(SelectObject(bitDevice, GetCurrentObject(fontDevice,OBJ_FONT)));

+	

+	/* Draw the character */

+	VERIFY(TextOut(bitDevice, 0, metric.tmAscent, &curChar, 1));

+	

+	/* Unselect our bmap object */

+	VERIFY(SelectObject(bitDevice, origBmap));

+	

+	/* Convert the display dependant representation to a 1 bit deep DIB */

+	numBytes = (bmapWidth * bmapHeight) / 8;

+	bmap = malloc(numBytes);

+	dibInfo->bmiHeader.biWidth = bmapWidth;

+	dibInfo->bmiHeader.biHeight = bmapHeight;

+	res = GetDIBits(bitDevice, bitObject, 0, bmapHeight, bmap,

+			dibInfo,

+			DIB_RGB_COLORS);

+	/* VERIFY(res); */

+	

+	/* Create the GL object */

+	glNewList(i + listBase, GL_COMPILE);

+	glBitmap(bmapWidth, bmapHeight, 0.0, (GLfloat)metric.tmDescent,

+		 (GLfloat)charWidth, 0.0,

+		 bmap);

+	glEndList();

+	/* CheckGL(); */

+	

+	/* Destroy the bmap object */

+	DeleteObject(bitObject);

+	

+	/* Deallocate the bitmap data */

+	free(bmap);

+    }

+    

+    /* Destroy the DC */

+    VERIFY(DeleteDC(bitDevice));

+    

+    free(dibInfo);

+    

+    return TRUE;

+#undef VERIFY

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglUseFontBitmapsA(HDC hdc, DWORD first,

+					     DWORD count, DWORD listBase)

+{

+    int i;

+    GLuint font_list;

+    DWORD size;

+    GLYPHMETRICS gm;

+    HANDLE hBits;

+    LPSTR lpBits;

+    MAT2 mat;

+    int  success = TRUE;

+    

+    if (count == 0)

+	return FALSE;

+    

+    font_list = listBase;

+    

+    mat.eM11 = FixedFromDouble(1);

+    mat.eM12 = FixedFromDouble(0);

+    mat.eM21 = FixedFromDouble(0);

+    mat.eM22 = FixedFromDouble(-1);

+    

+    memset(&gm,0,sizeof(gm));

+    

+    /*

+    ** If we can't get the glyph outline, it may be because this is a fixed

+    ** font.  Try processing it that way.

+    */

+    if( GetGlyphOutline(hdc, first, GGO_BITMAP, &gm, 0, NULL, &mat)

+	== GDI_ERROR ) {

+	return wglUseFontBitmaps_FX( hdc, first, count, listBase );

+    }

+    

+    /*

+    ** Otherwise process all desired characters.

+    */

+    for (i = 0; i < (int)count; i++) {

+	DWORD err;

+	

+	glNewList( font_list+i, GL_COMPILE );

+	

+	/* allocate space for the bitmap/outline */

+	size = GetGlyphOutline(hdc, first + i, GGO_BITMAP, 

+			       &gm, 0, NULL, &mat);

+	if (size == GDI_ERROR) {

+	    glEndList( );

+	    err = GetLastError();

+	    success = FALSE;

+	    continue;

+	}

+	

+	hBits  = GlobalAlloc(GHND, size+1);

+	lpBits = GlobalLock(hBits);

+	

+	err = 

+	    GetGlyphOutline(hdc,         /* handle to device context */

+			    first + i,   /* character to query */

+			    GGO_BITMAP,  /* format of data to return */

+			    &gm,         /* ptr to structure for metrics*/

+			    size,        /* size of buffer for data */

+			    lpBits,      /* pointer to buffer for data */

+			    &mat         /* pointer to transformation */

+			    /* matrix structure */

+		);

+	

+	if (err == GDI_ERROR) {

+	    GlobalUnlock(hBits);

+	    GlobalFree(hBits);

+	    

+	    glEndList( );

+	    err = GetLastError();

+	    success = FALSE;

+	    continue;

+	}

+	

+	glBitmap(gm.gmBlackBoxX,gm.gmBlackBoxY,

+		 (GLfloat)-gm.gmptGlyphOrigin.x,

+		 (GLfloat)gm.gmptGlyphOrigin.y,

+		 (GLfloat)gm.gmCellIncX,

+		 (GLfloat)gm.gmCellIncY,

+		 (const GLubyte * )lpBits);

+	

+	GlobalUnlock(hBits);

+	GlobalFree(hBits);

+	

+	glEndList( );

+    }

+    

+    return success;

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglShareLists(HGLRC hglrc1,

+					HGLRC hglrc2)

+{

+    WMesaShareLists((WMesaContext)hglrc1, (WMesaContext)hglrc2);

+    return(TRUE);

+}

+

+

+

+/* NOT IMPLEMENTED YET */

+WINGDIAPI BOOL GLAPIENTRY wglCopyContext(HGLRC hglrcSrc,

+					 HGLRC hglrcDst,

+					 UINT mask)

+{

+    (void) hglrcSrc; (void) hglrcDst; (void) mask;

+    return(FALSE);

+}

+

+WINGDIAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC hdc,

+						 int iLayerPlane)

+{

+    SetLastError(0);

+    if (iLayerPlane == 0)

+        return wglCreateContext( hdc );

+    return(NULL);

+}

+

+

+WINGDIAPI BOOL GLAPIENTRY wglUseFontBitmapsW(HDC hdc,

+					     DWORD first,

+					     DWORD count,

+					     DWORD listBase)

+{

+    (void) hdc; (void) first; (void) count; (void) listBase;

+    return FALSE;

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglUseFontOutlinesA(HDC hdc,

+					      DWORD first,

+					      DWORD count,

+					      DWORD listBase,

+					      FLOAT deviation,

+					      FLOAT extrusion,

+					      int format,

+					      LPGLYPHMETRICSFLOAT lpgmf)

+{

+    (void) hdc; (void) first; (void) count;

+    (void) listBase; (void) deviation; (void) extrusion; (void) format;

+    (void) lpgmf;

+    SetLastError(0);

+    return(FALSE);

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglUseFontOutlinesW(HDC hdc,

+					      DWORD first,

+					      DWORD count,

+					      DWORD listBase,

+					      FLOAT deviation,

+					      FLOAT extrusion,

+					      int format,

+					      LPGLYPHMETRICSFLOAT lpgmf)

+{

+    (void) hdc; (void) first; (void) count;

+    (void) listBase; (void) deviation; (void) extrusion; (void) format;

+    (void) lpgmf;

+    SetLastError(0);

+    return(FALSE);

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglDescribeLayerPlane(HDC hdc,

+						int iPixelFormat,

+						int iLayerPlane,

+						UINT nBytes,

+						LPLAYERPLANEDESCRIPTOR plpd)

+{

+    (void) hdc; (void) iPixelFormat; (void) iLayerPlane; 

+    (void) nBytes; (void) plpd;

+    SetLastError(0);

+    return(FALSE);

+}

+

+WINGDIAPI int GLAPIENTRY wglSetLayerPaletteEntries(HDC hdc,

+						   int iLayerPlane,

+						   int iStart,

+						   int cEntries,

+						   CONST COLORREF *pcr)

+{

+    (void) hdc; (void) iLayerPlane; (void) iStart; 

+    (void) cEntries; (void) pcr;

+    SetLastError(0);

+    return(0);

+}

+

+WINGDIAPI int GLAPIENTRY wglGetLayerPaletteEntries(HDC hdc,

+						   int iLayerPlane,

+						   int iStart,

+						   int cEntries,

+						   COLORREF *pcr)

+{

+    (void) hdc; (void) iLayerPlane; (void) iStart; (void) cEntries; (void) pcr;

+    SetLastError(0);

+    return(0);

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglRealizeLayerPalette(HDC hdc,

+						 int iLayerPlane,

+						 BOOL bRealize)

+{

+    (void) hdc; (void) iLayerPlane; (void) bRealize;

+    SetLastError(0);

+    return(FALSE);

+}

+

+WINGDIAPI BOOL GLAPIENTRY wglSwapLayerBuffers(HDC hdc,

+					      UINT fuPlanes)

+{

+    (void) hdc; (void) fuPlanes;

+    SetLastError(0);

+    return(FALSE);

+}

+

+WINGDIAPI const char * GLAPIENTRY wglGetExtensionsStringARB(HDC hdc)

+{

+    return "WGL_ARB_extensions_string";

+}

diff --git a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
index 1a13e9f5c..47580c4e9 100644
--- a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
@@ -5,12 +5,13 @@
 

 #include "wmesadef.h"

 #include "colors.h"

-#include <GL/wmesa.h>

+#include "GL/wmesa.h"

 #include <winuser.h>

-#include "context.h"

-#include "extensions.h"

-#include "framebuffer.h"

-#include "renderbuffer.h"

+#include "main/context.h"

+#include "main/extensions.h"

+#include "main/framebuffer.h"

+#include "main/renderbuffer.h"

+#include "main/macros.h"

 #include "drivers/common/driverfuncs.h"

 #include "drivers/common/meta.h"

 #include "vbo/vbo.h"

@@ -29,7 +30,7 @@ static WMesaFramebuffer FirstFramebuffer = NULL;
  * Create a new WMesaFramebuffer object which will correspond to the

  * given HDC (Window handle).

  */

-WMesaFramebuffer

+static WMesaFramebuffer

 wmesa_new_framebuffer(HDC hdc, struct gl_config *visual)

 {

     WMesaFramebuffer pwfb

@@ -47,7 +48,7 @@ wmesa_new_framebuffer(HDC hdc, struct gl_config *visual)
 /**

  * Given an hdc, free the corresponding WMesaFramebuffer

  */

-void

+static void

 wmesa_free_framebuffer(HDC hdc)

 {

     WMesaFramebuffer pwfb, prev;

@@ -70,7 +71,7 @@ wmesa_free_framebuffer(HDC hdc)
 /**

  * Given an hdc, return the corresponding WMesaFramebuffer

  */

-WMesaFramebuffer

+static WMesaFramebuffer

 wmesa_lookup_framebuffer(HDC hdc)

 {

     WMesaFramebuffer pwfb;

@@ -146,9 +147,8 @@ static void wmSetPixelFormat(WMesaFramebuffer pwfb, HDC hDC)
  * We write into this memory with the span routines and then blit it

  * to the window on a buffer swap.

  */

-BOOL wmCreateBackingStore(WMesaFramebuffer pwfb, long lxSize, long lySize)

+static BOOL wmCreateBackingStore(WMesaFramebuffer pwfb, long lxSize, long lySize)

 {

-    HDC          hdc = pwfb->hDC;

     LPBITMAPINFO pbmi = &(pwfb->bmi);

     HDC          hic;

 

@@ -185,7 +185,7 @@ BOOL wmCreateBackingStore(WMesaFramebuffer pwfb, long lxSize, long lySize)
 }

 

 

-static wmDeleteBackingStore(WMesaFramebuffer pwfb)

+static void wmDeleteBackingStore(WMesaFramebuffer pwfb)

 {

     if (pwfb->hbmDIB) {

 	SelectObject(pwfb->dib_hDC, pwfb->hOldBitmap);

@@ -226,7 +226,6 @@ wmesa_get_buffer_size(struct gl_framebuffer *buffer, GLuint *width, GLuint *heig
 

 static void wmesa_flush(struct gl_context *ctx)

 {

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->WinSysDrawBuffer);

 

     if (ctx->Visual.doubleBufferMode == 1) {

@@ -253,9 +252,7 @@ static void wmesa_flush(struct gl_context *ctx)
 static void clear_color(struct gl_context *ctx, const GLfloat color[4])

 {

     WMesaContext pwc = wmesa_context(ctx);

-    WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     GLubyte col[3];

-    UINT    bytesPerPixel = pwfb->cColorBits / 8; 

 

     CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);

     CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);

@@ -447,21 +444,15 @@ static void clear(struct gl_context *ctx, GLbitfield mask)
  **/

 

 /* Write a horizontal span of RGBA color pixels with a boolean mask. */

-static void write_rgba_span_front(const struct gl_context *ctx, 

-				   struct gl_renderbuffer *rb, 

-				   GLuint n, GLint x, GLint y,

-				   const GLubyte rgba[][4], 

-				   const GLubyte mask[] )

+static void write_rgba_span_front(struct gl_context *ctx, 

+				  struct gl_renderbuffer *rb, 

+				  GLuint n, GLint x, GLint y,

+				  const void *values, 

+				  const GLubyte *mask)

 {

+   const GLubyte (*rgba)[4] = (const GLubyte (*)[4])values;

    WMesaContext pwc = wmesa_context(ctx);

    WMesaFramebuffer pwfb = wmesa_lookup_framebuffer(pwc->hDC);

-   CONST BITMAPINFO bmi=

-   {

-      {

-         sizeof(BITMAPINFOHEADER),

-         n, 1, 1, 32, BI_RGB, 0, 1, 1, 0, 0

-      }

-   };

    HBITMAP bmp=0;

    HDC mdc=0;

    typedef union

@@ -534,12 +525,13 @@ static void write_rgba_span_front(const struct gl_context *ctx,
 }

 

 /* Write a horizontal span of RGB color pixels with a boolean mask. */

-static void write_rgb_span_front(const struct gl_context *ctx, 

-				  struct gl_renderbuffer *rb, 

-				  GLuint n, GLint x, GLint y,

-				  const GLubyte rgb[][3], 

-				  const GLubyte mask[] )

+static void write_rgb_span_front(struct gl_context *ctx, 

+				 struct gl_renderbuffer *rb, 

+				 GLuint n, GLint x, GLint y,

+				 const void *values, 

+				 const GLubyte *mask)

 {

+    const GLubyte (*rgb)[3] = (const GLubyte (*)[3])values;

     WMesaContext pwc = wmesa_context(ctx);

     GLuint i;

     

@@ -563,12 +555,13 @@ static void write_rgb_span_front(const struct gl_context *ctx,
  * Write a horizontal span of pixels with a boolean mask.  The current color

  * is used for all pixels.

  */

-static void write_mono_rgba_span_front(const struct gl_context *ctx, 

-					struct gl_renderbuffer *rb,

-					GLuint n, GLint x, GLint y,

-					const GLchan color[4], 

-					const GLubyte mask[])

+static void write_mono_rgba_span_front(struct gl_context *ctx, 

+                                       struct gl_renderbuffer *rb,

+                                       GLuint n, GLint x, GLint y,

+                                       const void *value, 

+                                       const GLubyte *mask)

 {

+    const GLchan *color = (const GLchan *)value;

     GLuint i;

     WMesaContext pwc = wmesa_context(ctx);

     COLORREF colorref;

@@ -588,13 +581,14 @@ static void write_mono_rgba_span_front(const struct gl_context *ctx,
 }

 

 /* Write an array of RGBA pixels with a boolean mask. */

-static void write_rgba_pixels_front(const struct gl_context *ctx, 

-				     struct gl_renderbuffer *rb,

-				     GLuint n, 

-				     const GLint x[], const GLint y[],

-				     const GLubyte rgba[][4], 

-				     const GLubyte mask[] )

+static void write_rgba_pixels_front(struct gl_context *ctx, 

+                                    struct gl_renderbuffer *rb,

+                                    GLuint n, 

+                                    const GLint x[], const GLint y[],

+                                    const void *values, 

+                                    const GLubyte *mask)

 {

+    const GLubyte (*rgba)[4] = (const GLubyte (*)[4])values;

     GLuint i;

     WMesaContext pwc = wmesa_context(ctx);

     (void) ctx;

@@ -611,13 +605,14 @@ static void write_rgba_pixels_front(const struct gl_context *ctx,
  * Write an array of pixels with a boolean mask.  The current color

  * is used for all pixels.

  */

-static void write_mono_rgba_pixels_front(const struct gl_context *ctx, 

-					  struct gl_renderbuffer *rb,

-					  GLuint n,

-					  const GLint x[], const GLint y[],

-					  const GLchan color[4],

-					  const GLubyte mask[] )

+static void write_mono_rgba_pixels_front(struct gl_context *ctx, 

+                                         struct gl_renderbuffer *rb,

+                                         GLuint n,

+                                         const GLint x[], const GLint y[],

+                                         const void *value,

+                                         const GLubyte *mask)

 {

+    const GLchan *color = (const GLchan *)value;

     GLuint i;

     WMesaContext pwc = wmesa_context(ctx);

     COLORREF colorref;

@@ -629,11 +624,12 @@ static void write_mono_rgba_pixels_front(const struct gl_context *ctx,
 }

 

 /* Read a horizontal span of color pixels. */

-static void read_rgba_span_front(const struct gl_context *ctx, 

-				  struct gl_renderbuffer *rb,

-				  GLuint n, GLint x, GLint y,

-				  GLubyte rgba[][4] )

+static void read_rgba_span_front(struct gl_context *ctx, 

+                                 struct gl_renderbuffer *rb,

+                                 GLuint n, GLint x, GLint y,

+                                 void *values)

 {

+    GLubyte (*rgba)[4] = (GLubyte (*)[4])values;

     WMesaContext pwc = wmesa_context(ctx);

     GLuint i;

     COLORREF Color;

@@ -649,11 +645,12 @@ static void read_rgba_span_front(const struct gl_context *ctx,
 

 

 /* Read an array of color pixels. */

-static void read_rgba_pixels_front(const struct gl_context *ctx, 

-				    struct gl_renderbuffer *rb,

-				    GLuint n, const GLint x[], const GLint y[],

-				    GLubyte rgba[][4])

+static void read_rgba_pixels_front(struct gl_context *ctx, 

+                                   struct gl_renderbuffer *rb,

+                                   GLuint n, const GLint x[], const GLint y[],

+                                   void *values)

 {

+    GLubyte (*rgba)[4] = (GLubyte (*)[4])values;

     WMesaContext pwc = wmesa_context(ctx);

     GLuint i;

     COLORREF Color;

@@ -678,13 +675,13 @@ LPDWORD lpdw = ((LPDWORD)((pwc)->pbPixels + (pwc)->ScanWidth * (y)) + (x)); \
 

 

 /* Write a horizontal span of RGBA color pixels with a boolean mask. */

-static void write_rgba_span_32(const struct gl_context *ctx, 

+static void write_rgba_span_32(struct gl_context *ctx, 

 			       struct gl_renderbuffer *rb, 

 			       GLuint n, GLint x, GLint y,

-			       const GLubyte rgba[][4], 

-			       const GLubyte mask[] )

+			       const void *values, 

+			       const GLubyte *mask)

 {

-    WMesaContext pwc = wmesa_context(ctx);

+    const GLubyte (*rgba)[4] = (const GLubyte (*)[4])values;

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     GLuint i;

     LPDWORD lpdw;

@@ -708,13 +705,13 @@ static void write_rgba_span_32(const struct gl_context *ctx,
 

 

 /* Write a horizontal span of RGB color pixels with a boolean mask. */

-static void write_rgb_span_32(const struct gl_context *ctx, 

+static void write_rgb_span_32(struct gl_context *ctx, 

 			      struct gl_renderbuffer *rb, 

 			      GLuint n, GLint x, GLint y,

-			      const GLubyte rgb[][3], 

-			      const GLubyte mask[] )

+			      const void *values, 

+			      const GLubyte *mask)

 {

-    WMesaContext pwc = wmesa_context(ctx);

+    const GLubyte (*rgb)[3] = (const GLubyte (*)[3])values;

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     GLuint i;

     LPDWORD lpdw;

@@ -740,16 +737,16 @@ static void write_rgb_span_32(const struct gl_context *ctx,
  * Write a horizontal span of pixels with a boolean mask.  The current color

  * is used for all pixels.

  */

-static void write_mono_rgba_span_32(const struct gl_context *ctx, 

+static void write_mono_rgba_span_32(struct gl_context *ctx, 

 				    struct gl_renderbuffer *rb,

 				    GLuint n, GLint x, GLint y,

-				    const GLchan color[4], 

-				    const GLubyte mask[])

+				    const void *value, 

+				    const GLubyte *mask)

 {

+    const GLchan *color = (const GLchan *)value;

     LPDWORD lpdw;

     DWORD pixel;

     GLuint i;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     lpdw = ((LPDWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

     y=FLIP(y);

@@ -766,14 +763,14 @@ static void write_mono_rgba_span_32(const struct gl_context *ctx,
 }

 

 /* Write an array of RGBA pixels with a boolean mask. */

-static void write_rgba_pixels_32(const struct gl_context *ctx, 

+static void write_rgba_pixels_32(struct gl_context *ctx, 

 				 struct gl_renderbuffer *rb,

 				 GLuint n, const GLint x[], const GLint y[],

-				 const GLubyte rgba[][4], 

-				 const GLubyte mask[])

+				 const void *values, 

+				 const GLubyte *mask)

 {

+    const GLubyte (*rgba)[4] = (const GLubyte (*)[4])values;

     GLuint i;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     for (i=0; i<n; i++)

 	if (mask[i])

@@ -785,15 +782,15 @@ static void write_rgba_pixels_32(const struct gl_context *ctx,
  * Write an array of pixels with a boolean mask.  The current color

  * is used for all pixels.

  */

-static void write_mono_rgba_pixels_32(const struct gl_context *ctx, 

+static void write_mono_rgba_pixels_32(struct gl_context *ctx, 

 				      struct gl_renderbuffer *rb,

 				      GLuint n,

 				      const GLint x[], const GLint y[],

-				      const GLchan color[4],

-				      const GLubyte mask[])

+				      const void *value,

+				      const GLubyte *mask)

 {

+    const GLchan *color = (const GLchan *)value;

     GLuint i;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     for (i=0; i<n; i++)

 	if (mask[i])

@@ -802,15 +799,15 @@ static void write_mono_rgba_pixels_32(const struct gl_context *ctx,
 }

 

 /* Read a horizontal span of color pixels. */

-static void read_rgba_span_32(const struct gl_context *ctx, 

+static void read_rgba_span_32(struct gl_context *ctx, 

 			      struct gl_renderbuffer *rb,

 			      GLuint n, GLint x, GLint y,

-			      GLubyte rgba[][4] )

+			      void *values)

 {

+    GLubyte (*rgba)[4] = (GLubyte (*)[4])values;

     GLuint i;

     DWORD pixel;

     LPDWORD lpdw;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     

     y = FLIP(y);

@@ -826,15 +823,15 @@ static void read_rgba_span_32(const struct gl_context *ctx,
 

 

 /* Read an array of color pixels. */

-static void read_rgba_pixels_32(const struct gl_context *ctx, 

+static void read_rgba_pixels_32(struct gl_context *ctx, 

 				struct gl_renderbuffer *rb,

 				GLuint n, const GLint x[], const GLint y[],

-				GLubyte rgba[][4])

+				void *values)

 {

+    GLubyte (*rgba)[4] = (GLubyte (*)[4])values;

     GLuint i;

     DWORD pixel;

     LPDWORD lpdw;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

 

     for (i=0; i<n; i++) {

@@ -860,13 +857,13 @@ lpb[1] = (g); \
 lpb[2] = (r); }

 

 /* Write a horizontal span of RGBA color pixels with a boolean mask. */

-static void write_rgba_span_24(const struct gl_context *ctx, 

+static void write_rgba_span_24(struct gl_context *ctx, 

 			       struct gl_renderbuffer *rb, 

 			       GLuint n, GLint x, GLint y,

-			       const GLubyte rgba[][4], 

-			       const GLubyte mask[] )

+			       const void *values, 

+			       const GLubyte *mask)

 {

-    WMesaContext pwc = wmesa_context(ctx);

+    const GLubyte (*rgba)[4] = (const GLubyte (*)[4])values;

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     GLuint i;

     LPBYTE lpb;

@@ -894,13 +891,13 @@ static void write_rgba_span_24(const struct gl_context *ctx,
 

 

 /* Write a horizontal span of RGB color pixels with a boolean mask. */

-static void write_rgb_span_24(const struct gl_context *ctx, 

+static void write_rgb_span_24(struct gl_context *ctx, 

 			      struct gl_renderbuffer *rb, 

 			      GLuint n, GLint x, GLint y,

-			      const GLubyte rgb[][3], 

-			      const GLubyte mask[] )

+			      const void *values, 

+			      const GLubyte *mask)

 {

-    WMesaContext pwc = wmesa_context(ctx);

+    const GLubyte (*rgb)[3] = (const GLubyte (*)[3])values;

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     GLuint i;

     LPBYTE lpb;

@@ -930,15 +927,15 @@ static void write_rgb_span_24(const struct gl_context *ctx,
  * Write a horizontal span of pixels with a boolean mask.  The current color

  * is used for all pixels.

  */

-static void write_mono_rgba_span_24(const struct gl_context *ctx, 

+static void write_mono_rgba_span_24(struct gl_context *ctx, 

 				    struct gl_renderbuffer *rb,

 				    GLuint n, GLint x, GLint y,

-				    const GLchan color[4], 

-				    const GLubyte mask[])

+				    const void *value, 

+				    const GLubyte *mask)

 {

+    const GLchan *color = (const GLchan *)value;

     LPBYTE lpb;

     GLuint i;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     lpb = ((LPBYTE)(pwfb->pbPixels + pwfb->ScanWidth * y)) + (3 * x);

     y=FLIP(y);

@@ -959,14 +956,14 @@ static void write_mono_rgba_span_24(const struct gl_context *ctx,
 }

 

 /* Write an array of RGBA pixels with a boolean mask. */

-static void write_rgba_pixels_24(const struct gl_context *ctx, 

+static void write_rgba_pixels_24(struct gl_context *ctx, 

 				 struct gl_renderbuffer *rb,

 				 GLuint n, const GLint x[], const GLint y[],

-				 const GLubyte rgba[][4], 

-				 const GLubyte mask[])

+				 const void *values, 

+				 const GLubyte *mask)

 {

+    const GLubyte (*rgba)[4] = (const GLubyte (*)[4])values;

     GLuint i;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     for (i=0; i<n; i++)

 	if (mask[i])

@@ -978,15 +975,15 @@ static void write_rgba_pixels_24(const struct gl_context *ctx,
  * Write an array of pixels with a boolean mask.  The current color

  * is used for all pixels.

  */

-static void write_mono_rgba_pixels_24(const struct gl_context *ctx, 

+static void write_mono_rgba_pixels_24(struct gl_context *ctx, 

 				      struct gl_renderbuffer *rb,

 				      GLuint n,

 				      const GLint x[], const GLint y[],

-				      const GLchan color[4],

-				      const GLubyte mask[])

+				      const void *value,

+				      const GLubyte *mask)

 {

+    const GLchan *color = (const GLchan *)value;

     GLuint i;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     for (i=0; i<n; i++)

 	if (mask[i])

@@ -995,14 +992,14 @@ static void write_mono_rgba_pixels_24(const struct gl_context *ctx,
 }

 

 /* Read a horizontal span of color pixels. */

-static void read_rgba_span_24(const struct gl_context *ctx, 

+static void read_rgba_span_24(struct gl_context *ctx, 

 			      struct gl_renderbuffer *rb,

 			      GLuint n, GLint x, GLint y,

-			      GLubyte rgba[][4] )

+			      void *values)

 {

+    GLubyte (*rgba)[4] = (GLubyte (*)[4])values;

     GLuint i;

     LPBYTE lpb;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     

     y = FLIP(y);

@@ -1017,14 +1014,14 @@ static void read_rgba_span_24(const struct gl_context *ctx,
 

 

 /* Read an array of color pixels. */

-static void read_rgba_pixels_24(const struct gl_context *ctx, 

+static void read_rgba_pixels_24(struct gl_context *ctx, 

 				struct gl_renderbuffer *rb,

 				GLuint n, const GLint x[], const GLint y[],

-				GLubyte rgba[][4])

+				void *values)

 {

+    GLubyte (*rgba)[4] = (GLubyte (*)[4])values;

     GLuint i;

     LPBYTE lpb;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

 

     for (i=0; i<n; i++) {

@@ -1049,13 +1046,13 @@ LPWORD lpw = ((LPWORD)((pwc)->pbPixels + (pwc)->ScanWidth * (y)) + (x)); \
 

 

 /* Write a horizontal span of RGBA color pixels with a boolean mask. */

-static void write_rgba_span_16(const struct gl_context *ctx, 

+static void write_rgba_span_16(struct gl_context *ctx, 

 			       struct gl_renderbuffer *rb, 

 			       GLuint n, GLint x, GLint y,

-			       const GLubyte rgba[][4], 

-			       const GLubyte mask[] )

+			       const void *values, 

+			       const GLubyte *mask)

 {

-    WMesaContext pwc = wmesa_context(ctx);

+    const GLubyte (*rgba)[4] = (const GLubyte (*)[4])values;

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     GLuint i;

     LPWORD lpw;

@@ -1079,13 +1076,13 @@ static void write_rgba_span_16(const struct gl_context *ctx,
 

 

 /* Write a horizontal span of RGB color pixels with a boolean mask. */

-static void write_rgb_span_16(const struct gl_context *ctx, 

+static void write_rgb_span_16(struct gl_context *ctx, 

 			      struct gl_renderbuffer *rb, 

 			      GLuint n, GLint x, GLint y,

-			      const GLubyte rgb[][3], 

-			      const GLubyte mask[] )

+			      const void *values, 

+			      const GLubyte *mask)

 {

-    WMesaContext pwc = wmesa_context(ctx);

+    const GLubyte (*rgb)[3] = (const GLubyte (*)[3])values;

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     GLuint i;

     LPWORD lpw;

@@ -1111,16 +1108,16 @@ static void write_rgb_span_16(const struct gl_context *ctx,
  * Write a horizontal span of pixels with a boolean mask.  The current color

  * is used for all pixels.

  */

-static void write_mono_rgba_span_16(const struct gl_context *ctx, 

+static void write_mono_rgba_span_16(struct gl_context *ctx, 

 				    struct gl_renderbuffer *rb,

 				    GLuint n, GLint x, GLint y,

-				    const GLchan color[4], 

-				    const GLubyte mask[])

+				    const void *value, 

+				    const GLubyte *mask)

 {

+    const GLchan *color = (const GLchan *)value;

     LPWORD lpw;

     WORD pixel;

     GLuint i;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     (void) ctx;

     lpw = ((LPWORD)(pwfb->pbPixels + pwfb->ScanWidth * y)) + x;

@@ -1138,14 +1135,14 @@ static void write_mono_rgba_span_16(const struct gl_context *ctx,
 }

 

 /* Write an array of RGBA pixels with a boolean mask. */

-static void write_rgba_pixels_16(const struct gl_context *ctx, 

+static void write_rgba_pixels_16(struct gl_context *ctx, 

 				 struct gl_renderbuffer *rb,

 				 GLuint n, const GLint x[], const GLint y[],

-				 const GLubyte rgba[][4], 

-				 const GLubyte mask[])

+				 const void *values, 

+				 const GLubyte *mask)

 {

+    const GLubyte (*rgba)[4] = (const GLubyte (*)[4])values;

     GLuint i;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     (void) ctx;

     for (i=0; i<n; i++)

@@ -1158,15 +1155,15 @@ static void write_rgba_pixels_16(const struct gl_context *ctx,
  * Write an array of pixels with a boolean mask.  The current color

  * is used for all pixels.

  */

-static void write_mono_rgba_pixels_16(const struct gl_context *ctx, 

+static void write_mono_rgba_pixels_16(struct gl_context *ctx, 

 				      struct gl_renderbuffer *rb,

 				      GLuint n,

 				      const GLint x[], const GLint y[],

-				      const GLchan color[4],

-				      const GLubyte mask[])

+				      const void *value,

+				      const GLubyte *mask)

 {

+    const GLchan *color = (const GLchan *)value;

     GLuint i;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     (void) ctx;

     for (i=0; i<n; i++)

@@ -1176,14 +1173,14 @@ static void write_mono_rgba_pixels_16(const struct gl_context *ctx,
 }

 

 /* Read a horizontal span of color pixels. */

-static void read_rgba_span_16(const struct gl_context *ctx, 

+static void read_rgba_span_16(struct gl_context *ctx, 

 			      struct gl_renderbuffer *rb,

 			      GLuint n, GLint x, GLint y,

-			      GLubyte rgba[][4] )

+			      void *values)

 {

+    GLubyte (*rgba)[4] = (GLubyte (*)[4])values;

     GLuint i, pixel;

     LPWORD lpw;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

     

     y = FLIP(y);

@@ -1200,14 +1197,14 @@ static void read_rgba_span_16(const struct gl_context *ctx,
 

 

 /* Read an array of color pixels. */

-static void read_rgba_pixels_16(const struct gl_context *ctx, 

+static void read_rgba_pixels_16(struct gl_context *ctx, 

 				struct gl_renderbuffer *rb,

 				GLuint n, const GLint x[], const GLint y[],

-				GLubyte rgba[][4])

+				void *values)

 {

+    GLubyte (*rgba)[4] = (GLubyte (*)[4])values;

     GLuint i, pixel;

     LPWORD lpw;

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(ctx->DrawBuffer);

 

     for (i=0; i<n; i++) {

@@ -1260,8 +1257,9 @@ wmesa_renderbuffer_storage(struct gl_context *ctx,
  * Plug in the Get/PutRow/Values functions for a renderbuffer depending

  * on if we're drawing to the front or back color buffer.

  */

-void wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,

-                                  int cColorBits, int double_buffer)

+static void

+wmesa_set_renderbuffer_funcs(struct gl_renderbuffer *rb, int pixelformat,

+                             int cColorBits, int double_buffer)

 {

     if (double_buffer) {

         /* back buffer */

@@ -1323,7 +1321,6 @@ static void
 wmesa_resize_buffers(struct gl_context *ctx, struct gl_framebuffer *buffer,

                      GLuint width, GLuint height)

 {

-    WMesaContext pwc = wmesa_context(ctx);

     WMesaFramebuffer pwfb = wmesa_framebuffer(buffer);

 

     if (pwfb->Base.Width != width || pwfb->Base.Height != height) {

@@ -1352,7 +1349,6 @@ static void wmesa_viewport(struct gl_context *ctx,
 			   GLint x, GLint y, 

 			   GLsizei width, GLsizei height)

 {

-    WMesaContext pwc = wmesa_context(ctx);

     GLuint new_width, new_height;

 

     wmesa_get_buffer_size(ctx->WinSysDrawBuffer, &new_width, &new_height);

@@ -1552,7 +1548,7 @@ void WMesaDestroyContext( WMesaContext pwc )
 /**

  * Create a new color renderbuffer.

  */

-struct gl_renderbuffer *

+static struct gl_renderbuffer *

 wmesa_new_renderbuffer(void)

 {

     struct gl_renderbuffer *rb = CALLOC_STRUCT(gl_renderbuffer);

diff --git a/mesalib/src/mesa/drivers/windows/gdi/wmesadef.h b/mesalib/src/mesa/drivers/windows/gdi/wmesadef.h
index 530673373..344f9488b 100644
--- a/mesalib/src/mesa/drivers/windows/gdi/wmesadef.h
+++ b/mesalib/src/mesa/drivers/windows/gdi/wmesadef.h
@@ -1,9 +1,9 @@
 #ifndef WMESADEF_H

 #define WMESADEF_H

-#ifdef __MINGW32__

+

 #include <windows.h>

-#endif

-#include "context.h"

+

+#include "main/context.h"

 

 

 /**