diff options
author | Graeme Gregory <dp@xora.org.uk> | 2008-12-31 14:48:18 +0000 |
---|---|---|
committer | Graeme Gregory <dp@xora.org.uk> | 2008-12-31 14:48:18 +0000 |
commit | 96811648052bd35b5e0c4ae5b9e59e8e5fa8e7ed (patch) | |
tree | ea9247e32b01ce2937c0388ce7b59224794cdab2 /src/glamo.h | |
parent | bfa7a2503067f28a7811a12548ba3975efeafe45 (diff) |
glamo* : everything compiles commit
Diffstat (limited to 'src/glamo.h')
-rw-r--r-- | src/glamo.h | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/src/glamo.h b/src/glamo.h index 7748fd6..76a3f1d 100644 --- a/src/glamo.h +++ b/src/glamo.h @@ -85,20 +85,22 @@ typedef struct _MemBuf { typedef struct { unsigned char* fbstart; unsigned char* fbmem; - int fboff; - int lineLength; - int rotate; - Bool shadowFB; - void *shadow; + int fboff; + int lineLength; + int rotate; + Bool shadowFB; + void *shadow; CloseScreenProcPtr CloseScreen; CreateScreenResourcesProcPtr CreateScreenResources; - void (*PointerMoved)(int index, int x, int y); + void (*PointerMoved)(int index, int x, int y); EntityInfoPtr pEnt; /* DGA info */ - DGAModePtr pDGAMode; - int nDGAMode; + DGAModePtr pDGAMode; + int nDGAMode; OptionInfoPtr Options; + ScreenPtr pScreen; + PixmapPtr srcPixmap; PixmapPtr dstPixmap; CARD32 src_offset; @@ -108,8 +110,22 @@ typedef struct { CARD32 settings; CARD32 foreground; + ExaDriverPtr exa; ExaOffscreenArea *exa_cmd_queue; + CARD16 *ring_addr; /* Beginning of ring buffer. */ + int ring_write; /* Index of write ptr in ring. */ + int ring_read; /* Index of read ptr in ring. */ + int ring_len; + + /* + * cmd queue cache in system memory + * It is to be flushed to cmd_queue_space + * "at once", when we are happy with it. + */ + MemBuf *cmd_queue_cache; + int cmd_queue_cache_start; + /* What was GLAMOCardInfo */ char *reg_base; Bool is_3362; @@ -178,6 +194,7 @@ MMIOSetBitMask(char *mmio, CARD32 reg, CARD16 mask, CARD16 val) MMIO_OUT16(mmio, reg, tmp); } +#if 0 /* glamo.c */ Bool GLAMOMapReg(KdCardInfo *card, GLAMOCardInfo *glamoc); @@ -190,10 +207,9 @@ GLAMODumpRegs(GLAMOScreenInfo *glamos, CARD16 from, CARD16 to); -/* glamo_draw.c */ -void -GLAMODrawSetup(ScreenPtr pScreen); +#endif +/* glamo_draw.c */ Bool GLAMODrawInit(ScreenPtr pScreen); @@ -212,6 +228,4 @@ GLAMORecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef); int GLAMOLog2(int val); -extern KdCardFuncs GLAMOFuncs; - #endif /* _GLAMO_H_ */ |