diff options
| author | ldelgass <ldelgass> | 2003-02-01 19:57:28 +0000 |
|---|---|---|
| committer | ldelgass <ldelgass> | 2003-02-01 19:57:28 +0000 |
| commit | 0f9834fb99594a808bea9af9f9bf3db12885f61c (patch) | |
| tree | 69994c70bdad7f38c33d829af8aa7b32edb3574b | |
| parent | 3a0951909b2d14c48c36ac3c2809413434b04dee (diff) | |
Sync txformat register defines between drm and ddx headers.texmem-0-0-1-20030204-trunk-premerge
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h | 5 | ||||
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drv.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h index fab03dde2..805dadd21 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h @@ -1157,6 +1157,11 @@ # define RADEON_TXFORMAT_ARGB8888 (6 << 0) # define RADEON_TXFORMAT_RGBA8888 (7 << 0) # define RADEON_TXFORMAT_Y8 (8 << 0) +# define RADEON_TXFORMAT_VYUY422 (10 << 0) +# define RADEON_TXFORMAT_YVYU422 (11 << 0) +# define RADEON_TXFORMAT_DXT1 (12 << 0) +# define RADEON_TXFORMAT_DXT23 (14 << 0) +# define RADEON_TXFORMAT_DXT45 (15 << 0) # define RADEON_TXFORMAT_FORMAT_MASK (31 << 0) # define RADEON_TXFORMAT_FORMAT_SHIFT 0 # define RADEON_TXFORMAT_APPLE_YUV_MODE (1 << 5) diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drv.h b/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drv.h index 22c5d04fa..0b5ef8c78 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drv.h +++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drv.h @@ -573,6 +573,7 @@ extern void radeon_do_release(drm_device_t *dev); #define RADEON_TXFORMAT_ARGB4444 5 #define RADEON_TXFORMAT_ARGB8888 6 #define RADEON_TXFORMAT_RGBA8888 7 +#define RADEON_TXFORMAT_Y8 8 #define RADEON_TXFORMAT_VYUY422 10 #define RADEON_TXFORMAT_YVYU422 11 #define RADEON_TXFORMAT_DXT1 12 |