glsl: Distinguish "type mismatch" error messages for modulus operator.
Previously, it would simply say "type error" in three different cases: - The LHS is not an integer - The RHS is not an integer - The LHS and RHS have different base types (int vs. uint) Now the error messages state the specific problem. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
60eb63a855
commit
8eb9753944
|
@ -447,9 +447,17 @@ modulus_result_type(const struct glsl_type *type_a,
|
|||
* integer vectors. The operand types must both be signed or both be
|
||||
* unsigned."
|
||||
*/
|
||||
if (!type_a->is_integer() || !type_b->is_integer()
|
||||
|| (type_a->base_type != type_b->base_type)) {
|
||||
_mesa_glsl_error(loc, state, "type mismatch");
|
||||
if (!type_a->is_integer()) {
|
||||
_mesa_glsl_error(loc, state, "LHS of operator %% must be an integer.");
|
||||
return glsl_type::error_type;
|
||||
}
|
||||
if (!type_b->is_integer()) {
|
||||
_mesa_glsl_error(loc, state, "RHS of operator %% must be an integer.");
|
||||
return glsl_type::error_type;
|
||||
}
|
||||
if (type_a->base_type != type_b->base_type) {
|
||||
_mesa_glsl_error(loc, state,
|
||||
"operands of %% must have the same base type");
|
||||
return glsl_type::error_type;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue