mesa: Changes to 'master'

[Oliver McFadden]

 src/mesa/drivers/dri/r300/r300_ioctl.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit 6f56e68ee305ab60569e449e53442e93d5a938a1
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Sun May 13 06:39:24 2007 +0000

    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));