diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-27 00:34:31 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-27 00:34:31 +1100 |
| commit | 68ef52886263690632552ae187a4673945c2ab74 (patch) | |
| tree | 0453c0063397c196ebe5e3dcd4d9c91392496d77 /src/gallium/winsys/dri/intel | |
| parent | 026e2fd3c6eb87a010a9c90341e8a77b09376b5b (diff) | |
| parent | ad6bb870de6103ed240fa1f9f828bd13a4401a9a (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/winsys/dri/intel')
| -rw-r--r-- | src/gallium/winsys/dri/intel/intel_batchbuffer.c | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/dri/intel/intel_batchbuffer.h | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/dri/intel/intel_context.c | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/winsys/dri/intel/intel_batchbuffer.c b/src/gallium/winsys/dri/intel/intel_batchbuffer.c index 49e04d81ec..5830b88b37 100644 --- a/src/gallium/winsys/dri/intel/intel_batchbuffer.c +++ b/src/gallium/winsys/dri/intel/intel_batchbuffer.c @@ -26,6 +26,7 @@ **************************************************************************/ #include <errno.h> +#include <stdio.h> #include "intel_batchbuffer.h" #include "intel_context.h" #include "intel_screen.h" diff --git a/src/gallium/winsys/dri/intel/intel_batchbuffer.h b/src/gallium/winsys/dri/intel/intel_batchbuffer.h index 82feafa21f..caf6870a3c 100644 --- a/src/gallium/winsys/dri/intel/intel_batchbuffer.h +++ b/src/gallium/winsys/dri/intel/intel_batchbuffer.h @@ -28,6 +28,7 @@ #ifndef INTEL_BATCHBUFFER_H #define INTEL_BATCHBUFFER_H +#include "pipe/p_debug.h" #include "pipe/p_compiler.h" #include "dri_bufmgr.h" diff --git a/src/gallium/winsys/dri/intel/intel_context.c b/src/gallium/winsys/dri/intel/intel_context.c index c033f2a592..79b320c6bf 100644 --- a/src/gallium/winsys/dri/intel/intel_context.c +++ b/src/gallium/winsys/dri/intel/intel_context.c @@ -188,7 +188,8 @@ intelCreateContext(const __GLcontextModes * visual, /* * Pipe-related setup */ - if (!getenv("INTEL_HW")) { + if (getenv("INTEL_SP")) { + /* use softpipe driver instead of hw */ pipe = intel_create_softpipe( intel, intelScreen->winsys ); } else { |