#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 "mm.h"
-#include "mga_sarea.h"
#include "colormac.h"
#include "texmem.h"
#include "macros.h"
#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:
int texelBytes;
GLuint age;
- mga_texture_regs_t setup;
+ drm_mga_texture_regs_t setup;
/* If one texture dimension wraps with GL_CLAMP and the other with
* GL_CLAMP_TO_EDGE, we have to fallback to software. We would also have
GLuint NewGLState;
GLuint dirty;
- mga_context_regs_t setup;
+ drm_mga_context_regs_t setup;
GLuint ClearColor;
GLuint ClearDepth;
GLuint swap_count;
GLuint swap_missed_count;
+ uint32_t last_frame_fence;
+
PFNGLXGETUSTPROC get_ust;
/* Drawable, cliprect and scissor information
/* Mirrors of some DRI state.
*/
- drmContext hHWContext;
+ drm_context_t hHWContext;
drm_hw_lock_t *driHwLock;
int driFd;
__DRIdrawablePrivate *driDrawable;
__DRIscreenPrivate *driScreen;
struct mga_screen_private_s *mgaScreen;
- MGASAREAPrivPtr sarea;
+ drm_mga_sarea_t *sarea;
/* Configuration cache
*/