diff options
author | Ian Romanick <[email protected]> | 2016-06-21 10:26:34 -0700 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2016-07-19 12:19:28 -0700 |
commit | 90537e1a0e97737c123742fb88fce7efd2284c04 (patch) | |
tree | f70268ea83f3854b29129d99238aad40579d3a23 /src/compiler/glsl/ast_to_hir.cpp | |
parent | 65b0346fdbaf22eb2a6fc33e426b672a40495800 (diff) |
MESA_shader_integer_functions: Allow implicit int->uint conversions
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/compiler/glsl/ast_to_hir.cpp')
-rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 1b882900081..3b00b69e3fd 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -244,7 +244,8 @@ get_implicit_conversion_operation(const glsl_type *to, const glsl_type *from, } case GLSL_TYPE_UINT: - if (!state->is_version(400, 0) && !state->ARB_gpu_shader5_enable) + if (!state->is_version(400, 0) && !state->ARB_gpu_shader5_enable + && !state->MESA_shader_integer_functions_enable) return (ir_expression_operation)0; switch (from->base_type) { case GLSL_TYPE_INT: return ir_unop_i2u; |