From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Mon, 16 Mar 2009 13:41:57 +0000 (-0700)
Subject: r300-gallium: r500-fs: Clamp only when saturation flags are set.
X-Git-Tag: 062012170305~17580^2~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=567aead92ae1b51578b0dea4709662b0d9c130e2;p=profile%2Fivi%2Fmesa.git

r300-gallium: r500-fs: Clamp only when saturation flags are set.
---

diff --git a/src/gallium/drivers/r300/r300_state_shader.c b/src/gallium/drivers/r300/r300_state_shader.c
index e7e5a11..0a4f7c8 100644
--- a/src/gallium/drivers/r300/r300_state_shader.c
+++ b/src/gallium/drivers/r300/r300_state_shader.c
@@ -228,9 +228,7 @@ static INLINE void r500_emit_alu(struct r500_fragment_shader* fs,
         R500_ALU_WMASK(dst->DstRegister.WriteMask);
     }
 
-    fs->instructions[i].inst0 |=
-        R500_INST_TEX_SEM_WAIT |
-        R500_INST_RGB_CLAMP | R500_INST_ALPHA_CLAMP;
+    fs->instructions[i].inst0 |= R500_INST_TEX_SEM_WAIT;
 
     fs->instructions[i].inst4 =
         R500_ALPHA_ADDRD(r300_fs_dst(assembler, &dst->DstRegister));
@@ -421,6 +419,12 @@ static void r500_fs_instruction(struct r500_fragment_shader* fs,
                     inst->Instruction.Opcode);
             break;
     }
+
+    /* Clamp, if saturation flags are set. */
+    if (inst->Instruction.Saturate == TGSI_SAT_ZERO_ONE) {
+        fs->instructions[fs->instruction_count - 1].inst0 |=
+            R500_INST_RGB_CLAMP | R500_INST_ALPHA_CLAMP;
+    }
 }
 
 static void r500_fs_finalize(struct r500_fragment_shader* fs,