X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fintel%2Fintel_screen.h;h=5863093f001765bf1316e9ce029cf63736c8525e;hb=35489ef285f1fde234b2b9bbb91fdc41fddefc02;hp=e1036de4db8aecc8367a250a685428c887774b4d;hpb=e97681c7f551a2a2a6bd5eff0f4192a870c816c0;p=mesa.git

diff --git a/src/mesa/drivers/dri/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h
index e1036de4db8..5863093f001 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.h
+++ b/src/mesa/drivers/dri/intel/intel_screen.h
@@ -34,73 +34,35 @@
 #include "i915_drm.h"
 #include "xmlconfig.h"
 
-/* XXX: change name or eliminate to avoid conflict with "struct
- * intel_region"!!!
- */
-typedef struct
+struct intel_screen
 {
-   drm_handle_t handle;
-   drmSize size;                /* region size in bytes */
-   char *map;                   /* memory map */
-   int offset;                  /* from start of video mem, in bytes */
-   unsigned int bo_handle;	/* buffer object id if available, or -1 */
-   /**
-    * Flags if the region is tiled.
-    *
-    * Not included is Y versus X tiling.
-    */
-   GLboolean tiled;
-} intelRegion;
-
-typedef struct
-{
-   intelRegion front;
-   intelRegion back;
-   intelRegion depth;
-   intelRegion tex;
-
    int deviceID;
-   int width;
-   int height;
-   int pitch;                   /* common row stride, in pixels */
 
    int logTextureGranularity;
 
-   __DRIscreenPrivate *driScrnPriv;
-
-   volatile drm_i915_sarea_t *sarea;
-
-   int drmMinor;
-
-   int irq_active;
+   __DRIscreen *driScrnPriv;
 
    GLboolean no_hw;
 
    GLboolean no_vbo;
-   int ttm;
    dri_bufmgr *bufmgr;
+   struct _mesa_HashTable *named_regions;
 
    /**
    * 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 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 struct intel_context *intelScreenContext(intelScreenPrivate *intelScreen);
+intelMakeCurrent(__DRIcontext * driContextPriv,
+                 __DRIdrawable * driDrawPriv,
+                 __DRIdrawable * driReadPriv);
 
 #endif