i915: Moved pipe_buffer and i915_winsys functions to a common folder

1 files changed, 12 insertions, 13 deletions

diff --git a/src/gallium/winsys/dri/intel/intel_screen.h b/src/gallium/winsys/dri/intel/intel_screen.h
index 1db0502b13..8036917903 100644
--- a/src/gallium/winsys/dri/intel/intel_screen.h
+++ b/src/gallium/winsys/dri/intel/intel_screen.h
@@ -1,8 +1,8 @@
 /**************************************************************************
- * 
+ *
  * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
@@ -10,11 +10,11 @@
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
@@ -22,7 +22,7 @@
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
+ *
  **************************************************************************/
 
 #ifndef _INTEL_SCREEN_H_
@@ -31,13 +31,16 @@
 #include "dri_util.h"
 #include "i830_common.h"
 #include "xmlconfig.h"
-#include "ws_dri_bufpool.h"
+#include "intel_drm/ws_dri_bufpool.h"
 
 #include "pipe/p_compiler.h"
 
+#include "intel_drm/intel_be_device.h"
 
 struct intel_screen
 {
+   struct intel_be_device base;
+
    struct {
       drm_handle_t handle;
 
@@ -51,7 +54,7 @@ struct intel_screen
       int width;
       int height;
       int size;
-      int cpp;                     /* for front and back buffers */   
+      int cpp;                     /* for front and back buffers */
    } front;
 
    int deviceID;
@@ -64,8 +67,6 @@ struct intel_screen
    */
    driOptionCache optionCache;
 
-   struct _DriBufferPool *batchPool;
-   struct _DriBufferPool *staticPool; /** for the X screen/framebuffer */
    boolean havePools;
 
    /**
@@ -74,13 +75,11 @@ struct intel_screen
     */
    struct intel_context *dummyContext;
 
-   /* 
+   /*
     * New stuff form the i915tex integration
     */
-   struct _DriFenceMgr *mgr;
-   struct _DriFreeSlabManager *fMan;
    unsigned batch_id;
-   unsigned max_batch_size;
+
 
    struct pipe_winsys *winsys;
 };