Translate MESA GLSL opcodes to TGSI opcodes.

diff --git a/src/mesa/pipe/tgsi/core/tgsi_token.h b/src/mesa/pipe/tgsi/core/tgsi_token.h
index 40297f257577157fd43ada9ffcbc9794ee15b0a2..12fc6df2ee933914dc8a2393561591950547532a 100644 (file)
--- a/src/mesa/pipe/tgsi/core/tgsi_token.h
+++ b/src/mesa/pipe/tgsi/core/tgsi_token.h
@@ -683,7 +683,7 @@ struct tgsi_immediate_float32
 #define TGSI_OPCODE_NOP                 98
 /* TGSI_OPCODE_ABS */
 /* TGSI_OPCODE_ADD */
-#define TGSI_OPCODE_BGNLOOP             99
+#define TGSI_OPCODE_BGNLOOP2            99
 #define TGSI_OPCODE_BGNSUB              100
 /* TGSI_OPCODE_BRA */
 /* TGSI_OPCODE_BRK */

diff --git a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
index a9415ac15bc7dbcbf1c5450414f638b3a1d6ea3e..aa14577642aee99c581806088bddf6b25a94fdff 100644 (file)
--- a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
+++ b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
@@ -369,6 +369,33 @@ compile_instruction(
       fullinst->Instruction.Opcode = TGSI_OPCODE_XPD;\r
       fulldst->DstRegister.WriteMask &= TGSI_WRITEMASK_XYZ;\r
       break;\r
+   case OPCODE_NOP:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_NOP;\r
+      break;\r
+   case OPCODE_BGNLOOP:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_BGNLOOP2;\r
+      break;\r
+   case OPCODE_BGNSUB:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_BGNSUB;\r
+      break;\r
+   case OPCODE_ENDLOOP:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_ENDLOOP2;\r
+      break;\r
+   case OPCODE_ENDSUB:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_ENDSUB;\r
+      break;\r
+   case OPCODE_NOISE1:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_NOISE1;\r
+      break;\r
+   case OPCODE_NOISE2:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_NOISE2;\r
+      break;\r
+   case OPCODE_NOISE3:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_NOISE3;\r
+      break;\r
+   case OPCODE_NOISE4:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_NOISE4;\r
+      break;\r
    case OPCODE_END:\r
       return GL_TRUE;\r
    default:\r