fix up radeon span functions using latest r200 code from Brian,

[mesa.git] / src / mesa / drivers / dri / mga / mgacontext.h

diff --git a/src/mesa/drivers/dri/mga/mgacontext.h b/src/mesa/drivers/dri/mga/mgacontext.h
index 958d06ad83dab205aea2b380c460c2117c7d45c5..81348b6c7f9169562bc407dc111f304f9c24c51a 100644 (file)
--- a/src/mesa/drivers/dri/mga/mgacontext.h
+++ b/src/mesa/drivers/dri/mga/mgacontext.h
@@ -29,11 +29,12 @@
 #ifndef MGALIB_INC
 #define MGALIB_INC
 
-#include <inttypes.h>
+#include <stdint.h>
+#include "drm.h"
+#include "mga_drm.h"
 #include "dri_util.h"
 #include "mtypes.h"
 #include "xf86drm.h"
-#include "mga_drm.h"
 #include "mm.h"
 #include "colormac.h"
 #include "texmem.h"
@@ -62,6 +63,7 @@
 #define MGA_FALLBACK_STENCIL        0x20
 #define MGA_FALLBACK_DEPTH          0x40
 #define MGA_FALLBACK_BORDER_MODE    0x80
+#define MGA_FALLBACK_DISABLE        0x100
 
 
 /* Use the templated vertex formats:
@@ -267,7 +269,7 @@ struct mga_context_t {
    GLuint swap_count;
    GLuint swap_missed_count;
 
-   PFNGLXGETUSTPROC get_ust;
+   uint32_t last_frame_fence;
 
    /* Drawable, cliprect and scissor information
     */
@@ -295,7 +297,7 @@ struct mga_context_t {
 
    /* Mirrors of some DRI state.
     */
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drm_hw_lock_t *driHwLock;
    int driFd;
    __DRIdrawablePrivate *driDrawable;