7 files changed, 39 insertions, 18 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_blit.c b/src/mesa/drivers/dri/intel_winsys/intel_blit.c
index 7e30c7d034e..48bbbbeac9b 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_blit.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_blit.c
@@ -34,7 +34,6 @@
 #include "intel_blit.h"
 #include "intel_buffers.h"
 #include "intel_context.h"
-#include "intel_fbo.h"
 #include "intel_reg.h"
 #include "vblank.h"
 
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_buffers.c b/src/mesa/drivers/dri/intel_winsys/intel_buffers.c
index d0139d5b2ad..cbf6ea38b3b 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_buffers.c
@@ -30,7 +30,6 @@
 #include "intel_blit.h"
 #include "intel_buffers.h"
 #include "intel_depthstencil.h"
-#include "intel_fbo.h"
 #include "intel_batchbuffer.h"
 #include "intel_reg.h"
 #include "context.h"
@@ -93,6 +92,7 @@ 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.
  */
@@ -107,7 +107,10 @@ intel_drawbuf_region(struct intel_context *intel)
    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.
  */
@@ -122,6 +125,8 @@ intel_readbuf_region(struct intel_context *intel)
       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.
@@ -520,4 +525,3 @@ intelCopySubBuffer(__DRIdrawablePrivate * dPriv, int x, int y, int w, int h)
       fprintf(stderr, "%s: drawable has no context!\n", __FUNCTION__);
    }
 }
-
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_buffers.h b/src/mesa/drivers/dri/intel_winsys/intel_buffers.h
index 5834e395010..3e1597e3c4c 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_buffers.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_buffers.h
@@ -32,24 +32,45 @@
 struct intel_context;
 struct intel_framebuffer;
 
+/**
+ * Intel framebuffer, derived from gl_framebuffer.
+ */
+struct intel_framebuffer
+{
+   struct gl_framebuffer Base;
+
+   /* Drawable page flipping state */
+   GLboolean pf_active;
+   GLuint pf_seq;
+   GLint pf_pipes;
+   GLint pf_current_page;
+   GLint pf_num_pages;
+
+   /* VBI
+    */
+   GLuint vbl_seq;
+   GLuint vblank_flags;
+   GLuint vbl_waited;
+
+   int64_t swap_ust;
+   int64_t swap_missed_ust;
+
+   GLuint swap_count;
+   GLuint swap_missed_count;
+
+   GLuint vbl_pending[3];  /**< [number of color buffers] */
+};
+
 
 extern GLboolean
 intel_intersect_cliprects(drm_clip_rect_t * dest,
                           const drm_clip_rect_t * a,
                           const drm_clip_rect_t * b);
 
-extern struct pipe_region *intel_readbuf_region(struct intel_context *intel);
-
-extern struct pipe_region *intel_drawbuf_region(struct intel_context *intel);
-
 extern void intel_wait_flips(struct intel_context *intel, GLuint batch_flags);
 
 extern void intelSwapBuffers(__DRIdrawablePrivate * dPriv);
 
 extern void intelWindowMoved(struct intel_context *intel);
 
-extern void intel_draw_buffer(GLcontext * ctx, struct gl_framebuffer *fb);
-
-extern void intelInitBufferFuncs(struct dd_function_table *functions);
-
 #endif /* INTEL_BUFFERS_H */
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 0d83d4efd61..5aba4ef5847 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -51,8 +51,8 @@
 #include "intel_ioctl.h"
 #include "intel_batchbuffer.h"
 #include "intel_blit.h"
-#include "intel_fbo.h"
 #include "intel_tex_layout.h"
+#include "intel_surface.h"
 
 #include "state_tracker/st_public.h"
 #include "state_tracker/st_context.h"
@@ -311,8 +311,6 @@ intelInitDriverFunctions(struct dd_function_table *functions)
    functions->GetString = intelGetString;
    functions->UpdateState = intelInvalidateState;
 
-   intelInitBufferFuncs(functions);
-
    st_init_driver_functions(functions);
 }
 
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_fbo.h b/src/mesa/drivers/dri/intel_winsys/intel_fbo.h
index 2801c7345d0..0487c27600e 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_fbo.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_fbo.h
@@ -36,7 +36,7 @@
 struct intel_context;
 struct pipe_region;
 
-
+#if 0
 /**
  * Intel framebuffer, derived from gl_framebuffer.
  */
@@ -65,6 +65,7 @@ struct intel_framebuffer
 
    GLuint vbl_pending[3];  /**< [number of color buffers] */
 };
+#endif
 
 
 /**
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
index e5f7b365274..b765c2b4b2c 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
@@ -38,9 +38,7 @@
 #include "intel_screen.h"
 #include "intel_batchbuffer.h"
 #include "intel_buffers.h"
-/*#include "intel_tex.h"*/
 #include "intel_ioctl.h"
-#include "intel_fbo.h"
 
 #include "i830_dri.h"
 #include "dri_bufpool.h"
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_surface.c b/src/mesa/drivers/dri/intel_winsys/intel_surface.c
index 20b6bda83f7..13c34e6c8ec 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_surface.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_surface.c
@@ -10,7 +10,7 @@
 
 #include "intel_context.h"
 #include "intel_buffers.h"
-#include "intel_fbo.h"
+#include "intel_surface.h"
 
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"