Mesa (master): r300g: remove the hack with OPCODE_RET

[Marek Olšák]

Module: Mesa
Branch: master
Commit: b6e2c32626551791a33433913dfb4401f8c67cf4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6e2c32626551791a33433913dfb4401f8c67cf4

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Nov 16 22:19:47 2010 +0100

r300g: remove the hack with OPCODE_RET

RET was interpreted as END, which was wrong. Instead, if a shader contains RET
in the main function, it will fail to compile with an error message
from now on.

The hack is from early days.

---

 src/gallium/drivers/r300/r300_tgsi_to_rc.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_tgsi_to_rc.c b/src/gallium/drivers/r300/r300_tgsi_to_rc.c
index a4911b9..33448bf 100644
--- a/src/gallium/drivers/r300/r300_tgsi_to_rc.c
+++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.c
@@ -363,10 +363,7 @@ void r300_tgsi_to_rc(struct tgsi_to_rc * ttr,
                 break;
             case TGSI_TOKEN_TYPE_INSTRUCTION:
                 inst = &parser.FullToken.FullInstruction;
-                /* This hack with the RET opcode woudn't work with
-                 * conditionals. */
-                if (inst->Instruction.Opcode == TGSI_OPCODE_END ||
-                    inst->Instruction.Opcode == TGSI_OPCODE_RET) {
+                if (inst->Instruction.Opcode == TGSI_OPCODE_END) {
                     break;
                 }