diff options
| author | Marek Olšák <[email protected]> | 2010-11-16 22:19:47 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2010-11-16 22:39:27 +0100 |
| commit | b6e2c32626551791a33433913dfb4401f8c67cf4 (patch) | |
| tree | 23a0083a7cdf2f87073e898d2b19180f731c428c /src/gallium/drivers/r300 | |
| parent | 2d2d6a80c14612de683001d24cbbbb9a8f620dd5 (diff) | |
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.
Diffstat (limited to 'src/gallium/drivers/r300')
| -rw-r--r-- | 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 a4911b9a2a6..33448bf0def 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; } |