Mesa (master): r600: Fix warning regarding mixing enums and unsigned in ?: expression

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a6321c4b5a038db4682e49e098e9368df7ea18c4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6321c4b5a038db4682e49e098e9368df7ea18c4

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Wed May  6 18:48:35 2020 +0200

r600: Fix warning regarding mixing enums and unsigned in ?: expression

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4939>

---

 src/gallium/drivers/r600/sb/sb_bc_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/sb/sb_bc_parser.cpp b/src/gallium/drivers/r600/sb/sb_bc_parser.cpp
index 6b19d61babe..abbb26c13c1 100644
--- a/src/gallium/drivers/r600/sb/sb_bc_parser.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_parser.cpp
@@ -476,7 +476,7 @@ int bc_parser::prepare_alu_group(cf_node* cf, alu_group_node *g) {
 				n->src[s] = sh->get_const_value(src.value);
 			} else if (src.sel == ALU_SRC_PS || src.sel == ALU_SRC_PV) {
 				unsigned pgroup = !cgroup, prev_slot = src.sel == ALU_SRC_PS ?
-						SLOT_TRANS : src.chan;
+						((unsigned)SLOT_TRANS) : src.chan;
 
 				// XXX shouldn't happen but llvm backend uses PS on cayman
 				if (prev_slot == SLOT_TRANS && ctx.is_cayman())