From fdee3e1d824ed2d100c04983d5c5fe349ca1fe73 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 17 Nov 2017 09:51:10 -0700 Subject: [PATCH] tgsi: bump tgsi_opcode_info::output_mode size to 4 bits MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To avoid problems with MSVC. And verify size with ASSERT_BITFIELD_SIZE(). Reviewed-by: Marek Olšák Reviewed-by: Charmaine Lee --- src/gallium/auxiliary/tgsi/tgsi_info.c | 2 ++ src/gallium/auxiliary/tgsi/tgsi_info.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c index c39de0edfcd..2baed5be356 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_info.c +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c @@ -56,6 +56,8 @@ tgsi_get_opcode_info( uint opcode ) static boolean firsttime = 1; ASSERT_BITFIELD_SIZE(struct tgsi_opcode_info, opcode, TGSI_OPCODE_LAST - 1); + ASSERT_BITFIELD_SIZE(struct tgsi_opcode_info, output_mode, + TGSI_OUTPUT_OTHER); if (firsttime) { unsigned i; diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.h b/src/gallium/auxiliary/tgsi/tgsi_info.h index 8d32f4774be..bbd86c6b969 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_info.h +++ b/src/gallium/auxiliary/tgsi/tgsi_info.h @@ -78,7 +78,7 @@ struct tgsi_opcode_info unsigned is_branch:1; unsigned pre_dedent:1; unsigned post_indent:1; - enum tgsi_output_mode output_mode:3; + enum tgsi_output_mode output_mode:4; unsigned opcode:8; }; -- 2.30.2