summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2008-02-28 10:09:02 +0000
committerOliver McFadden <[email protected]>2008-03-01 06:33:07 +0000
commit2a8b6c62a7a2c807dc1b4a515da62fc8918101c1 (patch)
treeefec70dcd37d6e4dcde9859625c5b5ee28ccc09e /src/mesa
parenta6d772ed16eddda85bae59e28eaab0d46debc30f (diff)
r300: Use the VE_ADD hardware opcode for the SUB opcode.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r300/r300_vertprog.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 9c733597aff..bbe42afa256 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -817,24 +817,7 @@ static GLuint *t_opcode_sub(struct r300_vertex_program *vp,
struct prog_src_register src[3])
{
//ADD RESULT 1.X Y Z W TMP 0{} {X Y Z W} PARAM 1{X Y Z W } {X Y Z W} neg Xneg Yneg Zneg W
-#if 1
- inst[0] =
- PVS_VECTOR_OPCODE(VE_MULTIPLY_ADD, t_dst_index(vp, &vpi->DstReg),
- t_dst_mask(vpi->DstReg.WriteMask),
- t_dst_class(vpi->DstReg.File));
- inst[1] = t_src(vp, &src[0]);
- inst[2] = ONE_SRC_0;
- inst[3] =
- PVS_SOURCE_OPCODE(t_src_index(vp, &src[1]),
- t_swizzle(GET_SWZ(src[1].Swizzle, 0)),
- t_swizzle(GET_SWZ(src[1].Swizzle, 1)),
- t_swizzle(GET_SWZ(src[1].Swizzle, 2)),
- t_swizzle(GET_SWZ(src[1].Swizzle, 3)),
- t_src_class(src[1].File),
- (!src[1].
- NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
- (src[1].RelAddr << 4);
-#else
+
inst[0] =
PVS_VECTOR_OPCODE(VE_ADD, t_dst_index(vp, &vpi->DstReg),
t_dst_mask(vpi->DstReg.WriteMask),
@@ -851,7 +834,6 @@ static GLuint *t_opcode_sub(struct r300_vertex_program *vp,
NegateBase) ? VSF_FLAG_ALL : VSF_FLAG_NONE) |
(src[1].RelAddr << 4);
inst[3] = 0;
-#endif
return inst;
}