Lift region-related functions up to the pipe interface.

Some of these functions probably should be driver-private.
Note: intel_buffer_object is in p_state.h and should be fixed/removed.
There are just a few i915 dependencies in intel_region.c

1 files changed, 4 insertions, 7 deletions

diff --git a/src/mesa/drivers/dri/i915pipe/intel_screen.h b/src/mesa/drivers/dri/i915pipe/intel_screen.h
index eb4685d6e9..d5866ac0ec 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_screen.h
+++ b/src/mesa/drivers/dri/i915pipe/intel_screen.h
@@ -25,19 +25,15 @@
  * 
  **************************************************************************/
 
-#ifndef _INTEL_INIT_H_
-#define _INTEL_INIT_H_
+#ifndef _INTEL_SCREEN_H_
+#define _INTEL_SCREEN_H_
 
-#include <sys/time.h>
 #include "dri_util.h"
 #include "intel_rotate.h"
 #include "i830_common.h"
 #include "xmlconfig.h"
 #include "dri_bufpool.h"
 
-/* XXX: change name or eliminate to avoid conflict with "struct
- * intel_region"!!!
- */
 typedef struct
 {
    drm_handle_t handle;
@@ -49,9 +45,10 @@ typedef struct
 
 typedef struct
 {
+   struct pipe_context *pipe;   /** for accessing region functions */
    intelRegion front;
 
-   struct intel_region *front_region;
+   struct pipe_region *front_region;
 
    int deviceID;
    int width;