From c5e8280504cea3a07dfb07d05c542051c9844c49 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Tue, 5 Jun 2018 13:59:00 +0200 Subject: [PATCH] gallium/aux/tgsi_text.c: Fix -Wsign-compare warnings tgsi/tgsi_text.c: In function 'parse_identifier': tgsi/tgsi_text.c:218:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (i == len - 1) ^~ tgsi/tgsi_text.c: In function 'parse_optional_swizzle': tgsi/tgsi_text.c:873:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (i = 0; i < components; i++) { ^ tgsi/tgsi_text.c: In function 'parse_instruction': tgsi/tgsi_text.c:1103:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (i = 0; i < info->num_dst + info->num_src + info->is_tex; i++) { ^ tgsi/tgsi_text.c:1118:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] else if (i < info->num_dst + info->num_src) { ^ tgsi/tgsi_text.c: In function 'parse_immediate': tgsi/tgsi_text.c:1660:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (type = 0; type < ARRAY_SIZE(tgsi_immediate_type_names); ++type) { ^ Signed-off-by: Gert Wollny Reviewed-by: Emil Velikov --- src/gallium/auxiliary/tgsi/tgsi_text.c | 8 ++++---- src/gallium/auxiliary/tgsi/tgsi_util.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c index 02241a66bfe..55a814994e0 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_text.c +++ b/src/gallium/auxiliary/tgsi/tgsi_text.c @@ -211,7 +211,7 @@ static boolean parse_int( const char **pcur, int *val ) static boolean parse_identifier( const char **pcur, char *ret, size_t len ) { const char *cur = *pcur; - int i = 0; + size_t i = 0; if (is_alpha_underscore( cur )) { ret[i++] = *cur++; while (is_alpha_underscore( cur ) || is_digit( cur )) { @@ -866,7 +866,7 @@ parse_optional_swizzle( eat_opt_white( &cur ); if (*cur == '.') { - uint i; + int i; cur++; eat_opt_white( &cur ); @@ -1037,7 +1037,7 @@ parse_instruction( struct translate_ctx *ctx, boolean has_label ) { - uint i; + int i; uint saturate = 0; uint precise = 0; const struct tgsi_opcode_info *info; @@ -1626,7 +1626,7 @@ static boolean parse_immediate( struct translate_ctx *ctx ) { struct tgsi_full_immediate imm; uint advance; - int type; + uint type; if (*ctx->cur == '[') { uint uindex; diff --git a/src/gallium/auxiliary/tgsi/tgsi_util.c b/src/gallium/auxiliary/tgsi/tgsi_util.c index a78172a8486..ebbd561f7d0 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_util.c +++ b/src/gallium/auxiliary/tgsi/tgsi_util.c @@ -106,7 +106,7 @@ tgsi_util_set_src_register_swizzle(struct tgsi_src_register *reg, unsigned tgsi_util_get_full_src_register_sign_mode( const struct tgsi_full_src_register *reg, - unsigned component) + UNUSED unsigned component) { unsigned sign_mode; -- 2.30.2