First pass of integrating the Tungsten Graphics driver for Broadwater. This

patch is based off of diffing from the branchpoint to the supplied code, but
with many chunks containing reversions of commits removed.  Won't work yet.

1 files changed, 1 insertions, 31 deletions

diff --git a/src/i830_dri.h b/src/i830_dri.h
index e511ac7f..281013b3 100644
--- a/src/i830_dri.h
+++ b/src/i830_dri.h
@@ -3,36 +3,18 @@
 #ifndef _I830_DRI_H
 #define _I830_DRI_H
 
+#include "xf86dri.h"
 #include "xf86drm.h"
 #include "i830_common.h"
 
 #define I830_MAX_DRAWABLES 256
 
-#define I830_MAJOR_VERSION 1
-#define I830_MINOR_VERSION 5
-#define I830_PATCHLEVEL 1
-
 #define I830_REG_SIZE 0x80000
 
 typedef struct _I830DRIRec {
    drm_handle_t regs;
    drmSize regsSize;
 
-   drmSize backbufferSize;
-   drm_handle_t backbuffer;
-
-   drmSize depthbufferSize;
-   drm_handle_t depthbuffer;
-
-   drmSize rotatedSize;
-   drm_handle_t rotatedbuffer;
-
-   drm_handle_t textures;
-   int textureSize;
-
-   drm_handle_t agp_buffers;
-   drmSize agp_buf_size;
-
    int deviceID;
    int width;
    int height;
@@ -43,18 +25,6 @@ typedef struct _I830DRIRec {
    int fbOffset;
    int fbStride;
 
-   int backOffset;
-   int backPitch;
-
-   int depthOffset;
-   int depthPitch;
-
-   int rotatedOffset;
-   int rotatedPitch;
-
-   int logTextureGranularity;
-   int textureOffset;
-
    int irq;
    int sarea_priv_offset;
 } I830DRIRec, *I830DRIPtr;