Synchronised mesa and glx

1 files changed, 1 insertions, 641 deletions

diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index a0ae2c142..a4125e3a5 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -41,12 +41,6 @@
  * named function in the specified dispatch table.
  */
 
-/* GLXEXT is defined when building the GLX extension in the xserver.
- */
-#if !defined(GLXEXT)
-#include "main/mfeatures.h"
-#endif
-
 #ifdef _MSC_VER
 #ifndef INLINE
 #define INLINE __inline
@@ -479,640 +473,8 @@
 #define _gloffset_MultiTexCoord4iv 405
 #define _gloffset_MultiTexCoord4s 406
 #define _gloffset_MultiTexCoord4sv 407
-
-#if !FEATURE_remap_table
-
-#define _gloffset_CompressedTexImage1D 408
-#define _gloffset_CompressedTexImage2D 409
-#define _gloffset_CompressedTexImage3D 410
-#define _gloffset_CompressedTexSubImage1D 411
-#define _gloffset_CompressedTexSubImage2D 412
-#define _gloffset_CompressedTexSubImage3D 413
-#define _gloffset_GetCompressedTexImage 414
-#define _gloffset_LoadTransposeMatrixd 415
-#define _gloffset_LoadTransposeMatrixf 416
-#define _gloffset_MultTransposeMatrixd 417
-#define _gloffset_MultTransposeMatrixf 418
-#define _gloffset_SampleCoverage 419
-#define _gloffset_BlendFuncSeparate 420
-#define _gloffset_FogCoordPointer 421
-#define _gloffset_FogCoordd 422
-#define _gloffset_FogCoorddv 423
-#define _gloffset_MultiDrawArrays 424
-#define _gloffset_PointParameterf 425
-#define _gloffset_PointParameterfv 426
-#define _gloffset_PointParameteri 427
-#define _gloffset_PointParameteriv 428
-#define _gloffset_SecondaryColor3b 429
-#define _gloffset_SecondaryColor3bv 430
-#define _gloffset_SecondaryColor3d 431
-#define _gloffset_SecondaryColor3dv 432
-#define _gloffset_SecondaryColor3i 433
-#define _gloffset_SecondaryColor3iv 434
-#define _gloffset_SecondaryColor3s 435
-#define _gloffset_SecondaryColor3sv 436
-#define _gloffset_SecondaryColor3ub 437
-#define _gloffset_SecondaryColor3ubv 438
-#define _gloffset_SecondaryColor3ui 439
-#define _gloffset_SecondaryColor3uiv 440
-#define _gloffset_SecondaryColor3us 441
-#define _gloffset_SecondaryColor3usv 442
-#define _gloffset_SecondaryColorPointer 443
-#define _gloffset_WindowPos2d 444
-#define _gloffset_WindowPos2dv 445
-#define _gloffset_WindowPos2f 446
-#define _gloffset_WindowPos2fv 447
-#define _gloffset_WindowPos2i 448
-#define _gloffset_WindowPos2iv 449
-#define _gloffset_WindowPos2s 450
-#define _gloffset_WindowPos2sv 451
-#define _gloffset_WindowPos3d 452
-#define _gloffset_WindowPos3dv 453
-#define _gloffset_WindowPos3f 454
-#define _gloffset_WindowPos3fv 455
-#define _gloffset_WindowPos3i 456
-#define _gloffset_WindowPos3iv 457
-#define _gloffset_WindowPos3s 458
-#define _gloffset_WindowPos3sv 459
-#define _gloffset_BeginQuery 460
-#define _gloffset_BindBuffer 461
-#define _gloffset_BufferData 462
-#define _gloffset_BufferSubData 463
-#define _gloffset_DeleteBuffers 464
-#define _gloffset_DeleteQueries 465
-#define _gloffset_EndQuery 466
-#define _gloffset_GenBuffers 467
-#define _gloffset_GenQueries 468
-#define _gloffset_GetBufferParameteriv 469
-#define _gloffset_GetBufferPointerv 470
-#define _gloffset_GetBufferSubData 471
-#define _gloffset_GetQueryObjectiv 472
-#define _gloffset_GetQueryObjectuiv 473
-#define _gloffset_GetQueryiv 474
-#define _gloffset_IsBuffer 475
-#define _gloffset_IsQuery 476
-#define _gloffset_MapBuffer 477
-#define _gloffset_UnmapBuffer 478
-#define _gloffset_AttachShader 479
-#define _gloffset_BindAttribLocation 480
-#define _gloffset_BlendEquationSeparate 481
-#define _gloffset_CompileShader 482
-#define _gloffset_CreateProgram 483
-#define _gloffset_CreateShader 484
-#define _gloffset_DeleteProgram 485
-#define _gloffset_DeleteShader 486
-#define _gloffset_DetachShader 487
-#define _gloffset_DisableVertexAttribArray 488
-#define _gloffset_DrawBuffers 489
-#define _gloffset_EnableVertexAttribArray 490
-#define _gloffset_GetActiveAttrib 491
-#define _gloffset_GetActiveUniform 492
-#define _gloffset_GetAttachedShaders 493
-#define _gloffset_GetAttribLocation 494
-#define _gloffset_GetProgramInfoLog 495
-#define _gloffset_GetProgramiv 496
-#define _gloffset_GetShaderInfoLog 497
-#define _gloffset_GetShaderSource 498
-#define _gloffset_GetShaderiv 499
-#define _gloffset_GetUniformLocation 500
-#define _gloffset_GetUniformfv 501
-#define _gloffset_GetUniformiv 502
-#define _gloffset_GetVertexAttribPointerv 503
-#define _gloffset_GetVertexAttribdv 504
-#define _gloffset_GetVertexAttribfv 505
-#define _gloffset_GetVertexAttribiv 506
-#define _gloffset_IsProgram 507
-#define _gloffset_IsShader 508
-#define _gloffset_LinkProgram 509
-#define _gloffset_ShaderSource 510
-#define _gloffset_StencilFuncSeparate 511
-#define _gloffset_StencilMaskSeparate 512
-#define _gloffset_StencilOpSeparate 513
-#define _gloffset_Uniform1f 514
-#define _gloffset_Uniform1fv 515
-#define _gloffset_Uniform1i 516
-#define _gloffset_Uniform1iv 517
-#define _gloffset_Uniform2f 518
-#define _gloffset_Uniform2fv 519
-#define _gloffset_Uniform2i 520
-#define _gloffset_Uniform2iv 521
-#define _gloffset_Uniform3f 522
-#define _gloffset_Uniform3fv 523
-#define _gloffset_Uniform3i 524
-#define _gloffset_Uniform3iv 525
-#define _gloffset_Uniform4f 526
-#define _gloffset_Uniform4fv 527
-#define _gloffset_Uniform4i 528
-#define _gloffset_Uniform4iv 529
-#define _gloffset_UniformMatrix2fv 530
-#define _gloffset_UniformMatrix3fv 531
-#define _gloffset_UniformMatrix4fv 532
-#define _gloffset_UseProgram 533
-#define _gloffset_ValidateProgram 534
-#define _gloffset_VertexAttrib1d 535
-#define _gloffset_VertexAttrib1dv 536
-#define _gloffset_VertexAttrib1s 537
-#define _gloffset_VertexAttrib1sv 538
-#define _gloffset_VertexAttrib2d 539
-#define _gloffset_VertexAttrib2dv 540
-#define _gloffset_VertexAttrib2s 541
-#define _gloffset_VertexAttrib2sv 542
-#define _gloffset_VertexAttrib3d 543
-#define _gloffset_VertexAttrib3dv 544
-#define _gloffset_VertexAttrib3s 545
-#define _gloffset_VertexAttrib3sv 546
-#define _gloffset_VertexAttrib4Nbv 547
-#define _gloffset_VertexAttrib4Niv 548
-#define _gloffset_VertexAttrib4Nsv 549
-#define _gloffset_VertexAttrib4Nub 550
-#define _gloffset_VertexAttrib4Nubv 551
-#define _gloffset_VertexAttrib4Nuiv 552
-#define _gloffset_VertexAttrib4Nusv 553
-#define _gloffset_VertexAttrib4bv 554
-#define _gloffset_VertexAttrib4d 555
-#define _gloffset_VertexAttrib4dv 556
-#define _gloffset_VertexAttrib4iv 557
-#define _gloffset_VertexAttrib4s 558
-#define _gloffset_VertexAttrib4sv 559
-#define _gloffset_VertexAttrib4ubv 560
-#define _gloffset_VertexAttrib4uiv 561
-#define _gloffset_VertexAttrib4usv 562
-#define _gloffset_VertexAttribPointer 563
-#define _gloffset_UniformMatrix2x3fv 564
-#define _gloffset_UniformMatrix2x4fv 565
-#define _gloffset_UniformMatrix3x2fv 566
-#define _gloffset_UniformMatrix3x4fv 567
-#define _gloffset_UniformMatrix4x2fv 568
-#define _gloffset_UniformMatrix4x3fv 569
-#define _gloffset_BeginConditionalRender 570
-#define _gloffset_BeginTransformFeedback 571
-#define _gloffset_BindBufferBase 572
-#define _gloffset_BindBufferRange 573
-#define _gloffset_BindFragDataLocation 574
-#define _gloffset_ClampColor 575
-#define _gloffset_ClearBufferfi 576
-#define _gloffset_ClearBufferfv 577
-#define _gloffset_ClearBufferiv 578
-#define _gloffset_ClearBufferuiv 579
-#define _gloffset_ColorMaski 580
-#define _gloffset_Disablei 581
-#define _gloffset_Enablei 582
-#define _gloffset_EndConditionalRender 583
-#define _gloffset_EndTransformFeedback 584
-#define _gloffset_GetBooleani_v 585
-#define _gloffset_GetFragDataLocation 586
-#define _gloffset_GetIntegeri_v 587
-#define _gloffset_GetStringi 588
-#define _gloffset_GetTexParameterIiv 589
-#define _gloffset_GetTexParameterIuiv 590
-#define _gloffset_GetTransformFeedbackVarying 591
-#define _gloffset_GetUniformuiv 592
-#define _gloffset_GetVertexAttribIiv 593
-#define _gloffset_GetVertexAttribIuiv 594
-#define _gloffset_IsEnabledi 595
-#define _gloffset_TexParameterIiv 596
-#define _gloffset_TexParameterIuiv 597
-#define _gloffset_TransformFeedbackVaryings 598
-#define _gloffset_Uniform1ui 599
-#define _gloffset_Uniform1uiv 600
-#define _gloffset_Uniform2ui 601
-#define _gloffset_Uniform2uiv 602
-#define _gloffset_Uniform3ui 603
-#define _gloffset_Uniform3uiv 604
-#define _gloffset_Uniform4ui 605
-#define _gloffset_Uniform4uiv 606
-#define _gloffset_VertexAttribI1iv 607
-#define _gloffset_VertexAttribI1uiv 608
-#define _gloffset_VertexAttribI4bv 609
-#define _gloffset_VertexAttribI4sv 610
-#define _gloffset_VertexAttribI4ubv 611
-#define _gloffset_VertexAttribI4usv 612
-#define _gloffset_VertexAttribIPointer 613
-#define _gloffset_PrimitiveRestartIndex 614
-#define _gloffset_TexBuffer 615
-#define _gloffset_FramebufferTexture 616
-#define _gloffset_GetBufferParameteri64v 617
-#define _gloffset_GetInteger64i_v 618
-#define _gloffset_VertexAttribDivisor 619
-#define _gloffset_BindProgramARB 620
-#define _gloffset_DeleteProgramsARB 621
-#define _gloffset_GenProgramsARB 622
-#define _gloffset_GetProgramEnvParameterdvARB 623
-#define _gloffset_GetProgramEnvParameterfvARB 624
-#define _gloffset_GetProgramLocalParameterdvARB 625
-#define _gloffset_GetProgramLocalParameterfvARB 626
-#define _gloffset_GetProgramStringARB 627
-#define _gloffset_GetProgramivARB 628
-#define _gloffset_IsProgramARB 629
-#define _gloffset_ProgramEnvParameter4dARB 630
-#define _gloffset_ProgramEnvParameter4dvARB 631
-#define _gloffset_ProgramEnvParameter4fARB 632
-#define _gloffset_ProgramEnvParameter4fvARB 633
-#define _gloffset_ProgramLocalParameter4dARB 634
-#define _gloffset_ProgramLocalParameter4dvARB 635
-#define _gloffset_ProgramLocalParameter4fARB 636
-#define _gloffset_ProgramLocalParameter4fvARB 637
-#define _gloffset_ProgramStringARB 638
-#define _gloffset_VertexAttrib1fARB 639
-#define _gloffset_VertexAttrib1fvARB 640
-#define _gloffset_VertexAttrib2fARB 641
-#define _gloffset_VertexAttrib2fvARB 642
-#define _gloffset_VertexAttrib3fARB 643
-#define _gloffset_VertexAttrib3fvARB 644
-#define _gloffset_VertexAttrib4fARB 645
-#define _gloffset_VertexAttrib4fvARB 646
-#define _gloffset_AttachObjectARB 647
-#define _gloffset_CreateProgramObjectARB 648
-#define _gloffset_CreateShaderObjectARB 649
-#define _gloffset_DeleteObjectARB 650
-#define _gloffset_DetachObjectARB 651
-#define _gloffset_GetAttachedObjectsARB 652
-#define _gloffset_GetHandleARB 653
-#define _gloffset_GetInfoLogARB 654
-#define _gloffset_GetObjectParameterfvARB 655
-#define _gloffset_GetObjectParameterivARB 656
-#define _gloffset_DrawArraysInstancedARB 657
-#define _gloffset_DrawElementsInstancedARB 658
-#define _gloffset_BindFramebuffer 659
-#define _gloffset_BindRenderbuffer 660
-#define _gloffset_BlitFramebuffer 661
-#define _gloffset_CheckFramebufferStatus 662
-#define _gloffset_DeleteFramebuffers 663
-#define _gloffset_DeleteRenderbuffers 664
-#define _gloffset_FramebufferRenderbuffer 665
-#define _gloffset_FramebufferTexture1D 666
-#define _gloffset_FramebufferTexture2D 667
-#define _gloffset_FramebufferTexture3D 668
-#define _gloffset_FramebufferTextureLayer 669
-#define _gloffset_GenFramebuffers 670
-#define _gloffset_GenRenderbuffers 671
-#define _gloffset_GenerateMipmap 672
-#define _gloffset_GetFramebufferAttachmentParameteriv 673
-#define _gloffset_GetRenderbufferParameteriv 674
-#define _gloffset_IsFramebuffer 675
-#define _gloffset_IsRenderbuffer 676
-#define _gloffset_RenderbufferStorage 677
-#define _gloffset_RenderbufferStorageMultisample 678
-#define _gloffset_FramebufferTextureFaceARB 679
-#define _gloffset_FlushMappedBufferRange 680
-#define _gloffset_MapBufferRange 681
-#define _gloffset_BindVertexArray 682
-#define _gloffset_DeleteVertexArrays 683
-#define _gloffset_GenVertexArrays 684
-#define _gloffset_IsVertexArray 685
-#define _gloffset_GetActiveUniformBlockName 686
-#define _gloffset_GetActiveUniformBlockiv 687
-#define _gloffset_GetActiveUniformName 688
-#define _gloffset_GetActiveUniformsiv 689
-#define _gloffset_GetUniformBlockIndex 690
-#define _gloffset_GetUniformIndices 691
-#define _gloffset_UniformBlockBinding 692
-#define _gloffset_CopyBufferSubData 693
-#define _gloffset_ClientWaitSync 694
-#define _gloffset_DeleteSync 695
-#define _gloffset_FenceSync 696
-#define _gloffset_GetInteger64v 697
-#define _gloffset_GetSynciv 698
-#define _gloffset_IsSync 699
-#define _gloffset_WaitSync 700
-#define _gloffset_DrawElementsBaseVertex 701
-#define _gloffset_DrawElementsInstancedBaseVertex 702
-#define _gloffset_DrawRangeElementsBaseVertex 703
-#define _gloffset_MultiDrawElementsBaseVertex 704
-#define _gloffset_ProvokingVertex 705
-#define _gloffset_GetMultisamplefv 706
-#define _gloffset_SampleMaski 707
-#define _gloffset_TexImage2DMultisample 708
-#define _gloffset_TexImage3DMultisample 709
-#define _gloffset_BlendEquationSeparateiARB 710
-#define _gloffset_BlendEquationiARB 711
-#define _gloffset_BlendFuncSeparateiARB 712
-#define _gloffset_BlendFunciARB 713
-#define _gloffset_BindFragDataLocationIndexed 714
-#define _gloffset_GetFragDataIndex 715
-#define _gloffset_BindSampler 716
-#define _gloffset_DeleteSamplers 717
-#define _gloffset_GenSamplers 718
-#define _gloffset_GetSamplerParameterIiv 719
-#define _gloffset_GetSamplerParameterIuiv 720
-#define _gloffset_GetSamplerParameterfv 721
-#define _gloffset_GetSamplerParameteriv 722
-#define _gloffset_IsSampler 723
-#define _gloffset_SamplerParameterIiv 724
-#define _gloffset_SamplerParameterIuiv 725
-#define _gloffset_SamplerParameterf 726
-#define _gloffset_SamplerParameterfv 727
-#define _gloffset_SamplerParameteri 728
-#define _gloffset_SamplerParameteriv 729
-#define _gloffset_GetQueryObjecti64v 730
-#define _gloffset_GetQueryObjectui64v 731
-#define _gloffset_QueryCounter 732
-#define _gloffset_ColorP3ui 733
-#define _gloffset_ColorP3uiv 734
-#define _gloffset_ColorP4ui 735
-#define _gloffset_ColorP4uiv 736
-#define _gloffset_MultiTexCoordP1ui 737
-#define _gloffset_MultiTexCoordP1uiv 738
-#define _gloffset_MultiTexCoordP2ui 739
-#define _gloffset_MultiTexCoordP2uiv 740
-#define _gloffset_MultiTexCoordP3ui 741
-#define _gloffset_MultiTexCoordP3uiv 742
-#define _gloffset_MultiTexCoordP4ui 743
-#define _gloffset_MultiTexCoordP4uiv 744
-#define _gloffset_NormalP3ui 745
-#define _gloffset_NormalP3uiv 746
-#define _gloffset_SecondaryColorP3ui 747
-#define _gloffset_SecondaryColorP3uiv 748
-#define _gloffset_TexCoordP1ui 749
-#define _gloffset_TexCoordP1uiv 750
-#define _gloffset_TexCoordP2ui 751
-#define _gloffset_TexCoordP2uiv 752
-#define _gloffset_TexCoordP3ui 753
-#define _gloffset_TexCoordP3uiv 754
-#define _gloffset_TexCoordP4ui 755
-#define _gloffset_TexCoordP4uiv 756
-#define _gloffset_VertexAttribP1ui 757
-#define _gloffset_VertexAttribP1uiv 758
-#define _gloffset_VertexAttribP2ui 759
-#define _gloffset_VertexAttribP2uiv 760
-#define _gloffset_VertexAttribP3ui 761
-#define _gloffset_VertexAttribP3uiv 762
-#define _gloffset_VertexAttribP4ui 763
-#define _gloffset_VertexAttribP4uiv 764
-#define _gloffset_VertexP2ui 765
-#define _gloffset_VertexP2uiv 766
-#define _gloffset_VertexP3ui 767
-#define _gloffset_VertexP3uiv 768
-#define _gloffset_VertexP4ui 769
-#define _gloffset_VertexP4uiv 770
-#define _gloffset_BindTransformFeedback 771
-#define _gloffset_DeleteTransformFeedbacks 772
-#define _gloffset_DrawTransformFeedback 773
-#define _gloffset_GenTransformFeedbacks 774
-#define _gloffset_IsTransformFeedback 775
-#define _gloffset_PauseTransformFeedback 776
-#define _gloffset_ResumeTransformFeedback 777
-#define _gloffset_BeginQueryIndexed 778
-#define _gloffset_DrawTransformFeedbackStream 779
-#define _gloffset_EndQueryIndexed 780
-#define _gloffset_GetQueryIndexediv 781
-#define _gloffset_ClearDepthf 782
-#define _gloffset_DepthRangef 783
-#define _gloffset_GetShaderPrecisionFormat 784
-#define _gloffset_ReleaseShaderCompiler 785
-#define _gloffset_ShaderBinary 786
-#define _gloffset_GetProgramBinary 787
-#define _gloffset_ProgramBinary 788
-#define _gloffset_ProgramParameteri 789
-#define _gloffset_DebugMessageCallbackARB 790
-#define _gloffset_DebugMessageControlARB 791
-#define _gloffset_DebugMessageInsertARB 792
-#define _gloffset_GetDebugMessageLogARB 793
-#define _gloffset_GetGraphicsResetStatusARB 794
-#define _gloffset_GetnColorTableARB 795
-#define _gloffset_GetnCompressedTexImageARB 796
-#define _gloffset_GetnConvolutionFilterARB 797
-#define _gloffset_GetnHistogramARB 798
-#define _gloffset_GetnMapdvARB 799
-#define _gloffset_GetnMapfvARB 800
-#define _gloffset_GetnMapivARB 801
-#define _gloffset_GetnMinmaxARB 802
-#define _gloffset_GetnPixelMapfvARB 803
-#define _gloffset_GetnPixelMapuivARB 804
-#define _gloffset_GetnPixelMapusvARB 805
-#define _gloffset_GetnPolygonStippleARB 806
-#define _gloffset_GetnSeparableFilterARB 807
-#define _gloffset_GetnTexImageARB 808
-#define _gloffset_GetnUniformdvARB 809
-#define _gloffset_GetnUniformfvARB 810
-#define _gloffset_GetnUniformivARB 811
-#define _gloffset_GetnUniformuivARB 812
-#define _gloffset_ReadnPixelsARB 813
-#define _gloffset_DrawArraysInstancedBaseInstance 814
-#define _gloffset_DrawElementsInstancedBaseInstance 815
-#define _gloffset_DrawElementsInstancedBaseVertexBaseInstance 816
-#define _gloffset_DrawTransformFeedbackInstanced 817
-#define _gloffset_DrawTransformFeedbackStreamInstanced 818
-#define _gloffset_GetInternalformativ 819
-#define _gloffset_TexStorage1D 820
-#define _gloffset_TexStorage2D 821
-#define _gloffset_TexStorage3D 822
-#define _gloffset_TextureStorage1DEXT 823
-#define _gloffset_TextureStorage2DEXT 824
-#define _gloffset_TextureStorage3DEXT 825
-#define _gloffset_TexBufferRange 826
-#define _gloffset_TexStorage2DMultisample 827
-#define _gloffset_TexStorage3DMultisample 828
-#define _gloffset_InvalidateBufferData 829
-#define _gloffset_InvalidateBufferSubData 830
-#define _gloffset_InvalidateFramebuffer 831
-#define _gloffset_InvalidateSubFramebuffer 832
-#define _gloffset_InvalidateTexImage 833
-#define _gloffset_InvalidateTexSubImage 834
-#define _gloffset_PolygonOffsetEXT 835
-#define _gloffset_DrawTexfOES 836
-#define _gloffset_DrawTexfvOES 837
-#define _gloffset_DrawTexiOES 838
-#define _gloffset_DrawTexivOES 839
-#define _gloffset_DrawTexsOES 840
-#define _gloffset_DrawTexsvOES 841
-#define _gloffset_DrawTexxOES 842
-#define _gloffset_DrawTexxvOES 843
-#define _gloffset_PointSizePointerOES 844
-#define _gloffset_QueryMatrixxOES 845
-#define _gloffset_SampleMaskSGIS 846
-#define _gloffset_SamplePatternSGIS 847
-#define _gloffset_ColorPointerEXT 848
-#define _gloffset_EdgeFlagPointerEXT 849
-#define _gloffset_IndexPointerEXT 850
-#define _gloffset_NormalPointerEXT 851
-#define _gloffset_TexCoordPointerEXT 852
-#define _gloffset_VertexPointerEXT 853
-#define _gloffset_DiscardFramebufferEXT 854
-#define _gloffset_LockArraysEXT 855
-#define _gloffset_UnlockArraysEXT 856
-#define _gloffset_SecondaryColor3fEXT 857
-#define _gloffset_SecondaryColor3fvEXT 858
-#define _gloffset_MultiDrawElementsEXT 859
-#define _gloffset_FogCoordfEXT 860
-#define _gloffset_FogCoordfvEXT 861
-#define _gloffset_ResizeBuffersMESA 862
-#define _gloffset_WindowPos4dMESA 863
-#define _gloffset_WindowPos4dvMESA 864
-#define _gloffset_WindowPos4fMESA 865
-#define _gloffset_WindowPos4fvMESA 866
-#define _gloffset_WindowPos4iMESA 867
-#define _gloffset_WindowPos4ivMESA 868
-#define _gloffset_WindowPos4sMESA 869
-#define _gloffset_WindowPos4svMESA 870
-#define _gloffset_MultiModeDrawArraysIBM 871
-#define _gloffset_MultiModeDrawElementsIBM 872
-#define _gloffset_AreProgramsResidentNV 873
-#define _gloffset_ExecuteProgramNV 874
-#define _gloffset_GetProgramParameterdvNV 875
-#define _gloffset_GetProgramParameterfvNV 876
-#define _gloffset_GetProgramStringNV 877
-#define _gloffset_GetProgramivNV 878
-#define _gloffset_GetTrackMatrixivNV 879
-#define _gloffset_GetVertexAttribdvNV 880
-#define _gloffset_GetVertexAttribfvNV 881
-#define _gloffset_GetVertexAttribivNV 882
-#define _gloffset_LoadProgramNV 883
-#define _gloffset_ProgramParameters4dvNV 884
-#define _gloffset_ProgramParameters4fvNV 885
-#define _gloffset_RequestResidentProgramsNV 886
-#define _gloffset_TrackMatrixNV 887
-#define _gloffset_VertexAttrib1dNV 888
-#define _gloffset_VertexAttrib1dvNV 889
-#define _gloffset_VertexAttrib1fNV 890
-#define _gloffset_VertexAttrib1fvNV 891
-#define _gloffset_VertexAttrib1sNV 892
-#define _gloffset_VertexAttrib1svNV 893
-#define _gloffset_VertexAttrib2dNV 894
-#define _gloffset_VertexAttrib2dvNV 895
-#define _gloffset_VertexAttrib2fNV 896
-#define _gloffset_VertexAttrib2fvNV 897
-#define _gloffset_VertexAttrib2sNV 898
-#define _gloffset_VertexAttrib2svNV 899
-#define _gloffset_VertexAttrib3dNV 900
-#define _gloffset_VertexAttrib3dvNV 901
-#define _gloffset_VertexAttrib3fNV 902
-#define _gloffset_VertexAttrib3fvNV 903
-#define _gloffset_VertexAttrib3sNV 904
-#define _gloffset_VertexAttrib3svNV 905
-#define _gloffset_VertexAttrib4dNV 906
-#define _gloffset_VertexAttrib4dvNV 907
-#define _gloffset_VertexAttrib4fNV 908
-#define _gloffset_VertexAttrib4fvNV 909
-#define _gloffset_VertexAttrib4sNV 910
-#define _gloffset_VertexAttrib4svNV 911
-#define _gloffset_VertexAttrib4ubNV 912
-#define _gloffset_VertexAttrib4ubvNV 913
-#define _gloffset_VertexAttribPointerNV 914
-#define _gloffset_VertexAttribs1dvNV 915
-#define _gloffset_VertexAttribs1fvNV 916
-#define _gloffset_VertexAttribs1svNV 917
-#define _gloffset_VertexAttribs2dvNV 918
-#define _gloffset_VertexAttribs2fvNV 919
-#define _gloffset_VertexAttribs2svNV 920
-#define _gloffset_VertexAttribs3dvNV 921
-#define _gloffset_VertexAttribs3fvNV 922
-#define _gloffset_VertexAttribs3svNV 923
-#define _gloffset_VertexAttribs4dvNV 924
-#define _gloffset_VertexAttribs4fvNV 925
-#define _gloffset_VertexAttribs4svNV 926
-#define _gloffset_VertexAttribs4ubvNV 927
-#define _gloffset_GetTexBumpParameterfvATI 928
-#define _gloffset_GetTexBumpParameterivATI 929
-#define _gloffset_TexBumpParameterfvATI 930
-#define _gloffset_TexBumpParameterivATI 931
-#define _gloffset_AlphaFragmentOp1ATI 932
-#define _gloffset_AlphaFragmentOp2ATI 933
-#define _gloffset_AlphaFragmentOp3ATI 934
-#define _gloffset_BeginFragmentShaderATI 935
-#define _gloffset_BindFragmentShaderATI 936
-#define _gloffset_ColorFragmentOp1ATI 937
-#define _gloffset_ColorFragmentOp2ATI 938
-#define _gloffset_ColorFragmentOp3ATI 939
-#define _gloffset_DeleteFragmentShaderATI 940
-#define _gloffset_EndFragmentShaderATI 941
-#define _gloffset_GenFragmentShadersATI 942
-#define _gloffset_PassTexCoordATI 943
-#define _gloffset_SampleMapATI 944
-#define _gloffset_SetFragmentShaderConstantATI 945
-#define _gloffset_ActiveStencilFaceEXT 946
-#define _gloffset_BindVertexArrayAPPLE 947
-#define _gloffset_GenVertexArraysAPPLE 948
-#define _gloffset_GetProgramNamedParameterdvNV 949
-#define _gloffset_GetProgramNamedParameterfvNV 950
-#define _gloffset_ProgramNamedParameter4dNV 951
-#define _gloffset_ProgramNamedParameter4dvNV 952
-#define _gloffset_ProgramNamedParameter4fNV 953
-#define _gloffset_ProgramNamedParameter4fvNV 954
-#define _gloffset_PrimitiveRestartNV 955
-#define _gloffset_GetTexGenxvOES 956
-#define _gloffset_TexGenxOES 957
-#define _gloffset_TexGenxvOES 958
-#define _gloffset_DepthBoundsEXT 959
-#define _gloffset_BufferParameteriAPPLE 960
-#define _gloffset_FlushMappedBufferRangeAPPLE 961
-#define _gloffset_VertexAttribI1iEXT 962
-#define _gloffset_VertexAttribI1uiEXT 963
-#define _gloffset_VertexAttribI2iEXT 964
-#define _gloffset_VertexAttribI2ivEXT 965
-#define _gloffset_VertexAttribI2uiEXT 966
-#define _gloffset_VertexAttribI2uivEXT 967
-#define _gloffset_VertexAttribI3iEXT 968
-#define _gloffset_VertexAttribI3ivEXT 969
-#define _gloffset_VertexAttribI3uiEXT 970
-#define _gloffset_VertexAttribI3uivEXT 971
-#define _gloffset_VertexAttribI4iEXT 972
-#define _gloffset_VertexAttribI4ivEXT 973
-#define _gloffset_VertexAttribI4uiEXT 974
-#define _gloffset_VertexAttribI4uivEXT 975
-#define _gloffset_ClearColorIiEXT 976
-#define _gloffset_ClearColorIuiEXT 977
-#define _gloffset_BindBufferOffsetEXT 978
-#define _gloffset_GetObjectParameterivAPPLE 979
-#define _gloffset_ObjectPurgeableAPPLE 980
-#define _gloffset_ObjectUnpurgeableAPPLE 981
-#define _gloffset_ActiveProgramEXT 982
-#define _gloffset_CreateShaderProgramEXT 983
-#define _gloffset_UseShaderProgramEXT 984
-#define _gloffset_TextureBarrierNV 985
-#define _gloffset_StencilFuncSeparateATI 986
-#define _gloffset_ProgramEnvParameters4fvEXT 987
-#define _gloffset_ProgramLocalParameters4fvEXT 988
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 989
-#define _gloffset_EGLImageTargetTexture2DOES 990
-#define _gloffset_AlphaFuncx 991
-#define _gloffset_ClearColorx 992
-#define _gloffset_ClearDepthx 993
-#define _gloffset_Color4x 994
-#define _gloffset_DepthRangex 995
-#define _gloffset_Fogx 996
-#define _gloffset_Fogxv 997
-#define _gloffset_Frustumf 998
-#define _gloffset_Frustumx 999
-#define _gloffset_LightModelx 1000
-#define _gloffset_LightModelxv 1001
-#define _gloffset_Lightx 1002
-#define _gloffset_Lightxv 1003
-#define _gloffset_LineWidthx 1004
-#define _gloffset_LoadMatrixx 1005
-#define _gloffset_Materialx 1006
-#define _gloffset_Materialxv 1007
-#define _gloffset_MultMatrixx 1008
-#define _gloffset_MultiTexCoord4x 1009
-#define _gloffset_Normal3x 1010
-#define _gloffset_Orthof 1011
-#define _gloffset_Orthox 1012
-#define _gloffset_PointSizex 1013
-#define _gloffset_PolygonOffsetx 1014
-#define _gloffset_Rotatex 1015
-#define _gloffset_SampleCoveragex 1016
-#define _gloffset_Scalex 1017
-#define _gloffset_TexEnvx 1018
-#define _gloffset_TexEnvxv 1019
-#define _gloffset_TexParameterx 1020
-#define _gloffset_Translatex 1021
-#define _gloffset_ClipPlanef 1022
-#define _gloffset_ClipPlanex 1023
-#define _gloffset_GetClipPlanef 1024
-#define _gloffset_GetClipPlanex 1025
-#define _gloffset_GetFixedv 1026
-#define _gloffset_GetLightxv 1027
-#define _gloffset_GetMaterialxv 1028
-#define _gloffset_GetTexEnvxv 1029
-#define _gloffset_GetTexParameterxv 1030
-#define _gloffset_PointParameterx 1031
-#define _gloffset_PointParameterxv 1032
-#define _gloffset_TexParameterxv 1033
-
-#else /* !FEATURE_remap_table */
-
 #define driDispatchRemapTable_size 626
-extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
+SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define CompressedTexImage1D_remap_index 0
 #define CompressedTexImage2D_remap_index 1
@@ -2368,8 +1730,6 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_PointParameterxv driDispatchRemapTable[PointParameterxv_remap_index]
 #define _gloffset_TexParameterxv driDispatchRemapTable[TexParameterxv_remap_index]
 
-#endif /* !FEATURE_remap_table */
-
 typedef void (GLAPIENTRYP _glptr_NewList)(GLuint, GLenum);
 #define CALL_NewList(disp, parameters) \
     (* GET_NewList(disp)) parameters