From 7f9c91356915ce1129098b43c884958d812b4c30 Mon Sep 17 00:00:00 2001 From: Elie Tournier Date: Tue, 26 Feb 2019 22:35:57 +0000 Subject: [PATCH] gallium: remove TGSI_OPCODE_CLAMP From Mesa ad019bf5c65fbc10505c84c43050b5299192ca03 Signed-off-by: Elie Tournier Signed-off-by: Dave Airlie --- src/gallium/auxiliary/tgsi/tgsi_info.c | 2 +- src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h | 1 - src/gallium/auxiliary/tgsi/tgsi_util.c | 1 - src/gallium/include/pipe/p_shader_tokens.h | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c index 3a969ee..a326a07 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_info.c +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c @@ -62,7 +62,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] = { 0, 0, 0, 0, 0, 0, NONE, "", 22 }, /* removed */ { 0, 0, 0, 0, 0, 0, NONE, "", 23 }, /* removed */ { 1, 1, 0, 0, 0, 0, COMP, "FRC", TGSI_OPCODE_FRC }, - { 1, 3, 0, 0, 0, 0, COMP, "CLAMP", TGSI_OPCODE_CLAMP }, + { 1, 3, 0, 0, 0, 0, COMP, "", 25 }, /* removed */ { 1, 1, 0, 0, 0, 0, COMP, "FLR", TGSI_OPCODE_FLR }, { 1, 1, 0, 0, 0, 0, COMP, "ROUND", TGSI_OPCODE_ROUND }, { 1, 1, 0, 0, 0, 0, REPL, "EX2", TGSI_OPCODE_EX2 }, diff --git a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h index e730fbf..7ecd1dd 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h +++ b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h @@ -78,7 +78,6 @@ OP13(LRP) OP11(SQRT) OP13(DP2A) OP11(FRC) -OP13(CLAMP) OP11(FLR) OP11(ROUND) OP11(EX2) diff --git a/src/gallium/auxiliary/tgsi/tgsi_util.c b/src/gallium/auxiliary/tgsi/tgsi_util.c index ad0eb4d..df49d35 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_util.c +++ b/src/gallium/auxiliary/tgsi/tgsi_util.c @@ -195,7 +195,6 @@ tgsi_util_get_inst_usage_mask(const struct tgsi_full_instruction *inst, case TGSI_OPCODE_LRP: case TGSI_OPCODE_FRC: case TGSI_OPCODE_CEIL: - case TGSI_OPCODE_CLAMP: case TGSI_OPCODE_FLR: case TGSI_OPCODE_ROUND: case TGSI_OPCODE_POW: diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index 9a03c74..0807f3e 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -354,7 +354,7 @@ struct tgsi_property_data { #define TGSI_OPCODE_DP2A 21 /* gap */ #define TGSI_OPCODE_FRC 24 -#define TGSI_OPCODE_CLAMP 25 + /* gap */ #define TGSI_OPCODE_FLR 26 #define TGSI_OPCODE_ROUND 27 #define TGSI_OPCODE_EX2 28