diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-19 15:28:29 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-19 15:28:29 +0000 |
| commit | 0749e2723b32ba430539791b94acd95dcf939a1d (patch) | |
| tree | 066fe341ee47a9dbdfde90a84db9a5fecba86d61 /src/mesa/tnl/t_context.h | |
| parent | 69ddf6cc41a18c6947e7deeb0b4240946f5ddb34 (diff) | |
Several loops over the map1/2 evaluator arrays were incorrect.
There's only 16 evaluator maps. Define new _TNL_NUM_EVAL constant for
those loops.
Also, fix priority of GL_NV_vertex_program generic maps - they override the
conventional maps.
See bug 7564.
Diffstat (limited to 'src/mesa/tnl/t_context.h')
| -rw-r--r-- | src/mesa/tnl/t_context.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h index 5cf262c580..97ad79c58f 100644 --- a/src/mesa/tnl/t_context.h +++ b/src/mesa/tnl/t_context.h @@ -172,6 +172,9 @@ enum { /* Number of available generic attributes */ #define _TNL_NUM_GENERIC 16 +/* Number of attributes used for evaluators */ +#define _TNL_NUM_EVAL 16 + #define PRIM_BEGIN 0x10 #define PRIM_END 0x20 #define PRIM_WEAK 0x40 @@ -199,8 +202,8 @@ struct tnl_eval2_map { struct tnl_eval { GLuint new_state; - struct tnl_eval1_map map1[_TNL_ATTRIB_EDGEFLAG + 1]; - struct tnl_eval2_map map2[_TNL_ATTRIB_EDGEFLAG + 1]; + struct tnl_eval1_map map1[_TNL_NUM_EVAL]; + struct tnl_eval2_map map2[_TNL_NUM_EVAL]; }; |