diff options
| author | Keith Whitwell <[email protected]> | 2008-04-19 15:29:27 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-04-19 15:29:27 +0100 |
| commit | 507fbe2d327efb8d608ce8e07436b97321560808 (patch) | |
| tree | e7ab438965a04592cb85dbfd40f7c26ae9fd03b7 /src/gallium/drivers | |
| parent | 0959f909ba585968f0408e78961e1c0ffc69a9f8 (diff) | |
draw: move some pipeline-specific code & state to draw_pipe.[ch]
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_prim_emit.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_prim_setup.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/i915simple/i915_context.c b/src/gallium/drivers/i915simple/i915_context.c index 58a5854f0d9..4bef21619c2 100644 --- a/src/gallium/drivers/i915simple/i915_context.c +++ b/src/gallium/drivers/i915simple/i915_context.c @@ -142,7 +142,7 @@ struct pipe_context *i915_create_context( struct pipe_screen *screen, */ i915->draw = draw_create(); assert(i915->draw); - if (GETENV("I915_VBUF")) { + if (!GETENV("I915_NO_VBUF")) { draw_set_rasterize_stage(i915->draw, i915_draw_vbuf_stage(i915)); } else { diff --git a/src/gallium/drivers/i915simple/i915_prim_emit.c b/src/gallium/drivers/i915simple/i915_prim_emit.c index b6fb0a6d88f..9ffa4601380 100644 --- a/src/gallium/drivers/i915simple/i915_prim_emit.c +++ b/src/gallium/drivers/i915simple/i915_prim_emit.c @@ -26,7 +26,7 @@ **************************************************************************/ -#include "draw/draw_private.h" +#include "draw/draw_pipe.h" #include "pipe/p_util.h" #include "i915_context.h" @@ -78,9 +78,6 @@ emit_hw_vertex( struct i915_context *i915, const uint j = vinfo->src_index[i]; const float *attrib = vertex->data[j]; switch (vinfo->emit[i]) { - case EMIT_OMIT: - /* no-op */ - break; case EMIT_1F: OUT_BATCH( fui(attrib[0]) ); count++; diff --git a/src/gallium/drivers/softpipe/sp_prim_setup.c b/src/gallium/drivers/softpipe/sp_prim_setup.c index 0ddb06764af..feb35d492a3 100644 --- a/src/gallium/drivers/softpipe/sp_prim_setup.c +++ b/src/gallium/drivers/softpipe/sp_prim_setup.c @@ -39,7 +39,7 @@ #include "sp_setup.h" #include "sp_state.h" #include "sp_prim_setup.h" -#include "draw/draw_private.h" +#include "draw/draw_pipe.h" #include "draw/draw_vertex.h" #include "pipe/p_util.h" |