Merge branch 'softpipe_0_1_branch' of git+ssh://[email protected]/git/mesa/mesa into softpipe_0_1_branch

4 files changed, 4 insertions, 21 deletions

diff --git a/src/mesa/pipe/draw/draw_context.c b/src/mesa/pipe/draw/draw_context.c
index d5d7d408de5..a808fb77770 100644
--- a/src/mesa/pipe/draw/draw_context.c
+++ b/src/mesa/pipe/draw/draw_context.c
@@ -201,13 +201,3 @@ void draw_set_viewport_state( struct draw_context *draw,
     * Full pipe will have vertex shader, vertex fetch of its own.
     */
 }
-
-
-void draw_set_vertex_array_info(struct draw_context *draw,
-                                const struct pipe_vertex_buffer *buffers,
-                                const struct pipe_vertex_element *elements)
-{
-   draw->vertex_buffer = buffers;
-   draw->vertex_element = elements;
-}
-
diff --git a/src/mesa/pipe/draw/draw_context.h b/src/mesa/pipe/draw/draw_context.h
index 19fddf71044..74fdd46262e 100644
--- a/src/mesa/pipe/draw/draw_context.h
+++ b/src/mesa/pipe/draw/draw_context.h
@@ -98,10 +98,6 @@ void draw_set_vertex_attributes2( struct draw_context *draw,
 				 const unsigned *attrs,
 				 unsigned nr_attrs );
 
-void draw_set_vertex_array_info(struct draw_context *draw,
-                                const struct pipe_vertex_buffer *buffers,
-                                const struct pipe_vertex_element *elements);
-
 /* XXX temporary */
 void draw_vb(struct draw_context *draw,
 	     struct vertex_buffer *VB );
diff --git a/src/mesa/pipe/draw/draw_prim.c b/src/mesa/pipe/draw/draw_prim.c
index 7757dacf34f..95e71efd6db 100644
--- a/src/mesa/pipe/draw/draw_prim.c
+++ b/src/mesa/pipe/draw/draw_prim.c
@@ -258,8 +258,10 @@ static void do_quad( struct draw_context *draw,
 		     unsigned v2,
 		     unsigned v3 )
 {
-   do_ef_triangle( draw, 1, ~(1<<0), v0, v1, v3 );
-   do_ef_triangle( draw, 0, ~(1<<1), v1, v2, v3 );
+   const unsigned omitEdge2 = ~(1 << 1);
+   const unsigned omitEdge3 = ~(1 << 2);
+   do_ef_triangle( draw, 1, omitEdge2, v0, v1, v3 );
+   do_ef_triangle( draw, 0, omitEdge3, v1, v2, v3 );
 }
 
 
diff --git a/src/mesa/pipe/draw/draw_private.h b/src/mesa/pipe/draw/draw_private.h
index 278950ec483..798fa5c3a69 100644
--- a/src/mesa/pipe/draw/draw_private.h
+++ b/src/mesa/pipe/draw/draw_private.h
@@ -158,8 +158,6 @@ struct draw_context
    /* pipe state that we need: */
    struct pipe_setup_state setup;
    struct pipe_viewport_state viewport;
-   const struct pipe_vertex_buffer *vertex_buffer;  /**< note: pointer */
-   const struct pipe_vertex_element *vertex_element; /**< note: pointer */
 
    /** need to know the pipe for vertex flushing/transformation: */
    struct pipe_context *pipe;
@@ -230,9 +228,6 @@ struct draw_context
    ubyte *verts;
    boolean in_vb;
    struct vertex_fetch *vf;
-
-   /* Misc for sp_draw_arrays.c (temporary?) */
-   void *mapped_vbuffer;
 };