Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

3 files changed, 531 insertions, 531 deletions

diff --git a/mesalib/src/mesa/vbo/vbo_exec_eval.c b/mesalib/src/mesa/vbo/vbo_exec_eval.c
index 0aff01b25..1e8c3c45b 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_eval.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_eval.c
@@ -1,263 +1,263 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.1

- *

- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- * Authors:

- *    Keith Whitwell <keith@tungstengraphics.com>

- */

-

-#include "main/glheader.h"

-#include "main/context.h"

-#include "main/macros.h"

-#include "math/m_eval.h"

-#include "main/dispatch.h"

-#include "vbo_exec.h"

-

-

-static void clear_active_eval1( struct vbo_exec_context *exec, GLuint attr ) 

-{

-   assert(attr < Elements(exec->eval.map1));

-   exec->eval.map1[attr].map = NULL;

-}

-

-static void clear_active_eval2( struct vbo_exec_context *exec, GLuint attr ) 

-{

-   assert(attr < Elements(exec->eval.map2));

-   exec->eval.map2[attr].map = NULL;

-}

-

-static void set_active_eval1( struct vbo_exec_context *exec, GLuint attr, GLuint dim, 

-			      struct gl_1d_map *map )

-{

-   assert(attr < Elements(exec->eval.map1));

-   if (!exec->eval.map1[attr].map) {

-      exec->eval.map1[attr].map = map;

-      exec->eval.map1[attr].sz = dim;

-   }

-} 

-

-static void set_active_eval2( struct vbo_exec_context *exec, GLuint attr, GLuint dim, 

-			      struct gl_2d_map *map )

-{

-   assert(attr < Elements(exec->eval.map2));

-   if (!exec->eval.map2[attr].map) {

-      exec->eval.map2[attr].map = map;

-      exec->eval.map2[attr].sz = dim;

-   }

-} 

-

-void vbo_exec_eval_update( struct vbo_exec_context *exec )

-{

-   struct gl_context *ctx = exec->ctx;

-   GLuint attr;

-

-   /* Vertex program maps have priority over conventional attribs */

-

-   for (attr = 0; attr < VBO_ATTRIB_FIRST_MATERIAL; attr++) {

-      clear_active_eval1( exec, attr );

-      clear_active_eval2( exec, attr );

-   }

-

-   if (ctx->Eval.Map1Color4) 

-      set_active_eval1( exec, VBO_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map1Color4 );

-      

-   if (ctx->Eval.Map2Color4) 

-      set_active_eval2( exec, VBO_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map2Color4 );

-

-   if (ctx->Eval.Map1TextureCoord4) 

-      set_active_eval1( exec, VBO_ATTRIB_TEX0, 4, &ctx->EvalMap.Map1Texture4 );

-   else if (ctx->Eval.Map1TextureCoord3) 

-      set_active_eval1( exec, VBO_ATTRIB_TEX0, 3, &ctx->EvalMap.Map1Texture3 );

-   else if (ctx->Eval.Map1TextureCoord2) 

-      set_active_eval1( exec, VBO_ATTRIB_TEX0, 2, &ctx->EvalMap.Map1Texture2 );

-   else if (ctx->Eval.Map1TextureCoord1) 

-      set_active_eval1( exec, VBO_ATTRIB_TEX0, 1, &ctx->EvalMap.Map1Texture1 );

-

-   if (ctx->Eval.Map2TextureCoord4) 

-      set_active_eval2( exec, VBO_ATTRIB_TEX0, 4, &ctx->EvalMap.Map2Texture4 );

-   else if (ctx->Eval.Map2TextureCoord3) 

-      set_active_eval2( exec, VBO_ATTRIB_TEX0, 3, &ctx->EvalMap.Map2Texture3 );

-   else if (ctx->Eval.Map2TextureCoord2) 

-      set_active_eval2( exec, VBO_ATTRIB_TEX0, 2, &ctx->EvalMap.Map2Texture2 );

-   else if (ctx->Eval.Map2TextureCoord1) 

-      set_active_eval2( exec, VBO_ATTRIB_TEX0, 1, &ctx->EvalMap.Map2Texture1 );

-

-   if (ctx->Eval.Map1Normal) 

-      set_active_eval1( exec, VBO_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map1Normal );

-

-   if (ctx->Eval.Map2Normal) 

-      set_active_eval2( exec, VBO_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map2Normal );

-

-   if (ctx->Eval.Map1Vertex4) 

-      set_active_eval1( exec, VBO_ATTRIB_POS, 4, &ctx->EvalMap.Map1Vertex4 );

-   else if (ctx->Eval.Map1Vertex3) 

-      set_active_eval1( exec, VBO_ATTRIB_POS, 3, &ctx->EvalMap.Map1Vertex3 );

-

-   if (ctx->Eval.Map2Vertex4) 

-      set_active_eval2( exec, VBO_ATTRIB_POS, 4, &ctx->EvalMap.Map2Vertex4 );

-   else if (ctx->Eval.Map2Vertex3) 

-      set_active_eval2( exec, VBO_ATTRIB_POS, 3, &ctx->EvalMap.Map2Vertex3 );

-

-   /* _NEW_PROGRAM */

-   if (ctx->VertexProgram._Enabled) {

-      /* These are the 16 evaluators which GL_NV_vertex_program defines.

-       * They alias and override the conventional vertex attributs.

-       */

-      for (attr = 0; attr < 16; attr++) {

-         /* _NEW_EVAL */

-         assert(attr < Elements(ctx->Eval.Map1Attrib));

-         if (ctx->Eval.Map1Attrib[attr]) 

-            set_active_eval1( exec, attr, 4, &ctx->EvalMap.Map1Attrib[attr] );

-

-         assert(attr < Elements(ctx->Eval.Map2Attrib));

-         if (ctx->Eval.Map2Attrib[attr]) 

-            set_active_eval2( exec, attr, 4, &ctx->EvalMap.Map2Attrib[attr] );

-      }

-   }

-

-   exec->eval.recalculate_maps = 0;

-}

-

-

-

-void vbo_exec_do_EvalCoord1f(struct vbo_exec_context *exec, GLfloat u)

-{

-   GLuint attr;

-

-   for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {

-      struct gl_1d_map *map = exec->eval.map1[attr].map;

-      if (map) {

-	 GLfloat uu = (u - map->u1) * map->du;

-	 GLfloat data[4];

-

-	 ASSIGN_4V(data, 0, 0, 0, 1);

-

-	 _math_horner_bezier_curve(map->Points, data, uu, 

-				   exec->eval.map1[attr].sz, 

-				   map->Order);

-

-	 COPY_SZ_4V( exec->vtx.attrptr[attr],

-		     exec->vtx.attrsz[attr],

-		     data );

-      }

-   }

-

-   /** Vertex -- EvalCoord1f is a noop if this map not enabled:

-    **/

-   if (exec->eval.map1[0].map) {

-      struct gl_1d_map *map = exec->eval.map1[0].map;

-      GLfloat uu = (u - map->u1) * map->du;

-      GLfloat vertex[4];

-

-      ASSIGN_4V(vertex, 0, 0, 0, 1);

-

-      _math_horner_bezier_curve(map->Points, vertex, uu, 

-				exec->eval.map1[0].sz, 

-				map->Order);

-

-      if (exec->eval.map1[0].sz == 4) 

-	 CALL_Vertex4fv(GET_DISPATCH(), ( vertex ));

-      else

-	 CALL_Vertex3fv(GET_DISPATCH(), ( vertex )); 

-   }

-}

-

-

-

-void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec, 

-			      GLfloat u, GLfloat v )

-{   

-   GLuint attr;

-

-   for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {

-      struct gl_2d_map *map = exec->eval.map2[attr].map;

-      if (map) {

-	 GLfloat uu = (u - map->u1) * map->du;

-	 GLfloat vv = (v - map->v1) * map->dv;

-	 GLfloat data[4];

-

-	 ASSIGN_4V(data, 0, 0, 0, 1);

-

-	 _math_horner_bezier_surf(map->Points, 

-				  data, 

-				  uu, vv, 

-				  exec->eval.map2[attr].sz, 

-				  map->Uorder, map->Vorder);

-

-	 COPY_SZ_4V( exec->vtx.attrptr[attr],

-		     exec->vtx.attrsz[attr],

-		     data );

-      }

-   }

-

-   /** Vertex -- EvalCoord2f is a noop if this map not enabled:

-    **/

-   if (exec->eval.map2[0].map) {

-      struct gl_2d_map *map = exec->eval.map2[0].map;

-      GLfloat uu = (u - map->u1) * map->du;

-      GLfloat vv = (v - map->v1) * map->dv;

-      GLfloat vertex[4];

-

-      ASSIGN_4V(vertex, 0, 0, 0, 1);

-

-      if (exec->ctx->Eval.AutoNormal) {

-	 GLfloat normal[4];

-         GLfloat du[4], dv[4];

-

-         _math_de_casteljau_surf(map->Points, vertex, du, dv, uu, vv, 

-				 exec->eval.map2[0].sz,

-				 map->Uorder, map->Vorder);

-

-	 if (exec->eval.map2[0].sz == 4) {

-	    du[0] = du[0]*vertex[3] - du[3]*vertex[0];

-	    du[1] = du[1]*vertex[3] - du[3]*vertex[1];

-	    du[2] = du[2]*vertex[3] - du[3]*vertex[2];

-	 

-	    dv[0] = dv[0]*vertex[3] - dv[3]*vertex[0];

-	    dv[1] = dv[1]*vertex[3] - dv[3]*vertex[1];

-	    dv[2] = dv[2]*vertex[3] - dv[3]*vertex[2];

-	 }

-

-

-         CROSS3(normal, du, dv);

-         NORMALIZE_3FV(normal);

-	 normal[3] = 1.0;

-

-	 COPY_SZ_4V( exec->vtx.attrptr[VBO_ATTRIB_NORMAL],

-		     exec->vtx.attrsz[VBO_ATTRIB_NORMAL],

-		     normal );

-

-      }

-      else {

-         _math_horner_bezier_surf(map->Points, vertex, uu, vv, 

-				  exec->eval.map2[0].sz,

-				  map->Uorder, map->Vorder);

-      }

-

-      if (exec->vtx.attrsz[0] == 4) 

-	 CALL_Vertex4fv(GET_DISPATCH(), ( vertex ));

-      else

-	 CALL_Vertex3fv(GET_DISPATCH(), ( vertex )); 

-   }

-}

-

-

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.1
+ *
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/macros.h"
+#include "math/m_eval.h"
+#include "main/dispatch.h"
+#include "vbo_exec.h"
+
+
+static void clear_active_eval1( struct vbo_exec_context *exec, GLuint attr ) 
+{
+   assert(attr < Elements(exec->eval.map1));
+   exec->eval.map1[attr].map = NULL;
+}
+
+static void clear_active_eval2( struct vbo_exec_context *exec, GLuint attr ) 
+{
+   assert(attr < Elements(exec->eval.map2));
+   exec->eval.map2[attr].map = NULL;
+}
+
+static void set_active_eval1( struct vbo_exec_context *exec, GLuint attr, GLuint dim, 
+			      struct gl_1d_map *map )
+{
+   assert(attr < Elements(exec->eval.map1));
+   if (!exec->eval.map1[attr].map) {
+      exec->eval.map1[attr].map = map;
+      exec->eval.map1[attr].sz = dim;
+   }
+} 
+
+static void set_active_eval2( struct vbo_exec_context *exec, GLuint attr, GLuint dim, 
+			      struct gl_2d_map *map )
+{
+   assert(attr < Elements(exec->eval.map2));
+   if (!exec->eval.map2[attr].map) {
+      exec->eval.map2[attr].map = map;
+      exec->eval.map2[attr].sz = dim;
+   }
+} 
+
+void vbo_exec_eval_update( struct vbo_exec_context *exec )
+{
+   struct gl_context *ctx = exec->ctx;
+   GLuint attr;
+
+   /* Vertex program maps have priority over conventional attribs */
+
+   for (attr = 0; attr < VBO_ATTRIB_FIRST_MATERIAL; attr++) {
+      clear_active_eval1( exec, attr );
+      clear_active_eval2( exec, attr );
+   }
+
+   if (ctx->Eval.Map1Color4) 
+      set_active_eval1( exec, VBO_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map1Color4 );
+      
+   if (ctx->Eval.Map2Color4) 
+      set_active_eval2( exec, VBO_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map2Color4 );
+
+   if (ctx->Eval.Map1TextureCoord4) 
+      set_active_eval1( exec, VBO_ATTRIB_TEX0, 4, &ctx->EvalMap.Map1Texture4 );
+   else if (ctx->Eval.Map1TextureCoord3) 
+      set_active_eval1( exec, VBO_ATTRIB_TEX0, 3, &ctx->EvalMap.Map1Texture3 );
+   else if (ctx->Eval.Map1TextureCoord2) 
+      set_active_eval1( exec, VBO_ATTRIB_TEX0, 2, &ctx->EvalMap.Map1Texture2 );
+   else if (ctx->Eval.Map1TextureCoord1) 
+      set_active_eval1( exec, VBO_ATTRIB_TEX0, 1, &ctx->EvalMap.Map1Texture1 );
+
+   if (ctx->Eval.Map2TextureCoord4) 
+      set_active_eval2( exec, VBO_ATTRIB_TEX0, 4, &ctx->EvalMap.Map2Texture4 );
+   else if (ctx->Eval.Map2TextureCoord3) 
+      set_active_eval2( exec, VBO_ATTRIB_TEX0, 3, &ctx->EvalMap.Map2Texture3 );
+   else if (ctx->Eval.Map2TextureCoord2) 
+      set_active_eval2( exec, VBO_ATTRIB_TEX0, 2, &ctx->EvalMap.Map2Texture2 );
+   else if (ctx->Eval.Map2TextureCoord1) 
+      set_active_eval2( exec, VBO_ATTRIB_TEX0, 1, &ctx->EvalMap.Map2Texture1 );
+
+   if (ctx->Eval.Map1Normal) 
+      set_active_eval1( exec, VBO_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map1Normal );
+
+   if (ctx->Eval.Map2Normal) 
+      set_active_eval2( exec, VBO_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map2Normal );
+
+   if (ctx->Eval.Map1Vertex4) 
+      set_active_eval1( exec, VBO_ATTRIB_POS, 4, &ctx->EvalMap.Map1Vertex4 );
+   else if (ctx->Eval.Map1Vertex3) 
+      set_active_eval1( exec, VBO_ATTRIB_POS, 3, &ctx->EvalMap.Map1Vertex3 );
+
+   if (ctx->Eval.Map2Vertex4) 
+      set_active_eval2( exec, VBO_ATTRIB_POS, 4, &ctx->EvalMap.Map2Vertex4 );
+   else if (ctx->Eval.Map2Vertex3) 
+      set_active_eval2( exec, VBO_ATTRIB_POS, 3, &ctx->EvalMap.Map2Vertex3 );
+
+   /* _NEW_PROGRAM */
+   if (ctx->VertexProgram._Enabled) {
+      /* These are the 16 evaluators which GL_NV_vertex_program defines.
+       * They alias and override the conventional vertex attributs.
+       */
+      for (attr = 0; attr < 16; attr++) {
+         /* _NEW_EVAL */
+         assert(attr < Elements(ctx->Eval.Map1Attrib));
+         if (ctx->Eval.Map1Attrib[attr]) 
+            set_active_eval1( exec, attr, 4, &ctx->EvalMap.Map1Attrib[attr] );
+
+         assert(attr < Elements(ctx->Eval.Map2Attrib));
+         if (ctx->Eval.Map2Attrib[attr]) 
+            set_active_eval2( exec, attr, 4, &ctx->EvalMap.Map2Attrib[attr] );
+      }
+   }
+
+   exec->eval.recalculate_maps = 0;
+}
+
+
+
+void vbo_exec_do_EvalCoord1f(struct vbo_exec_context *exec, GLfloat u)
+{
+   GLuint attr;
+
+   for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {
+      struct gl_1d_map *map = exec->eval.map1[attr].map;
+      if (map) {
+	 GLfloat uu = (u - map->u1) * map->du;
+	 GLfloat data[4];
+
+	 ASSIGN_4V(data, 0, 0, 0, 1);
+
+	 _math_horner_bezier_curve(map->Points, data, uu, 
+				   exec->eval.map1[attr].sz, 
+				   map->Order);
+
+	 COPY_SZ_4V( exec->vtx.attrptr[attr],
+		     exec->vtx.attrsz[attr],
+		     data );
+      }
+   }
+
+   /** Vertex -- EvalCoord1f is a noop if this map not enabled:
+    **/
+   if (exec->eval.map1[0].map) {
+      struct gl_1d_map *map = exec->eval.map1[0].map;
+      GLfloat uu = (u - map->u1) * map->du;
+      GLfloat vertex[4];
+
+      ASSIGN_4V(vertex, 0, 0, 0, 1);
+
+      _math_horner_bezier_curve(map->Points, vertex, uu, 
+				exec->eval.map1[0].sz, 
+				map->Order);
+
+      if (exec->eval.map1[0].sz == 4) 
+	 CALL_Vertex4fv(GET_DISPATCH(), ( vertex ));
+      else
+	 CALL_Vertex3fv(GET_DISPATCH(), ( vertex )); 
+   }
+}
+
+
+
+void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec, 
+			      GLfloat u, GLfloat v )
+{   
+   GLuint attr;
+
+   for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {
+      struct gl_2d_map *map = exec->eval.map2[attr].map;
+      if (map) {
+	 GLfloat uu = (u - map->u1) * map->du;
+	 GLfloat vv = (v - map->v1) * map->dv;
+	 GLfloat data[4];
+
+	 ASSIGN_4V(data, 0, 0, 0, 1);
+
+	 _math_horner_bezier_surf(map->Points, 
+				  data, 
+				  uu, vv, 
+				  exec->eval.map2[attr].sz, 
+				  map->Uorder, map->Vorder);
+
+	 COPY_SZ_4V( exec->vtx.attrptr[attr],
+		     exec->vtx.attrsz[attr],
+		     data );
+      }
+   }
+
+   /** Vertex -- EvalCoord2f is a noop if this map not enabled:
+    **/
+   if (exec->eval.map2[0].map) {
+      struct gl_2d_map *map = exec->eval.map2[0].map;
+      GLfloat uu = (u - map->u1) * map->du;
+      GLfloat vv = (v - map->v1) * map->dv;
+      GLfloat vertex[4];
+
+      ASSIGN_4V(vertex, 0, 0, 0, 1);
+
+      if (exec->ctx->Eval.AutoNormal) {
+	 GLfloat normal[4];
+         GLfloat du[4], dv[4];
+
+         _math_de_casteljau_surf(map->Points, vertex, du, dv, uu, vv, 
+				 exec->eval.map2[0].sz,
+				 map->Uorder, map->Vorder);
+
+	 if (exec->eval.map2[0].sz == 4) {
+	    du[0] = du[0]*vertex[3] - du[3]*vertex[0];
+	    du[1] = du[1]*vertex[3] - du[3]*vertex[1];
+	    du[2] = du[2]*vertex[3] - du[3]*vertex[2];
+	 
+	    dv[0] = dv[0]*vertex[3] - dv[3]*vertex[0];
+	    dv[1] = dv[1]*vertex[3] - dv[3]*vertex[1];
+	    dv[2] = dv[2]*vertex[3] - dv[3]*vertex[2];
+	 }
+
+
+         CROSS3(normal, du, dv);
+         NORMALIZE_3FV(normal);
+	 normal[3] = 1.0;
+
+	 COPY_SZ_4V( exec->vtx.attrptr[VBO_ATTRIB_NORMAL],
+		     exec->vtx.attrsz[VBO_ATTRIB_NORMAL],
+		     normal );
+
+      }
+      else {
+         _math_horner_bezier_surf(map->Points, vertex, uu, vv, 
+				  exec->eval.map2[0].sz,
+				  map->Uorder, map->Vorder);
+      }
+
+      if (exec->vtx.attrsz[0] == 4) 
+	 CALL_Vertex4fv(GET_DISPATCH(), ( vertex ));
+      else
+	 CALL_Vertex3fv(GET_DISPATCH(), ( vertex )); 
+   }
+}
+
+
diff --git a/mesalib/src/mesa/vbo/vbo_save_loopback.c b/mesalib/src/mesa/vbo/vbo_save_loopback.c
index 6a8860c78..51e598e7e 100644
--- a/mesalib/src/mesa/vbo/vbo_save_loopback.c
+++ b/mesalib/src/mesa/vbo/vbo_save_loopback.c
@@ -1,196 +1,196 @@
-/**************************************************************************

- * 

- * Copyright 2005 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

-#include "main/context.h"

-#include "main/glheader.h"

-#include "main/enums.h"

-#include "main/imports.h"

-#include "main/mfeatures.h"

-#include "main/mtypes.h"

-#include "main/dispatch.h"

-#include "glapi/glapi.h"

-

-#include "vbo_context.h"

-

-

-#if FEATURE_dlist

-

-

-typedef void (*attr_func)( struct gl_context *ctx, GLint target, const GLfloat * );

-

-

-/* This file makes heavy use of the aliasing of NV vertex attributes

- * with the legacy attributes, and also with ARB and Material

- * attributes as currently implemented.

- */

-static void VertexAttrib1fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)

-{

-   CALL_VertexAttrib1fvNV(ctx->Exec, (target, v));

-}

-

-static void VertexAttrib2fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)

-{

-   CALL_VertexAttrib2fvNV(ctx->Exec, (target, v));

-}

-

-static void VertexAttrib3fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)

-{

-   CALL_VertexAttrib3fvNV(ctx->Exec, (target, v));

-}

-

-static void VertexAttrib4fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)

-{

-   CALL_VertexAttrib4fvNV(ctx->Exec, (target, v));

-}

-

-static attr_func vert_attrfunc[4] = {

-   VertexAttrib1fvNV,

-   VertexAttrib2fvNV,

-   VertexAttrib3fvNV,

-   VertexAttrib4fvNV

-};

-

-struct loopback_attr {

-   GLint target;

-   GLint sz;

-   attr_func func;

-};

-

-/* Don't emit ends and begins on wrapped primitives.  Don't replay

- * wrapped vertices.  If we get here, it's probably because the

- * precalculated wrapping is wrong.

- */

-static void loopback_prim( struct gl_context *ctx,

-			   const GLfloat *buffer,

-			   const struct _mesa_prim *prim,

-			   GLuint wrap_count,

-			   GLuint vertex_size,

-			   const struct loopback_attr *la, GLuint nr )

-{

-   GLint start = prim->start;

-   GLint end = start + prim->count;

-   const GLfloat *data;

-   GLint j;

-   GLuint k;

-

-   if (0)

-      printf("loopback prim %s(%s,%s) verts %d..%d\n",

-	     _mesa_lookup_prim_by_nr(prim->mode),

-	     prim->begin ? "begin" : "..",

-	     prim->end ? "end" : "..",

-	     start, 

-	     end);

-

-   if (prim->begin) {

-      CALL_Begin(GET_DISPATCH(), ( prim->mode ));

-   }

-   else {

-      assert(start == 0);

-      start += wrap_count;

-   }

-

-   data = buffer + start * vertex_size;

-

-   for (j = start ; j < end ; j++) {

-      const GLfloat *tmp = data + la[0].sz;

-

-      for (k = 1 ; k < nr ; k++) {

-	 la[k].func( ctx, la[k].target, tmp );

-	 tmp += la[k].sz;

-      }

-	 

-      /* Fire the vertex

-       */

-      la[0].func( ctx, VBO_ATTRIB_POS, data );

-      data = tmp;

-   }

-

-   if (prim->end) {

-      CALL_End(GET_DISPATCH(), ());

-   }

-}

-

-/* Primitives generated by DrawArrays/DrawElements/Rectf may be

- * caught here.  If there is no primitive in progress, execute them

- * normally, otherwise need to track and discard the generated

- * primitives.

- */

-static void loopback_weak_prim( struct gl_context *ctx,

-				const struct _mesa_prim *prim )

-{

-   /* Use the prim_weak flag to ensure that if this primitive

-    * wraps, we don't mistake future vertex_lists for part of the

-    * surrounding primitive.

-    *

-    * While this flag is set, we are simply disposing of data

-    * generated by an operation now known to be a noop.

-    */

-   if (prim->begin)

-      ctx->Driver.CurrentExecPrimitive |= VBO_SAVE_PRIM_WEAK;

-   if (prim->end)

-      ctx->Driver.CurrentExecPrimitive &= ~VBO_SAVE_PRIM_WEAK;

-}

-

-

-void vbo_loopback_vertex_list( struct gl_context *ctx,

-			       const GLfloat *buffer,

-			       const GLubyte *attrsz,

-			       const struct _mesa_prim *prim,

-			       GLuint prim_count,

-			       GLuint wrap_count,

-			       GLuint vertex_size)

-{

-   struct loopback_attr la[VBO_ATTRIB_MAX];

-   GLuint i, nr = 0;

-

-   /* All Legacy, NV, ARB and Material attributes are routed through

-    * the NV attributes entrypoints:

-    */

-   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {

-      if (attrsz[i]) {

-	 la[nr].target = i;

-	 la[nr].sz = attrsz[i];

-	 la[nr].func = vert_attrfunc[attrsz[i]-1];

-	 nr++;

-      }

-   }

-

-   for (i = 0 ; i < prim_count ; i++) {

-      if ((prim[i].mode & VBO_SAVE_PRIM_WEAK) &&

-	  (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END))

-      {

-	 loopback_weak_prim( ctx, &prim[i] );

-      }

-      else

-      {

-	 loopback_prim( ctx, buffer, &prim[i], wrap_count, vertex_size, la, nr );

-      }

-   }

-}

-

-

-#endif /* FEATURE_dlist */

+/**************************************************************************
+ * 
+ * Copyright 2005 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+#include "main/context.h"
+#include "main/glheader.h"
+#include "main/enums.h"
+#include "main/imports.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+#include "main/dispatch.h"
+#include "glapi/glapi.h"
+
+#include "vbo_context.h"
+
+
+#if FEATURE_dlist
+
+
+typedef void (*attr_func)( struct gl_context *ctx, GLint target, const GLfloat * );
+
+
+/* This file makes heavy use of the aliasing of NV vertex attributes
+ * with the legacy attributes, and also with ARB and Material
+ * attributes as currently implemented.
+ */
+static void VertexAttrib1fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)
+{
+   CALL_VertexAttrib1fvNV(ctx->Exec, (target, v));
+}
+
+static void VertexAttrib2fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)
+{
+   CALL_VertexAttrib2fvNV(ctx->Exec, (target, v));
+}
+
+static void VertexAttrib3fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)
+{
+   CALL_VertexAttrib3fvNV(ctx->Exec, (target, v));
+}
+
+static void VertexAttrib4fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)
+{
+   CALL_VertexAttrib4fvNV(ctx->Exec, (target, v));
+}
+
+static attr_func vert_attrfunc[4] = {
+   VertexAttrib1fvNV,
+   VertexAttrib2fvNV,
+   VertexAttrib3fvNV,
+   VertexAttrib4fvNV
+};
+
+struct loopback_attr {
+   GLint target;
+   GLint sz;
+   attr_func func;
+};
+
+/* Don't emit ends and begins on wrapped primitives.  Don't replay
+ * wrapped vertices.  If we get here, it's probably because the
+ * precalculated wrapping is wrong.
+ */
+static void loopback_prim( struct gl_context *ctx,
+			   const GLfloat *buffer,
+			   const struct _mesa_prim *prim,
+			   GLuint wrap_count,
+			   GLuint vertex_size,
+			   const struct loopback_attr *la, GLuint nr )
+{
+   GLint start = prim->start;
+   GLint end = start + prim->count;
+   const GLfloat *data;
+   GLint j;
+   GLuint k;
+
+   if (0)
+      printf("loopback prim %s(%s,%s) verts %d..%d\n",
+	     _mesa_lookup_prim_by_nr(prim->mode),
+	     prim->begin ? "begin" : "..",
+	     prim->end ? "end" : "..",
+	     start, 
+	     end);
+
+   if (prim->begin) {
+      CALL_Begin(GET_DISPATCH(), ( prim->mode ));
+   }
+   else {
+      assert(start == 0);
+      start += wrap_count;
+   }
+
+   data = buffer + start * vertex_size;
+
+   for (j = start ; j < end ; j++) {
+      const GLfloat *tmp = data + la[0].sz;
+
+      for (k = 1 ; k < nr ; k++) {
+	 la[k].func( ctx, la[k].target, tmp );
+	 tmp += la[k].sz;
+      }
+	 
+      /* Fire the vertex
+       */
+      la[0].func( ctx, VBO_ATTRIB_POS, data );
+      data = tmp;
+   }
+
+   if (prim->end) {
+      CALL_End(GET_DISPATCH(), ());
+   }
+}
+
+/* Primitives generated by DrawArrays/DrawElements/Rectf may be
+ * caught here.  If there is no primitive in progress, execute them
+ * normally, otherwise need to track and discard the generated
+ * primitives.
+ */
+static void loopback_weak_prim( struct gl_context *ctx,
+				const struct _mesa_prim *prim )
+{
+   /* Use the prim_weak flag to ensure that if this primitive
+    * wraps, we don't mistake future vertex_lists for part of the
+    * surrounding primitive.
+    *
+    * While this flag is set, we are simply disposing of data
+    * generated by an operation now known to be a noop.
+    */
+   if (prim->begin)
+      ctx->Driver.CurrentExecPrimitive |= VBO_SAVE_PRIM_WEAK;
+   if (prim->end)
+      ctx->Driver.CurrentExecPrimitive &= ~VBO_SAVE_PRIM_WEAK;
+}
+
+
+void vbo_loopback_vertex_list( struct gl_context *ctx,
+			       const GLfloat *buffer,
+			       const GLubyte *attrsz,
+			       const struct _mesa_prim *prim,
+			       GLuint prim_count,
+			       GLuint wrap_count,
+			       GLuint vertex_size)
+{
+   struct loopback_attr la[VBO_ATTRIB_MAX];
+   GLuint i, nr = 0;
+
+   /* All Legacy, NV, ARB and Material attributes are routed through
+    * the NV attributes entrypoints:
+    */
+   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {
+      if (attrsz[i]) {
+	 la[nr].target = i;
+	 la[nr].sz = attrsz[i];
+	 la[nr].func = vert_attrfunc[attrsz[i]-1];
+	 nr++;
+      }
+   }
+
+   for (i = 0 ; i < prim_count ; i++) {
+      if ((prim[i].mode & VBO_SAVE_PRIM_WEAK) &&
+	  (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END))
+      {
+	 loopback_weak_prim( ctx, &prim[i] );
+      }
+      else
+      {
+	 loopback_prim( ctx, buffer, &prim[i], wrap_count, vertex_size, la, nr );
+      }
+   }
+}
+
+
+#endif /* FEATURE_dlist */
diff --git a/mesalib/src/mesa/vbo/vbo_split.h b/mesalib/src/mesa/vbo/vbo_split.h
index 14cf9e49c..b7f0a9c57 100644
--- a/mesalib/src/mesa/vbo/vbo_split.h
+++ b/mesalib/src/mesa/vbo/vbo_split.h
@@ -1,72 +1,72 @@
-/*

- * mesa 3-D graphics library

- * Version:  6.5

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-/**

- * \file vbo_context.h

- * \brief VBO builder module datatypes and definitions.

- * \author Keith Whitwell

- */

-

-

-/**

- * \mainpage The VBO splitter

- *

- * This is the private data used internally to the vbo_split_prims()

- * helper function.  Nobody outside the vbo_split* files needs to

- * include or know about this structure.

- */

-

-

-#ifndef _VBO_SPLIT_H

-#define _VBO_SPLIT_H

-

-#include "vbo.h"

-

-

-/* True if a primitive can be split without copying of vertices, false

- * otherwise.

- */

-GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr);

-

-void vbo_split_inplace( struct gl_context *ctx,

-			const struct gl_client_array *arrays[],

-			const struct _mesa_prim *prim,

-			GLuint nr_prims,

-			const struct _mesa_index_buffer *ib,

-			GLuint min_index,

-			GLuint max_index,

-			vbo_draw_func draw,

-			const struct split_limits *limits );

-

-/* Requires ib != NULL:

- */

-void vbo_split_copy( struct gl_context *ctx,

-		     const struct gl_client_array *arrays[],

-		     const struct _mesa_prim *prim,

-		     GLuint nr_prims,

-		     const struct _mesa_index_buffer *ib,

-		     vbo_draw_func draw,

-		     const struct split_limits *limits );

-

-#endif

+/*
+ * mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file vbo_context.h
+ * \brief VBO builder module datatypes and definitions.
+ * \author Keith Whitwell
+ */
+
+
+/**
+ * \mainpage The VBO splitter
+ *
+ * This is the private data used internally to the vbo_split_prims()
+ * helper function.  Nobody outside the vbo_split* files needs to
+ * include or know about this structure.
+ */
+
+
+#ifndef _VBO_SPLIT_H
+#define _VBO_SPLIT_H
+
+#include "vbo.h"
+
+
+/* True if a primitive can be split without copying of vertices, false
+ * otherwise.
+ */
+GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr);
+
+void vbo_split_inplace( struct gl_context *ctx,
+			const struct gl_client_array *arrays[],
+			const struct _mesa_prim *prim,
+			GLuint nr_prims,
+			const struct _mesa_index_buffer *ib,
+			GLuint min_index,
+			GLuint max_index,
+			vbo_draw_func draw,
+			const struct split_limits *limits );
+
+/* Requires ib != NULL:
+ */
+void vbo_split_copy( struct gl_context *ctx,
+		     const struct gl_client_array *arrays[],
+		     const struct _mesa_prim *prim,
+		     GLuint nr_prims,
+		     const struct _mesa_index_buffer *ib,
+		     vbo_draw_func draw,
+		     const struct split_limits *limits );
+
+#endif