From e438a36d8379d2ccb06aab2fa53fb52ae100198c Mon Sep 17 00:00:00 2001
From: George Sapountzis <gsapountzis@gmail.com>
Date: Thu, 3 Nov 2011 13:11:55 +0200
Subject: [PATCH] dri: unify __DRIcontextRec, __DRIdrawableRec

---
 src/mesa/drivers/dri/common/dri_util.h   | 34 ++++++++++++------------
 src/mesa/drivers/dri/common/drisw_util.h |  3 +--
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index af012f15010..3a33d275541 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -113,7 +113,7 @@ extern const struct __DriverAPIRec driDriverAPI;
  */
 struct __DRIdrawableRec {
     /**
-     * Driver's private drawable information.  
+     * Driver's private drawable information.
      *
      * This structure is opaque.
      */
@@ -125,9 +125,19 @@ struct __DRIdrawableRec {
      */
     void *loaderPrivate;
 
+    /**
+     * Pointer to context to which this drawable is currently bound.
+     */
+    __DRIcontext *driContextPriv;
+
+    /**
+     * Pointer to screen on which this drawable was created.
+     */
+    __DRIscreen *driScreenPriv;
+
     /**
      * Reference count for number of context's currently bound to this
-     * drawable.  
+     * drawable.
      *
      * Once it reaches zero, the drawable can be destroyed.
      *
@@ -146,16 +156,6 @@ struct __DRIdrawableRec {
 
     int w, h;
 
-    /**
-     * Pointer to context to which this drawable is currently bound.
-     */
-    __DRIcontext *driContextPriv;
-
-    /**
-     * Pointer to screen on which this drawable was created.
-     */
-    __DRIscreen *driScreenPriv;
-
     /**
      * Drawable timestamp.  Increased when the loader calls invalidate.
      */
@@ -173,6 +173,11 @@ struct __DRIcontextRec {
      */
     void *driverPrivate;
 
+    /**
+     * The loaders's private context data.  This structure is opaque.
+     */
+    void *loaderPrivate;
+
     /**
      * Pointer to drawable currently bound to this context for drawing.
      */
@@ -188,11 +193,6 @@ struct __DRIcontextRec {
      */
     __DRIscreen *driScreenPriv;
 
-    /**
-     * The loaders's private context data.  This structure is opaque.
-     */
-    void *loaderPrivate;
-
     struct {
 	int draw_stamp;
 	int read_stamp;
diff --git a/src/mesa/drivers/dri/common/drisw_util.h b/src/mesa/drivers/dri/common/drisw_util.h
index 6b3f46b545f..89917bbbe78 100644
--- a/src/mesa/drivers/dri/common/drisw_util.h
+++ b/src/mesa/drivers/dri/common/drisw_util.h
@@ -132,8 +132,7 @@ struct __DRIdrawableRec {
     /* gallium */
     unsigned int lastStamp;
 
-    int w;
-    int h;
+    int w, h;
 };
 
 #endif /* _DRISW_UTIL_H */
-- 
2.30.2