diff options
| author | Oliver McFadden <z3ro.geek@gmail.com> | 2007-05-13 06:39:24 +0000 |
|---|---|---|
| committer | Oliver McFadden <z3ro.geek@gmail.com> | 2007-05-13 06:39:24 +0000 |
| commit | 6f56e68ee305ab60569e449e53442e93d5a938a1 (patch) | |
| tree | ad84d43f5c2d7f0f329e411dd03e20b316e32fb3 /src | |
| parent | 65fae193831e9fd4b2fc5a1b8170215cc77427dd (diff) | |
r300: Use the defined values when writing to R300_VAP_INPUT_CNTL_[01].
You can verify this is correct with the following code.
assert (0x00000001 == R300_INPUT_CNTL_0_COLOR);
assert (0x00000405 ==
(R300_INPUT_CNTL_POS | R300_INPUT_CNTL_COLOR |
R300_INPUT_CNTL_TC0));
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_ioctl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c index d2cc97d213..9e741b3ecd 100644 --- a/src/mesa/drivers/dri/r300/r300_ioctl.c +++ b/src/mesa/drivers/dri/r300/r300_ioctl.c @@ -210,10 +210,12 @@ static void r300EmitClearState(GLcontext * ctx) reg_start(R300_VAP_INPUT_ROUTE_1_0, 0); e32(0xF688F688); + /* R300_VAP_INPUT_CNTL_0, R300_VAP_INPUT_CNTL_1 */ R300_STATECHANGE(r300, vic); reg_start(R300_VAP_INPUT_CNTL_0, 1); - e32(0x00000001); - e32(0x00000405); + e32(R300_INPUT_CNTL_0_COLOR); + e32(R300_INPUT_CNTL_POS | R300_INPUT_CNTL_COLOR | R300_INPUT_CNTL_TC0); + if (!has_tcl) { R300_STATECHANGE(r300, vte); |