GL_EXT_paletted_texture functions should alias GL_SGI_color_table functions.

The functions for GL_EXT_paletted_texture that do not share GLX
protocol with GL_ARB_imaging are supposed to alias the similar
functions from GL_SGI_color_table.  They didn't.  This patch corrects
this problem and enables GLX protocol for both extensions.

Since this removes 3 entries from the dispatch table, this change
creates a lot of changes in the generated files.

1 files changed, 198 insertions, 204 deletions

diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index b66e3c7849..bfcad1b9d7 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -607,207 +607,204 @@
 #define _gloffset_VertexPointerEXT 572
 #define _gloffset_PointParameterfEXT 573
 #define _gloffset_PointParameterfvEXT 574
-#define _gloffset_GetColorTableEXT 575
-#define _gloffset_GetColorTableParameterfvEXT 576
-#define _gloffset_GetColorTableParameterivEXT 577
-#define _gloffset_LockArraysEXT 578
-#define _gloffset_UnlockArraysEXT 579
-#define _gloffset_CullParameterdvEXT 580
-#define _gloffset_CullParameterfvEXT 581
-#define _gloffset_SecondaryColor3bEXT 582
-#define _gloffset_SecondaryColor3bvEXT 583
-#define _gloffset_SecondaryColor3dEXT 584
-#define _gloffset_SecondaryColor3dvEXT 585
-#define _gloffset_SecondaryColor3fEXT 586
-#define _gloffset_SecondaryColor3fvEXT 587
-#define _gloffset_SecondaryColor3iEXT 588
-#define _gloffset_SecondaryColor3ivEXT 589
-#define _gloffset_SecondaryColor3sEXT 590
-#define _gloffset_SecondaryColor3svEXT 591
-#define _gloffset_SecondaryColor3ubEXT 592
-#define _gloffset_SecondaryColor3ubvEXT 593
-#define _gloffset_SecondaryColor3uiEXT 594
-#define _gloffset_SecondaryColor3uivEXT 595
-#define _gloffset_SecondaryColor3usEXT 596
-#define _gloffset_SecondaryColor3usvEXT 597
-#define _gloffset_SecondaryColorPointerEXT 598
-#define _gloffset_MultiDrawArraysEXT 599
-#define _gloffset_MultiDrawElementsEXT 600
-#define _gloffset_FogCoordPointerEXT 601
-#define _gloffset_FogCoorddEXT 602
-#define _gloffset_FogCoorddvEXT 603
-#define _gloffset_FogCoordfEXT 604
-#define _gloffset_FogCoordfvEXT 605
-#define _gloffset_PixelTexGenSGIX 606
-#define _gloffset_BlendFuncSeparateEXT 607
-#define _gloffset_VertexWeightPointerEXT 608
-#define _gloffset_VertexWeightfEXT 609
-#define _gloffset_VertexWeightfvEXT 610
-#define _gloffset_FlushVertexArrayRangeNV 611
-#define _gloffset_VertexArrayRangeNV 612
-#define _gloffset_CombinerInputNV 613
-#define _gloffset_CombinerOutputNV 614
-#define _gloffset_CombinerParameterfNV 615
-#define _gloffset_CombinerParameterfvNV 616
-#define _gloffset_CombinerParameteriNV 617
-#define _gloffset_CombinerParameterivNV 618
-#define _gloffset_FinalCombinerInputNV 619
-#define _gloffset_GetCombinerInputParameterfvNV 620
-#define _gloffset_GetCombinerInputParameterivNV 621
-#define _gloffset_GetCombinerOutputParameterfvNV 622
-#define _gloffset_GetCombinerOutputParameterivNV 623
-#define _gloffset_GetFinalCombinerInputParameterfvNV 624
-#define _gloffset_GetFinalCombinerInputParameterivNV 625
-#define _gloffset_ResizeBuffersMESA 626
-#define _gloffset_WindowPos2dMESA 627
-#define _gloffset_WindowPos2dvMESA 628
-#define _gloffset_WindowPos2fMESA 629
-#define _gloffset_WindowPos2fvMESA 630
-#define _gloffset_WindowPos2iMESA 631
-#define _gloffset_WindowPos2ivMESA 632
-#define _gloffset_WindowPos2sMESA 633
-#define _gloffset_WindowPos2svMESA 634
-#define _gloffset_WindowPos3dMESA 635
-#define _gloffset_WindowPos3dvMESA 636
-#define _gloffset_WindowPos3fMESA 637
-#define _gloffset_WindowPos3fvMESA 638
-#define _gloffset_WindowPos3iMESA 639
-#define _gloffset_WindowPos3ivMESA 640
-#define _gloffset_WindowPos3sMESA 641
-#define _gloffset_WindowPos3svMESA 642
-#define _gloffset_WindowPos4dMESA 643
-#define _gloffset_WindowPos4dvMESA 644
-#define _gloffset_WindowPos4fMESA 645
-#define _gloffset_WindowPos4fvMESA 646
-#define _gloffset_WindowPos4iMESA 647
-#define _gloffset_WindowPos4ivMESA 648
-#define _gloffset_WindowPos4sMESA 649
-#define _gloffset_WindowPos4svMESA 650
-#define _gloffset_MultiModeDrawArraysIBM 651
-#define _gloffset_MultiModeDrawElementsIBM 652
-#define _gloffset_DeleteFencesNV 653
-#define _gloffset_FinishFenceNV 654
-#define _gloffset_GenFencesNV 655
-#define _gloffset_GetFenceivNV 656
-#define _gloffset_IsFenceNV 657
-#define _gloffset_SetFenceNV 658
-#define _gloffset_TestFenceNV 659
-#define _gloffset_AreProgramsResidentNV 660
-#define _gloffset_BindProgramNV 661
-#define _gloffset_DeleteProgramsNV 662
-#define _gloffset_ExecuteProgramNV 663
-#define _gloffset_GenProgramsNV 664
-#define _gloffset_GetProgramParameterdvNV 665
-#define _gloffset_GetProgramParameterfvNV 666
-#define _gloffset_GetProgramStringNV 667
-#define _gloffset_GetProgramivNV 668
-#define _gloffset_GetTrackMatrixivNV 669
-#define _gloffset_GetVertexAttribPointervNV 670
-#define _gloffset_GetVertexAttribdvNV 671
-#define _gloffset_GetVertexAttribfvNV 672
-#define _gloffset_GetVertexAttribivNV 673
-#define _gloffset_IsProgramNV 674
-#define _gloffset_LoadProgramNV 675
-#define _gloffset_ProgramParameter4dNV 676
-#define _gloffset_ProgramParameter4dvNV 677
-#define _gloffset_ProgramParameter4fNV 678
-#define _gloffset_ProgramParameter4fvNV 679
-#define _gloffset_ProgramParameters4dvNV 680
-#define _gloffset_ProgramParameters4fvNV 681
-#define _gloffset_RequestResidentProgramsNV 682
-#define _gloffset_TrackMatrixNV 683
-#define _gloffset_VertexAttrib1dNV 684
-#define _gloffset_VertexAttrib1dvNV 685
-#define _gloffset_VertexAttrib1fNV 686
-#define _gloffset_VertexAttrib1fvNV 687
-#define _gloffset_VertexAttrib1sNV 688
-#define _gloffset_VertexAttrib1svNV 689
-#define _gloffset_VertexAttrib2dNV 690
-#define _gloffset_VertexAttrib2dvNV 691
-#define _gloffset_VertexAttrib2fNV 692
-#define _gloffset_VertexAttrib2fvNV 693
-#define _gloffset_VertexAttrib2sNV 694
-#define _gloffset_VertexAttrib2svNV 695
-#define _gloffset_VertexAttrib3dNV 696
-#define _gloffset_VertexAttrib3dvNV 697
-#define _gloffset_VertexAttrib3fNV 698
-#define _gloffset_VertexAttrib3fvNV 699
-#define _gloffset_VertexAttrib3sNV 700
-#define _gloffset_VertexAttrib3svNV 701
-#define _gloffset_VertexAttrib4dNV 702
-#define _gloffset_VertexAttrib4dvNV 703
-#define _gloffset_VertexAttrib4fNV 704
-#define _gloffset_VertexAttrib4fvNV 705
-#define _gloffset_VertexAttrib4sNV 706
-#define _gloffset_VertexAttrib4svNV 707
-#define _gloffset_VertexAttrib4ubNV 708
-#define _gloffset_VertexAttrib4ubvNV 709
-#define _gloffset_VertexAttribPointerNV 710
-#define _gloffset_VertexAttribs1dvNV 711
-#define _gloffset_VertexAttribs1fvNV 712
-#define _gloffset_VertexAttribs1svNV 713
-#define _gloffset_VertexAttribs2dvNV 714
-#define _gloffset_VertexAttribs2fvNV 715
-#define _gloffset_VertexAttribs2svNV 716
-#define _gloffset_VertexAttribs3dvNV 717
-#define _gloffset_VertexAttribs3fvNV 718
-#define _gloffset_VertexAttribs3svNV 719
-#define _gloffset_VertexAttribs4dvNV 720
-#define _gloffset_VertexAttribs4fvNV 721
-#define _gloffset_VertexAttribs4svNV 722
-#define _gloffset_VertexAttribs4ubvNV 723
-#define _gloffset_AlphaFragmentOp1ATI 724
-#define _gloffset_AlphaFragmentOp2ATI 725
-#define _gloffset_AlphaFragmentOp3ATI 726
-#define _gloffset_BeginFragmentShaderATI 727
-#define _gloffset_BindFragmentShaderATI 728
-#define _gloffset_ColorFragmentOp1ATI 729
-#define _gloffset_ColorFragmentOp2ATI 730
-#define _gloffset_ColorFragmentOp3ATI 731
-#define _gloffset_DeleteFragmentShaderATI 732
-#define _gloffset_EndFragmentShaderATI 733
-#define _gloffset_GenFragmentShadersATI 734
-#define _gloffset_PassTexCoordATI 735
-#define _gloffset_SampleMapATI 736
-#define _gloffset_SetFragmentShaderConstantATI 737
-#define _gloffset_PointParameteriNV 738
-#define _gloffset_PointParameterivNV 739
-#define _gloffset_ActiveStencilFaceEXT 740
-#define _gloffset_BindVertexArrayAPPLE 741
-#define _gloffset_DeleteVertexArraysAPPLE 742
-#define _gloffset_GenVertexArraysAPPLE 743
-#define _gloffset_IsVertexArrayAPPLE 744
-#define _gloffset_GetProgramNamedParameterdvNV 745
-#define _gloffset_GetProgramNamedParameterfvNV 746
-#define _gloffset_ProgramNamedParameter4dNV 747
-#define _gloffset_ProgramNamedParameter4dvNV 748
-#define _gloffset_ProgramNamedParameter4fNV 749
-#define _gloffset_ProgramNamedParameter4fvNV 750
-#define _gloffset_DepthBoundsEXT 751
-#define _gloffset_BlendEquationSeparateEXT 752
-#define _gloffset_BindFramebufferEXT 753
-#define _gloffset_BindRenderbufferEXT 754
-#define _gloffset_CheckFramebufferStatusEXT 755
-#define _gloffset_DeleteFramebuffersEXT 756
-#define _gloffset_DeleteRenderbuffersEXT 757
-#define _gloffset_FramebufferRenderbufferEXT 758
-#define _gloffset_FramebufferTexture1DEXT 759
-#define _gloffset_FramebufferTexture2DEXT 760
-#define _gloffset_FramebufferTexture3DEXT 761
-#define _gloffset_GenFramebuffersEXT 762
-#define _gloffset_GenRenderbuffersEXT 763
-#define _gloffset_GenerateMipmapEXT 764
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 765
-#define _gloffset_GetQueryObjecti64vEXT 766
-#define _gloffset_GetQueryObjectui64vEXT 767
-#define _gloffset_GetRenderbufferParameterivEXT 768
-#define _gloffset_IsFramebufferEXT 769
-#define _gloffset_IsRenderbufferEXT 770
-#define _gloffset_RenderbufferStorageEXT 771
-#define _gloffset_BlitFramebufferEXT 772
-#define _gloffset_ProgramEnvParameters4fvEXT 773
-#define _gloffset_ProgramLocalParameters4fvEXT 774
-#define _gloffset_FIRST_DYNAMIC 775
+#define _gloffset_LockArraysEXT 575
+#define _gloffset_UnlockArraysEXT 576
+#define _gloffset_CullParameterdvEXT 577
+#define _gloffset_CullParameterfvEXT 578
+#define _gloffset_SecondaryColor3bEXT 579
+#define _gloffset_SecondaryColor3bvEXT 580
+#define _gloffset_SecondaryColor3dEXT 581
+#define _gloffset_SecondaryColor3dvEXT 582
+#define _gloffset_SecondaryColor3fEXT 583
+#define _gloffset_SecondaryColor3fvEXT 584
+#define _gloffset_SecondaryColor3iEXT 585
+#define _gloffset_SecondaryColor3ivEXT 586
+#define _gloffset_SecondaryColor3sEXT 587
+#define _gloffset_SecondaryColor3svEXT 588
+#define _gloffset_SecondaryColor3ubEXT 589
+#define _gloffset_SecondaryColor3ubvEXT 590
+#define _gloffset_SecondaryColor3uiEXT 591
+#define _gloffset_SecondaryColor3uivEXT 592
+#define _gloffset_SecondaryColor3usEXT 593
+#define _gloffset_SecondaryColor3usvEXT 594
+#define _gloffset_SecondaryColorPointerEXT 595
+#define _gloffset_MultiDrawArraysEXT 596
+#define _gloffset_MultiDrawElementsEXT 597
+#define _gloffset_FogCoordPointerEXT 598
+#define _gloffset_FogCoorddEXT 599
+#define _gloffset_FogCoorddvEXT 600
+#define _gloffset_FogCoordfEXT 601
+#define _gloffset_FogCoordfvEXT 602
+#define _gloffset_PixelTexGenSGIX 603
+#define _gloffset_BlendFuncSeparateEXT 604
+#define _gloffset_VertexWeightPointerEXT 605
+#define _gloffset_VertexWeightfEXT 606
+#define _gloffset_VertexWeightfvEXT 607
+#define _gloffset_FlushVertexArrayRangeNV 608
+#define _gloffset_VertexArrayRangeNV 609
+#define _gloffset_CombinerInputNV 610
+#define _gloffset_CombinerOutputNV 611
+#define _gloffset_CombinerParameterfNV 612
+#define _gloffset_CombinerParameterfvNV 613
+#define _gloffset_CombinerParameteriNV 614
+#define _gloffset_CombinerParameterivNV 615
+#define _gloffset_FinalCombinerInputNV 616
+#define _gloffset_GetCombinerInputParameterfvNV 617
+#define _gloffset_GetCombinerInputParameterivNV 618
+#define _gloffset_GetCombinerOutputParameterfvNV 619
+#define _gloffset_GetCombinerOutputParameterivNV 620
+#define _gloffset_GetFinalCombinerInputParameterfvNV 621
+#define _gloffset_GetFinalCombinerInputParameterivNV 622
+#define _gloffset_ResizeBuffersMESA 623
+#define _gloffset_WindowPos2dMESA 624
+#define _gloffset_WindowPos2dvMESA 625
+#define _gloffset_WindowPos2fMESA 626
+#define _gloffset_WindowPos2fvMESA 627
+#define _gloffset_WindowPos2iMESA 628
+#define _gloffset_WindowPos2ivMESA 629
+#define _gloffset_WindowPos2sMESA 630
+#define _gloffset_WindowPos2svMESA 631
+#define _gloffset_WindowPos3dMESA 632
+#define _gloffset_WindowPos3dvMESA 633
+#define _gloffset_WindowPos3fMESA 634
+#define _gloffset_WindowPos3fvMESA 635
+#define _gloffset_WindowPos3iMESA 636
+#define _gloffset_WindowPos3ivMESA 637
+#define _gloffset_WindowPos3sMESA 638
+#define _gloffset_WindowPos3svMESA 639
+#define _gloffset_WindowPos4dMESA 640
+#define _gloffset_WindowPos4dvMESA 641
+#define _gloffset_WindowPos4fMESA 642
+#define _gloffset_WindowPos4fvMESA 643
+#define _gloffset_WindowPos4iMESA 644
+#define _gloffset_WindowPos4ivMESA 645
+#define _gloffset_WindowPos4sMESA 646
+#define _gloffset_WindowPos4svMESA 647
+#define _gloffset_MultiModeDrawArraysIBM 648
+#define _gloffset_MultiModeDrawElementsIBM 649
+#define _gloffset_DeleteFencesNV 650
+#define _gloffset_FinishFenceNV 651
+#define _gloffset_GenFencesNV 652
+#define _gloffset_GetFenceivNV 653
+#define _gloffset_IsFenceNV 654
+#define _gloffset_SetFenceNV 655
+#define _gloffset_TestFenceNV 656
+#define _gloffset_AreProgramsResidentNV 657
+#define _gloffset_BindProgramNV 658
+#define _gloffset_DeleteProgramsNV 659
+#define _gloffset_ExecuteProgramNV 660
+#define _gloffset_GenProgramsNV 661
+#define _gloffset_GetProgramParameterdvNV 662
+#define _gloffset_GetProgramParameterfvNV 663
+#define _gloffset_GetProgramStringNV 664
+#define _gloffset_GetProgramivNV 665
+#define _gloffset_GetTrackMatrixivNV 666
+#define _gloffset_GetVertexAttribPointervNV 667
+#define _gloffset_GetVertexAttribdvNV 668
+#define _gloffset_GetVertexAttribfvNV 669
+#define _gloffset_GetVertexAttribivNV 670
+#define _gloffset_IsProgramNV 671
+#define _gloffset_LoadProgramNV 672
+#define _gloffset_ProgramParameter4dNV 673
+#define _gloffset_ProgramParameter4dvNV 674
+#define _gloffset_ProgramParameter4fNV 675
+#define _gloffset_ProgramParameter4fvNV 676
+#define _gloffset_ProgramParameters4dvNV 677
+#define _gloffset_ProgramParameters4fvNV 678
+#define _gloffset_RequestResidentProgramsNV 679
+#define _gloffset_TrackMatrixNV 680
+#define _gloffset_VertexAttrib1dNV 681
+#define _gloffset_VertexAttrib1dvNV 682
+#define _gloffset_VertexAttrib1fNV 683
+#define _gloffset_VertexAttrib1fvNV 684
+#define _gloffset_VertexAttrib1sNV 685
+#define _gloffset_VertexAttrib1svNV 686
+#define _gloffset_VertexAttrib2dNV 687
+#define _gloffset_VertexAttrib2dvNV 688
+#define _gloffset_VertexAttrib2fNV 689
+#define _gloffset_VertexAttrib2fvNV 690
+#define _gloffset_VertexAttrib2sNV 691
+#define _gloffset_VertexAttrib2svNV 692
+#define _gloffset_VertexAttrib3dNV 693
+#define _gloffset_VertexAttrib3dvNV 694
+#define _gloffset_VertexAttrib3fNV 695
+#define _gloffset_VertexAttrib3fvNV 696
+#define _gloffset_VertexAttrib3sNV 697
+#define _gloffset_VertexAttrib3svNV 698
+#define _gloffset_VertexAttrib4dNV 699
+#define _gloffset_VertexAttrib4dvNV 700
+#define _gloffset_VertexAttrib4fNV 701
+#define _gloffset_VertexAttrib4fvNV 702
+#define _gloffset_VertexAttrib4sNV 703
+#define _gloffset_VertexAttrib4svNV 704
+#define _gloffset_VertexAttrib4ubNV 705
+#define _gloffset_VertexAttrib4ubvNV 706
+#define _gloffset_VertexAttribPointerNV 707
+#define _gloffset_VertexAttribs1dvNV 708
+#define _gloffset_VertexAttribs1fvNV 709
+#define _gloffset_VertexAttribs1svNV 710
+#define _gloffset_VertexAttribs2dvNV 711
+#define _gloffset_VertexAttribs2fvNV 712
+#define _gloffset_VertexAttribs2svNV 713
+#define _gloffset_VertexAttribs3dvNV 714
+#define _gloffset_VertexAttribs3fvNV 715
+#define _gloffset_VertexAttribs3svNV 716
+#define _gloffset_VertexAttribs4dvNV 717
+#define _gloffset_VertexAttribs4fvNV 718
+#define _gloffset_VertexAttribs4svNV 719
+#define _gloffset_VertexAttribs4ubvNV 720
+#define _gloffset_AlphaFragmentOp1ATI 721
+#define _gloffset_AlphaFragmentOp2ATI 722
+#define _gloffset_AlphaFragmentOp3ATI 723
+#define _gloffset_BeginFragmentShaderATI 724
+#define _gloffset_BindFragmentShaderATI 725
+#define _gloffset_ColorFragmentOp1ATI 726
+#define _gloffset_ColorFragmentOp2ATI 727
+#define _gloffset_ColorFragmentOp3ATI 728
+#define _gloffset_DeleteFragmentShaderATI 729
+#define _gloffset_EndFragmentShaderATI 730
+#define _gloffset_GenFragmentShadersATI 731
+#define _gloffset_PassTexCoordATI 732
+#define _gloffset_SampleMapATI 733
+#define _gloffset_SetFragmentShaderConstantATI 734
+#define _gloffset_PointParameteriNV 735
+#define _gloffset_PointParameterivNV 736
+#define _gloffset_ActiveStencilFaceEXT 737
+#define _gloffset_BindVertexArrayAPPLE 738
+#define _gloffset_DeleteVertexArraysAPPLE 739
+#define _gloffset_GenVertexArraysAPPLE 740
+#define _gloffset_IsVertexArrayAPPLE 741
+#define _gloffset_GetProgramNamedParameterdvNV 742
+#define _gloffset_GetProgramNamedParameterfvNV 743
+#define _gloffset_ProgramNamedParameter4dNV 744
+#define _gloffset_ProgramNamedParameter4dvNV 745
+#define _gloffset_ProgramNamedParameter4fNV 746
+#define _gloffset_ProgramNamedParameter4fvNV 747
+#define _gloffset_DepthBoundsEXT 748
+#define _gloffset_BlendEquationSeparateEXT 749
+#define _gloffset_BindFramebufferEXT 750
+#define _gloffset_BindRenderbufferEXT 751
+#define _gloffset_CheckFramebufferStatusEXT 752
+#define _gloffset_DeleteFramebuffersEXT 753
+#define _gloffset_DeleteRenderbuffersEXT 754
+#define _gloffset_FramebufferRenderbufferEXT 755
+#define _gloffset_FramebufferTexture1DEXT 756
+#define _gloffset_FramebufferTexture2DEXT 757
+#define _gloffset_FramebufferTexture3DEXT 758
+#define _gloffset_GenFramebuffersEXT 759
+#define _gloffset_GenRenderbuffersEXT 760
+#define _gloffset_GenerateMipmapEXT 761
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 762
+#define _gloffset_GetQueryObjecti64vEXT 763
+#define _gloffset_GetQueryObjectui64vEXT 764
+#define _gloffset_GetRenderbufferParameterivEXT 765
+#define _gloffset_IsFramebufferEXT 766
+#define _gloffset_IsRenderbufferEXT 767
+#define _gloffset_RenderbufferStorageEXT 768
+#define _gloffset_BlitFramebufferEXT 769
+#define _gloffset_ProgramEnvParameters4fvEXT 770
+#define _gloffset_ProgramLocalParameters4fvEXT 771
+#define _gloffset_FIRST_DYNAMIC 772
 
 #else
 
@@ -978,9 +975,6 @@
 #define _gloffset_VertexPointerEXT driDispatchRemapTable[VertexPointerEXT_remap_index]
 #define _gloffset_PointParameterfEXT driDispatchRemapTable[PointParameterfEXT_remap_index]
 #define _gloffset_PointParameterfvEXT driDispatchRemapTable[PointParameterfvEXT_remap_index]
-#define _gloffset_GetColorTableEXT driDispatchRemapTable[GetColorTableEXT_remap_index]
-#define _gloffset_GetColorTableParameterfvEXT driDispatchRemapTable[GetColorTableParameterfvEXT_remap_index]
-#define _gloffset_GetColorTableParameterivEXT driDispatchRemapTable[GetColorTableParameterivEXT_remap_index]
 #define _gloffset_LockArraysEXT driDispatchRemapTable[LockArraysEXT_remap_index]
 #define _gloffset_UnlockArraysEXT driDispatchRemapTable[UnlockArraysEXT_remap_index]
 #define _gloffset_CullParameterdvEXT driDispatchRemapTable[CullParameterdvEXT_remap_index]