summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver McFadden <z3ro.geek@gmail.com>2007-05-06 12:09:42 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2007-05-06 12:09:42 +0000
commit8445960d9fc9271324b2f920c6712750b7229fb6 (patch)
tree695c46ffd11f295047083b66d67b144a4a05c09d
parent74cae00c0e5333c29b9c4483e0015019452ff7ce (diff)
r300: Added R300_AA_DISABLE for R300_GB_AA_CONFIG.
-rw-r--r--src/mesa/drivers/dri/r300/r300_reg.h1
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h
index b296aaa07a9..3754a5be395 100644
--- a/src/mesa/drivers/dri/r300/r300_reg.h
+++ b/src/mesa/drivers/dri/r300/r300_reg.h
@@ -488,6 +488,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
# define R300_GB_W_SELECT_1 (1<<4)
#define R300_GB_AA_CONFIG 0x4020
+# define R300_AA_DISABLE 0x00
# define R300_AA_ENABLE 0x01
# define R300_AA_SUBSAMPLES_2 0
# define R300_AA_SUBSAMPLES_3 (1<<1)
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index ded140cf27f..3e06c44381a 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1983,7 +1983,7 @@ void r300ResetHwState(r300ContextPtr r300)
| R300_GB_TILE_SIZE_16;
/* set to 0 when fog is disabled? */
r300->hw.gb_misc.cmd[R300_GB_MISC_SELECT] = R300_GB_FOG_SELECT_1_1_W;
- r300->hw.gb_misc.cmd[R300_GB_MISC_AA_CONFIG] = 0x00000000; /* No antialiasing */
+ r300->hw.gb_misc.cmd[R300_GB_MISC_AA_CONFIG] = R300_AA_DISABLE; /* No antialiasing */
r300->hw.unk4200.cmd[1] = r300PackFloat32(0.0);
r300->hw.unk4200.cmd[2] = r300PackFloat32(0.0);