SCons: Rename dri2_query_renderer.c to dri_common_query_renderer.c.

[mesa.git] / src / mesa / drivers / dri / radeon / server / radeon_dri.h

diff --git a/src/mesa/drivers/dri/radeon/server/radeon_dri.h b/src/mesa/drivers/dri/radeon/server/radeon_dri.h
index fce21227cb9801b1009c0344127929c69ceb8765..dc51372107572d8924bb2f3d6002a1ecc8571e4e 100644 (file)
--- a/src/mesa/drivers/dri/radeon/server/radeon_dri.h
+++ b/src/mesa/drivers/dri/radeon/server/radeon_dri.h
@@ -34,13 +34,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h,v 1.3 2002/04/24 16:20:40 martin Exp $ */
 
 #ifndef _RADEON_DRI_
 #define _RADEON_DRI_
 
 #include "xf86drm.h"
-#include "radeon_common.h"
+#include "drm.h"
+#include "radeon_drm.h"
 
 /* DRI Driver defaults */
 #define RADEON_DEFAULT_CP_PIO_MODE    RADEON_CSQ_PRIPIO_INDPIO
@@ -52,6 +52,7 @@
 #define RADEON_DEFAULT_BUFFER_SIZE    2 /* MB (must be page aligned) */
 #define RADEON_DEFAULT_AGP_TEX_SIZE   1 /* MB (must be page aligned) */
 #define RADEON_DEFAULT_CP_TIMEOUT     10000  /* usecs */
+#define RADEON_DEFAULT_PAGE_FLIP      0 /* page flipping diabled */
 #define RADEON_BUFFER_ALIGN           0x00000fff
 
 /**
@@ -86,7 +87,7 @@ typedef struct {
      * \name MMIO register data
      */
     /*@{*/
-    drmHandle     registerHandle; /**< \brief MMIO register map size */
+    drm_handle_t     registerHandle; /**< \brief MMIO register map size */
     drmSize       registerSize;   /**< \brief MMIO register map handle */
     /*@}*/
 
@@ -94,7 +95,7 @@ typedef struct {
      * \name CP in-memory status information
      */
     /*@{*/
-    drmHandle     statusHandle;   /**< \brief status map handle */
+    drm_handle_t     statusHandle;   /**< \brief status map handle */
     drmSize       statusSize;     /**< \brief status map size */
     /*@}*/
 
@@ -102,10 +103,10 @@ typedef struct {
      * \name CP AGP Texture data
      */
     /*@{*/
-    drmHandle     agpTexHandle;   /**< \brief AGP texture area map handle */
-    drmSize       agpTexMapSize;  /**< \brief AGP texture area map size */
-    int           log2AGPTexGran; /**< \brief AGP texture granularity in log base 2 */
-    int           agpTexOffset;   /**< \brief AGP texture area offset in AGP space */
+    drm_handle_t     gartTexHandle;   /**< \brief AGP texture area map handle */
+    drmSize       gartTexMapSize;  /**< \brief AGP texture area map size */
+    int           log2GARTTexGran; /**< \brief AGP texture granularity in log base 2 */
+    int           gartTexOffset;   /**< \brief AGP texture area offset in AGP space */
     /*@}*/
 
     unsigned int  sarea_priv_offset; /**< \brief offset of the private SAREA data*/