diff options
| author | Corbin Simpson <[email protected]> | 2008-05-15 00:11:10 -0700 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2008-05-17 07:12:37 -0700 |
| commit | d8529d9b008ede05165317b8ebb834525fd9835c (patch) | |
| tree | 83001ef82e6b71d6024dafb74b9f8179ca2cc43f /src | |
| parent | 5e075fb80968744c72dfaba062e0b591ac69fad0 (diff) | |
r5xx: Unbreak MAX and MIN.
Both of them had faulty copypasta.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r500_fragprog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.c b/src/mesa/drivers/dri/r300/r500_fragprog.c index a986947e9d8..2f63f3010e2 100644 --- a/src/mesa/drivers/dri/r300/r500_fragprog.c +++ b/src/mesa/drivers/dri/r300/r500_fragprog.c @@ -509,7 +509,7 @@ static GLboolean parse_program(struct r500_fragment_program *fp) break; case OPCODE_MAX: src[0] = make_src(fp, fpi->SrcReg[0]); - src[1] = make_src(fp, fpi->SrcReg[0]); + src[1] = make_src(fp, fpi->SrcReg[1]); fp->inst[counter].inst0 = R500_INST_TYPE_ALU | pixel_mask; fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]) | R500_RGB_ADDR1(src[1]); fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]) | R500_ALPHA_ADDR1(src[1]); @@ -526,7 +526,7 @@ static GLboolean parse_program(struct r500_fragment_program *fp) break; case OPCODE_MIN: src[0] = make_src(fp, fpi->SrcReg[0]); - src[1] = make_src(fp, fpi->SrcReg[0]); + src[1] = make_src(fp, fpi->SrcReg[1]); fp->inst[counter].inst0 = R500_INST_TYPE_ALU | pixel_mask; fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]) | R500_RGB_ADDR1(src[1]); fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]) | R500_ALPHA_ADDR1(src[1]); |