diff options
author | Ben Skeggs <darktama@iinet.net.au> | 2005-03-15 17:00:44 +0000 |
---|---|---|
committer | Ben Skeggs <darktama@iinet.net.au> | 2005-03-15 17:00:44 +0000 |
commit | 34dd4843d7b86eee8e0d18de275dd963ac2e3ffd (patch) | |
tree | 67a8195172d48168425360d0ba4f8034c3d2c422 /src/mesa/drivers/dri/r300/r300_reg.h | |
parent | 7457a648d28a49a58d2f626dcbd82d30506c7679 (diff) |
Initial multitexturing support. Old behaviour can be re-enabled by changing ifdefs in r300_setup_rs_unit and r300SetupPixelShader in r300_state.c\nRequires DRM update.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_reg.h')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_reg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h index a9cb88cf97..7242cbc892 100644 --- a/src/mesa/drivers/dri/r300/r300_reg.h +++ b/src/mesa/drivers/dri/r300/r300_reg.h @@ -536,8 +536,8 @@ I am fairly certain that they are correct unless stated otherwise in comments. // the ROUTE_0_COLOR bit is set and ROUTE_0_COLOR_DEST contains the // color register index. */ # define R300_RS_ROUTE_0_COLOR (1 << 14) -# define R300_RS_ROUTE_0_COLOR_DEST_SHIFT (1 << 17) -# define R300_RS_ROUTE_0_COLOR_DEST_MASK (31 << 6) /* GUESS */ +# define R300_RS_ROUTE_0_COLOR_DEST_SHIFT 17 +# define R300_RS_ROUTE_0_COLOR_DEST_MASK (31 << 17) /* GUESS */ /* END */ /* BEGIN: Scissors and cliprects |