From: Michal Krol <michal@tungstengraphics.com>
Date: Wed, 13 Aug 2008 07:15:27 +0000 (+0200)
Subject: gallium: Make a note that OPCODE_KIL is a conditional kill.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9804ab9accb3c6607c64a65bebe70124578240cd;p=mesa.git

gallium: Make a note that OPCODE_KIL is a conditional kill.
Map OPCODE_TEXKILL to OPCODE_KIL.
---

diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h
index ed931d24b99..3ab0c7deafa 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -240,6 +240,7 @@ struct tgsi_immediate_float32
  * GL_ARB_fragment_program
  */
 #define TGSI_OPCODE_CMP                 66
+#define TGSI_OPCODE_KIL                 116  /* conditional kill */
 #define TGSI_OPCODE_SCS                 67
 #define TGSI_OPCODE_TXB                 68
 
@@ -327,7 +328,7 @@ struct tgsi_immediate_float32
 /*
  * ps_1_1
  */
-#define TGSI_OPCODE_TEXKILL             TGSI_OPCODE_KILP
+#define TGSI_OPCODE_TEXKILL             TGSI_OPCODE_KIL
 
 /*
  * ps_1_2
@@ -386,7 +387,6 @@ struct tgsi_immediate_float32
  * vs_2_x
  */
 
-#define TGSI_OPCODE_KIL                 116  /* unpredicated kill */
 #define TGSI_OPCODE_END                 117  /* aka HALT */
 
 #define TGSI_OPCODE_LAST                119