vbo: remove dead code in vbo_can_merge_prims

[mesa.git] / src / mesa / vbo / vbo_exec_eval.c

diff --git a/src/mesa/vbo/vbo_exec_eval.c b/src/mesa/vbo/vbo_exec_eval.c
index 409f31abf885189fb1189ada1f85879c18318196..9754c2058ca71dc5ca74c7deb6e8644e69eb320c 100644 (file)
--- a/src/mesa/vbo/vbo_exec_eval.c
+++ b/src/mesa/vbo/vbo_exec_eval.c
@@ -35,20 +35,20 @@
 
 static void clear_active_eval1( struct vbo_exec_context *exec, GLuint attr ) 
 {
-   assert(attr < Elements(exec->eval.map1));
+   assert(attr < ARRAY_SIZE(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));
+   assert(attr < ARRAY_SIZE(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));
+   assert(attr < ARRAY_SIZE(exec->eval.map1));
    if (!exec->eval.map1[attr].map) {
       exec->eval.map1[attr].map = map;
       exec->eval.map1[attr].sz = dim;
@@ -58,7 +58,7 @@ static void set_active_eval1( struct vbo_exec_context *exec, GLuint attr, GLuint
 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));
+   assert(attr < ARRAY_SIZE(exec->eval.map2));
    if (!exec->eval.map2[attr].map) {
       exec->eval.map2[attr].map = map;
       exec->eval.map2[attr].sz = dim;
@@ -140,7 +140,7 @@ void vbo_exec_do_EvalCoord1f(struct vbo_exec_context *exec, GLfloat u)
                                   map->Order);
 
         COPY_SZ_4V( exec->vtx.attrptr[attr],
-                    exec->vtx.attrsz[attr],
+                    exec->vtx.attr[attr].size,
                     data );
       }
    }
@@ -189,7 +189,7 @@ void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec,
                                  map->Uorder, map->Vorder);
 
         COPY_SZ_4V( exec->vtx.attrptr[attr],
-                    exec->vtx.attrsz[attr],
+                    exec->vtx.attr[attr].size,
                     data );
       }
    }
@@ -228,7 +228,7 @@ void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec,
         normal[3] = FLOAT_AS_UNION(1.0);
 
         COPY_SZ_4V( exec->vtx.attrptr[VBO_ATTRIB_NORMAL],
-                    exec->vtx.attrsz[VBO_ATTRIB_NORMAL],
+                    exec->vtx.attr[VBO_ATTRIB_NORMAL].size,
                     normal );
 
       }
@@ -238,7 +238,7 @@ void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec,
                                  map->Uorder, map->Vorder);
       }
 
-      if (exec->vtx.attrsz[0] == 4) 
+      if (exec->vtx.attr[VBO_ATTRIB_POS].size == 4)
         CALL_Vertex4fv(GET_DISPATCH(), ( vertex ));
       else
         CALL_Vertex3fv(GET_DISPATCH(), ( vertex ));