Merge branch 'mesa_7_5_branch'

[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 99a8044576342e8291e03c77e9382360a946bb6e..0c691b3a5cdc50fe2d65d8e45fe5c492e2538fa3 100644 (file)
--- a/src/mesa/vbo/vbo_exec_eval.c
+++ b/src/mesa/vbo/vbo_exec_eval.c
@@ -25,13 +25,12 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
-#include "api_eval.h"
-#include "context.h"
-#include "macros.h"
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/macros.h"
 #include "math/m_eval.h"
+#include "glapi/dispatch.h"
 #include "vbo_exec.h"
-#include "dispatch.h"
 
 
 static void clear_active_eval1( struct vbo_exec_context *exec, GLuint attr ) 
@@ -135,7 +134,7 @@ void vbo_exec_do_EvalCoord1f(struct vbo_exec_context *exec, GLfloat u)
 {
    GLuint attr;
 
-   for (attr = 1; attr <= VBO_ATTRIB_INDEX; 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;
@@ -180,7 +179,7 @@ void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec,
 {   
    GLuint attr;
 
-   for (attr = 1; attr <= VBO_ATTRIB_INDEX; 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;