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 49e04d81ec1..5830b88b37e 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 82feafa21f6..caf6870a3c0 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 c033f2a592c..79b320c6bf4 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 {