summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2017-11-17 09:51:10 -0700
committerBrian Paul <[email protected]>2017-11-17 16:09:39 -0700
commitfdee3e1d824ed2d100c04983d5c5fe349ca1fe73 (patch)
tree65cf314f82c171db78cbc2115f1ed1b74f392b09
parenta01ba366e01b7d1cdfa6b0e6647536b10c0667ef (diff)
tgsi: bump tgsi_opcode_info::output_mode size to 4 bits
To avoid problems with MSVC. And verify size with ASSERT_BITFIELD_SIZE(). Reviewed-by: Marek Olšák <[email protected]> Reviewed-by: Charmaine Lee <[email protected]>
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_info.c2
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_info.h2
2 files changed, 3 insertions, 1 deletions
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;
};