2 files changed, 37 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i915/server/i830_common.h b/src/mesa/drivers/dri/i915/server/i830_common.h
index c03f742897..41b5cc3c01 100644
--- a/src/mesa/drivers/dri/i915/server/i830_common.h
+++ b/src/mesa/drivers/dri/i915/server/i830_common.h
@@ -51,6 +51,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define DRM_I830_FREE                     0x09
 #define DRM_I830_INIT_HEAP                0x0a
 #define DRM_I830_CMDBUFFER                0x0b
+#define DRM_I830_DESTROY_HEAP             0x0c
 
 typedef struct {
    enum {
@@ -87,6 +88,30 @@ typedef struct {
         int pf_active;               
         int pf_current_page;	/* which buffer is being displayed? */
         int perf_boxes;	        /* performance boxes to be displayed */   
+	int width, height;      /* screen size in pixels */
+
+	drm_handle_t front_handle;
+	int front_offset;
+	int front_size;
+
+	drm_handle_t back_handle;
+	int back_offset;
+	int back_size;
+
+	drm_handle_t depth_handle;
+	int depth_offset;
+	int depth_size;
+
+	drm_handle_t tex_handle;
+	int tex_offset;
+	int tex_size;
+	int log_tex_granularity;
+	int pitch;
+	int rotation;           /* 0, 90, 180 or 270 */
+	int rotated_offset;
+	int rotated_size;
+	int rotated_pitch;
+	int virtualX, virtualY;
 } drmI830Sarea;
 
 /* Flags for perf_boxes
@@ -115,8 +140,7 @@ typedef struct {
 	int num_cliprects;	/* mulitpass with multiple cliprects? */
         drm_clip_rect_t *cliprects; /* pointer to userspace cliprects */
 } drmI830CmdBuffer;
-
-
+ 
 typedef struct {
 	int *irq_seq;
 } drmI830IrqEmit;
@@ -165,5 +189,9 @@ typedef struct {
 	int start;	
 } drmI830MemInitHeap;
 
+typedef struct {
+	int region;
+} drmI830MemDestroyHeap;
+
 
 #endif /* _I830_DRM_H_ */
diff --git a/src/mesa/drivers/dri/i915/server/i830_dri.h b/src/mesa/drivers/dri/i915/server/i830_dri.h
index 978f47a2b3..6c9a709021 100644
--- a/src/mesa/drivers/dri/i915/server/i830_dri.h
+++ b/src/mesa/drivers/dri/i915/server/i830_dri.h
@@ -14,9 +14,6 @@
 
 #define I830_REG_SIZE 0x80000
 
-/* Note: This structure has changed slightly from what is expected by
- * the i830_drv.o driver.  Maybe that should be reverted.
- */
 typedef struct _I830DRIRec {
    drm_handle_t regs;
    drmSize regsSize;
@@ -27,6 +24,9 @@ typedef struct _I830DRIRec {
    drmSize depthbufferSize;
    drm_handle_t depthbuffer;
 
+   drmSize rotatedSize;
+   drm_handle_t rotatedbuffer;
+
    drm_handle_t textures;
    int textureSize;
 
@@ -39,6 +39,7 @@ typedef struct _I830DRIRec {
    int mem;
    int cpp;
    int bitsPerPixel;
+
    int fbOffset;
    int fbStride;
 
@@ -48,6 +49,9 @@ typedef struct _I830DRIRec {
    int depthOffset;
    int depthPitch;
 
+   int rotatedOffset;
+   int rotatedPitch;
+
    int logTextureGranularity;
    int textureOffset;