fix merge conflicts

2 files changed, 4 insertions, 37 deletions

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_buffers.c b/src/mesa/drivers/dri/intel_winsys/intel_buffers.c
index 375f51c705..eb42be98e5 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_buffers.c
@@ -90,41 +90,6 @@ intel_intersect_cliprects(drm_clip_rect_t * dst,
    return GL_TRUE;
 }
 
-<<<<<<< HEAD:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
-/**
- * Return pointer to current color drawing region, or NULL.
- */
-#if 0
-struct pipe_region *
-intel_drawbuf_region(struct intel_context *intel)
-{
-   struct intel_renderbuffer *irbColor =
-      intel_renderbuffer(intel->ctx.DrawBuffer->_ColorDrawBuffers[0][0]);
-   if (irbColor)
-      return irbColor->Base.surface->region;
-   else
-      return NULL;
-}
-=======
->>>>>>> remove dead code, remove intel_fbo.h includes:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
-
-<<<<<<< HEAD:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
-/**
- * Return pointer to current color reading region, or NULL.
- */
-struct pipe_region *
-intel_readbuf_region(struct intel_context *intel)
-{
-   struct intel_renderbuffer *irb
-      = intel_renderbuffer(intel->ctx.ReadBuffer->_ColorReadBuffer);
-   if (irb)
-      return irb->Base.surface->region;
-   else
-      return NULL;
-}
-#endif
-=======
->>>>>>> remove dead code, remove intel_fbo.h includes:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
 
 /**
  * This will be called whenever the currently bound window is moved/resized.
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index c4e8e0f95c..9d6ef058a3 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -351,7 +351,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
    /* Initialize the software rasterizer and helper modules. */
    _vbo_CreateContext(ctx);
    _tnl_CreateContext(ctx);
-
+#if 0
    /*
     * Pipe-related setup
     */
@@ -404,7 +404,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
    default:
       assert(0); /*FIX*/
    }
-
+#endif
 
    /*
     * memory pools
@@ -465,6 +465,8 @@ intelCreateContext(const __GLcontextModes * mesaVis,
     */
    if (!getenv("INTEL_HW")) {
       intel->pipe = intel_create_softpipe( intel );
+      intel->pipe->surface_alloc = intel_new_surface;
+      intel->pipe->supported_formats = intel_supported_formats;
    }
    else {
       switch (intel->intelScreen->deviceID) {