updated vertex program dispatch

6 files changed, 759 insertions, 791 deletions

diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index 34d2a9d516..e810ecb4b5 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -580,85 +580,69 @@
 #define _gloffset_SecondaryColor3usEXT 575
 #define _gloffset_SecondaryColor3usvEXT 576
 #define _gloffset_SecondaryColorPointerEXT 577
-#define _gloffset_WindowPos2dARB 578
-#define _gloffset_WindowPos2fARB 579
-#define _gloffset_WindowPos2iARB 580
-#define _gloffset_WindowPos2sARB 581
-#define _gloffset_WindowPos2dvARB 582
-#define _gloffset_WindowPos2fvARB 583
-#define _gloffset_WindowPos2ivARB 584
-#define _gloffset_WindowPos2svARB 585
-#define _gloffset_WindowPos3dARB 586
-#define _gloffset_WindowPos3fARB 587
-#define _gloffset_WindowPos3iARB 588
-#define _gloffset_WindowPos3sARB 589
-#define _gloffset_WindowPos3dvARB 590
-#define _gloffset_WindowPos3fvARB 591
-#define _gloffset_WindowPos3ivARB 592
-#define _gloffset_WindowPos3svARB 593
-#define _gloffset_BindProgramNV 594
-#define _gloffset_DeleteProgramsNV 595
-#define _gloffset_ExecuteProgramNV 596
-#define _gloffset_GenProgramsNV 597
-#define _gloffset_AreProgramsResidentNV 598
-#define _gloffset_RequestResidentProgramsNV 599
-#define _gloffset_GetProgramParameterfvNV 600
-#define _gloffset_GetProgramParameterdvNV 601
-#define _gloffset_GetProgramivNV 602
-#define _gloffset_GetProgramStringNV 603
-#define _gloffset_GetTrackMatrixivNV 604
-#define _gloffset_GetVertexAttribdvNV 605
-#define _gloffset_GetVertexAttribfvNV 606
-#define _gloffset_GetVertexAttribivNV 607
-#define _gloffset_GetVertexAttribPointervNV 608
-#define _gloffset_IsProgramNV 609
-#define _gloffset_LoadProgramNV 610
-#define _gloffset_ProgramParameter4fNV 611
-#define _gloffset_ProgramParameter4dNV 612
-#define _gloffset_ProgramParameter4dvNV 613
-#define _gloffset_ProgramParameter4fvNV 614
-#define _gloffset_ProgramParameters4dvNV 615
-#define _gloffset_ProgramParameters4fvNV 616
-#define _gloffset_TrackMatrixNV 617
-#define _gloffset_VertexAttribPointerNV 618
-#define _gloffset_VertexAttrib1sNV 619
-#define _gloffset_VertexAttrib1fNV 620
-#define _gloffset_VertexAttrib1dNV 621
-#define _gloffset_VertexAttrib2sNV 622
-#define _gloffset_VertexAttrib2fNV 623
-#define _gloffset_VertexAttrib2dNV 624
-#define _gloffset_VertexAttrib3sNV 625
-#define _gloffset_VertexAttrib3fNV 626
-#define _gloffset_VertexAttrib3dNV 627
-#define _gloffset_VertexAttrib4sNV 628
-#define _gloffset_VertexAttrib4fNV 629
-#define _gloffset_VertexAttrib4dNV 630
-#define _gloffset_VertexAttrib4ubNV 631
-#define _gloffset_VertexAttrib1svNV 632
-#define _gloffset_VertexAttrib1fvNV 633
-#define _gloffset_VertexAttrib1dvNV 634
-#define _gloffset_VertexAttrib2svNV 635
-#define _gloffset_VertexAttrib2fvNV 636
-#define _gloffset_VertexAttrib2dvNV 637
-#define _gloffset_VertexAttrib3svNV 638
-#define _gloffset_VertexAttrib3fvNV 639
-#define _gloffset_VertexAttrib3dvNV 640
-#define _gloffset_VertexAttrib4svNV 641
-#define _gloffset_VertexAttrib4fvNV 642
-#define _gloffset_VertexAttrib4dvNV 643
-#define _gloffset_VertexAttrib4ubvNV 644
-#define _gloffset_VertexAttribs1svNV 645
-#define _gloffset_VertexAttribs1fvNV 646
-#define _gloffset_VertexAttribs1dvNV 647
-#define _gloffset_VertexAttribs2svNV 648
-#define _gloffset_VertexAttribs2fvNV 649
-#define _gloffset_VertexAttribs2dvNV 650
-#define _gloffset_VertexAttribs3svNV 651
-#define _gloffset_VertexAttribs3fvNV 652
-#define _gloffset_VertexAttribs3dvNV 653
-#define _gloffset_VertexAttribs4svNV 654
-#define _gloffset_VertexAttribs4fvNV 655
-#define _gloffset_VertexAttribs4dvNV 656
-#define _gloffset_VertexAttribs4ubvNV 657
+#define _gloffset_AreProgramsResidentNV 578
+#define _gloffset_BindProgramNV 579
+#define _gloffset_DeleteProgramsNV 580
+#define _gloffset_ExecuteProgramNV 581
+#define _gloffset_GenProgramsNV 582
+#define _gloffset_GetProgramParameterdvNV 583
+#define _gloffset_GetProgramParameterfvNV 584
+#define _gloffset_GetProgramivNV 585
+#define _gloffset_GetProgramStringNV 586
+#define _gloffset_GetTrackMatrixivNV 587
+#define _gloffset_GetVertexAttribdvNV 588
+#define _gloffset_GetVertexAttribfvNV 589
+#define _gloffset_GetVertexAttribivNV 590
+#define _gloffset_GetVertexAttribPointervNV 591
+#define _gloffset_IsProgramNV 592
+#define _gloffset_LoadProgramNV 593
+#define _gloffset_ProgramParameter4dNV 594
+#define _gloffset_ProgramParameter4dvNV 595
+#define _gloffset_ProgramParameter4fNV 596
+#define _gloffset_ProgramParameter4fvNV 597
+#define _gloffset_ProgramParameters4dvNV 598
+#define _gloffset_ProgramParameters4fvNV 599
+#define _gloffset_RequestResidentProgramsNV 600
+#define _gloffset_TrackMatrixNV 601
+#define _gloffset_VertexAttribPointerNV 602
+#define _gloffset_VertexAttrib1dNV 603
+#define _gloffset_VertexAttrib1dvNV 604
+#define _gloffset_VertexAttrib1fNV 605
+#define _gloffset_VertexAttrib1fvNV 606
+#define _gloffset_VertexAttrib1sNV 607
+#define _gloffset_VertexAttrib1svNV 608
+#define _gloffset_VertexAttrib2dNV 609
+#define _gloffset_VertexAttrib2dvNV 610
+#define _gloffset_VertexAttrib2fNV 611
+#define _gloffset_VertexAttrib2fvNV 612
+#define _gloffset_VertexAttrib2sNV 613
+#define _gloffset_VertexAttrib2svNV 614
+#define _gloffset_VertexAttrib3dNV 615
+#define _gloffset_VertexAttrib3dvNV 616
+#define _gloffset_VertexAttrib3fNV 617
+#define _gloffset_VertexAttrib3fvNV 618
+#define _gloffset_VertexAttrib3sNV 619
+#define _gloffset_VertexAttrib3svNV 620
+#define _gloffset_VertexAttrib4dNV 621
+#define _gloffset_VertexAttrib4dvNV 622
+#define _gloffset_VertexAttrib4fNV 623
+#define _gloffset_VertexAttrib4fvNV 624
+#define _gloffset_VertexAttrib4sNV 625
+#define _gloffset_VertexAttrib4svNV 626
+#define _gloffset_VertexAttrib4ubNV 627
+#define _gloffset_VertexAttrib4ubvNV 628
+#define _gloffset_VertexAttribs1dvNV 629
+#define _gloffset_VertexAttribs1fvNV 630
+#define _gloffset_VertexAttribs1svNV 631
+#define _gloffset_VertexAttribs2dvNV 632
+#define _gloffset_VertexAttribs2fvNV 633
+#define _gloffset_VertexAttribs2svNV 634
+#define _gloffset_VertexAttribs3dvNV 635
+#define _gloffset_VertexAttribs3fvNV 636
+#define _gloffset_VertexAttribs3svNV 637
+#define _gloffset_VertexAttribs4dvNV 638
+#define _gloffset_VertexAttribs4fvNV 639
+#define _gloffset_VertexAttribs4svNV 640
+#define _gloffset_VertexAttribs4ubvNV 641
 
 #endif
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 8cf465bfb9..aa3b449c33 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -584,86 +584,70 @@ struct _glapi_table
    void (*SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 575 */
    void (*SecondaryColor3usvEXT)(const GLushort * v); /* 576 */
    void (*SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 577 */
-   void (*WindowPos2dARB)(GLdouble x, GLdouble y); /* 578 */
-   void (*WindowPos2fARB)(GLfloat x, GLfloat y); /* 579 */
-   void (*WindowPos2iARB)(GLint x, GLint y); /* 580 */
-   void (*WindowPos2sARB)(GLshort x, GLshort y); /* 581 */
-   void (*WindowPos2dvARB)(const GLdouble * p); /* 582 */
-   void (*WindowPos2fvARB)(const GLfloat * p); /* 583 */
-   void (*WindowPos2ivARB)(const GLint * p); /* 584 */
-   void (*WindowPos2svARB)(const GLshort * p); /* 585 */
-   void (*WindowPos3dARB)(GLdouble x, GLdouble y, GLdouble z); /* 586 */
-   void (*WindowPos3fARB)(GLfloat x, GLfloat y, GLfloat z); /* 587 */
-   void (*WindowPos3iARB)(GLint x, GLint y, GLint z); /* 588 */
-   void (*WindowPos3sARB)(GLshort x, GLshort y, GLshort z); /* 589 */
-   void (*WindowPos3dvARB)(const GLdouble * p); /* 590 */
-   void (*WindowPos3fvARB)(const GLfloat * p); /* 591 */
-   void (*WindowPos3ivARB)(const GLint * p); /* 592 */
-   void (*WindowPos3svARB)(const GLshort * p); /* 593 */
-   void (*BindProgramNV)(GLenum target, GLuint id); /* 594 */
-   void (*DeleteProgramsNV)(GLsizei n, const GLuint * ids); /* 595 */
-   void (*ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 596 */
-   void (*GenProgramsNV)(GLsizei n, GLuint * ids); /* 597 */
-   GLboolean (*AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 598 */
-   void (*RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 599 */
-   void (*GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 600 */
-   void (*GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 601 */
-   void (*GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 602 */
-   void (*GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 603 */
-   void (*GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 604 */
-   void (*GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 605 */
-   void (*GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 606 */
-   void (*GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 607 */
-   void (*GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 608 */
-   GLboolean (*IsProgramNV)(GLuint id); /* 609 */
-   void (*LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 610 */
-   void (*ProgramParameter4fNV)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 611 */
-   void (*ProgramParameter4dNV)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 612 */
-   void (*ProgramParameter4dvNV)(GLenum target, GLuint index, const GLdouble * params); /* 613 */
-   void (*ProgramParameter4fvNV)(GLenum target, GLuint index, const GLfloat * params); /* 614 */
-   void (*ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 615 */
-   void (*ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 616 */
-   void (*TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 617 */
-   void (*VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 618 */
-   void (*VertexAttrib1sNV)(GLuint index, GLshort x); /* 619 */
-   void (*VertexAttrib1fNV)(GLuint index, GLfloat x); /* 620 */
-   void (*VertexAttrib1dNV)(GLuint index, GLdouble x); /* 621 */
-   void (*VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 622 */
-   void (*VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 623 */
-   void (*VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 624 */
-   void (*VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 625 */
-   void (*VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 626 */
-   void (*VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 627 */
-   void (*VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 628 */
-   void (*VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 629 */
-   void (*VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 630 */
-   void (*VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 631 */
-   void (*VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 632 */
-   void (*VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 633 */
-   void (*VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 634 */
-   void (*VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 635 */
-   void (*VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 636 */
-   void (*VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 637 */
-   void (*VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 638 */
-   void (*VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 639 */
-   void (*VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 640 */
-   void (*VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 641 */
-   void (*VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 642 */
-   void (*VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 643 */
-   void (*VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 644 */
-   void (*VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 645 */
-   void (*VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 646 */
-   void (*VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 647 */
-   void (*VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 648 */
-   void (*VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 649 */
-   void (*VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 650 */
-   void (*VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 651 */
-   void (*VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 652 */
-   void (*VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 653 */
-   void (*VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 654 */
-   void (*VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 655 */
-   void (*VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 656 */
-   void (*VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 657 */
+   GLboolean (*AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 578 */
+   void (*BindProgramNV)(GLenum target, GLuint id); /* 579 */
+   void (*DeleteProgramsNV)(GLsizei n, const GLuint * ids); /* 580 */
+   void (*ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 581 */
+   void (*GenProgramsNV)(GLsizei n, GLuint * ids); /* 582 */
+   void (*GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 583 */
+   void (*GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 584 */
+   void (*GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 585 */
+   void (*GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 586 */
+   void (*GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 587 */
+   void (*GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 588 */
+   void (*GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 589 */
+   void (*GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 590 */
+   void (*GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 591 */
+   GLboolean (*IsProgramNV)(GLuint id); /* 592 */
+   void (*LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 593 */
+   void (*ProgramParameter4dNV)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 594 */
+   void (*ProgramParameter4dvNV)(GLenum target, GLuint index, const GLdouble * params); /* 595 */
+   void (*ProgramParameter4fNV)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 596 */
+   void (*ProgramParameter4fvNV)(GLenum target, GLuint index, const GLfloat * params); /* 597 */
+   void (*ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 598 */
+   void (*ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 599 */
+   void (*RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 600 */
+   void (*TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 601 */
+   void (*VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 602 */
+   void (*VertexAttrib1dNV)(GLuint index, GLdouble x); /* 603 */
+   void (*VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 604 */
+   void (*VertexAttrib1fNV)(GLuint index, GLfloat x); /* 605 */
+   void (*VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 606 */
+   void (*VertexAttrib1sNV)(GLuint index, GLshort x); /* 607 */
+   void (*VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 608 */
+   void (*VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 609 */
+   void (*VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 610 */
+   void (*VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 611 */
+   void (*VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 612 */
+   void (*VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 613 */
+   void (*VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 614 */
+   void (*VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 615 */
+   void (*VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 616 */
+   void (*VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 617 */
+   void (*VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 618 */
+   void (*VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 619 */
+   void (*VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 620 */
+   void (*VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 621 */
+   void (*VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 622 */
+   void (*VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 623 */
+   void (*VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 624 */
+   void (*VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 625 */
+   void (*VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 626 */
+   void (*VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 627 */
+   void (*VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 628 */
+   void (*VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 629 */
+   void (*VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 630 */
+   void (*VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 631 */
+   void (*VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 632 */
+   void (*VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 633 */
+   void (*VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 634 */
+   void (*VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 635 */
+   void (*VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 636 */
+   void (*VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 637 */
+   void (*VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 638 */
+   void (*VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 639 */
+   void (*VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 640 */
+   void (*VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 641 */
 };
 
 #endif
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index c28fbb5c4a..298b591798 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -3546,82 +3546,87 @@ KEYWORD1 void KEYWORD2 NAME(SamplePatternEXT)(GLenum pattern)
 /* No dispatch for GetCombinerStageParameterfvNV() */
 KEYWORD1 void KEYWORD2 NAME(WindowPos2dARB)(GLdouble x, GLdouble y)
 {
-   DISPATCH(WindowPos2dARB, (x, y), (F, "glWindowPos2dARB(%f, %f);\n", x, y));
+   DISPATCH(WindowPos2dMESA, (x, y), (F, "glWindowPos2dARB(%f, %f);\n", x, y));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2fARB)(GLfloat x, GLfloat y)
 {
-   DISPATCH(WindowPos2fARB, (x, y), (F, "glWindowPos2fARB(%f, %f);\n", x, y));
+   DISPATCH(WindowPos2fMESA, (x, y), (F, "glWindowPos2fARB(%f, %f);\n", x, y));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2iARB)(GLint x, GLint y)
 {
-   DISPATCH(WindowPos2iARB, (x, y), (F, "glWindowPos2iARB(%d, %d);\n", x, y));
+   DISPATCH(WindowPos2iMESA, (x, y), (F, "glWindowPos2iARB(%d, %d);\n", x, y));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2sARB)(GLshort x, GLshort y)
 {
-   DISPATCH(WindowPos2sARB, (x, y), (F, "glWindowPos2sARB(%d, %d);\n", x, y));
+   DISPATCH(WindowPos2sMESA, (x, y), (F, "glWindowPos2sARB(%d, %d);\n", x, y));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2dvARB)(const GLdouble * p)
 {
-   DISPATCH(WindowPos2dvARB, (p), (F, "glWindowPos2dvARB(%p /* %g, %g */);\n", (void *) p, p[0], p[1]));
+   DISPATCH(WindowPos2dvMESA, (p), (F, "glWindowPos2dvARB(%p /* %g, %g */);\n", (void *) p, p[0], p[1]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2fvARB)(const GLfloat * p)
 {
-   DISPATCH(WindowPos2fvARB, (p), (F, "glWindowPos2fvARB(%p /* %g, %g */);\n", (void *) p, p[0], p[1]));
+   DISPATCH(WindowPos2fvMESA, (p), (F, "glWindowPos2fvARB(%p /* %g, %g */);\n", (void *) p, p[0], p[1]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2ivARB)(const GLint * p)
 {
-   DISPATCH(WindowPos2ivARB, (p), (F, "glWindowPos2ivARB(%p);\n", (void *) p));
+   DISPATCH(WindowPos2ivMESA, (p), (F, "glWindowPos2ivARB(%p);\n", (void *) p));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2svARB)(const GLshort * p)
 {
-   DISPATCH(WindowPos2svARB, (p), (F, "glWindowPos2svARB(%p);\n", (void *) p));
+   DISPATCH(WindowPos2svMESA, (p), (F, "glWindowPos2svARB(%p);\n", (void *) p));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3dARB)(GLdouble x, GLdouble y, GLdouble z)
 {
-   DISPATCH(WindowPos3dARB, (x, y, z), (F, "glWindowPos3dARB(%f, %f, %f);\n", x, y, z));
+   DISPATCH(WindowPos3dMESA, (x, y, z), (F, "glWindowPos3dARB(%f, %f, %f);\n", x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3fARB)(GLfloat x, GLfloat y, GLfloat z)
 {
-   DISPATCH(WindowPos3fARB, (x, y, z), (F, "glWindowPos3fARB(%f, %f, %f);\n", x, y, z));
+   DISPATCH(WindowPos3fMESA, (x, y, z), (F, "glWindowPos3fARB(%f, %f, %f);\n", x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3iARB)(GLint x, GLint y, GLint z)
 {
-   DISPATCH(WindowPos3iARB, (x, y, z), (F, "glWindowPos3iARB(%d, %d, %d);\n", x, y, z));
+   DISPATCH(WindowPos3iMESA, (x, y, z), (F, "glWindowPos3iARB(%d, %d, %d);\n", x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3sARB)(GLshort x, GLshort y, GLshort z)
 {
-   DISPATCH(WindowPos3sARB, (x, y, z), (F, "glWindowPos3sARB(%d, %d, %d);\n", x, y, z));
+   DISPATCH(WindowPos3sMESA, (x, y, z), (F, "glWindowPos3sARB(%d, %d, %d);\n", x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3dvARB)(const GLdouble * p)
 {
-   DISPATCH(WindowPos3dvARB, (p), (F, "glWindowPos3dvARB(%p /* %g, %g, %g */);\n", (void *) p, p[0], p[1], p[2]));
+   DISPATCH(WindowPos3dvMESA, (p), (F, "glWindowPos3dvARB(%p /* %g, %g, %g */);\n", (void *) p, p[0], p[1], p[2]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3fvARB)(const GLfloat * p)
 {
-   DISPATCH(WindowPos3fvARB, (p), (F, "glWindowPos3fvARB(%p /* %g, %g, %g */);\n", (void *) p, p[0], p[1], p[2]));
+   DISPATCH(WindowPos3fvMESA, (p), (F, "glWindowPos3fvARB(%p /* %g, %g, %g */);\n", (void *) p, p[0], p[1], p[2]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3ivARB)(const GLint * p)
 {
-   DISPATCH(WindowPos3ivARB, (p), (F, "glWindowPos3ivARB(%p);\n", (void *) p));
+   DISPATCH(WindowPos3ivMESA, (p), (F, "glWindowPos3ivARB(%p);\n", (void *) p));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3svARB)(const GLshort * p)
 {
-   DISPATCH(WindowPos3svARB, (p), (F, "glWindowPos3svARB(%p);\n", (void *) p));
+   DISPATCH(WindowPos3svMESA, (p), (F, "glWindowPos3svARB(%p);\n", (void *) p));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences)
+{
+   RETURN_DISPATCH(AreProgramsResidentNV, (n, ids, residences), (F, "glAreProgramsResidentNV(%d, %p, %p);\n", n, (void *) ids, (void *) residences));
 }
 
 KEYWORD1 void KEYWORD2 NAME(BindProgramNV)(GLenum target, GLuint id)
@@ -3644,14 +3649,9 @@ KEYWORD1 void KEYWORD2 NAME(GenProgramsNV)(GLsizei n, GLuint * ids)
    DISPATCH(GenProgramsNV, (n, ids), (F, "glGenProgramsNV(%d, %p);\n", n, (void *) ids));
 }
 
-KEYWORD1 GLboolean KEYWORD2 NAME(AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences)
-{
-   RETURN_DISPATCH(AreProgramsResidentNV, (n, ids, residences), (F, "glAreProgramsResidentNV(%d, %p, %p);\n", n, (void *) ids, (void *) residences));
-}
-
-KEYWORD1 void KEYWORD2 NAME(RequestResidentProgramsNV)(GLsizei n, const GLuint * ids)
+KEYWORD1 void KEYWORD2 NAME(GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params)
 {
-   DISPATCH(RequestResidentProgramsNV, (n, ids), (F, "glRequestResidentProgramsNV(%d, %p);\n", n, (void *) ids));
+   DISPATCH(GetProgramParameterdvNV, (target, index, pname, params), (F, "glGetProgramParameterdvNV(0x%x, %d, 0x%x, %p);\n", target, index, pname, (void *) params));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params)
@@ -3659,11 +3659,6 @@ KEYWORD1 void KEYWORD2 NAME(GetProgramParameterfvNV)(GLenum target, GLuint index
    DISPATCH(GetProgramParameterfvNV, (target, index, pname, params), (F, "glGetProgramParameterfvNV(0x%x, %d, 0x%x, %p);\n", target, index, pname, (void *) params));
 }
 
-KEYWORD1 void KEYWORD2 NAME(GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params)
-{
-   DISPATCH(GetProgramParameterdvNV, (target, index, pname, params), (F, "glGetProgramParameterdvNV(0x%x, %d, 0x%x, %p);\n", target, index, pname, (void *) params));
-}
-
 KEYWORD1 void KEYWORD2 NAME(GetProgramivNV)(GLuint id, GLenum pname, GLint * params)
 {
    DISPATCH(GetProgramivNV, (id, pname, params), (F, "glGetProgramivNV(%d, 0x%x, %p);\n", id, pname, (void *) params));
@@ -3709,11 +3704,6 @@ KEYWORD1 void KEYWORD2 NAME(LoadProgramNV)(GLenum target, GLuint id, GLsizei len
    DISPATCH(LoadProgramNV, (target, id, len, program), (F, "glLoadProgramNV(0x%x, %d, %d, %p);\n", target, id, len, (void *) program));
 }
 
-KEYWORD1 void KEYWORD2 NAME(ProgramParameter4fNV)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   DISPATCH(ProgramParameter4fNV, (target, index, x, y, z, w), (F, "glProgramParameter4fNV(0x%x, %d, %f, %f, %f, %f);\n", target, index, x, y, z, w));
-}
-
 KEYWORD1 void KEYWORD2 NAME(ProgramParameter4dNV)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    DISPATCH(ProgramParameter4dNV, (target, index, x, y, z, w), (F, "glProgramParameter4dNV(0x%x, %d, %f, %f, %f, %f);\n", target, index, x, y, z, w));
@@ -3724,6 +3714,11 @@ KEYWORD1 void KEYWORD2 NAME(ProgramParameter4dvNV)(GLenum target, GLuint index,
    DISPATCH(ProgramParameter4dvNV, (target, index, params), (F, "glProgramParameter4dvNV(0x%x, %d, %p /* %g, %g, %g, %g */);\n", target, index, (void *) params, params[0], params[1], params[2], params[3]));
 }
 
+KEYWORD1 void KEYWORD2 NAME(ProgramParameter4fNV)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   DISPATCH(ProgramParameter4fNV, (target, index, x, y, z, w), (F, "glProgramParameter4fNV(0x%x, %d, %f, %f, %f, %f);\n", target, index, x, y, z, w));
+}
+
 KEYWORD1 void KEYWORD2 NAME(ProgramParameter4fvNV)(GLenum target, GLuint index, const GLfloat * params)
 {
    DISPATCH(ProgramParameter4fvNV, (target, index, params), (F, "glProgramParameter4fvNV(0x%x, %d, %p /* %g, %g, %g, %g */);\n", target, index, (void *) params, params[0], params[1], params[2], params[3]));
@@ -3739,6 +3734,11 @@ KEYWORD1 void KEYWORD2 NAME(ProgramParameters4fvNV)(GLenum target, GLuint index,
    DISPATCH(ProgramParameters4fvNV, (target, index, num, params), (F, "glProgramParameters4fvNV(0x%x, %d, %d, %p /* %g, %g, %g, %g */);\n", target, index, num, (void *) params, params[0], params[1], params[2], params[3]));
 }
 
+KEYWORD1 void KEYWORD2 NAME(RequestResidentProgramsNV)(GLsizei n, const GLuint * ids)
+{
+   DISPATCH(RequestResidentProgramsNV, (n, ids), (F, "glRequestResidentProgramsNV(%d, %p);\n", n, (void *) ids));
+}
+
 KEYWORD1 void KEYWORD2 NAME(TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform)
 {
    DISPATCH(TrackMatrixNV, (target, address, matrix, transform), (F, "glTrackMatrixNV(0x%x, %d, 0x%x, 0x%x);\n", target, address, matrix, transform));
@@ -3749,9 +3749,14 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttribPointerNV)(GLuint index, GLint size, GLe
    DISPATCH(VertexAttribPointerNV, (index, size, type, stride, pointer), (F, "glVertexAttribPointerNV(%d, %d, 0x%x, %d, %p);\n", index, size, type, stride, (void *) pointer));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib1sNV)(GLuint index, GLshort x)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dNV)(GLuint index, GLdouble x)
 {
-   DISPATCH(VertexAttrib1sNV, (index, x), (F, "glVertexAttrib1sNV(%d, %d);\n", index, x));
+   DISPATCH(VertexAttrib1dNV, (index, x), (F, "glVertexAttrib1dNV(%d, %f);\n", index, x));
+}
+
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dvNV)(GLuint index, const GLdouble * v)
+{
+   DISPATCH(VertexAttrib1dvNV, (index, v), (F, "glVertexAttrib1dvNV(%d, %p);\n", index, (void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fNV)(GLuint index, GLfloat x)
@@ -3759,19 +3764,19 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fNV)(GLuint index, GLfloat x)
    DISPATCH(VertexAttrib1fNV, (index, x), (F, "glVertexAttrib1fNV(%d, %f);\n", index, x));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dNV)(GLuint index, GLdouble x)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)
 {
-   DISPATCH(VertexAttrib1dNV, (index, x), (F, "glVertexAttrib1dNV(%d, %f);\n", index, x));
+   DISPATCH(VertexAttrib1fvNV, (index, v), (F, "glVertexAttrib1fvNV(%d, %p);\n", index, (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1sNV)(GLuint index, GLshort x)
 {
-   DISPATCH(VertexAttrib2sNV, (index, x, y), (F, "glVertexAttrib2sNV(%d, %d, %d);\n", index, x, y));
+   DISPATCH(VertexAttrib1sNV, (index, x), (F, "glVertexAttrib1sNV(%d, %d);\n", index, x));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib1svNV)(GLuint index, const GLshort * v)
 {
-   DISPATCH(VertexAttrib2fNV, (index, x, y), (F, "glVertexAttrib2fNV(%d, %f, %f);\n", index, x, y));
+   DISPATCH(VertexAttrib1svNV, (index, v), (F, "glVertexAttrib1svNV(%d, %p);\n", index, (void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y)
@@ -3779,84 +3784,84 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble
    DISPATCH(VertexAttrib2dNV, (index, x, y), (F, "glVertexAttrib2dNV(%d, %f, %f);\n", index, x, y));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dvNV)(GLuint index, const GLdouble * v)
 {
-   DISPATCH(VertexAttrib3sNV, (index, x, y, z), (F, "glVertexAttrib3sNV(%d, %d, %d, %d);\n", index, x, y, z));
+   DISPATCH(VertexAttrib2dvNV, (index, v), (F, "glVertexAttrib2dvNV(%d, %p /* %g, %g */);\n", index, (void *) v, v[0], v[1]));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
 {
-   DISPATCH(VertexAttrib3fNV, (index, x, y, z), (F, "glVertexAttrib3fNV(%d, %f, %f, %f);\n", index, x, y, z));
+   DISPATCH(VertexAttrib2fNV, (index, x, y), (F, "glVertexAttrib2fNV(%d, %f, %f);\n", index, x, y));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)
 {
-   DISPATCH(VertexAttrib3dNV, (index, x, y, z), (F, "glVertexAttrib3dNV(%d, %f, %f, %f);\n", index, x, y, z));
+   DISPATCH(VertexAttrib2fvNV, (index, v), (F, "glVertexAttrib2fvNV(%d, %p /* %g, %g */);\n", index, (void *) v, v[0], v[1]));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y)
 {
-   DISPATCH(VertexAttrib4sNV, (index, x, y, z, w), (F, "glVertexAttrib4sNV(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
+   DISPATCH(VertexAttrib2sNV, (index, x, y), (F, "glVertexAttrib2sNV(%d, %d, %d);\n", index, x, y));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib2svNV)(GLuint index, const GLshort * v)
 {
-   DISPATCH(VertexAttrib4fNV, (index, x, y, z, w), (F, "glVertexAttrib4fNV(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
+   DISPATCH(VertexAttrib2svNV, (index, v), (F, "glVertexAttrib2svNV(%d, %p);\n", index, (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-   DISPATCH(VertexAttrib4dNV, (index, x, y, z, w), (F, "glVertexAttrib4dNV(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
+   DISPATCH(VertexAttrib3dNV, (index, x, y, z), (F, "glVertexAttrib3dNV(%d, %f, %f, %f);\n", index, x, y, z));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dvNV)(GLuint index, const GLdouble * v)
 {
-   DISPATCH(VertexAttrib4ubNV, (index, x, y, z, w), (F, "glVertexAttrib4ubNV(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
+   DISPATCH(VertexAttrib3dvNV, (index, v), (F, "glVertexAttrib3dvNV(%d, %p /* %g, %g, %g */);\n", index, (void *) v, v[0], v[1], v[2]));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib1svNV)(GLuint index, const GLshort * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-   DISPATCH(VertexAttrib1svNV, (index, v), (F, "glVertexAttrib1svNV(%d, %p);\n", index, (void *) v));
+   DISPATCH(VertexAttrib3fNV, (index, x, y, z), (F, "glVertexAttrib3fNV(%d, %f, %f, %f);\n", index, x, y, z));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fvNV)(GLuint index, const GLfloat * v)
 {
-   DISPATCH(VertexAttrib1fvNV, (index, v), (F, "glVertexAttrib1fvNV(%d, %p);\n", index, (void *) v));
+   DISPATCH(VertexAttrib3fvNV, (index, v), (F, "glVertexAttrib3fvNV(%d, %p /* %g, %g, %g */);\n", index, (void *) v, v[0], v[1], v[2]));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dvNV)(GLuint index, const GLdouble * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-   DISPATCH(VertexAttrib1dvNV, (index, v), (F, "glVertexAttrib1dvNV(%d, %p);\n", index, (void *) v));
+   DISPATCH(VertexAttrib3sNV, (index, x, y, z), (F, "glVertexAttrib3sNV(%d, %d, %d, %d);\n", index, x, y, z));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib2svNV)(GLuint index, const GLshort * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib3svNV)(GLuint index, const GLshort * v)
 {
-   DISPATCH(VertexAttrib2svNV, (index, v), (F, "glVertexAttrib2svNV(%d, %p);\n", index, (void *) v));
+   DISPATCH(VertexAttrib3svNV, (index, v), (F, "glVertexAttrib3svNV(%d, %p);\n", index, (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-   DISPATCH(VertexAttrib2fvNV, (index, v), (F, "glVertexAttrib2fvNV(%d, %p /* %g, %g */);\n", index, (void *) v, v[0], v[1]));
+   DISPATCH(VertexAttrib4dNV, (index, x, y, z, w), (F, "glVertexAttrib4dNV(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dvNV)(GLuint index, const GLdouble * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dvNV)(GLuint index, const GLdouble * v)
 {
-   DISPATCH(VertexAttrib2dvNV, (index, v), (F, "glVertexAttrib2dvNV(%d, %p /* %g, %g */);\n", index, (void *) v, v[0], v[1]));
+   DISPATCH(VertexAttrib4dvNV, (index, v), (F, "glVertexAttrib4dvNV(%d, %p /* %g, %g, %g, %g */);\n", index, (void *) v, v[0], v[1], v[2], v[3]));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib3svNV)(GLuint index, const GLshort * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   DISPATCH(VertexAttrib3svNV, (index, v), (F, "glVertexAttrib3svNV(%d, %p);\n", index, (void *) v));
+   DISPATCH(VertexAttrib4fNV, (index, x, y, z, w), (F, "glVertexAttrib4fNV(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fvNV)(GLuint index, const GLfloat * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)
 {
-   DISPATCH(VertexAttrib3fvNV, (index, v), (F, "glVertexAttrib3fvNV(%d, %p /* %g, %g, %g */);\n", index, (void *) v, v[0], v[1], v[2]));
+   DISPATCH(VertexAttrib4fvNV, (index, v), (F, "glVertexAttrib4fvNV(%d, %p /* %g, %g, %g, %g */);\n", index, (void *) v, v[0], v[1], v[2], v[3]));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dvNV)(GLuint index, const GLdouble * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-   DISPATCH(VertexAttrib3dvNV, (index, v), (F, "glVertexAttrib3dvNV(%d, %p /* %g, %g, %g */);\n", index, (void *) v, v[0], v[1], v[2]));
+   DISPATCH(VertexAttrib4sNV, (index, x, y, z, w), (F, "glVertexAttrib4sNV(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4svNV)(GLuint index, const GLshort * v)
@@ -3864,14 +3869,9 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib4svNV)(GLuint index, const GLshort * v)
    DISPATCH(VertexAttrib4svNV, (index, v), (F, "glVertexAttrib4svNV(%d, %p);\n", index, (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)
-{
-   DISPATCH(VertexAttrib4fvNV, (index, v), (F, "glVertexAttrib4fvNV(%d, %p /* %g, %g, %g, %g */);\n", index, (void *) v, v[0], v[1], v[2], v[3]));
-}
-
-KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dvNV)(GLuint index, const GLdouble * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-   DISPATCH(VertexAttrib4dvNV, (index, v), (F, "glVertexAttrib4dvNV(%d, %p /* %g, %g, %g, %g */);\n", index, (void *) v, v[0], v[1], v[2], v[3]));
+   DISPATCH(VertexAttrib4ubNV, (index, x, y, z, w), (F, "glVertexAttrib4ubNV(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubvNV)(GLuint index, const GLubyte * v)
@@ -3879,9 +3879,9 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubvNV)(GLuint index, const GLubyte * v)
    DISPATCH(VertexAttrib4ubvNV, (index, v), (F, "glVertexAttrib4ubvNV(%d, %p);\n", index, (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v)
 {
-   DISPATCH(VertexAttribs1svNV, (index, n, v), (F, "glVertexAttribs1svNV(%d, %d, %p);\n", index, n, (void *) v));
+   DISPATCH(VertexAttribs1dvNV, (index, n, v), (F, "glVertexAttribs1dvNV(%d, %d, %p);\n", index, n, (void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v)
@@ -3889,14 +3889,14 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttribs1fvNV)(GLuint index, GLsizei n, const G
    DISPATCH(VertexAttribs1fvNV, (index, n, v), (F, "glVertexAttribs1fvNV(%d, %d, %p);\n", index, n, (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v)
 {
-   DISPATCH(VertexAttribs1dvNV, (index, n, v), (F, "glVertexAttribs1dvNV(%d, %d, %p);\n", index, n, (void *) v));
+   DISPATCH(VertexAttribs1svNV, (index, n, v), (F, "glVertexAttribs1svNV(%d, %d, %p);\n", index, n, (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v)
 {
-   DISPATCH(VertexAttribs2svNV, (index, n, v), (F, "glVertexAttribs2svNV(%d, %d, %p);\n", index, n, (void *) v));
+   DISPATCH(VertexAttribs2dvNV, (index, n, v), (F, "glVertexAttribs2dvNV(%d, %d, %p /* %g, %g */);\n", index, n, (void *) v, v[0], v[1]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v)
@@ -3904,14 +3904,14 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttribs2fvNV)(GLuint index, GLsizei n, const G
    DISPATCH(VertexAttribs2fvNV, (index, n, v), (F, "glVertexAttribs2fvNV(%d, %d, %p /* %g, %g */);\n", index, n, (void *) v, v[0], v[1]));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v)
 {
-   DISPATCH(VertexAttribs2dvNV, (index, n, v), (F, "glVertexAttribs2dvNV(%d, %d, %p /* %g, %g */);\n", index, n, (void *) v, v[0], v[1]));
+   DISPATCH(VertexAttribs2svNV, (index, n, v), (F, "glVertexAttribs2svNV(%d, %d, %p);\n", index, n, (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v)
 {
-   DISPATCH(VertexAttribs3svNV, (index, n, v), (F, "glVertexAttribs3svNV(%d, %d, %p);\n", index, n, (void *) v));
+   DISPATCH(VertexAttribs3dvNV, (index, n, v), (F, "glVertexAttribs3dvNV(%d, %d, %p /* %g, %g, %g */);\n", index, n, (void *) v, v[0], v[1], v[2]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v)
@@ -3919,14 +3919,14 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttribs3fvNV)(GLuint index, GLsizei n, const G
    DISPATCH(VertexAttribs3fvNV, (index, n, v), (F, "glVertexAttribs3fvNV(%d, %d, %p /* %g, %g, %g */);\n", index, n, (void *) v, v[0], v[1], v[2]));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v)
 {
-   DISPATCH(VertexAttribs3dvNV, (index, n, v), (F, "glVertexAttribs3dvNV(%d, %d, %p /* %g, %g, %g */);\n", index, n, (void *) v, v[0], v[1], v[2]));
+   DISPATCH(VertexAttribs3svNV, (index, n, v), (F, "glVertexAttribs3svNV(%d, %d, %p);\n", index, n, (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v)
 {
-   DISPATCH(VertexAttribs4svNV, (index, n, v), (F, "glVertexAttribs4svNV(%d, %d, %p);\n", index, n, (void *) v));
+   DISPATCH(VertexAttribs4dvNV, (index, n, v), (F, "glVertexAttribs4dvNV(%d, %d, %p /* %g, %g, %g, %g */);\n", index, n, (void *) v, v[0], v[1], v[2], v[3]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v)
@@ -3934,9 +3934,9 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttribs4fvNV)(GLuint index, GLsizei n, const G
    DISPATCH(VertexAttribs4fvNV, (index, n, v), (F, "glVertexAttribs4fvNV(%d, %d, %p /* %g, %g, %g, %g */);\n", index, n, (void *) v, v[0], v[1], v[2], v[3]));
 }
 
-KEYWORD1 void KEYWORD2 NAME(VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v)
+KEYWORD1 void KEYWORD2 NAME(VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v)
 {
-   DISPATCH(VertexAttribs4dvNV, (index, n, v), (F, "glVertexAttribs4dvNV(%d, %d, %p /* %g, %g, %g, %g */);\n", index, n, (void *) v, v[0], v[1], v[2], v[3]));
+   DISPATCH(VertexAttribs4svNV, (index, n, v), (F, "glVertexAttribs4svNV(%d, %d, %p);\n", index, n, (void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v)
@@ -4535,30 +4535,13 @@ void *DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SecondaryColor3usEXT),
    TABLE_ENTRY(SecondaryColor3usvEXT),
    TABLE_ENTRY(SecondaryColorPointerEXT),
-   TABLE_ENTRY(WindowPos2dARB),
-   TABLE_ENTRY(WindowPos2fARB),
-   TABLE_ENTRY(WindowPos2iARB),
-   TABLE_ENTRY(WindowPos2sARB),
-   TABLE_ENTRY(WindowPos2dvARB),
-   TABLE_ENTRY(WindowPos2fvARB),
-   TABLE_ENTRY(WindowPos2ivARB),
-   TABLE_ENTRY(WindowPos2svARB),
-   TABLE_ENTRY(WindowPos3dARB),
-   TABLE_ENTRY(WindowPos3fARB),
-   TABLE_ENTRY(WindowPos3iARB),
-   TABLE_ENTRY(WindowPos3sARB),
-   TABLE_ENTRY(WindowPos3dvARB),
-   TABLE_ENTRY(WindowPos3fvARB),
-   TABLE_ENTRY(WindowPos3ivARB),
-   TABLE_ENTRY(WindowPos3svARB),
+   TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
    TABLE_ENTRY(ExecuteProgramNV),
    TABLE_ENTRY(GenProgramsNV),
-   TABLE_ENTRY(AreProgramsResidentNV),
-   TABLE_ENTRY(RequestResidentProgramsNV),
-   TABLE_ENTRY(GetProgramParameterfvNV),
    TABLE_ENTRY(GetProgramParameterdvNV),
+   TABLE_ENTRY(GetProgramParameterfvNV),
    TABLE_ENTRY(GetProgramivNV),
    TABLE_ENTRY(GetProgramStringNV),
    TABLE_ENTRY(GetTrackMatrixivNV),
@@ -4568,52 +4551,53 @@ void *DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetVertexAttribPointervNV),
    TABLE_ENTRY(IsProgramNV),
    TABLE_ENTRY(LoadProgramNV),
-   TABLE_ENTRY(ProgramParameter4fNV),
    TABLE_ENTRY(ProgramParameter4dNV),
    TABLE_ENTRY(ProgramParameter4dvNV),
+   TABLE_ENTRY(ProgramParameter4fNV),
    TABLE_ENTRY(ProgramParameter4fvNV),
    TABLE_ENTRY(ProgramParameters4dvNV),
    TABLE_ENTRY(ProgramParameters4fvNV),
+   TABLE_ENTRY(RequestResidentProgramsNV),
    TABLE_ENTRY(TrackMatrixNV),
    TABLE_ENTRY(VertexAttribPointerNV),
-   TABLE_ENTRY(VertexAttrib1sNV),
-   TABLE_ENTRY(VertexAttrib1fNV),
    TABLE_ENTRY(VertexAttrib1dNV),
-   TABLE_ENTRY(VertexAttrib2sNV),
-   TABLE_ENTRY(VertexAttrib2fNV),
-   TABLE_ENTRY(VertexAttrib2dNV),
-   TABLE_ENTRY(VertexAttrib3sNV),
-   TABLE_ENTRY(VertexAttrib3fNV),
-   TABLE_ENTRY(VertexAttrib3dNV),
-   TABLE_ENTRY(VertexAttrib4sNV),
-   TABLE_ENTRY(VertexAttrib4fNV),
-   TABLE_ENTRY(VertexAttrib4dNV),
-   TABLE_ENTRY(VertexAttrib4ubNV),
-   TABLE_ENTRY(VertexAttrib1svNV),
-   TABLE_ENTRY(VertexAttrib1fvNV),
    TABLE_ENTRY(VertexAttrib1dvNV),
-   TABLE_ENTRY(VertexAttrib2svNV),
-   TABLE_ENTRY(VertexAttrib2fvNV),
+   TABLE_ENTRY(VertexAttrib1fNV),
+   TABLE_ENTRY(VertexAttrib1fvNV),
+   TABLE_ENTRY(VertexAttrib1sNV),
+   TABLE_ENTRY(VertexAttrib1svNV),
+   TABLE_ENTRY(VertexAttrib2dNV),
    TABLE_ENTRY(VertexAttrib2dvNV),
-   TABLE_ENTRY(VertexAttrib3svNV),
-   TABLE_ENTRY(VertexAttrib3fvNV),
+   TABLE_ENTRY(VertexAttrib2fNV),
+   TABLE_ENTRY(VertexAttrib2fvNV),
+   TABLE_ENTRY(VertexAttrib2sNV),
+   TABLE_ENTRY(VertexAttrib2svNV),
+   TABLE_ENTRY(VertexAttrib3dNV),
    TABLE_ENTRY(VertexAttrib3dvNV),
-   TABLE_ENTRY(VertexAttrib4svNV),
-   TABLE_ENTRY(VertexAttrib4fvNV),
+   TABLE_ENTRY(VertexAttrib3fNV),
+   TABLE_ENTRY(VertexAttrib3fvNV),
+   TABLE_ENTRY(VertexAttrib3sNV),
+   TABLE_ENTRY(VertexAttrib3svNV),
+   TABLE_ENTRY(VertexAttrib4dNV),
    TABLE_ENTRY(VertexAttrib4dvNV),
+   TABLE_ENTRY(VertexAttrib4fNV),
+   TABLE_ENTRY(VertexAttrib4fvNV),
+   TABLE_ENTRY(VertexAttrib4sNV),
+   TABLE_ENTRY(VertexAttrib4svNV),
+   TABLE_ENTRY(VertexAttrib4ubNV),
    TABLE_ENTRY(VertexAttrib4ubvNV),
-   TABLE_ENTRY(VertexAttribs1svNV),
-   TABLE_ENTRY(VertexAttribs1fvNV),
    TABLE_ENTRY(VertexAttribs1dvNV),
-   TABLE_ENTRY(VertexAttribs2svNV),
-   TABLE_ENTRY(VertexAttribs2fvNV),
+   TABLE_ENTRY(VertexAttribs1fvNV),
+   TABLE_ENTRY(VertexAttribs1svNV),
    TABLE_ENTRY(VertexAttribs2dvNV),
-   TABLE_ENTRY(VertexAttribs3svNV),
-   TABLE_ENTRY(VertexAttribs3fvNV),
+   TABLE_ENTRY(VertexAttribs2fvNV),
+   TABLE_ENTRY(VertexAttribs2svNV),
    TABLE_ENTRY(VertexAttribs3dvNV),
-   TABLE_ENTRY(VertexAttribs4svNV),
-   TABLE_ENTRY(VertexAttribs4fvNV),
+   TABLE_ENTRY(VertexAttribs3fvNV),
+   TABLE_ENTRY(VertexAttribs3svNV),
    TABLE_ENTRY(VertexAttribs4dvNV),
+   TABLE_ENTRY(VertexAttribs4fvNV),
+   TABLE_ENTRY(VertexAttribs4svNV),
    TABLE_ENTRY(VertexAttribs4ubvNV),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
@@ -4818,6 +4802,22 @@ void *UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(BlendFuncSeparateINGR),
    TABLE_ENTRY(SampleMaskEXT),
    TABLE_ENTRY(SamplePatternEXT),
+   TABLE_ENTRY(WindowPos2dARB),
+   TABLE_ENTRY(WindowPos2fARB),
+   TABLE_ENTRY(WindowPos2iARB),
+   TABLE_ENTRY(WindowPos2sARB),
+   TABLE_ENTRY(WindowPos2dvARB),
+   TABLE_ENTRY(WindowPos2fvARB),
+   TABLE_ENTRY(WindowPos2ivARB),
+   TABLE_ENTRY(WindowPos2svARB),
+   TABLE_ENTRY(WindowPos3dARB),
+   TABLE_ENTRY(WindowPos3fARB),
+   TABLE_ENTRY(WindowPos3iARB),
+   TABLE_ENTRY(WindowPos3sARB),
+   TABLE_ENTRY(WindowPos3dvARB),
+   TABLE_ENTRY(WindowPos3fvARB),
+   TABLE_ENTRY(WindowPos3ivARB),
+   TABLE_ENTRY(WindowPos3svARB),
 };
 #endif /*UNUSED_TABLE_NAME*/
 
diff --git a/src/mesa/main/glprocs.h b/src/mesa/main/glprocs.h
index bf573adfa0..ecb9cbb984 100644
--- a/src/mesa/main/glprocs.h
+++ b/src/mesa/main/glprocs.h
@@ -672,30 +672,29 @@ static struct name_address_offset static_functions[] = {
    { "glTbufferMask3DFX", (GLvoid *) glTbufferMask3DFX, _gloffset_TbufferMask3DFX },
    { "glSampleMaskEXT", (GLvoid *) glSampleMaskEXT, _gloffset_SampleMaskSGIS },
    { "glSamplePatternEXT", (GLvoid *) glSamplePatternEXT, _gloffset_SamplePatternSGIS },
-   { "glWindowPos2dARB", (GLvoid *) glWindowPos2dARB, _gloffset_WindowPos2dARB },
-   { "glWindowPos2fARB", (GLvoid *) glWindowPos2fARB, _gloffset_WindowPos2fARB },
-   { "glWindowPos2iARB", (GLvoid *) glWindowPos2iARB, _gloffset_WindowPos2iARB },
-   { "glWindowPos2sARB", (GLvoid *) glWindowPos2sARB, _gloffset_WindowPos2sARB },
-   { "glWindowPos2dvARB", (GLvoid *) glWindowPos2dvARB, _gloffset_WindowPos2dvARB },
-   { "glWindowPos2fvARB", (GLvoid *) glWindowPos2fvARB, _gloffset_WindowPos2fvARB },
-   { "glWindowPos2ivARB", (GLvoid *) glWindowPos2ivARB, _gloffset_WindowPos2ivARB },
-   { "glWindowPos2svARB", (GLvoid *) glWindowPos2svARB, _gloffset_WindowPos2svARB },
-   { "glWindowPos3dARB", (GLvoid *) glWindowPos3dARB, _gloffset_WindowPos3dARB },
-   { "glWindowPos3fARB", (GLvoid *) glWindowPos3fARB, _gloffset_WindowPos3fARB },
-   { "glWindowPos3iARB", (GLvoid *) glWindowPos3iARB, _gloffset_WindowPos3iARB },
-   { "glWindowPos3sARB", (GLvoid *) glWindowPos3sARB, _gloffset_WindowPos3sARB },
-   { "glWindowPos3dvARB", (GLvoid *) glWindowPos3dvARB, _gloffset_WindowPos3dvARB },
-   { "glWindowPos3fvARB", (GLvoid *) glWindowPos3fvARB, _gloffset_WindowPos3fvARB },
-   { "glWindowPos3ivARB", (GLvoid *) glWindowPos3ivARB, _gloffset_WindowPos3ivARB },
-   { "glWindowPos3svARB", (GLvoid *) glWindowPos3svARB, _gloffset_WindowPos3svARB },
+   { "glWindowPos2dARB", (GLvoid *) glWindowPos2dARB, _gloffset_WindowPos2dMESA },
+   { "glWindowPos2fARB", (GLvoid *) glWindowPos2fARB, _gloffset_WindowPos2fMESA },
+   { "glWindowPos2iARB", (GLvoid *) glWindowPos2iARB, _gloffset_WindowPos2iMESA },
+   { "glWindowPos2sARB", (GLvoid *) glWindowPos2sARB, _gloffset_WindowPos2sMESA },
+   { "glWindowPos2dvARB", (GLvoid *) glWindowPos2dvARB, _gloffset_WindowPos2dvMESA },
+   { "glWindowPos2fvARB", (GLvoid *) glWindowPos2fvARB, _gloffset_WindowPos2fvMESA },
+   { "glWindowPos2ivARB", (GLvoid *) glWindowPos2ivARB, _gloffset_WindowPos2ivMESA },
+   { "glWindowPos2svARB", (GLvoid *) glWindowPos2svARB, _gloffset_WindowPos2svMESA },
+   { "glWindowPos3dARB", (GLvoid *) glWindowPos3dARB, _gloffset_WindowPos3dMESA },
+   { "glWindowPos3fARB", (GLvoid *) glWindowPos3fARB, _gloffset_WindowPos3fMESA },
+   { "glWindowPos3iARB", (GLvoid *) glWindowPos3iARB, _gloffset_WindowPos3iMESA },
+   { "glWindowPos3sARB", (GLvoid *) glWindowPos3sARB, _gloffset_WindowPos3sMESA },
+   { "glWindowPos3dvARB", (GLvoid *) glWindowPos3dvARB, _gloffset_WindowPos3dvMESA },
+   { "glWindowPos3fvARB", (GLvoid *) glWindowPos3fvARB, _gloffset_WindowPos3fvMESA },
+   { "glWindowPos3ivARB", (GLvoid *) glWindowPos3ivARB, _gloffset_WindowPos3ivMESA },
+   { "glWindowPos3svARB", (GLvoid *) glWindowPos3svARB, _gloffset_WindowPos3svMESA },
+   { "glAreProgramsResidentNV", (GLvoid *) glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV },
    { "glBindProgramNV", (GLvoid *) glBindProgramNV, _gloffset_BindProgramNV },
    { "glDeleteProgramsNV", (GLvoid *) glDeleteProgramsNV, _gloffset_DeleteProgramsNV },
    { "glExecuteProgramNV", (GLvoid *) glExecuteProgramNV, _gloffset_ExecuteProgramNV },
    { "glGenProgramsNV", (GLvoid *) glGenProgramsNV, _gloffset_GenProgramsNV },
-   { "glAreProgramsResidentNV", (GLvoid *) glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV },
-   { "glRequestResidentProgramsNV", (GLvoid *) glRequestResidentProgramsNV, _gloffset_RequestResidentProgramsNV },
-   { "glGetProgramParameterfvNV", (GLvoid *) glGetProgramParameterfvNV, _gloffset_GetProgramParameterfvNV },
    { "glGetProgramParameterdvNV", (GLvoid *) glGetProgramParameterdvNV, _gloffset_GetProgramParameterdvNV },
+   { "glGetProgramParameterfvNV", (GLvoid *) glGetProgramParameterfvNV, _gloffset_GetProgramParameterfvNV },
    { "glGetProgramivNV", (GLvoid *) glGetProgramivNV, _gloffset_GetProgramivNV },
    { "glGetProgramStringNV", (GLvoid *) glGetProgramStringNV, _gloffset_GetProgramStringNV },
    { "glGetTrackMatrixivNV", (GLvoid *) glGetTrackMatrixivNV, _gloffset_GetTrackMatrixivNV },
@@ -705,52 +704,53 @@ static struct name_address_offset static_functions[] = {
    { "glGetVertexAttribPointervNV", (GLvoid *) glGetVertexAttribPointervNV, _gloffset_GetVertexAttribPointervNV },
    { "glIsProgramNV", (GLvoid *) glIsProgramNV, _gloffset_IsProgramNV },
    { "glLoadProgramNV", (GLvoid *) glLoadProgramNV, _gloffset_LoadProgramNV },
-   { "glProgramParameter4fNV", (GLvoid *) glProgramParameter4fNV, _gloffset_ProgramParameter4fNV },
    { "glProgramParameter4dNV", (GLvoid *) glProgramParameter4dNV, _gloffset_ProgramParameter4dNV },
    { "glProgramParameter4dvNV", (GLvoid *) glProgramParameter4dvNV, _gloffset_ProgramParameter4dvNV },
+   { "glProgramParameter4fNV", (GLvoid *) glProgramParameter4fNV, _gloffset_ProgramParameter4fNV },
    { "glProgramParameter4fvNV", (GLvoid *) glProgramParameter4fvNV, _gloffset_ProgramParameter4fvNV },
    { "glProgramParameters4dvNV", (GLvoid *) glProgramParameters4dvNV, _gloffset_ProgramParameters4dvNV },
    { "glProgramParameters4fvNV", (GLvoid *) glProgramParameters4fvNV, _gloffset_ProgramParameters4fvNV },
+   { "glRequestResidentProgramsNV", (GLvoid *) glRequestResidentProgramsNV, _gloffset_RequestResidentProgramsNV },
    { "glTrackMatrixNV", (GLvoid *) glTrackMatrixNV, _gloffset_TrackMatrixNV },
    { "glVertexAttribPointerNV", (GLvoid *) glVertexAttribPointerNV, _gloffset_VertexAttribPointerNV },
-   { "glVertexAttrib1sNV", (GLvoid *) glVertexAttrib1sNV, _gloffset_VertexAttrib1sNV },
-   { "glVertexAttrib1fNV", (GLvoid *) glVertexAttrib1fNV, _gloffset_VertexAttrib1fNV },
    { "glVertexAttrib1dNV", (GLvoid *) glVertexAttrib1dNV, _gloffset_VertexAttrib1dNV },
-   { "glVertexAttrib2sNV", (GLvoid *) glVertexAttrib2sNV, _gloffset_VertexAttrib2sNV },
-   { "glVertexAttrib2fNV", (GLvoid *) glVertexAttrib2fNV, _gloffset_VertexAttrib2fNV },
-   { "glVertexAttrib2dNV", (GLvoid *) glVertexAttrib2dNV, _gloffset_VertexAttrib2dNV },
-   { "glVertexAttrib3sNV", (GLvoid *) glVertexAttrib3sNV, _gloffset_VertexAttrib3sNV },
-   { "glVertexAttrib3fNV", (GLvoid *) glVertexAttrib3fNV, _gloffset_VertexAttrib3fNV },
-   { "glVertexAttrib3dNV", (GLvoid *) glVertexAttrib3dNV, _gloffset_VertexAttrib3dNV },
-   { "glVertexAttrib4sNV", (GLvoid *) glVertexAttrib4sNV, _gloffset_VertexAttrib4sNV },
-   { "glVertexAttrib4fNV", (GLvoid *) glVertexAttrib4fNV, _gloffset_VertexAttrib4fNV },
-   { "glVertexAttrib4dNV", (GLvoid *) glVertexAttrib4dNV, _gloffset_VertexAttrib4dNV },
-   { "glVertexAttrib4ubNV", (GLvoid *) glVertexAttrib4ubNV, _gloffset_VertexAttrib4ubNV },
-   { "glVertexAttrib1svNV", (GLvoid *) glVertexAttrib1svNV, _gloffset_VertexAttrib1svNV },
-   { "glVertexAttrib1fvNV", (GLvoid *) glVertexAttrib1fvNV, _gloffset_VertexAttrib1fvNV },
    { "glVertexAttrib1dvNV", (GLvoid *) glVertexAttrib1dvNV, _gloffset_VertexAttrib1dvNV },
-   { "glVertexAttrib2svNV", (GLvoid *) glVertexAttrib2svNV, _gloffset_VertexAttrib2svNV },
-   { "glVertexAttrib2fvNV", (GLvoid *) glVertexAttrib2fvNV, _gloffset_VertexAttrib2fvNV },
+   { "glVertexAttrib1fNV", (GLvoid *) glVertexAttrib1fNV, _gloffset_VertexAttrib1fNV },
+   { "glVertexAttrib1fvNV", (GLvoid *) glVertexAttrib1fvNV, _gloffset_VertexAttrib1fvNV },
+   { "glVertexAttrib1sNV", (GLvoid *) glVertexAttrib1sNV, _gloffset_VertexAttrib1sNV },
+   { "glVertexAttrib1svNV", (GLvoid *) glVertexAttrib1svNV, _gloffset_VertexAttrib1svNV },
+   { "glVertexAttrib2dNV", (GLvoid *) glVertexAttrib2dNV, _gloffset_VertexAttrib2dNV },
    { "glVertexAttrib2dvNV", (GLvoid *) glVertexAttrib2dvNV, _gloffset_VertexAttrib2dvNV },
-   { "glVertexAttrib3svNV", (GLvoid *) glVertexAttrib3svNV, _gloffset_VertexAttrib3svNV },
-   { "glVertexAttrib3fvNV", (GLvoid *) glVertexAttrib3fvNV, _gloffset_VertexAttrib3fvNV },
+   { "glVertexAttrib2fNV", (GLvoid *) glVertexAttrib2fNV, _gloffset_VertexAttrib2fNV },
+   { "glVertexAttrib2fvNV", (GLvoid *) glVertexAttrib2fvNV, _gloffset_VertexAttrib2fvNV },
+   { "glVertexAttrib2sNV", (GLvoid *) glVertexAttrib2sNV, _gloffset_VertexAttrib2sNV },
+   { "glVertexAttrib2svNV", (GLvoid *) glVertexAttrib2svNV, _gloffset_VertexAttrib2svNV },
+   { "glVertexAttrib3dNV", (GLvoid *) glVertexAttrib3dNV, _gloffset_VertexAttrib3dNV },
    { "glVertexAttrib3dvNV", (GLvoid *) glVertexAttrib3dvNV, _gloffset_VertexAttrib3dvNV },
-   { "glVertexAttrib4svNV", (GLvoid *) glVertexAttrib4svNV, _gloffset_VertexAttrib4svNV },
-   { "glVertexAttrib4fvNV", (GLvoid *) glVertexAttrib4fvNV, _gloffset_VertexAttrib4fvNV },
+   { "glVertexAttrib3fNV", (GLvoid *) glVertexAttrib3fNV, _gloffset_VertexAttrib3fNV },
+   { "glVertexAttrib3fvNV", (GLvoid *) glVertexAttrib3fvNV, _gloffset_VertexAttrib3fvNV },
+   { "glVertexAttrib3sNV", (GLvoid *) glVertexAttrib3sNV, _gloffset_VertexAttrib3sNV },
+   { "glVertexAttrib3svNV", (GLvoid *) glVertexAttrib3svNV, _gloffset_VertexAttrib3svNV },
+   { "glVertexAttrib4dNV", (GLvoid *) glVertexAttrib4dNV, _gloffset_VertexAttrib4dNV },
    { "glVertexAttrib4dvNV", (GLvoid *) glVertexAttrib4dvNV, _gloffset_VertexAttrib4dvNV },
+   { "glVertexAttrib4fNV", (GLvoid *) glVertexAttrib4fNV, _gloffset_VertexAttrib4fNV },
+   { "glVertexAttrib4fvNV", (GLvoid *) glVertexAttrib4fvNV, _gloffset_VertexAttrib4fvNV },
+   { "glVertexAttrib4sNV", (GLvoid *) glVertexAttrib4sNV, _gloffset_VertexAttrib4sNV },
+   { "glVertexAttrib4svNV", (GLvoid *) glVertexAttrib4svNV, _gloffset_VertexAttrib4svNV },
+   { "glVertexAttrib4ubNV", (GLvoid *) glVertexAttrib4ubNV, _gloffset_VertexAttrib4ubNV },
    { "glVertexAttrib4ubvNV", (GLvoid *) glVertexAttrib4ubvNV, _gloffset_VertexAttrib4ubvNV },
-   { "glVertexAttribs1svNV", (GLvoid *) glVertexAttribs1svNV, _gloffset_VertexAttribs1svNV },
-   { "glVertexAttribs1fvNV", (GLvoid *) glVertexAttribs1fvNV, _gloffset_VertexAttribs1fvNV },
    { "glVertexAttribs1dvNV", (GLvoid *) glVertexAttribs1dvNV, _gloffset_VertexAttribs1dvNV },
-   { "glVertexAttribs2svNV", (GLvoid *) glVertexAttribs2svNV, _gloffset_VertexAttribs2svNV },
-   { "glVertexAttribs2fvNV", (GLvoid *) glVertexAttribs2fvNV, _gloffset_VertexAttribs2fvNV },
+   { "glVertexAttribs1fvNV", (GLvoid *) glVertexAttribs1fvNV, _gloffset_VertexAttribs1fvNV },
+   { "glVertexAttribs1svNV", (GLvoid *) glVertexAttribs1svNV, _gloffset_VertexAttribs1svNV },
    { "glVertexAttribs2dvNV", (GLvoid *) glVertexAttribs2dvNV, _gloffset_VertexAttribs2dvNV },
-   { "glVertexAttribs3svNV", (GLvoid *) glVertexAttribs3svNV, _gloffset_VertexAttribs3svNV },
-   { "glVertexAttribs3fvNV", (GLvoid *) glVertexAttribs3fvNV, _gloffset_VertexAttribs3fvNV },
+   { "glVertexAttribs2fvNV", (GLvoid *) glVertexAttribs2fvNV, _gloffset_VertexAttribs2fvNV },
+   { "glVertexAttribs2svNV", (GLvoid *) glVertexAttribs2svNV, _gloffset_VertexAttribs2svNV },
    { "glVertexAttribs3dvNV", (GLvoid *) glVertexAttribs3dvNV, _gloffset_VertexAttribs3dvNV },
-   { "glVertexAttribs4svNV", (GLvoid *) glVertexAttribs4svNV, _gloffset_VertexAttribs4svNV },
-   { "glVertexAttribs4fvNV", (GLvoid *) glVertexAttribs4fvNV, _gloffset_VertexAttribs4fvNV },
+   { "glVertexAttribs3fvNV", (GLvoid *) glVertexAttribs3fvNV, _gloffset_VertexAttribs3fvNV },
+   { "glVertexAttribs3svNV", (GLvoid *) glVertexAttribs3svNV, _gloffset_VertexAttribs3svNV },
    { "glVertexAttribs4dvNV", (GLvoid *) glVertexAttribs4dvNV, _gloffset_VertexAttribs4dvNV },
+   { "glVertexAttribs4fvNV", (GLvoid *) glVertexAttribs4fvNV, _gloffset_VertexAttribs4fvNV },
+   { "glVertexAttribs4svNV", (GLvoid *) glVertexAttribs4svNV, _gloffset_VertexAttribs4svNV },
    { "glVertexAttribs4ubvNV", (GLvoid *) glVertexAttribs4ubvNV, _gloffset_VertexAttribs4ubvNV },
    { NULL, NULL }  /* end of list marker */
 };
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 5bdc02944b..ea964c2432 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -14059,13 +14059,13 @@ glWindowPos2dARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos2dARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos2dARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos2dMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2dMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos2dARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos2dMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14080,13 +14080,13 @@ glWindowPos2fARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos2fARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos2fARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos2fMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2fMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos2fARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos2fMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14101,13 +14101,13 @@ glWindowPos2iARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos2iARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos2iARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos2iMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2iMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos2iARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos2iMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14122,13 +14122,13 @@ glWindowPos2sARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos2sARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos2sARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos2sMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2sMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos2sARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos2sMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14143,13 +14143,13 @@ glWindowPos2dvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos2dvARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos2dvARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos2dvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2dvMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos2dvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos2dvMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14164,13 +14164,13 @@ glWindowPos2fvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos2fvARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos2fvARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos2fvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2fvMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos2fvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos2fvMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14185,13 +14185,13 @@ glWindowPos2ivARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos2ivARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos2ivARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos2ivMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2ivMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos2ivARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos2ivMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14206,13 +14206,13 @@ glWindowPos2svARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos2svARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos2svARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos2svMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos2svMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos2svARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos2svMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14227,13 +14227,13 @@ glWindowPos3dARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos3dARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos3dARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos3dMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3dMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos3dARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos3dMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14248,13 +14248,13 @@ glWindowPos3fARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos3fARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos3fARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos3fMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3fMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos3fARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos3fMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14269,13 +14269,13 @@ glWindowPos3iARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos3iARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos3iARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos3iMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3iMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos3iARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos3iMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14290,13 +14290,13 @@ glWindowPos3sARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos3sARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos3sARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos3sMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3sMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos3sARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos3sMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14311,13 +14311,13 @@ glWindowPos3dvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos3dvARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos3dvARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos3dvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3dvMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos3dvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos3dvMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14332,13 +14332,13 @@ glWindowPos3fvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos3fvARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos3fvARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos3fvMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3fvMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos3fvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos3fvMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14353,13 +14353,13 @@ glWindowPos3ivARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos3ivARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos3ivARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos3ivMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3ivMESA), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos3ivARB)], %g3
+	ld	[%g1 + (4 * _gloffset_WindowPos3ivMESA)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14374,13 +14374,34 @@ glWindowPos3svARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_WindowPos3svARB), %g2
-	or	%g2, %lo(8 * _gloffset_WindowPos3svARB), %g2
+	sethi	%hi(8 * _gloffset_WindowPos3svMESA), %g2
+	or	%g2, %lo(8 * _gloffset_WindowPos3svMESA), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_WindowPos3svMESA)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glAreProgramsResidentNV
+.type glAreProgramsResidentNV,#function
+glAreProgramsResidentNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_AreProgramsResidentNV), %g2
+	or	%g2, %lo(8 * _gloffset_AreProgramsResidentNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_WindowPos3svARB)], %g3
+	ld	[%g1 + (4 * _gloffset_AreProgramsResidentNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14469,30 +14490,9 @@ glGenProgramsNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glAreProgramsResidentNV
-.type glAreProgramsResidentNV,#function
-glAreProgramsResidentNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_AreProgramsResidentNV), %g2
-	or	%g2, %lo(8 * _gloffset_AreProgramsResidentNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_AreProgramsResidentNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glRequestResidentProgramsNV
-.type glRequestResidentProgramsNV,#function
-glRequestResidentProgramsNV:
+.globl glGetProgramParameterdvNV
+.type glGetProgramParameterdvNV,#function
+glGetProgramParameterdvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -14500,13 +14500,13 @@ glRequestResidentProgramsNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_RequestResidentProgramsNV), %g2
-	or	%g2, %lo(8 * _gloffset_RequestResidentProgramsNV), %g2
+	sethi	%hi(8 * _gloffset_GetProgramParameterdvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetProgramParameterdvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_RequestResidentProgramsNV)], %g3
+	ld	[%g1 + (4 * _gloffset_GetProgramParameterdvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14532,27 +14532,6 @@ glGetProgramParameterfvNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glGetProgramParameterdvNV
-.type glGetProgramParameterdvNV,#function
-glGetProgramParameterdvNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GetProgramParameterdvNV), %g2
-	or	%g2, %lo(8 * _gloffset_GetProgramParameterdvNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GetProgramParameterdvNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
 .globl glGetProgramivNV
 .type glGetProgramivNV,#function
 glGetProgramivNV:
@@ -14742,9 +14721,9 @@ glLoadProgramNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glProgramParameter4fNV
-.type glProgramParameter4fNV,#function
-glProgramParameter4fNV:
+.globl glProgramParameter4dNV
+.type glProgramParameter4dNV,#function
+glProgramParameter4dNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -14752,20 +14731,20 @@ glProgramParameter4fNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_ProgramParameter4fNV), %g2
-	or	%g2, %lo(8 * _gloffset_ProgramParameter4fNV), %g2
+	sethi	%hi(8 * _gloffset_ProgramParameter4dNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramParameter4dNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_ProgramParameter4fNV)], %g3
+	ld	[%g1 + (4 * _gloffset_ProgramParameter4dNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glProgramParameter4dNV
-.type glProgramParameter4dNV,#function
-glProgramParameter4dNV:
+.globl glProgramParameter4dvNV
+.type glProgramParameter4dvNV,#function
+glProgramParameter4dvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -14773,20 +14752,20 @@ glProgramParameter4dNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_ProgramParameter4dNV), %g2
-	or	%g2, %lo(8 * _gloffset_ProgramParameter4dNV), %g2
+	sethi	%hi(8 * _gloffset_ProgramParameter4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramParameter4dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_ProgramParameter4dNV)], %g3
+	ld	[%g1 + (4 * _gloffset_ProgramParameter4dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glProgramParameter4dvNV
-.type glProgramParameter4dvNV,#function
-glProgramParameter4dvNV:
+.globl glProgramParameter4fNV
+.type glProgramParameter4fNV,#function
+glProgramParameter4fNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -14794,13 +14773,13 @@ glProgramParameter4dvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_ProgramParameter4dvNV), %g2
-	or	%g2, %lo(8 * _gloffset_ProgramParameter4dvNV), %g2
+	sethi	%hi(8 * _gloffset_ProgramParameter4fNV), %g2
+	or	%g2, %lo(8 * _gloffset_ProgramParameter4fNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_ProgramParameter4dvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_ProgramParameter4fNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14868,6 +14847,27 @@ glProgramParameters4fvNV:
 	jmpl	%g3, %g0
 	nop
 
+.globl glRequestResidentProgramsNV
+.type glRequestResidentProgramsNV,#function
+glRequestResidentProgramsNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_RequestResidentProgramsNV), %g2
+	or	%g2, %lo(8 * _gloffset_RequestResidentProgramsNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_RequestResidentProgramsNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
 .globl glTrackMatrixNV
 .type glTrackMatrixNV,#function
 glTrackMatrixNV:
@@ -14910,9 +14910,9 @@ glVertexAttribPointerNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib1sNV
-.type glVertexAttrib1sNV,#function
-glVertexAttrib1sNV:
+.globl glVertexAttrib1dNV
+.type glVertexAttrib1dNV,#function
+glVertexAttrib1dNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -14920,13 +14920,34 @@ glVertexAttrib1sNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1sNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1sNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1dNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1sNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1dNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glVertexAttrib1dvNV
+.type glVertexAttrib1dvNV,#function
+glVertexAttrib1dvNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_VertexAttrib1dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1dvNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -14952,9 +14973,9 @@ glVertexAttrib1fNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib1dNV
-.type glVertexAttrib1dNV,#function
-glVertexAttrib1dNV:
+.globl glVertexAttrib1fvNV
+.type glVertexAttrib1fvNV,#function
+glVertexAttrib1fvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -14962,20 +14983,20 @@ glVertexAttrib1dNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1dNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1dNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1fvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1dNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1fvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib2sNV
-.type glVertexAttrib2sNV,#function
-glVertexAttrib2sNV:
+.globl glVertexAttrib1sNV
+.type glVertexAttrib1sNV,#function
+glVertexAttrib1sNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -14983,20 +15004,20 @@ glVertexAttrib2sNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2sNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2sNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1sNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2sNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1sNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib2fNV
-.type glVertexAttrib2fNV,#function
-glVertexAttrib2fNV:
+.globl glVertexAttrib1svNV
+.type glVertexAttrib1svNV,#function
+glVertexAttrib1svNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15004,13 +15025,13 @@ glVertexAttrib2fNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2fNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2fNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2fNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -15036,9 +15057,9 @@ glVertexAttrib2dNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib3sNV
-.type glVertexAttrib3sNV,#function
-glVertexAttrib3sNV:
+.globl glVertexAttrib2dvNV
+.type glVertexAttrib2dvNV,#function
+glVertexAttrib2dvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15046,20 +15067,20 @@ glVertexAttrib3sNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3sNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3sNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3sNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib3fNV
-.type glVertexAttrib3fNV,#function
-glVertexAttrib3fNV:
+.globl glVertexAttrib2fNV
+.type glVertexAttrib2fNV,#function
+glVertexAttrib2fNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15067,20 +15088,20 @@ glVertexAttrib3fNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3fNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3fNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2fNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3fNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2fNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib3dNV
-.type glVertexAttrib3dNV,#function
-glVertexAttrib3dNV:
+.globl glVertexAttrib2fvNV
+.type glVertexAttrib2fvNV,#function
+glVertexAttrib2fvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15088,20 +15109,20 @@ glVertexAttrib3dNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3dNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3dNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2fvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3dNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2fvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib4sNV
-.type glVertexAttrib4sNV,#function
-glVertexAttrib4sNV:
+.globl glVertexAttrib2sNV
+.type glVertexAttrib2sNV,#function
+glVertexAttrib2sNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15109,20 +15130,20 @@ glVertexAttrib4sNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4sNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4sNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2sNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4sNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2sNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib4fNV
-.type glVertexAttrib4fNV,#function
-glVertexAttrib4fNV:
+.globl glVertexAttrib2svNV
+.type glVertexAttrib2svNV,#function
+glVertexAttrib2svNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15130,20 +15151,20 @@ glVertexAttrib4fNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4fNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4fNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4fNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib4dNV
-.type glVertexAttrib4dNV,#function
-glVertexAttrib4dNV:
+.globl glVertexAttrib3dNV
+.type glVertexAttrib3dNV,#function
+glVertexAttrib3dNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15151,20 +15172,20 @@ glVertexAttrib4dNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4dNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4dNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3dNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4dNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3dNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib4ubNV
-.type glVertexAttrib4ubNV,#function
-glVertexAttrib4ubNV:
+.globl glVertexAttrib3dvNV
+.type glVertexAttrib3dvNV,#function
+glVertexAttrib3dvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15172,20 +15193,20 @@ glVertexAttrib4ubNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4ubNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4ubNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4ubNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib1svNV
-.type glVertexAttrib1svNV,#function
-glVertexAttrib1svNV:
+.globl glVertexAttrib3fNV
+.type glVertexAttrib3fNV,#function
+glVertexAttrib3fNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15193,20 +15214,20 @@ glVertexAttrib1svNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1svNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1svNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3fNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1svNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3fNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib1fvNV
-.type glVertexAttrib1fvNV,#function
-glVertexAttrib1fvNV:
+.globl glVertexAttrib3fvNV
+.type glVertexAttrib3fvNV,#function
+glVertexAttrib3fvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15214,20 +15235,20 @@ glVertexAttrib1fvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1fvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1fvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3fvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1fvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3fvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib1dvNV
-.type glVertexAttrib1dvNV,#function
-glVertexAttrib1dvNV:
+.globl glVertexAttrib3sNV
+.type glVertexAttrib3sNV,#function
+glVertexAttrib3sNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15235,20 +15256,20 @@ glVertexAttrib1dvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1dvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1dvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3sNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1dvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3sNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib2svNV
-.type glVertexAttrib2svNV,#function
-glVertexAttrib2svNV:
+.globl glVertexAttrib3svNV
+.type glVertexAttrib3svNV,#function
+glVertexAttrib3svNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15256,20 +15277,20 @@ glVertexAttrib2svNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2svNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2svNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2svNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib2fvNV
-.type glVertexAttrib2fvNV,#function
-glVertexAttrib2fvNV:
+.globl glVertexAttrib4dNV
+.type glVertexAttrib4dNV,#function
+glVertexAttrib4dNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15277,20 +15298,20 @@ glVertexAttrib2fvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2fvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2fvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4dNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2fvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4dNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib2dvNV
-.type glVertexAttrib2dvNV,#function
-glVertexAttrib2dvNV:
+.globl glVertexAttrib4dvNV
+.type glVertexAttrib4dvNV,#function
+glVertexAttrib4dvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15298,20 +15319,20 @@ glVertexAttrib2dvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2dvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2dvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2dvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib3svNV
-.type glVertexAttrib3svNV,#function
-glVertexAttrib3svNV:
+.globl glVertexAttrib4fNV
+.type glVertexAttrib4fNV,#function
+glVertexAttrib4fNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15319,20 +15340,20 @@ glVertexAttrib3svNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3svNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3svNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4fNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3svNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4fNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib3fvNV
-.type glVertexAttrib3fvNV,#function
-glVertexAttrib3fvNV:
+.globl glVertexAttrib4fvNV
+.type glVertexAttrib4fvNV,#function
+glVertexAttrib4fvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15340,20 +15361,20 @@ glVertexAttrib3fvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3fvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3fvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4fvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3fvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4fvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib3dvNV
-.type glVertexAttrib3dvNV,#function
-glVertexAttrib3dvNV:
+.globl glVertexAttrib4sNV
+.type glVertexAttrib4sNV,#function
+glVertexAttrib4sNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15361,13 +15382,13 @@ glVertexAttrib3dvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3dvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3dvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4sNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3dvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4sNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -15393,30 +15414,9 @@ glVertexAttrib4svNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttrib4fvNV
-.type glVertexAttrib4fvNV,#function
-glVertexAttrib4fvNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4fvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4fvNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4fvNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glVertexAttrib4dvNV
-.type glVertexAttrib4dvNV,#function
-glVertexAttrib4dvNV:
+.globl glVertexAttrib4ubNV
+.type glVertexAttrib4ubNV,#function
+glVertexAttrib4ubNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15424,13 +15424,13 @@ glVertexAttrib4dvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4dvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4dvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4ubNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4ubNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4dvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4ubNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -15456,9 +15456,9 @@ glVertexAttrib4ubvNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttribs1svNV
-.type glVertexAttribs1svNV,#function
-glVertexAttribs1svNV:
+.globl glVertexAttribs1dvNV
+.type glVertexAttribs1dvNV,#function
+glVertexAttribs1dvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15466,13 +15466,13 @@ glVertexAttribs1svNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttribs1svNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttribs1svNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttribs1dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs1dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttribs1svNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttribs1dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -15498,9 +15498,9 @@ glVertexAttribs1fvNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttribs1dvNV
-.type glVertexAttribs1dvNV,#function
-glVertexAttribs1dvNV:
+.globl glVertexAttribs1svNV
+.type glVertexAttribs1svNV,#function
+glVertexAttribs1svNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15508,20 +15508,20 @@ glVertexAttribs1dvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttribs1dvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttribs1dvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttribs1svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs1svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttribs1dvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttribs1svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttribs2svNV
-.type glVertexAttribs2svNV,#function
-glVertexAttribs2svNV:
+.globl glVertexAttribs2dvNV
+.type glVertexAttribs2dvNV,#function
+glVertexAttribs2dvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15529,13 +15529,13 @@ glVertexAttribs2svNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttribs2svNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttribs2svNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttribs2dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs2dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttribs2svNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttribs2dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -15561,9 +15561,9 @@ glVertexAttribs2fvNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttribs2dvNV
-.type glVertexAttribs2dvNV,#function
-glVertexAttribs2dvNV:
+.globl glVertexAttribs2svNV
+.type glVertexAttribs2svNV,#function
+glVertexAttribs2svNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15571,20 +15571,20 @@ glVertexAttribs2dvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttribs2dvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttribs2dvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttribs2svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs2svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttribs2dvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttribs2svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttribs3svNV
-.type glVertexAttribs3svNV,#function
-glVertexAttribs3svNV:
+.globl glVertexAttribs3dvNV
+.type glVertexAttribs3dvNV,#function
+glVertexAttribs3dvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15592,13 +15592,13 @@ glVertexAttribs3svNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttribs3svNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttribs3svNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttribs3dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs3dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttribs3svNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttribs3dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -15624,9 +15624,9 @@ glVertexAttribs3fvNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttribs3dvNV
-.type glVertexAttribs3dvNV,#function
-glVertexAttribs3dvNV:
+.globl glVertexAttribs3svNV
+.type glVertexAttribs3svNV,#function
+glVertexAttribs3svNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15634,20 +15634,20 @@ glVertexAttribs3dvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttribs3dvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttribs3dvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttribs3svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs3svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttribs3dvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttribs3svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttribs4svNV
-.type glVertexAttribs4svNV,#function
-glVertexAttribs4svNV:
+.globl glVertexAttribs4dvNV
+.type glVertexAttribs4dvNV,#function
+glVertexAttribs4dvNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15655,13 +15655,13 @@ glVertexAttribs4svNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttribs4svNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttribs4svNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttribs4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs4dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttribs4svNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttribs4dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -15687,9 +15687,9 @@ glVertexAttribs4fvNV:
 	jmpl	%g3, %g0
 	nop
 
-.globl glVertexAttribs4dvNV
-.type glVertexAttribs4dvNV,#function
-glVertexAttribs4dvNV:
+.globl glVertexAttribs4svNV
+.type glVertexAttribs4svNV,#function
+glVertexAttribs4svNV:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -15697,13 +15697,13 @@ glVertexAttribs4dvNV:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttribs4dvNV), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttribs4dvNV), %g2
+	sethi	%hi(8 * _gloffset_VertexAttribs4svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttribs4svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttribs4dvNV)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttribs4svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index f8ed32aa0c..959ef2d8a8 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -4031,97 +4031,103 @@ ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos2dARB))
 GL_PREFIX(WindowPos2dARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos2dARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos2dMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos2fARB))
 GL_PREFIX(WindowPos2fARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos2fARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos2fMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos2iARB))
 GL_PREFIX(WindowPos2iARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos2iARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos2iMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos2sARB))
 GL_PREFIX(WindowPos2sARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos2sARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos2sMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos2dvARB))
 GL_PREFIX(WindowPos2dvARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos2dvARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos2dvMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos2fvARB))
 GL_PREFIX(WindowPos2fvARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos2fvARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos2fvMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos2ivARB))
 GL_PREFIX(WindowPos2ivARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos2ivARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos2ivMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos2svARB))
 GL_PREFIX(WindowPos2svARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos2svARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos2svMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos3dARB))
 GL_PREFIX(WindowPos3dARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos3dARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos3dMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos3fARB))
 GL_PREFIX(WindowPos3fARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos3fARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos3fMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos3iARB))
 GL_PREFIX(WindowPos3iARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos3iARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos3iMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos3sARB))
 GL_PREFIX(WindowPos3sARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos3sARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos3sMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos3dvARB))
 GL_PREFIX(WindowPos3dvARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos3dvARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos3dvMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos3fvARB))
 GL_PREFIX(WindowPos3fvARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos3fvARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos3fvMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos3ivARB))
 GL_PREFIX(WindowPos3ivARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos3ivARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos3ivMESA))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos3svARB))
 GL_PREFIX(WindowPos3svARB):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_WindowPos3svARB))
+	JMP(GL_OFFSET(_gloffset_WindowPos3svMESA))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(AreProgramsResidentNV))
+GL_PREFIX(AreProgramsResidentNV):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	JMP(GL_OFFSET(_gloffset_AreProgramsResidentNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(BindProgramNV))
@@ -4148,16 +4154,10 @@ GL_PREFIX(GenProgramsNV):
 	JMP(GL_OFFSET(_gloffset_GenProgramsNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(AreProgramsResidentNV))
-GL_PREFIX(AreProgramsResidentNV):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_AreProgramsResidentNV))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(RequestResidentProgramsNV))
-GL_PREFIX(RequestResidentProgramsNV):
+GLOBL_FN(GL_PREFIX(GetProgramParameterdvNV))
+GL_PREFIX(GetProgramParameterdvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_RequestResidentProgramsNV))
+	JMP(GL_OFFSET(_gloffset_GetProgramParameterdvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetProgramParameterfvNV))
@@ -4166,12 +4166,6 @@ GL_PREFIX(GetProgramParameterfvNV):
 	JMP(GL_OFFSET(_gloffset_GetProgramParameterfvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetProgramParameterdvNV))
-GL_PREFIX(GetProgramParameterdvNV):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_GetProgramParameterdvNV))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetProgramivNV))
 GL_PREFIX(GetProgramivNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4226,12 +4220,6 @@ GL_PREFIX(LoadProgramNV):
 	JMP(GL_OFFSET(_gloffset_LoadProgramNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(ProgramParameter4fNV))
-GL_PREFIX(ProgramParameter4fNV):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_ProgramParameter4fNV))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ProgramParameter4dNV))
 GL_PREFIX(ProgramParameter4dNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4244,6 +4232,12 @@ GL_PREFIX(ProgramParameter4dvNV):
 	JMP(GL_OFFSET(_gloffset_ProgramParameter4dvNV))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(ProgramParameter4fNV))
+GL_PREFIX(ProgramParameter4fNV):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	JMP(GL_OFFSET(_gloffset_ProgramParameter4fNV))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ProgramParameter4fvNV))
 GL_PREFIX(ProgramParameter4fvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4262,6 +4256,12 @@ GL_PREFIX(ProgramParameters4fvNV):
 	JMP(GL_OFFSET(_gloffset_ProgramParameters4fvNV))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(RequestResidentProgramsNV))
+GL_PREFIX(RequestResidentProgramsNV):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	JMP(GL_OFFSET(_gloffset_RequestResidentProgramsNV))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(TrackMatrixNV))
 GL_PREFIX(TrackMatrixNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
@@ -4274,10 +4274,16 @@ GL_PREFIX(VertexAttribPointerNV):
 	JMP(GL_OFFSET(_gloffset_VertexAttribPointerNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib1sNV))
-GL_PREFIX(VertexAttrib1sNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib1dNV))
+GL_PREFIX(VertexAttrib1dNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1sNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1dNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(VertexAttrib1dvNV))
+GL_PREFIX(VertexAttrib1dvNV):
+	MOV_L(GLNAME(_glapi_Dispatch), EAX)
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1dvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib1fNV))
@@ -4286,22 +4292,22 @@ GL_PREFIX(VertexAttrib1fNV):
 	JMP(GL_OFFSET(_gloffset_VertexAttrib1fNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib1dNV))
-GL_PREFIX(VertexAttrib1dNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib1fvNV))
+GL_PREFIX(VertexAttrib1fvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1dNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1fvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib2sNV))
-GL_PREFIX(VertexAttrib2sNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib1sNV))
+GL_PREFIX(VertexAttrib1sNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2sNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1sNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib2fNV))
-GL_PREFIX(VertexAttrib2fNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib1svNV))
+GL_PREFIX(VertexAttrib1svNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2fNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1svNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib2dNV))
@@ -4310,100 +4316,100 @@ GL_PREFIX(VertexAttrib2dNV):
 	JMP(GL_OFFSET(_gloffset_VertexAttrib2dNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib3sNV))
-GL_PREFIX(VertexAttrib3sNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib2dvNV))
+GL_PREFIX(VertexAttrib2dvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3sNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2dvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib3fNV))
-GL_PREFIX(VertexAttrib3fNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib2fNV))
+GL_PREFIX(VertexAttrib2fNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3fNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2fNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib3dNV))
-GL_PREFIX(VertexAttrib3dNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib2fvNV))
+GL_PREFIX(VertexAttrib2fvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3dNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2fvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib4sNV))
-GL_PREFIX(VertexAttrib4sNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib2sNV))
+GL_PREFIX(VertexAttrib2sNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4sNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2sNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib4fNV))
-GL_PREFIX(VertexAttrib4fNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib2svNV))
+GL_PREFIX(VertexAttrib2svNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4fNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2svNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib4dNV))
-GL_PREFIX(VertexAttrib4dNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib3dNV))
+GL_PREFIX(VertexAttrib3dNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4dNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3dNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib4ubNV))
-GL_PREFIX(VertexAttrib4ubNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib3dvNV))
+GL_PREFIX(VertexAttrib3dvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3dvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib1svNV))
-GL_PREFIX(VertexAttrib1svNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib3fNV))
+GL_PREFIX(VertexAttrib3fNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1svNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3fNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib1fvNV))
-GL_PREFIX(VertexAttrib1fvNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib3fvNV))
+GL_PREFIX(VertexAttrib3fvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1fvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3fvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib1dvNV))
-GL_PREFIX(VertexAttrib1dvNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib3sNV))
+GL_PREFIX(VertexAttrib3sNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1dvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3sNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib2svNV))
-GL_PREFIX(VertexAttrib2svNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib3svNV))
+GL_PREFIX(VertexAttrib3svNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2svNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3svNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib2fvNV))
-GL_PREFIX(VertexAttrib2fvNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib4dNV))
+GL_PREFIX(VertexAttrib4dNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2fvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4dNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib2dvNV))
-GL_PREFIX(VertexAttrib2dvNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib4dvNV))
+GL_PREFIX(VertexAttrib4dvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2dvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4dvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib3svNV))
-GL_PREFIX(VertexAttrib3svNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib4fNV))
+GL_PREFIX(VertexAttrib4fNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3svNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4fNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib3fvNV))
-GL_PREFIX(VertexAttrib3fvNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib4fvNV))
+GL_PREFIX(VertexAttrib4fvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3fvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4fvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib3dvNV))
-GL_PREFIX(VertexAttrib3dvNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib4sNV))
+GL_PREFIX(VertexAttrib4sNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3dvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4sNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4svNV))
@@ -4412,16 +4418,10 @@ GL_PREFIX(VertexAttrib4svNV):
 	JMP(GL_OFFSET(_gloffset_VertexAttrib4svNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib4fvNV))
-GL_PREFIX(VertexAttrib4fvNV):
-	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4fvNV))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttrib4dvNV))
-GL_PREFIX(VertexAttrib4dvNV):
+GLOBL_FN(GL_PREFIX(VertexAttrib4ubNV))
+GL_PREFIX(VertexAttrib4ubNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4dvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4ubvNV))
@@ -4430,10 +4430,10 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttribs1svNV))
-GL_PREFIX(VertexAttribs1svNV):
+GLOBL_FN(GL_PREFIX(VertexAttribs1dvNV))
+GL_PREFIX(VertexAttribs1dvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttribs1svNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttribs1dvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttribs1fvNV))
@@ -4442,16 +4442,16 @@ GL_PREFIX(VertexAttribs1fvNV):
 	JMP(GL_OFFSET(_gloffset_VertexAttribs1fvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttribs1dvNV))
-GL_PREFIX(VertexAttribs1dvNV):
+GLOBL_FN(GL_PREFIX(VertexAttribs1svNV))
+GL_PREFIX(VertexAttribs1svNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttribs1dvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttribs1svNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttribs2svNV))
-GL_PREFIX(VertexAttribs2svNV):
+GLOBL_FN(GL_PREFIX(VertexAttribs2dvNV))
+GL_PREFIX(VertexAttribs2dvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttribs2svNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttribs2dvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttribs2fvNV))
@@ -4460,16 +4460,16 @@ GL_PREFIX(VertexAttribs2fvNV):
 	JMP(GL_OFFSET(_gloffset_VertexAttribs2fvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttribs2dvNV))
-GL_PREFIX(VertexAttribs2dvNV):
+GLOBL_FN(GL_PREFIX(VertexAttribs2svNV))
+GL_PREFIX(VertexAttribs2svNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttribs2dvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttribs2svNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttribs3svNV))
-GL_PREFIX(VertexAttribs3svNV):
+GLOBL_FN(GL_PREFIX(VertexAttribs3dvNV))
+GL_PREFIX(VertexAttribs3dvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttribs3svNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttribs3dvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttribs3fvNV))
@@ -4478,16 +4478,16 @@ GL_PREFIX(VertexAttribs3fvNV):
 	JMP(GL_OFFSET(_gloffset_VertexAttribs3fvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttribs3dvNV))
-GL_PREFIX(VertexAttribs3dvNV):
+GLOBL_FN(GL_PREFIX(VertexAttribs3svNV))
+GL_PREFIX(VertexAttribs3svNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttribs3dvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttribs3svNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttribs4svNV))
-GL_PREFIX(VertexAttribs4svNV):
+GLOBL_FN(GL_PREFIX(VertexAttribs4dvNV))
+GL_PREFIX(VertexAttribs4dvNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttribs4svNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttribs4dvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttribs4fvNV))
@@ -4496,10 +4496,10 @@ GL_PREFIX(VertexAttribs4fvNV):
 	JMP(GL_OFFSET(_gloffset_VertexAttribs4fvNV))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(VertexAttribs4dvNV))
-GL_PREFIX(VertexAttribs4dvNV):
+GLOBL_FN(GL_PREFIX(VertexAttribs4svNV))
+GL_PREFIX(VertexAttribs4svNV):
 	MOV_L(GLNAME(_glapi_Dispatch), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttribs4dvNV))
+	JMP(GL_OFFSET(_gloffset_VertexAttribs4svNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttribs4ubvNV))