From: Rob Clark <robclark@freedesktop.org>
Date: Fri, 18 Sep 2015 01:07:41 +0000 (-0400)
Subject: nir/builder: fix c++11 compiler warning
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e4ab489b5963e57df01fa20bb95d67139de8b75;p=mesa.git

nir/builder: fix c++11 compiler warning

Fixes:

   In file included from nir/nir_lower_samplers.cpp:27:0:
   nir/nir_builder.h: In function 'nir_ssa_def* nir_channel(nir_builder*, nir_ssa_def*, int)':
   nir/nir_builder.h:222:37: warning: narrowing conversion of 'c' from 'int' to 'unsigned int' inside { } is ill-formed in C++11 [-Wnarrowing]
       unsigned swizzle[4] = {c, c, c, c};

Signed-off-by: Rob Clark <robclark@freedesktop.org>
---

diff --git a/src/glsl/nir/nir_builder.h b/src/glsl/nir/nir_builder.h
index 44134cf4c29..47533302a6d 100644
--- a/src/glsl/nir/nir_builder.h
+++ b/src/glsl/nir/nir_builder.h
@@ -217,7 +217,7 @@ nir_swizzle(nir_builder *build, nir_ssa_def *src, unsigned swiz[4],
 }
 
 static inline nir_ssa_def *
-nir_channel(nir_builder *b, nir_ssa_def *def, int c)
+nir_channel(nir_builder *b, nir_ssa_def *def, unsigned c)
 {
    unsigned swizzle[4] = {c, c, c, c};
    return nir_swizzle(b, def, swizzle, 1, false);