i915: Remove various remaining dead code.

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

diff --git a/src/mesa/drivers/dri/i915/intel_screen.h b/src/mesa/drivers/dri/i915/intel_screen.h
index ffe5e8e50d24249090d2096d7f8ae629dff1854c..a0ff0e07445b26d321bcd6df84191e444fbc4a2d 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.h
+++ b/src/mesa/drivers/dri/i915/intel_screen.h
@@ -28,69 +28,48 @@
 #ifndef _INTEL_INIT_H_
 #define _INTEL_INIT_H_
 
+#include <stdbool.h>
 #include <sys/time.h>
 #include "dri_util.h"
+#include "intel_bufmgr.h"
+#include "i915_drm.h"
+#include "xmlconfig.h"
 
-
-typedef struct {
-   drm_handle_t handle;
-   drmSize size;
-   char *map;
-} intelRegion;
-
-typedef struct 
+struct intel_screen
 {
-   intelRegion front;
-   intelRegion back;
-   intelRegion depth;
-   intelRegion tex;
-   
    int deviceID;
-   int width;
-   int height;
-   int mem;
-   
-   int cpp;         /* for front and back buffers */
-   int bitsPerPixel;
-   
-   int fbFormat;
+   int gen;
 
-   int frontOffset;
-   int frontPitch;
+   int max_gl_core_version;
+   int max_gl_compat_version;
+   int max_gl_es1_version;
+   int max_gl_es2_version;
 
-   int backOffset;
-   int backPitch;
+   __DRIscreen *driScrnPriv;
 
-   int depthOffset;
-   int depthPitch;
-   
-   
-   int textureOffset;
-   int textureSize;
-   int logTextureGranularity;
-   
-   __DRIscreenPrivate *driScrnPriv;
-   unsigned int sarea_priv_offset;
+   bool no_hw;
 
-   int drmMinor;
+   bool hw_has_swizzling;
 
-   int irq_active;
-   int allow_batchbuffer;
-} intelScreenPrivate;
+   bool no_vbo;
+   dri_bufmgr *bufmgr;
 
+   /**
+   * Configuration cache with default values for all contexts
+   */
+   driOptionCache optionCache;
+};
 
-extern void
-intelDestroyContext(__DRIcontextPrivate *driContextPriv);
+extern void intelDestroyContext(__DRIcontext * driContextPriv);
 
-extern GLboolean
-intelUnbindContext(__DRIcontextPrivate *driContextPriv);
+extern GLboolean intelUnbindContext(__DRIcontext * driContextPriv);
 
 extern GLboolean
-intelMakeCurrent(__DRIcontextPrivate *driContextPriv,
-                __DRIdrawablePrivate *driDrawPriv,
-                __DRIdrawablePrivate *driReadPriv);
+intelMakeCurrent(__DRIcontext * driContextPriv,
+                 __DRIdrawable * driDrawPriv,
+                 __DRIdrawable * driReadPriv);
 
-extern void
-intelSwapBuffers( __DRIdrawablePrivate *dPriv);
+double get_time(void);
+void aub_dump_bmp(struct gl_context *ctx);
 
 #endif