Module Name: xsrc
Committed By: riastradh
Date: Fri Feb 26 22:09:05 UTC 2016
Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600: r600_isa.h
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/sb: sb_expr.cpp
Log Message:
Don't use (implicit) int as type for values >=2^31.
Should fix Clang c++11-narrowing errors.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/r600_isa.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/sb/sb_expr.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/r600_isa.h
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/r600_isa.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/r600_isa.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/r600_isa.h:1.1.1.1 Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/r600_isa.h Fri Feb 26 22:09:05 2016
@@ -102,13 +102,13 @@ enum alu_op_flags
/* condition codes - 3 bits */
AF_CC_SHIFT = 29,
- AF_CC_MASK = (7 << AF_CC_SHIFT),
- AF_CC_E = (0 << AF_CC_SHIFT),
- AF_CC_GT = (1 << AF_CC_SHIFT),
- AF_CC_GE = (2 << AF_CC_SHIFT),
- AF_CC_NE = (3 << AF_CC_SHIFT),
- AF_CC_LT = (4 << AF_CC_SHIFT),
- AF_CC_LE = (5 << AF_CC_SHIFT),
+ AF_CC_MASK = (7u << AF_CC_SHIFT),
+ AF_CC_E = (0u << AF_CC_SHIFT),
+ AF_CC_GT = (1u << AF_CC_SHIFT),
+ AF_CC_GE = (2u << AF_CC_SHIFT),
+ AF_CC_NE = (3u << AF_CC_SHIFT),
+ AF_CC_LT = (4u << AF_CC_SHIFT),
+ AF_CC_LE = (5u << AF_CC_SHIFT),
};
/* flags for FETCH instructions (TEX/VTX) */
@@ -165,7 +165,7 @@ struct alu_op_info
* (0 if instruction doesn't exist for chip class) */
int slots[4];
/* flags (mostly autogenerated from instruction name) */
- int flags;
+ unsigned flags;
};
/* FETCH instruction info */
Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/sb/sb_expr.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/sb/sb_expr.cpp:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/sb/sb_expr.cpp:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/sb/sb_expr.cpp:1.1.1.1 Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600/sb/sb_expr.cpp Fri Feb 26 22:09:05 2016
@@ -876,12 +876,12 @@ bool expr_handler::evaluate_condition(un
switch (cmp_type) {
case AF_FLOAT_CMP: {
switch (cc) {
- case AF_CC_E : return s1.f == s2.f;
- case AF_CC_GT: return s1.f > s2.f;
- case AF_CC_GE: return s1.f >= s2.f;
- case AF_CC_NE: return s1.f != s2.f;
- case AF_CC_LT: return s1.f < s2.f;
- case AF_CC_LE: return s1.f <= s2.f;
+ case (unsigned)AF_CC_E : return s1.f == s2.f;
+ case (unsigned)AF_CC_GT: return s1.f > s2.f;
+ case (unsigned)AF_CC_GE: return s1.f >= s2.f;
+ case (unsigned)AF_CC_NE: return s1.f != s2.f;
+ case (unsigned)AF_CC_LT: return s1.f < s2.f;
+ case (unsigned)AF_CC_LE: return s1.f <= s2.f;
default:
assert(!"invalid condition code");
return false;
@@ -889,12 +889,12 @@ bool expr_handler::evaluate_condition(un
}
case AF_INT_CMP: {
switch (cc) {
- case AF_CC_E : return s1.i == s2.i;
- case AF_CC_GT: return s1.i > s2.i;
- case AF_CC_GE: return s1.i >= s2.i;
- case AF_CC_NE: return s1.i != s2.i;
- case AF_CC_LT: return s1.i < s2.i;
- case AF_CC_LE: return s1.i <= s2.i;
+ case (unsigned)AF_CC_E : return s1.i == s2.i;
+ case (unsigned)AF_CC_GT: return s1.i > s2.i;
+ case (unsigned)AF_CC_GE: return s1.i >= s2.i;
+ case (unsigned)AF_CC_NE: return s1.i != s2.i;
+ case (unsigned)AF_CC_LT: return s1.i < s2.i;
+ case (unsigned)AF_CC_LE: return s1.i <= s2.i;
default:
assert(!"invalid condition code");
return false;
@@ -902,12 +902,12 @@ bool expr_handler::evaluate_condition(un
}
case AF_UINT_CMP: {
switch (cc) {
- case AF_CC_E : return s1.u == s2.u;
- case AF_CC_GT: return s1.u > s2.u;
- case AF_CC_GE: return s1.u >= s2.u;
- case AF_CC_NE: return s1.u != s2.u;
- case AF_CC_LT: return s1.u < s2.u;
- case AF_CC_LE: return s1.u <= s2.u;
+ case (unsigned)AF_CC_E : return s1.u == s2.u;
+ case (unsigned)AF_CC_GT: return s1.u > s2.u;
+ case (unsigned)AF_CC_GE: return s1.u >= s2.u;
+ case (unsigned)AF_CC_NE: return s1.u != s2.u;
+ case (unsigned)AF_CC_LT: return s1.u < s2.u;
+ case (unsigned)AF_CC_LE: return s1.u <= s2.u;
default:
assert(!"invalid condition code");
return false;
