diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-26 07:46:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-26 07:46:15 +0200 |
| commit | ec34243fae167734bfa5ba81278763af7db0fb2b (patch) | |
| tree | 759fdfbe8376d8ba3a9dd82d33df9d2735e2fbc9 /mesalib/src/glsl | |
| parent | 1ba15549ff13d0bfcf4e82c6005d3cc40f2bf098 (diff) | |
| parent | 8647aa1a5029fcd96f134103331ddf3c21bc0a0b (diff) | |
| download | vcxsrv-ec34243fae167734bfa5ba81278763af7db0fb2b.tar.gz vcxsrv-ec34243fae167734bfa5ba81278763af7db0fb2b.tar.bz2 vcxsrv-ec34243fae167734bfa5ba81278763af7db0fb2b.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 26 Jul 2013
Diffstat (limited to 'mesalib/src/glsl')
| -rw-r--r-- | mesalib/src/glsl/loop_analysis.cpp | 3 | ||||
| -rw-r--r-- | mesalib/src/glsl/lower_named_interface_blocks.cpp | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/mesalib/src/glsl/loop_analysis.cpp b/mesalib/src/glsl/loop_analysis.cpp index 191e92de7..40897bb6f 100644 --- a/mesalib/src/glsl/loop_analysis.cpp +++ b/mesalib/src/glsl/loop_analysis.cpp @@ -503,7 +503,8 @@ is_loop_terminator(ir_if *ir) ir_instruction *const inst = (ir_instruction *) ir->then_instructions.get_head(); - assert(inst != NULL); + if (inst == NULL) + return false; if (inst->ir_type != ir_type_loop_jump) return false; diff --git a/mesalib/src/glsl/lower_named_interface_blocks.cpp b/mesalib/src/glsl/lower_named_interface_blocks.cpp index d0d491d3d..20196a356 100644 --- a/mesalib/src/glsl/lower_named_interface_blocks.cpp +++ b/mesalib/src/glsl/lower_named_interface_blocks.cpp @@ -129,9 +129,9 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) iface_field_name); if (!found_var) { ir_variable *new_var; + char *var_name = + ralloc_strdup(mem_ctx, iface_t->fields.structure[i].name); if (array_t == NULL) { - char *var_name = - ralloc_strdup(mem_ctx, iface_t->fields.structure[i].name); new_var = new(mem_ctx) ir_variable(iface_t->fields.structure[i].type, var_name, @@ -141,10 +141,6 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) glsl_type::get_array_instance( iface_t->fields.structure[i].type, array_t->length); - char *var_name = - ralloc_asprintf(mem_ctx, "%s[%d]", - iface_t->fields.structure[i].name, - array_t->length); new_var = new(mem_ctx) ir_variable(new_array_type, var_name, |