diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2005-01-21 18:13:55 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-01-21 18:13:55 +0000 |
| commit | 86e5b0a0ddf731953a850da25d951b5f0c6ad542 (patch) | |
| tree | df657363219d36f11a84f40f249d648d85292915 | |
| parent | 2f039483ef05569d2d1f1543d69fb395dc80b84a (diff) | |
Sync up the definition of VIADRIRec with what the X server is actually
using. Probably some DDX version numbers need bumping to reflect the
changed interface, it's suprising this worked at all.
| -rw-r--r-- | src/mesa/drivers/dri/unichrome/via_dri.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_dri.h b/src/mesa/drivers/dri/unichrome/via_dri.h index a624398f1a..7b5574ec29 100644 --- a/src/mesa/drivers/dri/unichrome/via_dri.h +++ b/src/mesa/drivers/dri/unichrome/via_dri.h @@ -9,10 +9,6 @@ #define VIA_VERSION_MINOR 1 typedef struct { - int CtxOwner; -} VIASAREAPriv; - -typedef struct { drm_handle_t handle; drmSize size; drmAddress map; @@ -29,6 +25,7 @@ typedef struct { int priv2; int fbOffset; int fbSize; + char drixinerama; int backOffset; int depthOffset; int textureOffset; @@ -36,10 +33,8 @@ typedef struct { int irqEnabled; unsigned int scrnX, scrnY; int sarea_priv_offset; - /*=* John Sheng [2003.12.9] Tuxracer & VQ *=*/ - int VQEnable; - int DRIIrqEnable; int ringBufActive; + unsigned int reg_pause_addr; } VIADRIRec, *VIADRIPtr; typedef struct { @@ -50,13 +45,4 @@ typedef struct { int dummy; } VIADRIContextRec, *VIADRIContextPtr; -#ifdef XFree86Server - -#include "screenint.h" - -Bool VIADRIScreenInit(ScreenPtr pScreen); -void VIADRICloseScreen(ScreenPtr pScreen); -Bool VIADRIFinishScreenInit(ScreenPtr pScreen); - -#endif #endif |