util/tgsi: Fix ureg_EMIT/ENDPRIM prototype.

[mesa.git] / src / gallium / auxiliary / tgsi / tgsi_opcode_tmp.h

diff --git a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
index e472947507dad1c53eaa7d62398de3ac53c40f8b..7888be86702b350233666226560fc3cbfbb2e714 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2008 VMware, Inc.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -32,6 +32,22 @@
 #define OP14_TEX(a) OP14(a)
 #endif
 
+#ifndef OP12_SAMPLE
+#define OP12_SAMPLE(a) OP12(a)
+#endif
+
+#ifndef OP13_SAMPLE
+#define OP13_SAMPLE(a) OP13(a)
+#endif
+
+#ifndef OP14_SAMPLE
+#define OP14_SAMPLE(a) OP14(a)
+#endif
+
+#ifndef OP15_SAMPLE
+#define OP15_SAMPLE(a) OP15(a)
+#endif
+
 #ifndef OP00_LBL
 #define OP00_LBL(a) OP00(a)
 #endif
@@ -60,6 +76,7 @@ OP13(MAD)
 OP12(SUB)
 OP13(LRP)
 OP13(CND)
+OP11(SQRT)
 OP13(DP2A)
 OP11(FRC)
 OP13(CLAMP)
@@ -75,7 +92,7 @@ OP12(DPH)
 OP11(COS)
 OP11(DDX)
 OP11(DDY)
-OP00(KILP)
+OP00(KILL)
 OP11(PK2H)
 OP11(PK2US)
 OP11(PK4B)
@@ -111,6 +128,7 @@ OP12(DP2)
 OP12_TEX(TXL)
 OP00(BRK)
 OP01_LBL(IF)
+OP01_LBL(UIF)
 OP00_LBL(ELSE)
 OP00(ENDIF)
 OP01(PUSHA)
@@ -128,8 +146,8 @@ OP13(SAD)
 OP12_TEX(TXF)
 OP12_TEX(TXQ)
 OP00(CONT)
-OP00(EMIT)
-OP00(ENDPRIM)
+OP01(EMIT)
+OP01(ENDPRIM)
 OP00_LBL(BGNLOOP)
 OP00(BGNSUB)
 OP00_LBL(ENDLOOP)
@@ -137,11 +155,14 @@ OP00(ENDSUB)
 OP00(NOP)
 OP11(NRM4)
 OP01(CALLNZ)
-OP01(IFC)
 OP01(BREAKC)
-OP01(KIL)
+OP01(KILL_IF)
 OP00(END)
 OP11(F2I)
+OP12(FSEQ)
+OP12(FSGE)
+OP12(FSLT)
+OP12(FSNE)
 OP12(IDIV)
 OP12(IMAX)
 OP12(IMIN)
@@ -163,7 +184,28 @@ OP12(USGE)
 OP12(USHR)
 OP12(USLT)
 OP12(USNE)
+OP01(SWITCH)
+OP01(CASE)
+OP00(DEFAULT)
+OP00(ENDSWITCH)
+
+OP13_SAMPLE(SAMPLE)
+OP12_SAMPLE(SAMPLE_I)
+OP13_SAMPLE(SAMPLE_I_MS)
+OP14_SAMPLE(SAMPLE_B)
+OP14_SAMPLE(SAMPLE_C)
+OP14_SAMPLE(SAMPLE_C_LZ)
+OP15_SAMPLE(SAMPLE_D)
+OP14_SAMPLE(SAMPLE_L)
+OP13_SAMPLE(GATHER4)
+OP12(SVIEWINFO)
+OP13(SAMPLE_POS)
+OP12(SAMPLE_INFO)
 
+OP13(UCMP)
+
+OP12(IMUL_HI)
+OP12(UMUL_HI)
 
 #undef OP00
 #undef OP01
@@ -176,9 +218,17 @@ OP12(USNE)
 #undef OP14
 #endif
 
+#ifdef OP15
+#undef OP15
+#endif
+
 #undef OP00_LBL
 #undef OP01_LBL
 
 #undef OP12_TEX
 #undef OP14_TEX
 
+#undef OP12_SAMPLE
+#undef OP13_SAMPLE
+#undef OP14_SAMPLE
+#undef OP15_SAMPLE