Fix merge issue

2 files changed, 19 insertions, 16 deletions

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index b88c785fb6..fea6995b07 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -311,21 +311,6 @@ intelInitDriverFunctions(struct dd_function_table *functions)
 
 
 
-/**
- * Return list of surface formats supported by this driver.
- */
-static const GLuint *
-intel_supported_formats(struct pipe_context *pipe, GLuint *numFormats)
-{
-   static const GLuint formats[] = {
-      PIPE_FORMAT_U_A8_R8_G8_B8,
-      PIPE_FORMAT_U_R5_G6_B5,
-      PIPE_FORMAT_S8_Z24,
-   };
-
-   *numFormats = sizeof(formats) / sizeof(formats[0]);
-   return formats;
-}
 
 
 GLboolean
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c b/src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c
index fdd7acf747..06db5c9f43 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c
@@ -36,9 +36,9 @@
 
 #include "intel_context.h"
 #include "intel_pipe.h"
-#include "intel_surface.h"
 
 #include "pipe/softpipe/sp_winsys.h"
+#include "pipe/p_defines.h"
 
 /* Shouldn't really need this:
  */
@@ -158,6 +158,24 @@ intel_create_buffer(struct softpipe_winsys *sws,
 }
 
 
+/**
+ * Return list of surface formats supported by this driver.
+ */
+static const GLuint *
+intel_supported_formats(struct pipe_context *pipe, GLuint *numFormats)
+{
+   static const GLuint formats[] = {
+      PIPE_FORMAT_U_A8_R8_G8_B8,
+      PIPE_FORMAT_U_R5_G6_B5,
+      PIPE_FORMAT_S8_Z24,
+   };
+
+   *numFormats = sizeof(formats) / sizeof(formats[0]);
+   return formats;
+}
+
+
+
 struct pipe_context *
 intel_create_softpipe( struct intel_context *intel )
 {