summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-10-15 10:28:18 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-15 10:28:18 -0600
commit583c11d38375c535d3835d89012fa5318bbd34ce (patch)
treed7bc68bdbf790947689b405d7d31918fed23b3ad
parent41b3fcbf0404bc4a4f6588c0feef553bb65d4440 (diff)
simplify KIL usage for bitmap fragprog
-rw-r--r--src/mesa/state_tracker/st_cb_drawpixels.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 92705cdc44..e3479deb79 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -105,11 +105,10 @@ make_fragment_shader(struct st_context *st, GLboolean bitmapMode)
= MAKE_SWIZZLE4(SWIZZLE_ONE, SWIZZLE_ONE, SWIZZLE_ONE, SWIZZLE_ONE );
ic++;
- /* SUB tmp0.w, tmp0.w, tmp0.x; # tmp0.w -= 1 */
+ /* SUB tmp0, tmp0.wwww, tmp0.xxxx; # tmp0.w -= 1 */
p->Instructions[ic].Opcode = OPCODE_SUB;
p->Instructions[ic].DstReg.File = PROGRAM_TEMPORARY;
p->Instructions[ic].DstReg.Index = 0;
- p->Instructions[ic].DstReg.WriteMask = WRITEMASK_W;
p->Instructions[ic].SrcReg[0].File = PROGRAM_TEMPORARY;
p->Instructions[ic].SrcReg[0].Index = 0;
p->Instructions[ic].SrcReg[0].Swizzle = SWIZZLE_WWWW;
@@ -118,11 +117,10 @@ make_fragment_shader(struct st_context *st, GLboolean bitmapMode)
p->Instructions[ic].SrcReg[1].Swizzle = SWIZZLE_XXXX; /* 1.0 */
ic++;
- /* KIL if tmp0.w < 0 */
+ /* KIL if tmp0 < 0 */
p->Instructions[ic].Opcode = OPCODE_KIL;
p->Instructions[ic].SrcReg[0].File = PROGRAM_TEMPORARY;
p->Instructions[ic].SrcReg[0].Index = 0;
- p->Instructions[ic].SrcReg[0].Swizzle = SWIZZLE_WWWW;
ic++;
/* MOV result.color, fragment.color */