summaryrefslogtreecommitdiffstats
path: root/src/mesa/pipe/softpipe
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-08-17 12:19:40 -0600
committerBrian <[email protected]>2007-08-17 12:19:40 -0600
commita30939714cdc73cb633672cad7d86b425781526d (patch)
tree262ddd93df6c35f16a5f3319e5eb0f62b508c520 /src/mesa/pipe/softpipe
parente3647578d159dcb93799023eacba0c2d3c7fbd18 (diff)
added pipe ptr to draw_context
Diffstat (limited to 'src/mesa/pipe/softpipe')
-rw-r--r--src/mesa/pipe/softpipe/sp_draw_arrays.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/pipe/softpipe/sp_draw_arrays.c b/src/mesa/pipe/softpipe/sp_draw_arrays.c
index 52a54a2c961..ac7ae9a887d 100644
--- a/src/mesa/pipe/softpipe/sp_draw_arrays.c
+++ b/src/mesa/pipe/softpipe/sp_draw_arrays.c
@@ -61,9 +61,6 @@
#endif
-static struct softpipe_context *sp_global = NULL;
-
-
static INLINE unsigned
compute_clipmask(float cx, float cy, float cz, float cw)
@@ -104,9 +101,7 @@ run_vertex_program(struct draw_context *draw,
const void *vbuffer, unsigned elts[4], unsigned count,
struct vertex_header *vOut[])
{
-#if 1
- struct softpipe_context *sp = sp_global;
-#endif
+ struct softpipe_context *sp = softpipe_context(draw->pipe);
struct tgsi_exec_machine machine;
unsigned int j;
@@ -368,8 +363,6 @@ softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
struct draw_context *draw = sp->draw;
struct pipe_buffer_handle *buf;
- sp_global = sp;
-
softpipe_map_surfaces(sp);
/*
@@ -384,6 +377,7 @@ softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
draw->pipeline.first->begin( draw->pipeline.first );
draw->vs_flush = vs_flush;
+ draw->pipe = pipe; /* XXX pass pipe to draw_create() */
draw_invalidate_vcache( draw );