summaryrefslogtreecommitdiff
path: root/src/radeon_reg.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:19 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:19 +0000
commit397653e558b5fa4936ee6c9ac1eb6acaa9cf1cbc (patch)
tree5988c3f829963dfa7315e626c4d0e72e85d76e09 /src/radeon_reg.h
parent42cbea1d05a9e44b0d560da29bff19711ebb8a94 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'src/radeon_reg.h')
-rw-r--r--src/radeon_reg.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index 1d73e21..821a087 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -1064,6 +1064,8 @@
# define RADEON_SURF_TRANSLATION_DIS (1 << 8)
# define RADEON_NONSURF_AP0_SWP_16BPP (1 << 20)
# define RADEON_NONSURF_AP0_SWP_32BPP (1 << 21)
+# define RADEON_NONSURF_AP1_SWP_16BPP (1 << 22)
+# define RADEON_NONSURF_AP1_SWP_32BPP (1 << 23)
#define RADEON_SURFACE0_INFO 0x0b0c
#define RADEON_SURFACE0_LOWER_BOUND 0x0b04
#define RADEON_SURFACE0_UPPER_BOUND 0x0b08