diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-05-20 16:30:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-05-20 16:30:36 +1000 |
| commit | f0d76d526b0d37f36085d58b0c5c8cb9d9d9d7c9 (patch) | |
| tree | 56dca1c44154f1bb0b9a1326b85a4d57903eebb5 /src/mesa/drivers/dri/r300/r300_ioctl.c | |
| parent | 2005de48f9b87de6fffb792a6b16a880e92e3d82 (diff) | |
r300/r500: fixup some of the register write sizes
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_ioctl.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c index 9aa1120966..cc85d45efc 100644 --- a/src/mesa/drivers/dri/r300/r300_ioctl.c +++ b/src/mesa/drivers/dri/r300/r300_ioctl.c @@ -248,7 +248,7 @@ static void r300EmitClearState(GLcontext * ctx) R300_VPORT_Z_OFFSET_ENA); e32(0x8); - reg_start(R300_VAP_PSC_SGN_NORM_CNTL, SGN_NORM_ZERO); + reg_start(R300_VAP_PSC_SGN_NORM_CNTL, 0); e32(0xaaaaaaaa); R300_STATECHANGE(r300, vof); @@ -292,7 +292,7 @@ static void r300EmitClearState(GLcontext * ctx) if (!is_r500) { R300_STATECHANGE(r300, ri); - reg_start(R300_RS_IP_0, 8); + reg_start(R300_RS_IP_0, 7); for (i = 0; i < 8; ++i) { e32(R300_RS_SEL_T(1) | R300_RS_SEL_R(2) | R300_RS_SEL_Q(3)); } @@ -309,11 +309,12 @@ static void r300EmitClearState(GLcontext * ctx) } else { R300_STATECHANGE(r300, ri); - reg_start(R500_RS_IP_0, 8); + reg_start(R500_RS_IP_0, 7); for (i = 0; i < 8; ++i) { - e32((1 << R500_RS_IP_TEX_PTR_T_SHIFT) | - (2 << R500_RS_IP_TEX_PTR_R_SHIFT) | - (3 << R500_RS_IP_TEX_PTR_Q_SHIFT) ); + e32((R500_RS_IP_PTR_K0 << R500_RS_IP_TEX_PTR_S_SHIFT) | + (R500_RS_IP_PTR_K0 << R500_RS_IP_TEX_PTR_T_SHIFT) | + (R500_RS_IP_PTR_K0 << R500_RS_IP_TEX_PTR_R_SHIFT) | + (R500_RS_IP_PTR_K1 << R500_RS_IP_TEX_PTR_Q_SHIFT)); } R300_STATECHANGE(r300, rc); |