svn merge ^/branches/released .

5 files changed, 158 insertions, 151 deletions

diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c
index 3c59e9be3..ed0361742 100644
--- a/mesalib/src/mesa/main/api_arrayelt.c
+++ b/mesalib/src/mesa/main/api_arrayelt.c
@@ -175,31 +175,31 @@ static int FogCoordFuncs[NUM_TYPES];
 

 /* GL_BYTE attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NbvNV(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1bvNV(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NbvNV(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2bvNV(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NbvNV(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),

@@ -207,13 +207,13 @@ VertexAttrib3NbvNV(GLuint index, const GLbyte *v)
 					       BYTE_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3bvNV(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NbvNV(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),

@@ -222,7 +222,7 @@ VertexAttrib4NbvNV(GLuint index, const GLbyte *v)
 					       BYTE_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4bvNV(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));

@@ -230,46 +230,46 @@ VertexAttrib4bvNV(GLuint index, const GLbyte *v)
 

 /* GL_UNSIGNED_BYTE attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NubvNV(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1ubvNV(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NubvNV(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),

                                           UBYTE_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2ubvNV(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NubvNV(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),

 					       UBYTE_TO_FLOAT(v[1]),

 					       UBYTE_TO_FLOAT(v[2])));

 }

-static void

+static void GLAPIENTRY

 VertexAttrib3ubvNV(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

                                           (GLfloat)v[1], (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NubvNV(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),

@@ -278,7 +278,7 @@ VertexAttrib4NubvNV(GLuint index, const GLubyte *v)
                                           UBYTE_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4ubvNV(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

@@ -288,32 +288,32 @@ VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
 

 /* GL_SHORT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NsvNV(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1svNV(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NsvNV(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),

                                           SHORT_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2svNV(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NsvNV(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),

@@ -321,14 +321,14 @@ VertexAttrib3NsvNV(GLuint index, const GLshort *v)
 			     SHORT_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3svNV(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

                                           (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NsvNV(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),

@@ -337,7 +337,7 @@ VertexAttrib4NsvNV(GLuint index, const GLshort *v)
 			     SHORT_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4svNV(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

@@ -346,33 +346,33 @@ VertexAttrib4svNV(GLuint index, const GLshort *v)
 

 /* GL_UNSIGNED_SHORT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NusvNV(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1usvNV(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NusvNV(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

 			     USHORT_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2usvNV(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

                                           (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NusvNV(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

@@ -380,14 +380,14 @@ VertexAttrib3NusvNV(GLuint index, const GLushort *v)
 					       USHORT_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3usvNV(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

                                           (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NusvNV(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

@@ -396,7 +396,7 @@ VertexAttrib4NusvNV(GLuint index, const GLushort *v)
 					       USHORT_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4usvNV(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

@@ -405,32 +405,32 @@ VertexAttrib4usvNV(GLuint index, const GLushort *v)
 

 /* GL_INT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NivNV(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1ivNV(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NivNV(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

 					       INT_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2ivNV(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NivNV(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

@@ -438,14 +438,14 @@ VertexAttrib3NivNV(GLuint index, const GLint *v)
 					       INT_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3ivNV(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

                                           (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NivNV(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

@@ -454,7 +454,7 @@ VertexAttrib4NivNV(GLuint index, const GLint *v)
                                           INT_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4ivNV(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

@@ -463,33 +463,33 @@ VertexAttrib4ivNV(GLuint index, const GLint *v)
 

 /* GL_UNSIGNED_INT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NuivNV(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1uivNV(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NuivNV(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

                                           UINT_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2uivNV(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

                                           (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NuivNV(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

@@ -497,14 +497,14 @@ VertexAttrib3NuivNV(GLuint index, const GLuint *v)
 					       UINT_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3uivNV(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

                                           (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NuivNV(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

@@ -513,7 +513,7 @@ VertexAttrib4NuivNV(GLuint index, const GLuint *v)
 					       UINT_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4uivNV(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

@@ -522,25 +522,25 @@ VertexAttrib4uivNV(GLuint index, const GLuint *v)
 

 /* GL_FLOAT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1fvNV(GLuint index, const GLfloat *v)

 {

    CALL_VertexAttrib1fvNV(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2fvNV(GLuint index, const GLfloat *v)

 {

    CALL_VertexAttrib2fvNV(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3fvNV(GLuint index, const GLfloat *v)

 {

    CALL_VertexAttrib3fvNV(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4fvNV(GLuint index, const GLfloat *v)

 {

    CALL_VertexAttrib4fvNV(GET_DISPATCH(), (index, v));

@@ -548,25 +548,25 @@ VertexAttrib4fvNV(GLuint index, const GLfloat *v)
 

 /* GL_DOUBLE attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1dvNV(GLuint index, const GLdouble *v)

 {

    CALL_VertexAttrib1dvNV(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2dvNV(GLuint index, const GLdouble *v)

 {

    CALL_VertexAttrib2dvNV(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3dvNV(GLuint index, const GLdouble *v)

 {

    CALL_VertexAttrib3dvNV(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4dvNV(GLuint index, const GLdouble *v)

 {

    CALL_VertexAttrib4dvNV(GET_DISPATCH(), (index, v));

@@ -680,31 +680,31 @@ static attrib_func AttribFuncsNV[2][4][NUM_TYPES] = {
 

 /* GL_BYTE attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NbvARB(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1bvARB(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NbvARB(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2bvARB(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NbvARB(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),

@@ -712,13 +712,13 @@ VertexAttrib3NbvARB(GLuint index, const GLbyte *v)
 					       BYTE_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3bvARB(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NbvARB(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),

@@ -727,7 +727,7 @@ VertexAttrib4NbvARB(GLuint index, const GLbyte *v)
 					       BYTE_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4bvARB(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));

@@ -735,19 +735,19 @@ VertexAttrib4bvARB(GLuint index, const GLbyte *v)
 

 /* GL_UNSIGNED_BYTE attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NubvARB(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1ubvARB(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NubvARB(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,

@@ -755,14 +755,14 @@ VertexAttrib2NubvARB(GLuint index, const GLubyte *v)
                                            UBYTE_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2ubvARB(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,

                                            (GLfloat)v[0], (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NubvARB(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index,

@@ -770,7 +770,7 @@ VertexAttrib3NubvARB(GLuint index, const GLubyte *v)
                                            UBYTE_TO_FLOAT(v[1]),

                                            UBYTE_TO_FLOAT(v[2])));

 }

-static void

+static void GLAPIENTRY

 VertexAttrib3ubvARB(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index,

@@ -779,7 +779,7 @@ VertexAttrib3ubvARB(GLuint index, const GLubyte *v)
                                            (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NubvARB(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(),

@@ -790,7 +790,7 @@ VertexAttrib4NubvARB(GLuint index, const GLubyte *v)
                            UBYTE_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4ubvARB(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(),

@@ -801,19 +801,19 @@ VertexAttrib4ubvARB(GLuint index, const GLubyte *v)
 

 /* GL_SHORT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NsvARB(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1svARB(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NsvARB(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(),

@@ -821,14 +821,14 @@ VertexAttrib2NsvARB(GLuint index, const GLshort *v)
                            SHORT_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2svARB(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(),

                           (index, (GLfloat)v[0], (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NsvARB(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(),

@@ -838,7 +838,7 @@ VertexAttrib3NsvARB(GLuint index, const GLshort *v)
                            SHORT_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3svARB(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(),

@@ -846,7 +846,7 @@ VertexAttrib3svARB(GLuint index, const GLshort *v)
                            (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NsvARB(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(),

@@ -857,7 +857,7 @@ VertexAttrib4NsvARB(GLuint index, const GLshort *v)
                            SHORT_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4svARB(GLuint index, const GLshort *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

@@ -866,33 +866,33 @@ VertexAttrib4svARB(GLuint index, const GLshort *v)
 

 /* GL_UNSIGNED_SHORT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NusvARB(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1usvARB(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NusvARB(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

 			     USHORT_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2usvARB(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

                                            (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NusvARB(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

@@ -900,14 +900,14 @@ VertexAttrib3NusvARB(GLuint index, const GLushort *v)
 					       USHORT_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3usvARB(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

                                            (GLfloat)v[1], (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NusvARB(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

@@ -916,7 +916,7 @@ VertexAttrib4NusvARB(GLuint index, const GLushort *v)
 					       USHORT_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4usvARB(GLuint index, const GLushort *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2], (GLfloat)v[3]));

@@ -924,33 +924,33 @@ VertexAttrib4usvARB(GLuint index, const GLushort *v)
 

 /* GL_INT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NivARB(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1ivARB(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NivARB(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

 					       INT_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2ivARB(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

                                            (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NivARB(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

@@ -958,14 +958,14 @@ VertexAttrib3NivARB(GLuint index, const GLint *v)
 					       INT_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3ivARB(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

                                            (GLfloat)v[1], (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NivARB(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

@@ -974,7 +974,7 @@ VertexAttrib4NivARB(GLuint index, const GLint *v)
 					       INT_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4ivARB(GLuint index, const GLint *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

@@ -983,33 +983,33 @@ VertexAttrib4ivARB(GLuint index, const GLint *v)
 

 /* GL_UNSIGNED_INT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1NuivARB(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib1uivARB(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2NuivARB(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

                                            UINT_TO_FLOAT(v[1])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2uivARB(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

                                            (GLfloat)v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3NuivARB(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

@@ -1017,14 +1017,14 @@ VertexAttrib3NuivARB(GLuint index, const GLuint *v)
                                            UINT_TO_FLOAT(v[2])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3uivARB(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

                                            (GLfloat)v[1], (GLfloat)v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4NuivARB(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

@@ -1033,7 +1033,7 @@ VertexAttrib4NuivARB(GLuint index, const GLuint *v)
                                            UINT_TO_FLOAT(v[3])));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4uivARB(GLuint index, const GLuint *v)

 {

    CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

@@ -1042,25 +1042,25 @@ VertexAttrib4uivARB(GLuint index, const GLuint *v)
 

 /* GL_FLOAT attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1fvARB(GLuint index, const GLfloat *v)

 {

    CALL_VertexAttrib1fvARB(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2fvARB(GLuint index, const GLfloat *v)

 {

    CALL_VertexAttrib2fvARB(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3fvARB(GLuint index, const GLfloat *v)

 {

    CALL_VertexAttrib3fvARB(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4fvARB(GLuint index, const GLfloat *v)

 {

    CALL_VertexAttrib4fvARB(GET_DISPATCH(), (index, v));

@@ -1068,25 +1068,25 @@ VertexAttrib4fvARB(GLuint index, const GLfloat *v)
 

 /* GL_DOUBLE attributes */

 

-static void

+static void GLAPIENTRY

 VertexAttrib1dvARB(GLuint index, const GLdouble *v)

 {

    CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib2dvARB(GLuint index, const GLdouble *v)

 {

    CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib3dvARB(GLuint index, const GLdouble *v)

 {

    CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttrib4dvARB(GLuint index, const GLdouble *v)

 {

    CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v));

@@ -1096,50 +1096,50 @@ VertexAttrib4dvARB(GLuint index, const GLdouble *v)
 /**

  * Integer-valued attributes

  */

-static void

+static void GLAPIENTRY

 VertexAttribI1bv(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI2bv(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI3bv(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI4bv(GLuint index, const GLbyte *v)

 {

    CALL_VertexAttribI4bvEXT(GET_DISPATCH(), (index, v));

 }

 

 

-static void

+static void GLAPIENTRY

 VertexAttribI1ubv(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI2ubv(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI3ubv(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI4ubv(GLuint index, const GLubyte *v)

 {

    CALL_VertexAttribI4ubvEXT(GET_DISPATCH(), (index, v));

@@ -1147,50 +1147,50 @@ VertexAttribI4ubv(GLuint index, const GLubyte *v)
 

 

 

-static void

+static void GLAPIENTRY

 VertexAttribI1sv(GLuint index, const GLshort *v)

 {

    CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI2sv(GLuint index, const GLshort *v)

 {

    CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI3sv(GLuint index, const GLshort *v)

 {

    CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI4sv(GLuint index, const GLshort *v)

 {

    CALL_VertexAttribI4svEXT(GET_DISPATCH(), (index, v));

 }

 

 

-static void

+static void GLAPIENTRY

 VertexAttribI1usv(GLuint index, const GLushort *v)

 {

    CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI2usv(GLuint index, const GLushort *v)

 {

    CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI3usv(GLuint index, const GLushort *v)

 {

    CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI4usv(GLuint index, const GLushort *v)

 {

    CALL_VertexAttribI4usvEXT(GET_DISPATCH(), (index, v));

@@ -1198,50 +1198,50 @@ VertexAttribI4usv(GLuint index, const GLushort *v)
 

 

 

-static void

+static void GLAPIENTRY

 VertexAttribI1iv(GLuint index, const GLint *v)

 {

    CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI2iv(GLuint index, const GLint *v)

 {

    CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI3iv(GLuint index, const GLint *v)

 {

    CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI4iv(GLuint index, const GLint *v)

 {

    CALL_VertexAttribI4ivEXT(GET_DISPATCH(), (index, v));

 }

 

 

-static void

+static void GLAPIENTRY

 VertexAttribI1uiv(GLuint index, const GLuint *v)

 {

    CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI2uiv(GLuint index, const GLuint *v)

 {

    CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI3uiv(GLuint index, const GLuint *v)

 {

    CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

 }

 

-static void

+static void GLAPIENTRY

 VertexAttribI4uiv(GLuint index, const GLuint *v)

 {

    CALL_VertexAttribI4uivEXT(GET_DISPATCH(), (index, v));

diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index c1d773b18..f2b344fd1 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -149,12 +149,14 @@ extern "C" {
  * We also need to define a USED attribute, so the optimizer doesn't 

  * inline a static function that we later use in an alias. - ajax

  */

-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))

-#  define PUBLIC __attribute__((visibility("default")))

-#  define USED __attribute__((used))

-#else

-#  define PUBLIC

-#  define USED

+#ifndef PUBLIC

+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))

+#    define PUBLIC __attribute__((visibility("default")))

+#    define USED __attribute__((used))

+#  else

+#    define PUBLIC

+#    define USED

+#  endif

 #endif

 

 

@@ -173,15 +175,17 @@ extern "C" {
  * __builtin_expect macros

  */

 #if !defined(__GNUC__)

-#  define __builtin_expect(x, y) x

+#  define __builtin_expect(x, y) (x)

 #endif

 

-#ifdef __GNUC__

-#define likely(x) __builtin_expect(!!(x), 1)

-#define unlikely(x) __builtin_expect(!!(x), 0)

-#else

-#define likely(x) !!(x)

-#define unlikely(x) !!(x)

+#ifndef likely

+#  ifdef __GNUC__

+#    define likely(x)   __builtin_expect(!!(x), 1)

+#    define unlikely(x) __builtin_expect(!!(x), 0)

+#  else

+#    define likely(x)   (x)

+#    define unlikely(x) (x)

+#  endif

 #endif

 

 /**

diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index 3c8474591..3a963b981 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -7036,7 +7036,7 @@ save_VertexAttribDivisor(GLuint index, GLuint divisor)
 

 /* GL_NV_texture_barrier */

 static void

-save_TextureBarrierNV()

+save_TextureBarrierNV(void)

 {

    GET_CURRENT_CONTEXT(ctx);

    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);

diff --git a/mesalib/src/mesa/main/glapidispatch.h b/mesalib/src/mesa/main/glapidispatch.h
index ae7f80d89..809f84904 100644
--- a/mesalib/src/mesa/main/glapidispatch.h
+++ b/mesalib/src/mesa/main/glapidispatch.h
@@ -3227,7 +3227,7 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_ClampColor(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum)), _gloffset_ClampColor, parameters)

 #define GET_ClampColor(disp) GET_by_offset(disp, _gloffset_ClampColor)

 #define SET_ClampColor(disp, fn) SET_by_offset(disp, _gloffset_ClampColor, fn)

-#define CALL_ClearBufferfi(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, const GLfloat, const GLint)), _gloffset_ClearBufferfi, parameters)

+#define CALL_ClearBufferfi(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLfloat, GLint)), _gloffset_ClearBufferfi, parameters)

 #define GET_ClearBufferfi(disp) GET_by_offset(disp, _gloffset_ClearBufferfi)

 #define SET_ClearBufferfi(disp, fn) SET_by_offset(disp, _gloffset_ClearBufferfi, fn)

 #define CALL_ClearBufferfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, const GLfloat *)), _gloffset_ClearBufferfv, parameters)

diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.c b/mesalib/src/mesa/state_tracker/st_cb_blit.c
index 39499450d..4c3d561a4 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_blit.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_blit.c
@@ -39,6 +39,7 @@
 #include "st_texture.h"

 #include "st_cb_blit.h"

 #include "st_cb_fbo.h"

+#include "st_atom.h"

 

 #include "util/u_blit.h"

 

@@ -75,6 +76,8 @@ st_BlitFramebuffer(struct gl_context *ctx,
    struct gl_framebuffer *readFB = ctx->ReadBuffer;

    struct gl_framebuffer *drawFB = ctx->DrawBuffer;

 

+   st_validate_state(st);

+

    if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,

                         &dstX0, &dstY0, &dstX1, &dstY1)) {

       return; /* nothing to draw/blit */