gallium: remove TGSI_OPCODE_CALLNZ

From Mesa 0bb367830a613da30991ca60b4dccdda61302038

Signed-off-by: Elie Tournier <elie.tournier@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
macos/master
Elie Tournier 6 years ago committed by Dave Airlie
parent 9053c5be0d
commit 69a9443c38
  1. 2
      src/gallium/auxiliary/tgsi/tgsi_info.c
  2. 1
      src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
  3. 1
      src/gallium/include/pipe/p_shader_tokens.h

@ -150,7 +150,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
{ 1, 2, 0, 0, 0, 0, COMP, "FSLT", TGSI_OPCODE_FSLT }, { 1, 2, 0, 0, 0, 0, COMP, "FSLT", TGSI_OPCODE_FSLT },
{ 1, 2, 0, 0, 0, 0, COMP, "FSNE", TGSI_OPCODE_FSNE }, { 1, 2, 0, 0, 0, 0, COMP, "FSNE", TGSI_OPCODE_FSNE },
{ 0, 1, 0, 0, 0, 0, OTHR, "MEMBAR", TGSI_OPCODE_MEMBAR }, { 0, 1, 0, 0, 0, 0, OTHR, "MEMBAR", TGSI_OPCODE_MEMBAR },
{ 0, 1, 0, 0, 0, 0, NONE, "CALLNZ", TGSI_OPCODE_CALLNZ }, { 0, 1, 0, 0, 0, 0, NONE, "", 113 }, /* removed */
{ 0, 1, 0, 0, 0, 0, NONE, "", 114 }, /* removed */ { 0, 1, 0, 0, 0, 0, NONE, "", 114 }, /* removed */
{ 0, 1, 0, 0, 0, 0, NONE, "BREAKC", TGSI_OPCODE_BREAKC }, { 0, 1, 0, 0, 0, 0, NONE, "BREAKC", TGSI_OPCODE_BREAKC },
{ 0, 1, 0, 0, 0, 0, NONE, "KILL_IF", TGSI_OPCODE_KILL_IF }, { 0, 1, 0, 0, 0, 0, NONE, "KILL_IF", TGSI_OPCODE_KILL_IF },

@ -140,7 +140,6 @@ OP00(BGNSUB)
OP00_LBL(ENDLOOP) OP00_LBL(ENDLOOP)
OP00(ENDSUB) OP00(ENDSUB)
OP00(NOP) OP00(NOP)
OP01(CALLNZ)
OP01(BREAKC) OP01(BREAKC)
OP01(KILL_IF) OP01(KILL_IF)
OP00(END) OP00(END)

@ -442,7 +442,6 @@ struct tgsi_property_data {
#define TGSI_OPCODE_FSNE 111 #define TGSI_OPCODE_FSNE 111
#define TGSI_OPCODE_MEMBAR 112 #define TGSI_OPCODE_MEMBAR 112
#define TGSI_OPCODE_CALLNZ 113
/* gap */ /* gap */
#define TGSI_OPCODE_BREAKC 115 #define TGSI_OPCODE_BREAKC 115
#define TGSI_OPCODE_KILL_IF 116 /* conditional kill */ #define TGSI_OPCODE_KILL_IF 116 /* conditional kill */

Loading…
Cancel
Save