From b6e2c32626551791a33433913dfb4401f8c67cf4 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Tue, 16 Nov 2010 22:19:47 +0100 Subject: 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 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/gallium/drivers/r300/r300_tgsi_to_rc.c') diff --git a/src/gallium/drivers/r300/r300_tgsi_to_rc.c b/src/gallium/drivers/r300/r300_tgsi_to_rc.c index a4911b9a2a..33448bf0de 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; } -- cgit v1.2.3