From 16cec9f7674f9754bc03282d6b5596fbb086acd1 Mon Sep 17 00:00:00 2001 From: Aapo Tahkola Date: Sun, 6 May 2007 14:28:23 +0300 Subject: r300: fix primary color on rs480 --- src/mesa/drivers/dri/r300/r300_ioctl.c | 1 + src/mesa/drivers/dri/r300/r300_maos.c | 6 ++++++ 2 files changed, 7 insertions(+) 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 ); } -- cgit v1.2.3