Handle API and dispatch table changes that removed a bunch of extension entry points.

2 files changed, 50 insertions, 114 deletions

diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index 507ab98349f..f0b275730ca 100644
--- a/src/mesa/drivers/windows/gdi/mesa.def
+++ b/src/mesa/drivers/windows/gdi/mesa.def
@@ -500,8 +500,6 @@ EXPORTS
 	glPolygonOffsetEXT
 	glTexImage3DEXT
 	glTexSubImage3DEXT
-	glGetTexFilterFuncSGIS
-	glTexFilterFuncSGIS
 	glTexSubImage1DEXT
 	glTexSubImage2DEXT
 	glCopyTexImage1DEXT
@@ -509,57 +507,12 @@ EXPORTS
 	glCopyTexSubImage1DEXT
 	glCopyTexSubImage2DEXT
 	glCopyTexSubImage3DEXT
-	glGetHistogramEXT
-	glGetHistogramParameterfvEXT
-	glGetHistogramParameterivEXT
-	glGetMinmaxEXT
-	glGetMinmaxParameterfvEXT
-	glGetMinmaxParameterivEXT
-	glHistogramEXT
-	glMinmaxEXT
-	glResetHistogramEXT
-	glResetMinmaxEXT
-	glConvolutionFilter1DEXT
-	glConvolutionFilter2DEXT
-	glConvolutionParameterfEXT
-	glConvolutionParameterfvEXT
-	glConvolutionParameteriEXT
-	glConvolutionParameterivEXT
-	glCopyConvolutionFilter1DEXT
-	glCopyConvolutionFilter2DEXT
-	glGetConvolutionFilterEXT
-	glGetConvolutionParameterfvEXT
-	glGetConvolutionParameterivEXT
-	glGetSeparableFilterEXT
-	glSeparableFilter2DEXT
-	glColorTableSGI
-	glColorTableParameterfvSGI
-	glColorTableParameterivSGI
-	glCopyColorTableSGI
-	glGetColorTableSGI
-	glGetColorTableParameterfvSGI
-	glGetColorTableParameterivSGI
-	glPixelTexGenSGIX
-	glPixelTexGenParameteriSGIS
-	glPixelTexGenParameterivSGIS
-	glPixelTexGenParameterfSGIS
-	glPixelTexGenParameterfvSGIS
-	glGetPixelTexGenParameterivSGIS
-	glGetPixelTexGenParameterfvSGIS
-	glTexImage4DSGIS
-	glTexSubImage4DSGIS
 	glAreTexturesResidentEXT
 	glBindTextureEXT
 	glDeleteTexturesEXT
 	glGenTexturesEXT
 	glIsTextureEXT
 	glPrioritizeTexturesEXT
-	glDetailTexFuncSGIS
-	glGetDetailTexFuncSGIS
-	glSharpenTexFuncSGIS
-	glGetSharpenTexFuncSGIS
-	glSampleMaskSGIS
-	glSamplePatternSGIS
 	glArrayElementEXT
 	glColorPointerEXT
 	glDrawArraysEXT
@@ -570,63 +523,16 @@ EXPORTS
 	glTexCoordPointerEXT
 	glVertexPointerEXT
 	glBlendEquationEXT
-	glSpriteParameterfSGIX
-	glSpriteParameterfvSGIX
-	glSpriteParameteriSGIX
-	glSpriteParameterivSGIX
 	glPointParameterfEXT
 	glPointParameterfvEXT
 	glPointParameterfARB
 	glPointParameterfvARB
-	glPointParameterfSGIS
-	glPointParameterfvSGIS
-	glGetInstrumentsSGIX
-	glInstrumentsBufferSGIX
-	glPollInstrumentsSGIX
-	glReadInstrumentsSGIX
-	glStartInstrumentsSGIX
-	glStopInstrumentsSGIX
-	glFrameZoomSGIX
-	glTagSampleBufferSGIX
-	glReferencePlaneSGIX
-	glFlushRasterSGIX
-	glColorSubTableEXT
-	glCopyColorSubTableEXT
-	glHintPGI
 	glColorTableEXT
 	glGetColorTableEXT
 	glGetColorTableParameterivEXT
 	glGetColorTableParameterfvEXT
-	glGetListParameterfvSGIX
-	glGetListParameterivSGIX
-	glListParameterfSGIX
-	glListParameterfvSGIX
-	glListParameteriSGIX
-	glListParameterivSGIX
-	glIndexMaterialEXT
-	glIndexFuncEXT
 	glLockArraysEXT
 	glUnlockArraysEXT
-	glCullParameterdvEXT
-	glCullParameterfvEXT
-	glFragmentColorMaterialSGIX
-	glFragmentLightfSGIX
-	glFragmentLightfvSGIX
-	glFragmentLightiSGIX
-	glFragmentLightivSGIX
-	glFragmentLightModelfSGIX
-	glFragmentLightModelfvSGIX
-	glFragmentLightModeliSGIX
-	glFragmentLightModelivSGIX
-	glFragmentMaterialfSGIX
-	glFragmentMaterialfvSGIX
-	glFragmentMaterialiSGIX
-	glFragmentMaterialivSGIX
-	glGetFragmentLightfvSGIX
-	glGetFragmentLightivSGIX
-	glGetFragmentMaterialfvSGIX
-	glGetFragmentMaterialivSGIX
-	glLightEnviSGIX
 	glDrawRangeElementsEXT
 	glSecondaryColor3bEXT
 	glSecondaryColor3bvEXT
@@ -653,10 +559,6 @@ EXPORTS
 	glFogCoorddvEXT
 	glFogCoordPointerEXT
 	glBlendFuncSeparateEXT
-	glBlendFuncSeparateINGR
-	glVertexWeightfEXT
-	glVertexWeightfvEXT
-	glVertexWeightPointerEXT
 	glFlushVertexArrayRangeNV
 	glVertexArrayRangeNV
 	glCombinerParameterfvNV
@@ -697,11 +599,6 @@ EXPORTS
 	glWindowPos4ivMESA
 	glWindowPos4sMESA
 	glWindowPos4svMESA
-	glMultiModeDrawArraysIBM
-	glMultiModeDrawElementsIBM
-	glTbufferMask3DFX
-	glSampleMaskEXT
-	glSamplePatternEXT
 	glWindowPos2dARB
 	glWindowPos2fARB
 	glWindowPos2iARB
@@ -784,7 +681,6 @@ EXPORTS
 	glVertexAttribs4ubvNV
 	glPointParameteriNV
 	glPointParameterivNV
-	glBlendFuncSeparate
 	glFogCoordf
 	glFogCoordfv
 	glFogCoordd
@@ -829,14 +725,6 @@ EXPORTS
 	glWindowPos3iv
 	glWindowPos3s
 	glWindowPos3sv
-	glActiveStencilFaceEXT
-	glDeleteFencesNV
-	glGenFencesNV
-	glIsFenceNV
-	glTestFenceNV
-	glGetFenceivNV
-	glFinishFenceNV
-	glSetFenceNV
 	glVertexAttrib1sARB
 	glVertexAttrib1fARB
 	glVertexAttrib1dARB
@@ -916,7 +804,6 @@ EXPORTS
 	glIsBufferARB
 	glMapBufferARB
 	glUnmapBufferARB
-	glDepthBoundsEXT
 	glGenQueriesARB
 	glDeleteQueriesARB
 	glIsQueryARB
@@ -1069,7 +956,6 @@ EXPORTS
 	_swrast_DestroyContext
 	_swrast_InvalidateState
 	_swrast_ReadPixels
-;	_swrast_zbuffer_address
 	_swsetup_Wakeup
 	_swsetup_CreateContext
 	_swsetup_DestroyContext
diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 8dbd6f836a5..78e3d9ec8d1 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1397,3 +1397,53 @@ void WMesaSwapBuffers( HDC hdc )
         _mesa_problem(NULL, "wmesa: can't swap non-current window");
     }
 }
+
+/* This is hopefully a temporary hack to define some needed dispatch
+ * table entries.  Hopefully, I'll find a better solution.  The
+ * dispatch table generation scripts ought to be making these dummy
+ * stubs as well. */
+void gl_dispatch_stub_543(void){};
+void gl_dispatch_stub_544(void){};
+void gl_dispatch_stub_545(void){};
+void gl_dispatch_stub_546(void){};
+void gl_dispatch_stub_547(void){};
+void gl_dispatch_stub_548(void){};
+void gl_dispatch_stub_549(void){};
+void gl_dispatch_stub_550(void){};
+void gl_dispatch_stub_551(void){};
+void gl_dispatch_stub_552(void){};
+void gl_dispatch_stub_553(void){};
+void gl_dispatch_stub_554(void){};
+void gl_dispatch_stub_555(void){};
+void gl_dispatch_stub_556(void){};
+void gl_dispatch_stub_557(void){};
+void gl_dispatch_stub_558(void){};
+void gl_dispatch_stub_559(void){};
+void gl_dispatch_stub_560(void){};
+void gl_dispatch_stub_561(void){};
+void gl_dispatch_stub_565(void){};
+void gl_dispatch_stub_566(void){};
+void gl_dispatch_stub_577(void){};
+void gl_dispatch_stub_578(void){};
+void gl_dispatch_stub_603(void){};
+void gl_dispatch_stub_645(void){};
+void gl_dispatch_stub_646(void){};
+void gl_dispatch_stub_647(void){};
+void gl_dispatch_stub_648(void){};
+void gl_dispatch_stub_649(void){};
+void gl_dispatch_stub_650(void){};
+void gl_dispatch_stub_651(void){};
+void gl_dispatch_stub_652(void){};
+void gl_dispatch_stub_653(void){};
+void gl_dispatch_stub_734(void){};
+void gl_dispatch_stub_735(void){};
+void gl_dispatch_stub_736(void){};
+void gl_dispatch_stub_737(void){};
+void gl_dispatch_stub_738(void){};
+void gl_dispatch_stub_745(void){};
+void gl_dispatch_stub_746(void){};
+void gl_dispatch_stub_760(void){};
+void gl_dispatch_stub_761(void){};
+void gl_dispatch_stub_766(void){};
+void gl_dispatch_stub_767(void){};
+void gl_dispatch_stub_768(void){};