diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2009-05-10 16:57:22 +0200 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2009-05-10 16:57:22 +0200 |
| commit | 221b30d595ab2f97fd0518c761615dd28f3ef5ca (patch) | |
| tree | 354ff4786ea95579edac01c5715a934783492dbe /src/gallium/winsys/drm/intel/gem/intel_be_context.c | |
| parent | 13e0ff0df1bb75993bded7b248dd37f58fbfd22c (diff) | |
| parent | 53c2cc8fefa07723fc456d94eda292e201c41dae (diff) | |
Merge commit 'origin/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r200/r200_state.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_fragprog.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/r300/r500_fragprog.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/radeon/radeon_state.c
Diffstat (limited to 'src/gallium/winsys/drm/intel/gem/intel_be_context.c')
| -rw-r--r-- | src/gallium/winsys/drm/intel/gem/intel_be_context.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gallium/winsys/drm/intel/gem/intel_be_context.c b/src/gallium/winsys/drm/intel/gem/intel_be_context.c index bb6f1b916c..fe0b138fbe 100644 --- a/src/gallium/winsys/drm/intel/gem/intel_be_context.c +++ b/src/gallium/winsys/drm/intel/gem/intel_be_context.c @@ -1,6 +1,8 @@ #include "pipe/p_screen.h" +#include "softpipe/sp_winsys.h" + #include "intel_be_device.h" #include "intel_be_context.h" #include "intel_be_batchbuffer.h" @@ -106,13 +108,13 @@ intel_be_create_context(struct pipe_screen *screen) intel_be_init_context(intel, device); -#if 0 - pipe = intel_create_softpipe(intel, screen->winsys); -#else - pipe = i915_create_context(screen, &device->base, &intel->base); -#endif + if (device->softpipe) + pipe = softpipe_create(screen); + else + pipe = i915_create_context(screen, &device->base, &intel->base); - pipe->priv = intel; + if (pipe) + pipe->priv = intel; return pipe; } |