added glBlendFuncSeparate, glMultiDrawArrays, glMultiDrawElements

diff --git a/progs/tests/getprocaddress.c b/progs/tests/getprocaddress.c
index ee0a0f8d0346e764c1399e06ff7595f34b30e49b..919ec9cfc09e9538322cac9871c20bb2c9902fb0 100644 (file)
--- a/progs/tests/getprocaddress.c
+++ b/progs/tests/getprocaddress.c
@@ -1,4 +1,4 @@
-/* $Id: getprocaddress.c,v 1.4 2002/11/07 16:23:40 brianp Exp $ */
+/* $Id: getprocaddress.c,v 1.5 2002/11/07 16:35:02 brianp Exp $ */
 
 /*
  * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
@@ -465,11 +465,14 @@ static const char *functions[] = {
    "glCompressedTexSubImage1D",
    "glGetCompressedTexImage",
    "-1.4",
+   "glBlendFuncSeparate",
    "glFogCoordf",
    "glFogCoordfv",
    "glFogCoordd",
    "glFogCoorddv",
    "glFogCoordPointer",
+   "glMultiDrawArrays",
+   "glMultiDrawElements",
    "glPointParameterf",
    "glPointParameterfv",
    "glPointParameteri",

diff --git a/src/mesa/glapi/APIspec b/src/mesa/glapi/APIspec
index 83093805bc067098f812aca137bb13e6fe9f59d6..c1cb030168554acf519d023dd40d9d92c7e3c6e4 100644 (file)
--- a/src/mesa/glapi/APIspec
+++ b/src/mesa/glapi/APIspec
@@ -1,4 +1,4 @@
-# $Id: APIspec,v 1.12 2002/11/07 16:20:20 brianp Exp $
+# $Id: APIspec,v 1.13 2002/11/07 16:35:01 brianp Exp $
 
 # This file describes all the OpenGL functions.
 # We use a number of Python scripts to parse this file and
@@ -7367,6 +7367,66 @@ offset           643
 
 # OpenGL 1.4
 
+name           BlendFuncSeparate
+alias          BlendFuncSeparateEXT
+return         void
+param          sfactorRGB      GLenum
+param          dfactorRGB      GLenum
+param          sfactorAlpha    GLenum
+param          dfactorAlpha    GLenum
+category       GL_EXT_blend_func_separate
+
+name           FogCoordf
+return         void
+param          coord           GLfloat
+category       1.4
+alias          FogCoordfEXT
+
+name           FogCoordfv
+return         void
+param          coord           const GLfloat *
+category       1.4
+alias          FogCoordfvEXT
+
+name           FogCoordd
+return         void
+param          coord           GLdouble
+category       1.4
+alias          FogCoorddEXT
+
+name           FogCoorddv
+return         void
+param          coord           const GLdouble *
+category       1.4
+alias          FogCoorddvEXT
+
+name           FogCoordPointer
+return         void
+param          type            GLenum
+param          stride          GLsizei
+param          pointer         const GLvoid *
+category       1.4
+alias          FogCoordPointerEXT
+
+name           MultiDrawArrays
+return         void
+param          mode            GLenum
+param          first           GLint *
+param          count           GLsizei *
+param          primcount       GLsizei
+category       GL_EXT_multi_draw_arrays
+alias          MultiDrawArraysEXT
+
+name           MultiDrawElements
+return         void
+param          mode            GLenum
+param          count           const GLsizei *
+param          type            GLenum
+param          indices         const GLvoid **
+param          primcount       GLsizei
+category       GL_EXT_multi_draw_arrays
+alias          MultiDrawElementsEXT
+
 name           PointParameterf
 return         void
 param          pname           GLenum
@@ -7625,39 +7685,6 @@ category 1.4
 alias          WindowPos3svMESA
 
 
-name           FogCoordf
-return         void
-param          coord           GLfloat
-category       1.4
-alias          FogCoordfEXT
-
-name           FogCoordfv
-return         void
-param          coord           const GLfloat *
-category       1.4
-alias          FogCoordfvEXT
-
-name           FogCoordd
-return         void
-param          coord           GLdouble
-category       1.4
-alias          FogCoorddEXT
-
-name           FogCoorddv
-return         void
-param          coord           const GLdouble *
-category       1.4
-alias          FogCoorddvEXT
-
-name           FogCoordPointer
-return         void
-param          type            GLenum
-param          stride          GLsizei
-param          pointer         const GLvoid *
-category       1.4
-alias          FogCoordPointerEXT
-
-
 # GL_EXT_stencil_two_side
 
 name ActiveStencilFaceEXT

diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index a2992e1225335aaee1421475e805099e6adaf245..ba6a093787c0512f736fd7822b6b729367291b87 100644 (file)
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -3994,6 +3994,46 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (void *) params));
 }
 
+KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+{
+   DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparate(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordf)(GLfloat coord)
+{
+   DISPATCH(FogCoordfEXT, (coord), (F, "glFogCoordf(%f);\n", coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordfv)(const GLfloat * coord)
+{
+   DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfv(%p);\n", (void *) coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordd)(GLdouble coord)
+{
+   DISPATCH(FogCoorddEXT, (coord), (F, "glFogCoordd(%f);\n", coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoorddv)(const GLdouble * coord)
+{
+   DISPATCH(FogCoorddvEXT, (coord), (F, "glFogCoorddv(%p);\n", (void *) coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(FogCoordPointerEXT, (type, stride, pointer), (F, "glFogCoordPointer(0x%x, %d, %p);\n", type, stride, (void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiDrawArrays)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount)
+{
+   DISPATCH(MultiDrawArraysEXT, (mode, first, count, primcount), (F, "glMultiDrawArrays(0x%x, %p, %p, %d);\n", mode, (void *) first, (void *) count, primcount));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiDrawElements)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount)
+{
+   DISPATCH(MultiDrawElementsEXT, (mode, count, type, indices, primcount), (F, "glMultiDrawElements(0x%x, %p, 0x%x, %p, %d);\n", mode, (void *) count, type, (void *) indices, primcount));
+}
+
 KEYWORD1 void KEYWORD2 NAME(PointParameterf)(GLenum pname, GLfloat param)
 {
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterf(0x%x, %f);\n", pname, param));
@@ -4179,31 +4219,6 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos3sv)(const GLshort * v)
    DISPATCH(WindowPos3svMESA, (v), (F, "glWindowPos3sv(%p);\n", (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(FogCoordf)(GLfloat coord)
-{
-   DISPATCH(FogCoordfEXT, (coord), (F, "glFogCoordf(%f);\n", coord));
-}
-
-KEYWORD1 void KEYWORD2 NAME(FogCoordfv)(const GLfloat * coord)
-{
-   DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfv(%p);\n", (void *) coord));
-}
-
-KEYWORD1 void KEYWORD2 NAME(FogCoordd)(GLdouble coord)
-{
-   DISPATCH(FogCoorddEXT, (coord), (F, "glFogCoordd(%f);\n", coord));
-}
-
-KEYWORD1 void KEYWORD2 NAME(FogCoorddv)(const GLdouble * coord)
-{
-   DISPATCH(FogCoorddvEXT, (coord), (F, "glFogCoorddv(%p);\n", (void *) coord));
-}
-
-KEYWORD1 void KEYWORD2 NAME(FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid * pointer)
-{
-   DISPATCH(FogCoordPointerEXT, (type, stride, pointer), (F, "glFogCoordPointer(0x%x, %d, %p);\n", type, stride, (void *) pointer));
-}
-
 KEYWORD1 void KEYWORD2 NAME(ActiveStencilFaceEXT)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
@@ -5096,6 +5111,14 @@ void *UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos3fvARB),
    TABLE_ENTRY(WindowPos3ivARB),
    TABLE_ENTRY(WindowPos3svARB),
+   TABLE_ENTRY(BlendFuncSeparate),
+   TABLE_ENTRY(FogCoordf),
+   TABLE_ENTRY(FogCoordfv),
+   TABLE_ENTRY(FogCoordd),
+   TABLE_ENTRY(FogCoorddv),
+   TABLE_ENTRY(FogCoordPointer),
+   TABLE_ENTRY(MultiDrawArrays),
+   TABLE_ENTRY(MultiDrawElements),
    TABLE_ENTRY(PointParameterf),
    TABLE_ENTRY(PointParameterfv),
    TABLE_ENTRY(PointParameteri),
@@ -5133,11 +5156,6 @@ void *UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos3iv),
    TABLE_ENTRY(WindowPos3s),
    TABLE_ENTRY(WindowPos3sv),
-   TABLE_ENTRY(FogCoordf),
-   TABLE_ENTRY(FogCoordfv),
-   TABLE_ENTRY(FogCoordd),
-   TABLE_ENTRY(FogCoorddv),
-   TABLE_ENTRY(FogCoordPointer),
 };
 #endif /*UNUSED_TABLE_NAME*/
 

diff --git a/src/mesa/main/glprocs.h b/src/mesa/main/glprocs.h
index dd8c0f977d8845932ad04dcaecf7d304183e2641..af7aea669c5abb18be42562f50e2925990148cb0 100644 (file)
--- a/src/mesa/main/glprocs.h
+++ b/src/mesa/main/glprocs.h
@@ -764,6 +764,14 @@ static struct name_address_offset static_functions[] = {
    { "glVertexAttribs4ubvNV", (GLvoid *) glVertexAttribs4ubvNV, _gloffset_VertexAttribs4ubvNV },
    { "glPointParameteriNV", (GLvoid *) glPointParameteriNV, _gloffset_PointParameteriNV },
    { "glPointParameterivNV", (GLvoid *) glPointParameterivNV, _gloffset_PointParameterivNV },
+   { "glBlendFuncSeparate", (GLvoid *) glBlendFuncSeparate, _gloffset_BlendFuncSeparateEXT },
+   { "glFogCoordf", (GLvoid *) glFogCoordf, _gloffset_FogCoordfEXT },
+   { "glFogCoordfv", (GLvoid *) glFogCoordfv, _gloffset_FogCoordfvEXT },
+   { "glFogCoordd", (GLvoid *) glFogCoordd, _gloffset_FogCoorddEXT },
+   { "glFogCoorddv", (GLvoid *) glFogCoorddv, _gloffset_FogCoorddvEXT },
+   { "glFogCoordPointer", (GLvoid *) glFogCoordPointer, _gloffset_FogCoordPointerEXT },
+   { "glMultiDrawArrays", (GLvoid *) glMultiDrawArrays, _gloffset_MultiDrawArraysEXT },
+   { "glMultiDrawElements", (GLvoid *) glMultiDrawElements, _gloffset_MultiDrawElementsEXT },
    { "glPointParameterf", (GLvoid *) glPointParameterf, _gloffset_PointParameterfEXT },
    { "glPointParameterfv", (GLvoid *) glPointParameterfv, _gloffset_PointParameterfvEXT },
    { "glPointParameteri", (GLvoid *) glPointParameteri, _gloffset_PointParameteriNV },
@@ -801,11 +809,6 @@ static struct name_address_offset static_functions[] = {
    { "glWindowPos3iv", (GLvoid *) glWindowPos3iv, _gloffset_WindowPos3ivMESA },
    { "glWindowPos3s", (GLvoid *) glWindowPos3s, _gloffset_WindowPos3sMESA },
    { "glWindowPos3sv", (GLvoid *) glWindowPos3sv, _gloffset_WindowPos3svMESA },
-   { "glFogCoordf", (GLvoid *) glFogCoordf, _gloffset_FogCoordfEXT },
-   { "glFogCoordfv", (GLvoid *) glFogCoordfv, _gloffset_FogCoordfvEXT },
-   { "glFogCoordd", (GLvoid *) glFogCoordd, _gloffset_FogCoorddEXT },
-   { "glFogCoorddv", (GLvoid *) glFogCoorddv, _gloffset_FogCoorddvEXT },
-   { "glFogCoordPointer", (GLvoid *) glFogCoordPointer, _gloffset_FogCoordPointerEXT },
    { "glActiveStencilFaceEXT", (GLvoid *) glActiveStencilFaceEXT, _gloffset_ActiveStencilFaceEXT },
    { NULL, NULL }  /* end of list marker */
 };

diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 2bbe8131375c1f70876ff6966764999582bfd1d3..7381700879c3cee55ffd761acc1ac204cd486cca 100644 (file)
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -15981,6 +15981,174 @@ glPointParameterivNV:
        jmpl    %g3, %g0
        nop
 
+.globl glBlendFuncSeparate
+.type glBlendFuncSeparate,#function
+glBlendFuncSeparate:
+#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_BlendFuncSeparateEXT), %g2
+       or      %g2, %lo(8 * _gloffset_BlendFuncSeparateEXT), %g2
+       ldx     [%g1 + %g2], %g3
+#else
+       sethi   %hi(0x00000000), %g1
+       ld      [%g1 + %lo(0x00000000)], %g1
+       ld      [%g1 + (4 * _gloffset_BlendFuncSeparateEXT)], %g3
+#endif
+       jmpl    %g3, %g0
+       nop
+
+.globl glFogCoordf
+.type glFogCoordf,#function
+glFogCoordf:
+#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_FogCoordfEXT), %g2
+       or      %g2, %lo(8 * _gloffset_FogCoordfEXT), %g2
+       ldx     [%g1 + %g2], %g3
+#else
+       sethi   %hi(0x00000000), %g1
+       ld      [%g1 + %lo(0x00000000)], %g1
+       ld      [%g1 + (4 * _gloffset_FogCoordfEXT)], %g3
+#endif
+       jmpl    %g3, %g0
+       nop
+
+.globl glFogCoordfv
+.type glFogCoordfv,#function
+glFogCoordfv:
+#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_FogCoordfvEXT), %g2
+       or      %g2, %lo(8 * _gloffset_FogCoordfvEXT), %g2
+       ldx     [%g1 + %g2], %g3
+#else
+       sethi   %hi(0x00000000), %g1
+       ld      [%g1 + %lo(0x00000000)], %g1
+       ld      [%g1 + (4 * _gloffset_FogCoordfvEXT)], %g3
+#endif
+       jmpl    %g3, %g0
+       nop
+
+.globl glFogCoordd
+.type glFogCoordd,#function
+glFogCoordd:
+#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_FogCoorddEXT), %g2
+       or      %g2, %lo(8 * _gloffset_FogCoorddEXT), %g2
+       ldx     [%g1 + %g2], %g3
+#else
+       sethi   %hi(0x00000000), %g1
+       ld      [%g1 + %lo(0x00000000)], %g1
+       ld      [%g1 + (4 * _gloffset_FogCoorddEXT)], %g3
+#endif
+       jmpl    %g3, %g0
+       nop
+
+.globl glFogCoorddv
+.type glFogCoorddv,#function
+glFogCoorddv:
+#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_FogCoorddvEXT), %g2
+       or      %g2, %lo(8 * _gloffset_FogCoorddvEXT), %g2
+       ldx     [%g1 + %g2], %g3
+#else
+       sethi   %hi(0x00000000), %g1
+       ld      [%g1 + %lo(0x00000000)], %g1
+       ld      [%g1 + (4 * _gloffset_FogCoorddvEXT)], %g3
+#endif
+       jmpl    %g3, %g0
+       nop
+
+.globl glFogCoordPointer
+.type glFogCoordPointer,#function
+glFogCoordPointer:
+#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_FogCoordPointerEXT), %g2
+       or      %g2, %lo(8 * _gloffset_FogCoordPointerEXT), %g2
+       ldx     [%g1 + %g2], %g3
+#else
+       sethi   %hi(0x00000000), %g1
+       ld      [%g1 + %lo(0x00000000)], %g1
+       ld      [%g1 + (4 * _gloffset_FogCoordPointerEXT)], %g3
+#endif
+       jmpl    %g3, %g0
+       nop
+
+.globl glMultiDrawArrays
+.type glMultiDrawArrays,#function
+glMultiDrawArrays:
+#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_MultiDrawArraysEXT), %g2
+       or      %g2, %lo(8 * _gloffset_MultiDrawArraysEXT), %g2
+       ldx     [%g1 + %g2], %g3
+#else
+       sethi   %hi(0x00000000), %g1
+       ld      [%g1 + %lo(0x00000000)], %g1
+       ld      [%g1 + (4 * _gloffset_MultiDrawArraysEXT)], %g3
+#endif
+       jmpl    %g3, %g0
+       nop
+
+.globl glMultiDrawElements
+.type glMultiDrawElements,#function
+glMultiDrawElements:
+#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_MultiDrawElementsEXT), %g2
+       or      %g2, %lo(8 * _gloffset_MultiDrawElementsEXT), %g2
+       ldx     [%g1 + %g2], %g3
+#else
+       sethi   %hi(0x00000000), %g1
+       ld      [%g1 + %lo(0x00000000)], %g1
+       ld      [%g1 + (4 * _gloffset_MultiDrawElementsEXT)], %g3
+#endif
+       jmpl    %g3, %g0
+       nop
+
 .globl glPointParameterf
 .type glPointParameterf,#function
 glPointParameterf:
@@ -16758,111 +16926,6 @@ glWindowPos3sv:
        jmpl    %g3, %g0
        nop
 
-.globl glFogCoordf
-.type glFogCoordf,#function
-glFogCoordf:
-#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_FogCoordfEXT), %g2
-       or      %g2, %lo(8 * _gloffset_FogCoordfEXT), %g2
-       ldx     [%g1 + %g2], %g3
-#else
-       sethi   %hi(0x00000000), %g1
-       ld      [%g1 + %lo(0x00000000)], %g1
-       ld      [%g1 + (4 * _gloffset_FogCoordfEXT)], %g3
-#endif
-       jmpl    %g3, %g0
-       nop
-
-.globl glFogCoordfv
-.type glFogCoordfv,#function
-glFogCoordfv:
-#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_FogCoordfvEXT), %g2
-       or      %g2, %lo(8 * _gloffset_FogCoordfvEXT), %g2
-       ldx     [%g1 + %g2], %g3
-#else
-       sethi   %hi(0x00000000), %g1
-       ld      [%g1 + %lo(0x00000000)], %g1
-       ld      [%g1 + (4 * _gloffset_FogCoordfvEXT)], %g3
-#endif
-       jmpl    %g3, %g0
-       nop
-
-.globl glFogCoordd
-.type glFogCoordd,#function
-glFogCoordd:
-#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_FogCoorddEXT), %g2
-       or      %g2, %lo(8 * _gloffset_FogCoorddEXT), %g2
-       ldx     [%g1 + %g2], %g3
-#else
-       sethi   %hi(0x00000000), %g1
-       ld      [%g1 + %lo(0x00000000)], %g1
-       ld      [%g1 + (4 * _gloffset_FogCoorddEXT)], %g3
-#endif
-       jmpl    %g3, %g0
-       nop
-
-.globl glFogCoorddv
-.type glFogCoorddv,#function
-glFogCoorddv:
-#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_FogCoorddvEXT), %g2
-       or      %g2, %lo(8 * _gloffset_FogCoorddvEXT), %g2
-       ldx     [%g1 + %g2], %g3
-#else
-       sethi   %hi(0x00000000), %g1
-       ld      [%g1 + %lo(0x00000000)], %g1
-       ld      [%g1 + (4 * _gloffset_FogCoorddvEXT)], %g3
-#endif
-       jmpl    %g3, %g0
-       nop
-
-.globl glFogCoordPointer
-.type glFogCoordPointer,#function
-glFogCoordPointer:
-#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_FogCoordPointerEXT), %g2
-       or      %g2, %lo(8 * _gloffset_FogCoordPointerEXT), %g2
-       ldx     [%g1 + %g2], %g3
-#else
-       sethi   %hi(0x00000000), %g1
-       ld      [%g1 + %lo(0x00000000)], %g1
-       ld      [%g1 + (4 * _gloffset_FogCoordPointerEXT)], %g3
-#endif
-       jmpl    %g3, %g0
-       nop
-
 .globl glActiveStencilFaceEXT
 .type glActiveStencilFaceEXT,#function
 glActiveStencilFaceEXT:

diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index fe1c35e811187fe278e500463b7641875bd34954..57dd296c760046538a9ddfb19a2b37c8f6a59b59 100644 (file)
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -4581,6 +4581,54 @@ GL_PREFIX(PointParameterivNV):
        MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
        JMP(GL_OFFSET(_gloffset_PointParameterivNV))
 
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BlendFuncSeparate))
+GL_PREFIX(BlendFuncSeparate):
+       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+       JMP(GL_OFFSET(_gloffset_BlendFuncSeparateEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordf))
+GL_PREFIX(FogCoordf):
+       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+       JMP(GL_OFFSET(_gloffset_FogCoordfEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordfv))
+GL_PREFIX(FogCoordfv):
+       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+       JMP(GL_OFFSET(_gloffset_FogCoordfvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordd))
+GL_PREFIX(FogCoordd):
+       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+       JMP(GL_OFFSET(_gloffset_FogCoorddEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoorddv))
+GL_PREFIX(FogCoorddv):
+       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+       JMP(GL_OFFSET(_gloffset_FogCoorddvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FogCoordPointer))
+GL_PREFIX(FogCoordPointer):
+       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+       JMP(GL_OFFSET(_gloffset_FogCoordPointerEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiDrawArrays))
+GL_PREFIX(MultiDrawArrays):
+       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+       JMP(GL_OFFSET(_gloffset_MultiDrawArraysEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(MultiDrawElements))
+GL_PREFIX(MultiDrawElements):
+       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+       JMP(GL_OFFSET(_gloffset_MultiDrawElementsEXT))
+
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(PointParameterf))
 GL_PREFIX(PointParameterf):
@@ -4803,36 +4851,6 @@ GL_PREFIX(WindowPos3sv):
        MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
        JMP(GL_OFFSET(_gloffset_WindowPos3svMESA))
 
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FogCoordf))
-GL_PREFIX(FogCoordf):
-       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-       JMP(GL_OFFSET(_gloffset_FogCoordfEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FogCoordfv))
-GL_PREFIX(FogCoordfv):
-       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-       JMP(GL_OFFSET(_gloffset_FogCoordfvEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FogCoordd))
-GL_PREFIX(FogCoordd):
-       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-       JMP(GL_OFFSET(_gloffset_FogCoorddEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FogCoorddv))
-GL_PREFIX(FogCoorddv):
-       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-       JMP(GL_OFFSET(_gloffset_FogCoorddvEXT))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FogCoordPointer))
-GL_PREFIX(FogCoordPointer):
-       MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-       JMP(GL_OFFSET(_gloffset_FogCoordPointerEXT))
-
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ActiveStencilFaceEXT))
 GL_PREFIX(ActiveStencilFaceEXT):