diff options
| author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-30 13:46:18 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-30 13:46:18 +0200 |
| commit | 3869c3c87a40d9f41414082ad8dd3d747e6b34d8 (patch) | |
| tree | 04d493660504d59b7e2d3c8b2a5178b3865b84ec /src/gallium/drivers/softpipe/sp_context.c | |
| parent | 2ade5268dca67a73d3f5f8cc41ea86d1e48de9f0 (diff) | |
| parent | 012c0dd6321e858af22389f98201c8dcb8f8780c (diff) | |
Merge branch 'gallium-tex-surfaces' into gallium-0.1
Conflicts:
src/gallium/drivers/i915simple/i915_context.h
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_context.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_context.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c index 531bd76963..1e0106b86c 100644 --- a/src/gallium/drivers/softpipe/sp_context.c +++ b/src/gallium/drivers/softpipe/sp_context.c @@ -179,6 +179,7 @@ softpipe_create( struct pipe_screen *screen, softpipe->pipe.draw_arrays = softpipe_draw_arrays; softpipe->pipe.draw_elements = softpipe_draw_elements; + softpipe->pipe.draw_range_elements = softpipe_draw_range_elements; softpipe->pipe.set_edgeflags = softpipe_set_edgeflags; @@ -227,11 +228,13 @@ softpipe_create( struct pipe_screen *screen, if (GETENV( "SP_NO_RAST" ) != NULL) softpipe->no_rast = TRUE; - if (GETENV( "SP_VBUF" ) != NULL) { - sp_init_vbuf(softpipe); + if (GETENV( "SP_NO_VBUF" ) != NULL) { + /* Deprecated path -- vbuf is the intended interface to the draw module: + */ + draw_set_rasterize_stage(softpipe->draw, softpipe->setup); } else { - draw_set_rasterize_stage(softpipe->draw, softpipe->setup); + sp_init_vbuf(softpipe); } /* plug in AA line/point stages */ |