From 55ac31533d23056bdff9fb30a6211cc70c2d1bc2 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 12 Apr 2021 11:45:51 -0700 Subject: [PATCH] iris: Return correct enum names from fmt_swizzle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SCS_ONE and ISL_CHANNEL_SELECT_ONE (and SCS_ZERO and ISL_CHANNEL_SELECT_ZERO) have the same values, so this doesn't matter in practice. However, some compiler warning options will cause warnings to be generated. src/gallium/drivers/iris/iris_state.c: In function ‘fmt_swizzle’: src/gallium/drivers/iris/iris_state.c:2177:32: warning: implicit conversion from ‘enum GFX125_ShaderChannelSelect’ to ‘enum isl_channel_select’ [-Wenum-conversion] 2177 | case PIPE_SWIZZLE_1: return SCS_ONE; | ^~~~~~~ src/gallium/drivers/iris/iris_state.c:2178:32: warning: implicit conversion from ‘enum GFX125_ShaderChannelSelect’ to ‘enum isl_channel_select’ [-Wenum-conversion] 2178 | case PIPE_SWIZZLE_0: return SCS_ZERO; | ^~~~~~~~ Reviewed-by: Emma Anholt Part-of: --- src/gallium/drivers/iris/iris_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 05c01c45215..7ea661586e5 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -2174,8 +2174,8 @@ fmt_swizzle(const struct iris_format_info *fmt, enum pipe_swizzle swz) case PIPE_SWIZZLE_Y: return fmt->swizzle.g; case PIPE_SWIZZLE_Z: return fmt->swizzle.b; case PIPE_SWIZZLE_W: return fmt->swizzle.a; - case PIPE_SWIZZLE_1: return SCS_ONE; - case PIPE_SWIZZLE_0: return SCS_ZERO; + case PIPE_SWIZZLE_1: return ISL_CHANNEL_SELECT_ONE; + case PIPE_SWIZZLE_0: return ISL_CHANNEL_SELECT_ZERO; default: unreachable("invalid swizzle"); } }