diff options
| author | Michel Daenzer <michel@daenzer.net> | 2000-09-12 19:18:11 +0000 |
|---|---|---|
| committer | Michel Daenzer <michel@daenzer.net> | 2000-09-12 19:18:11 +0000 |
| commit | 934a4f32cf0755cfd14c3d6b311cba997c58604f (patch) | |
| tree | 024133b70712871865c625a55dc428ab79ca1efc /linux/mga_drm.h | |
| parent | 4b3cb1afbc10f57766f2344a96985dbbe12106cb (diff) | |
merge trunk to ppc-1-0-0-branchppc-1-0-0-20000912
Diffstat (limited to 'linux/mga_drm.h')
| -rw-r--r-- | linux/mga_drm.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/linux/mga_drm.h b/linux/mga_drm.h index e75e91a4..52cf7766 100644 --- a/linux/mga_drm.h +++ b/linux/mga_drm.h @@ -73,17 +73,19 @@ /* 3d state excluding texture units: */ -#define MGA_CTXREG_DSTORG 0 /* validated */ -#define MGA_CTXREG_MACCESS 1 -#define MGA_CTXREG_PLNWT 2 -#define MGA_CTXREG_DWGCTL 3 -#define MGA_CTXREG_ALPHACTRL 4 -#define MGA_CTXREG_FOGCOLOR 5 -#define MGA_CTXREG_WFLAG 6 -#define MGA_CTXREG_TDUAL0 7 -#define MGA_CTXREG_TDUAL1 8 -#define MGA_CTXREG_FCOL 9 -#define MGA_CTX_SETUP_SIZE 10 +#define MGA_CTXREG_DSTORG 0 /* validated */ +#define MGA_CTXREG_MACCESS 1 +#define MGA_CTXREG_PLNWT 2 +#define MGA_CTXREG_DWGCTL 3 +#define MGA_CTXREG_ALPHACTRL 4 +#define MGA_CTXREG_FOGCOLOR 5 +#define MGA_CTXREG_WFLAG 6 +#define MGA_CTXREG_TDUAL0 7 +#define MGA_CTXREG_TDUAL1 8 +#define MGA_CTXREG_FCOL 9 +#define MGA_CTXREG_STENCIL 10 +#define MGA_CTXREG_STENCILCTL 11 +#define MGA_CTX_SETUP_SIZE 12 /* 2d state */ @@ -233,6 +235,7 @@ typedef struct _drm_mga_sarea { /* Mechanism to validate card state. */ int ctxOwner; + int vertexsize; } drm_mga_sarea_t; /* Device specific ioctls: @@ -241,6 +244,8 @@ typedef struct _drm_mga_clear { unsigned int clear_color; unsigned int clear_depth; unsigned int flags; + unsigned int clear_depth_mask; + unsigned int clear_color_mask; } drm_mga_clear_t; typedef struct _drm_mga_swap { |