From 9053c5be0dedb7fb6788d4e8c6673d6593437d70 Mon Sep 17 00:00:00 2001 From: Elie Tournier Date: Tue, 26 Feb 2019 23:03:13 +0000 Subject: [PATCH] gallium: remove TGSI FENCE opcodes From Mesa 068c3ad2cbef748783837ebbaa6cdca325d0475e Signed-off-by: Elie Tournier Signed-off-by: Dave Airlie --- src/gallium/auxiliary/tgsi/tgsi_info.c | 6 +++--- src/gallium/include/pipe/p_shader_tokens.h | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c index a326a07..e941159 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_info.c +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c @@ -201,9 +201,9 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] = { 1, 1, 0, 0, 0, 0, COMP, "ISSG", TGSI_OPCODE_ISSG }, { 1, 2, 0, 0, 0, 0, OTHR, "LOAD", TGSI_OPCODE_LOAD }, { 1, 2, 0, 0, 0, 0, OTHR, "STORE", TGSI_OPCODE_STORE }, - { 1, 0, 0, 0, 0, 0, OTHR, "MFENCE", TGSI_OPCODE_MFENCE }, - { 1, 0, 0, 0, 0, 0, OTHR, "LFENCE", TGSI_OPCODE_LFENCE }, - { 1, 0, 0, 0, 0, 0, OTHR, "SFENCE", TGSI_OPCODE_SFENCE }, + { 1, 0, 0, 0, 0, 0, OTHR, "", 163 }, + { 1, 0, 0, 0, 0, 0, OTHR, "", 164 }, + { 1, 0, 0, 0, 0, 0, OTHR, "", 165 }, { 0, 0, 0, 0, 0, 0, OTHR, "BARRIER", TGSI_OPCODE_BARRIER }, { 1, 3, 0, 0, 0, 0, OTHR, "ATOMUADD", TGSI_OPCODE_ATOMUADD }, diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index 0807f3e..44c449c 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -497,9 +497,7 @@ struct tgsi_property_data { #define TGSI_OPCODE_LOAD 161 #define TGSI_OPCODE_STORE 162 -#define TGSI_OPCODE_MFENCE 163 -#define TGSI_OPCODE_LFENCE 164 -#define TGSI_OPCODE_SFENCE 165 + /* gap */ #define TGSI_OPCODE_BARRIER 166 #define TGSI_OPCODE_ATOMUADD 167