Remove leftover __DRI{screen,drawable,context}Private references

[mesa.git] / src / mesa / drivers / dri / intel / intel_screen.h

diff --git a/src/mesa/drivers/dri/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h
index 3a1a969b23f297a17ad72f95cd303d2921d3a2a2..e87e306d86b361a9a9118e46b703562a60b30635 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_screen.h
+++ b/src/mesa/drivers/dri/intel/intel_screen.h
@@ -30,9 +30,9 @@
 
 #include <sys/time.h>
 #include "dri_util.h"
-#include "i830_common.h"
+#include "intel_bufmgr.h"
+#include "i915_drm.h"
 #include "xmlconfig.h"
-#include "dri_bufmgr.h"
 
 /* XXX: change name or eliminate to avoid conflict with "struct
  * intel_region"!!!
@@ -43,7 +43,6 @@ typedef struct
    drmSize size;                /* region size in bytes */
    char *map;                   /* memory map */
    int offset;                  /* from start of video mem, in bytes */
-   int pitch;                   /* row stride, in bytes */
    unsigned int bo_handle;     /* buffer object id if available, or -1 */
    /**
     * Flags if the region is tiled.
@@ -57,72 +56,50 @@ typedef struct
 {
    intelRegion front;
    intelRegion back;
-   intelRegion third;
    intelRegion depth;
    intelRegion tex;
 
-   struct intel_region *front_region;
-   struct intel_region *back_region;
-   struct intel_region *third_region;
-   struct intel_region *depth_region;
-
    int deviceID;
    int width;
    int height;
-   int mem;                     /* unused */
-
-   int cpp;                     /* for front and back buffers */
-/*    int bitsPerPixel;   */
-   int fbFormat;                /* XXX FBO: this is obsolete - remove after i830 updates */
+   int pitch;                   /* common row stride, in pixels */
 
    int logTextureGranularity;
 
-   __DRIscreenPrivate *driScrnPriv;
-   unsigned int sarea_priv_offset;
+   __DRIscreen *driScrnPriv;
+
+   volatile drm_i915_sarea_t *sarea;
 
    int drmMinor;
 
    int irq_active;
-   int allow_batchbuffer;
 
-   /**
-   * Configuration cache with default values for all contexts
-   */
-   driOptionCache optionCache;
+   GLboolean no_hw;
 
+   GLboolean no_vbo;
    dri_bufmgr *bufmgr;
-   unsigned int maxBatchSize;
+   GLboolean kernel_exec_fencing;
 
    /**
-    * This value indicates that the kernel memory manager is being used
-    * instead of the fake client-side memory manager.
-    */
-   GLboolean ttm;
+   * Configuration cache with default values for all contexts
+   */
+   driOptionCache optionCache;
 } intelScreenPrivate;
 
 
 
-extern GLboolean intelMapScreenRegions(__DRIscreenPrivate * sPriv);
+extern GLboolean intelMapScreenRegions(__DRIscreen * sPriv);
 
 extern void intelUnmapScreenRegions(intelScreenPrivate * intelScreen);
 
-extern void
-intelUpdateScreenFromSAREA(intelScreenPrivate * intelScreen,
-                           drmI830Sarea * sarea);
+extern void intelDestroyContext(__DRIcontext * driContextPriv);
 
-extern void intelDestroyContext(__DRIcontextPrivate * driContextPriv);
-
-extern GLboolean intelUnbindContext(__DRIcontextPrivate * driContextPriv);
+extern GLboolean intelUnbindContext(__DRIcontext * driContextPriv);
 
 extern GLboolean
-intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
-                 __DRIdrawablePrivate * driDrawPriv,
-                 __DRIdrawablePrivate * driReadPriv);
-
-extern void intelSwapBuffers(__DRIdrawablePrivate * dPriv);
-
-extern void
-intelCopySubBuffer(__DRIdrawablePrivate * dPriv, int x, int y, int w, int h);
+intelMakeCurrent(__DRIcontext * driContextPriv,
+                 __DRIdrawable * driDrawPriv,
+                 __DRIdrawable * driReadPriv);
 
 extern struct intel_context *intelScreenContext(intelScreenPrivate *intelScreen);