Merge branch 'gallium-edgeflags'

Conflicts:
	src/mesa/state_tracker/st_draw.c

diff --cc src/gallium/auxiliary/tgsi/tgsi_dump.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_scan.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_scan.h
Simple merge

diff --cc src/gallium/drivers/nv30/nv30_context.h
Simple merge

diff --cc src/gallium/drivers/nv40/nv40_context.h
Simple merge

diff --cc src/gallium/drivers/nv40/nv40_state_emit.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_state.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_vs.c
Simple merge

diff --cc src/gallium/drivers/svga/svga_context.h
Simple merge

diff --cc src/gallium/include/pipe/p_shader_tokens.h
Simple merge

diff --cc src/mesa/state_tracker/st_draw.c
index ec8092d7e9e78af5c8f79740cab998dc47c7adda,2d287ef4ef52b23f1c00c3d43409ef8776852a32..e54f21be6009c7a1051127df9aeb68f1843c7a61
--- 1/src/mesa/state_tracker/st_draw.c
--- 2/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@@ -381,9 -332,9 +332,9 @@@ setup_interleaved_attribs(GLcontext *ct
  {
     struct pipe_context *pipe = ctx->st->pipe;
     GLuint attr;
 -   const GLubyte *offset0;
 +   const GLubyte *offset0 = NULL;
  
-    for (attr = 0; attr < vp->num_inputs; attr++) {
+    for (attr = 0; attr < vpv->num_inputs; attr++) {
        const GLuint mesaAttr = vp->index_to_input[attr];
        struct gl_buffer_object *bufobj = arrays[mesaAttr]->BufferObj;
        struct st_buffer_object *stobj = st_buffer_object(bufobj);
@@@ -574,7 -513,8 +527,8 @@@ st_draw_vbo(GLcontext *ctx
     GLuint attr;
     struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];
     unsigned num_vbuffers, num_velements;
 -   GLboolean userSpace;
 +   GLboolean userSpace = GL_FALSE;
+    GLboolean vertDataEdgeFlags;
  
     /* Gallium probably doesn't want this in some cases. */
     if (!index_bounds_valid)
@@@ -687,12 -633,6 +649,8 @@@
            * through to driver & draw module.  These interfaces still
            * need a bit of work...
            */
-          setup_edgeflags(ctx, prims[i].mode,
-                          prims[i].start + indexOffset, prims[i].count,
-                          arrays[VERT_ATTRIB_EDGEFLAG]);
- 
 +         prim = translate_prim( ctx, prims[i].mode );
 +
           pipe->draw_range_elements(pipe, indexBuf, indexSize,
                                     min_index,
                                     max_index,
@@@ -701,14 -641,8 +659,10 @@@
        }
        else {
           for (i = 0; i < nr_prims; i++) {
-             setup_edgeflags(ctx, prims[i].mode,
-                             prims[i].start + indexOffset, prims[i].count,
-                             arrays[VERT_ATTRIB_EDGEFLAG]);
- 
 +            prim = translate_prim( ctx, prims[i].mode );
 +            
              pipe->draw_elements(pipe, indexBuf, indexSize,
 -                                prims[i].mode,
 +                                prim,
                                  prims[i].start + indexOffset, prims[i].count);
           }
        }
@@@ -718,16 -652,8 +672,12 @@@
     else {
        /* non-indexed */
        GLuint i;
 +      GLuint prim;
 +
        for (i = 0; i < nr_prims; i++) {
-          setup_edgeflags(ctx, prims[i].mode,
-                          prims[i].start, prims[i].count,
-                          arrays[VERT_ATTRIB_EDGEFLAG]);
- 
 -         pipe->draw_arrays(pipe, prims[i].mode, prims[i].start, prims[i].count);
 +         prim = translate_prim( ctx, prims[i].mode );
 +
 +         pipe->draw_arrays(pipe, prim, prims[i].start, prims[i].count);
        }
     }
  

diff --cc src/mesa/state_tracker/st_program.c
Simple merge