Merge branch '7.8'

[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 4117d49e4237dffed8d1dba8276e1d3eb70125f8..5863093f001765bf1316e9ce029cf63736c8525e 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_screen.h
+++ b/src/mesa/drivers/dri/intel/intel_screen.h
@@ -37,25 +37,16 @@
 struct intel_screen
 {
    int deviceID;
-   int width;
-   int height;
-   int pitch;                   /* common row stride, in pixels */
 
    int logTextureGranularity;
 
    __DRIscreen *driScrnPriv;
 
-   volatile drm_i915_sarea_t *sarea;
-
-   int drmMinor;
-
-   int irq_active;
-
    GLboolean no_hw;
 
    GLboolean no_vbo;
    dri_bufmgr *bufmgr;
-   GLboolean kernel_exec_fencing;
+   struct _mesa_HashTable *named_regions;
 
    /**
    * Configuration cache with default values for all contexts