Translate the remaining ops.

diff --git a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
index aa14577642aee99c581806088bddf6b25a94fdff..8ce3931f5e41c41cf01dce54edf61c1b3e5a990d 100644 (file)
--- a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
+++ b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
@@ -252,21 +252,36 @@ compile_instruction(
    case OPCODE_ADD:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_ADD;\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_BRA:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_BRA;\r
+      break;\r
+   case OPCODE_BRK:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_BRK;\r
+      break;\r
    case OPCODE_CMP:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_CMP;\r
       break;\r
+   case OPCODE_CONT:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_CONT;\r
+      break;\r
    case OPCODE_COS:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_COS;\r
       break;\r
-   case OPCODE_DP3:\r
-      fullinst->Instruction.Opcode = TGSI_OPCODE_DP3;\r
-      break;\r
    case OPCODE_DDX:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_DDX;\r
       break;\r
    case OPCODE_DDY:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_DDY;\r
       break;\r
+   case OPCODE_DP3:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_DP3;\r
+      break;\r
    case OPCODE_DP4:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_DP4;\r
       break;\r
@@ -276,21 +291,45 @@ compile_instruction(
    case OPCODE_DST:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_DST;\r
       break;\r
+   case OPCODE_ELSE:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_ELSE;\r
+      break;\r
+   case OPCODE_ENDIF:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_ENDIF;\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_EX2:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_EX2;\r
       break;\r
+   case OPCODE_EXP:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_EXP;\r
+      break;\r
    case OPCODE_FLR:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_FLR;\r
       break;\r
    case OPCODE_FRC:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_FRC;\r
       break;\r
+   case OPCODE_IF:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_IF;\r
+      break;\r
+   case OPCODE_INT:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_INT;\r
+      break;\r
    case OPCODE_KIL:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_KIL;\r
       break;\r
    case OPCODE_LG2:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_LG2;\r
       break;\r
+   case OPCODE_LOG:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_LOG;\r
+      break;\r
    case OPCODE_LIT:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_LIT;\r
       break;\r
@@ -312,6 +351,21 @@ compile_instruction(
    case OPCODE_MUL:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_MUL;\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_NOP:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_NOP;\r
+      break;\r
    case OPCODE_POW:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_POW;\r
       break;\r
@@ -328,15 +382,27 @@ compile_instruction(
       fullinst->Instruction.Opcode = TGSI_OPCODE_SCS;\r
       fulldst->DstRegister.WriteMask &= TGSI_WRITEMASK_XY;\r
       break;\r
+   case OPCODE_SEQ:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_SEQ;\r
+      break;\r
    case OPCODE_SGE:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_SGE;\r
       break;\r
+   case OPCODE_SGT:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_SGT;\r
+      break;\r
    case OPCODE_SIN:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_SIN;\r
       break;\r
+   case OPCODE_SLE:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_SLE;\r
+      break;\r
    case OPCODE_SLT:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_SLT;\r
       break;\r
+   case OPCODE_SNE:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_SNE;\r
+      break;\r
    case OPCODE_SUB:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_SUB;\r
       break;\r
@@ -357,6 +423,20 @@ compile_instruction(
       fullinst->FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_SAMPLER;\r
       fullinst->FullSrcRegisters[1].SrcRegister.Index = inst->TexSrcUnit;\r
       break;\r
+   case OPCODE_TXD:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_TXD;\r
+      fullinst->Instruction.NumSrcRegs = 2;\r
+      fullinst->InstructionExtTexture.Texture = map_texture_target( inst->TexSrcTarget );\r
+      fullinst->FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_SAMPLER;\r
+      fullinst->FullSrcRegisters[1].SrcRegister.Index = inst->TexSrcUnit;\r
+      break;\r
+   case OPCODE_TXL:\r
+      fullinst->Instruction.Opcode = TGSI_OPCODE_TXL;\r
+      fullinst->Instruction.NumSrcRegs = 2;\r
+      fullinst->InstructionExtTexture.Texture = map_texture_target( inst->TexSrcTarget );\r
+      fullinst->FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_SAMPLER;\r
+      fullinst->FullSrcRegisters[1].SrcRegister.Index = inst->TexSrcUnit;\r
+      break;\r
    case OPCODE_TXP:\r
       fullinst->Instruction.Opcode = TGSI_OPCODE_TEX;\r
       fullinst->Instruction.NumSrcRegs = 2;\r
@@ -369,33 +449,6 @@ 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