X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2Ftgsi%2Ftgsi_opcode_tmp.h;h=54a1ee15b68aa5b73c7d18c4dc6bc99bca4ac244;hb=00589be6c42501779e609b6c1e89a14d8536df08;hp=e7bcf4bf7543c154b7ee2c8232fbe2c52d02c5f1;hpb=ba002eb1965ccdb09d7c3657d32e22e71ed4096a;p=mesa.git

diff --git a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
index e7bcf4bf754..54a1ee15b68 100644
--- 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.
@@ -28,10 +28,6 @@
 #define OP12_TEX(a) OP12(a)
 #endif
 
-#ifndef OP14_TEX
-#define OP14_TEX(a) OP14(a)
-#endif
-
 #ifndef OP00_LBL
 #define OP00_LBL(a) OP00(a)
 #endif
@@ -57,37 +53,31 @@ OP12(MAX)
 OP12(SLT)
 OP12(SGE)
 OP13(MAD)
-OP12(SUB)
+OP12_TEX(TEX_LZ)
 OP13(LRP)
-OP13(CND)
-OP13(DP2A)
+OP11(SQRT)
 OP11(FRC)
-OP13(CLAMP)
+OP12_TEX(TXF_LZ)
 OP11(FLR)
 OP11(ROUND)
 OP11(EX2)
 OP11(LG2)
 OP12(POW)
-OP12(XPD)
-OP11(ABS)
-OP11(RCC)
-OP12(DPH)
 OP11(COS)
 OP11(DDX)
 OP11(DDY)
-OP00(KILP)
+OP11(DDX_FINE)
+OP11(DDY_FINE)
+OP00(KILL)
 OP11(PK2H)
 OP11(PK2US)
 OP11(PK4B)
 OP11(PK4UB)
-OP12(RFL)
 OP12(SEQ)
-OP12(SFL)
 OP12(SGT)
 OP11(SIN)
 OP12(SLE)
 OP12(SNE)
-OP12(STR)
 OP12_TEX(TEX)
 OP14_TEX(TXD)
 OP12_TEX(TXP)
@@ -95,63 +85,86 @@ OP11(UP2H)
 OP11(UP2US)
 OP11(UP4B)
 OP11(UP4UB)
-OP13(X2D)
-OP11(ARA)
 OP11(ARR)
-OP01(BRA)
 OP00_LBL(CAL)
 OP00(RET)
 OP11(SSG)
 OP13(CMP)
-OP11(SCS)
 OP12_TEX(TXB)
-OP11(NRM)
 OP12(DIV)
 OP12(DP2)
 OP12_TEX(TXL)
 OP00(BRK)
 OP01_LBL(IF)
-OP11(BGNFOR)
-OP01(REP)
+OP01_LBL(UIF)
 OP00_LBL(ELSE)
 OP00(ENDIF)
-OP10(ENDFOR)
-OP00(ENDREP)
-OP01(PUSHA)
-OP10(POPA)
 OP11(CEIL)
 OP11(I2F)
 OP11(NOT)
 OP11(TRUNC)
 OP12(SHL)
-OP12(SHR)
 OP12(AND)
 OP12(OR)
 OP12(MOD)
 OP12(XOR)
-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)
 OP00(ENDSUB)
-OP11(NOISE1)
-OP11(NOISE2)
-OP11(NOISE3)
-OP11(NOISE4)
 OP00(NOP)
-OP11(NRM4)
-OP01(CALLNZ)
-OP01(IFC)
-OP01(BREAKC)
-OP01(KIL)
+OP01(KILL_IF)
 OP00(END)
-OP11(SWZ)
+OP11(F2I)
+OP12(FSEQ)
+OP12(FSGE)
+OP12(FSLT)
+OP12(FSNE)
+OP12(IDIV)
+OP12(IMAX)
+OP12(IMIN)
+OP11(INEG)
+OP12(ISGE)
+OP12(ISHR)
+OP12(ISLT)
+OP11(F2U)
+OP11(U2F)
+OP12(UADD)
+OP12(UDIV)
+OP13(UMAD)
+OP12(UMAX)
+OP12(UMIN)
+OP12(UMOD)
+OP12(UMUL)
+OP12(USEQ)
+OP12(USGE)
+OP12(USHR)
+OP12(USLT)
+OP12(USNE)
+OP01(SWITCH)
+OP01(CASE)
+OP00(DEFAULT)
+OP00(ENDSWITCH)
+
+OP12(SVIEWINFO)
+OP13(SAMPLE_POS)
+OP12(SAMPLE_INFO)
+OP11(UARL)
+
+OP13(UCMP)
+OP11(IABS)
+OP11(ISSG)
 
+OP11(IMG2HND)
+OP11(SAMP2HND)
+
+OP12(IMUL_HI)
+OP12(UMUL_HI)
 
 #undef OP00
 #undef OP01
@@ -160,13 +173,8 @@ OP11(SWZ)
 #undef OP12
 #undef OP13
 
-#ifdef OP14
-#undef OP14
-#endif
-
 #undef OP00_LBL
 #undef OP01_LBL
 
 #undef OP12_TEX
 #undef OP14_TEX
-