summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAapo Tahkola <aet@rasterburn.org>2007-05-06 14:28:23 +0300
committerAapo Tahkola <aapo@aapo-desktop.(none)>2007-05-06 14:28:23 +0300
commit16cec9f7674f9754bc03282d6b5596fbb086acd1 (patch)
tree007b2c1b0735eb33ccb5bfb96293a550bd935c87
parent5e2a66466d7f75181ccc54fba70f2a4f95d44272 (diff)
r300: fix primary color on rs480
-rw-r--r--src/mesa/drivers/dri/r300/r300_ioctl.c1
-rw-r--r--src/mesa/drivers/dri/r300/r300_maos.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index c4dc97b8d49..82414259df9 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -206,6 +206,7 @@ static void r300EmitClearState(GLcontext * ctx)
e32(0x00000405);
if (!has_tcl) {
+ R300_STATECHANGE(r300, vte);
/* comes from fglrx startup of clear */
reg_start(R300_SE_VTE_CNTL, 1);
e32(0x043f);
diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c
index b0d96f7601a..b2ce6cb991c 100644
--- a/src/mesa/drivers/dri/r300/r300_maos.c
+++ b/src/mesa/drivers/dri/r300/r300_maos.c
@@ -440,6 +440,12 @@ int r300EmitArrays(GLcontext *ctx)
inputs[i] = nr++;
else
inputs[i] = -1;
+
+ if(!(r300->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL)) {
+ for (i = 0; i < VERT_ATTRIB_MAX; i++)
+ if (inputs[i] > 0)
+ inputs[i]++;
+ }
RENDERINPUTS_COPY( rmesa->state.render_inputs_bitset, inputs_bitset );
}