summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300/r300_vertprog.h
diff options
context:
space:
mode:
authorOliver McFadden <z3ro.geek@gmail.com>2008-02-25 13:16:05 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2008-03-01 06:33:06 +0000
commit8c4d811295f89bc59c54160bcaf861b47514b458 (patch)
tree20e60751ad20442e35a4e842e75dff0b1c0650b0 /src/mesa/drivers/dri/r300/r300_vertprog.h
parentb2c02a4a7c2948f06fc2470d3c53b2292a9d482f (diff)
r300: Added the vertex program swizzle (aka selection) defines.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_vertprog.h')
-rw-r--r--src/mesa/drivers/dri/r300/r300_vertprog.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.h b/src/mesa/drivers/dri/r300/r300_vertprog.h
index b0b81b5e74..5eba2d5432 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.h
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.h
@@ -111,20 +111,20 @@
#define VP_IN(class,idx) \
(((idx) << R300_VPI_IN_REG_INDEX_SHIFT) | \
(PVS_SRC_REG_##class << 0) | \
- (R300_VPI_IN_SELECT_X << R300_VPI_IN_X_SHIFT) | \
- (R300_VPI_IN_SELECT_Y << R300_VPI_IN_Y_SHIFT) | \
- (R300_VPI_IN_SELECT_Z << R300_VPI_IN_Z_SHIFT) | \
- (R300_VPI_IN_SELECT_W << R300_VPI_IN_W_SHIFT))
+ (PVS_SRC_SELECT_X << R300_VPI_IN_X_SHIFT) | \
+ (PVS_SRC_SELECT_Y << R300_VPI_IN_Y_SHIFT) | \
+ (PVS_SRC_SELECT_Z << R300_VPI_IN_Z_SHIFT) | \
+ (PVS_SRC_SELECT_W << R300_VPI_IN_W_SHIFT))
#define VP_ZERO() \
- ((R300_VPI_IN_SELECT_ZERO << R300_VPI_IN_X_SHIFT) | \
- (R300_VPI_IN_SELECT_ZERO << R300_VPI_IN_Y_SHIFT) | \
- (R300_VPI_IN_SELECT_ZERO << R300_VPI_IN_Z_SHIFT) | \
- (R300_VPI_IN_SELECT_ZERO << R300_VPI_IN_W_SHIFT))
+ ((PVS_SRC_SELECT_FORCE_0 << R300_VPI_IN_X_SHIFT) | \
+ (PVS_SRC_SELECT_FORCE_0 << R300_VPI_IN_Y_SHIFT) | \
+ (PVS_SRC_SELECT_FORCE_0 << R300_VPI_IN_Z_SHIFT) | \
+ (PVS_SRC_SELECT_FORCE_0 << R300_VPI_IN_W_SHIFT))
#define VP_ONE() \
- ((R300_VPI_IN_SELECT_ONE << R300_VPI_IN_X_SHIFT) | \
- (R300_VPI_IN_SELECT_ONE << R300_VPI_IN_Y_SHIFT) | \
- (R300_VPI_IN_SELECT_ONE << R300_VPI_IN_Z_SHIFT) | \
- (R300_VPI_IN_SELECT_ONE << R300_VPI_IN_W_SHIFT))
+ ((PVS_SRC_SELECT_FORCE_1 << R300_VPI_IN_X_SHIFT) | \
+ (PVS_SRC_SELECT_FORCE_1 << R300_VPI_IN_Y_SHIFT) | \
+ (PVS_SRC_SELECT_FORCE_1 << R300_VPI_IN_Z_SHIFT) | \
+ (PVS_SRC_SELECT_FORCE_1 << R300_VPI_IN_W_SHIFT))
#define VP_NEG(in,comp) ((in) ^ (R300_VPI_IN_NEG_##comp))
#define VP_NEGALL(in,comp) VP_NEG(VP_NEG(VP_NEG(VP_NEG((in),X),Y),Z),W)