diff options
author | marha <marha@users.sourceforge.net> | 2014-09-08 23:27:52 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-08 23:27:52 +0200 |
commit | cb346e228aeb500cd61ec86644c034c238332d3b (patch) | |
tree | 5902a043a3643391e689ebb146e6fd02af1c4b8e /mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp | |
parent | 4aef26e36bc9aba4cd67c158e17f5fb93c9e018c (diff) | |
download | vcxsrv-cb346e228aeb500cd61ec86644c034c238332d3b.tar.gz vcxsrv-cb346e228aeb500cd61ec86644c034c238332d3b.tar.bz2 vcxsrv-cb346e228aeb500cd61ec86644c034c238332d3b.zip |
xkeyboard-config mesa git update 8 Sep 2014
xkeyboard-config commit 1b9901151cdb22e413319e6fca80fbbfc5e51502
mesa commit 12fb74fe895fe9954df127ca0ec6e4422fffb156
Diffstat (limited to 'mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp')
-rw-r--r-- | mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp b/mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp index 7c5d80f43..d878cb078 100644 --- a/mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp +++ b/mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp @@ -76,7 +76,7 @@ compare_index_block(exec_list *instructions, ir_variable *index, ir_rvalue *broadcast_index = new(mem_ctx) ir_dereference_variable(index); assert(index->type->is_scalar()); - assert(index->type->base_type == GLSL_TYPE_INT); + assert(index->type->base_type == GLSL_TYPE_INT || index->type->base_type == GLSL_TYPE_UINT); assert(components >= 1 && components <= 4); if (components > 1) { |