diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-09 16:07:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-09 16:07:11 +0200 |
| commit | 58780b4306bd1254c6c0e65d255630d5c546005f (patch) | |
| tree | 71c3b3842ee282b0228246840f5006c369684ab7 /mesalib/src/glsl/ast_to_hir.cpp | |
| parent | 38e785557684536d03fff096d56d5db61cc42e8a (diff) | |
| parent | 8a448108ec0bc3a0a488b2234e0d12aee503c67c (diff) | |
| download | vcxsrv-58780b4306bd1254c6c0e65d255630d5c546005f.tar.gz vcxsrv-58780b4306bd1254c6c0e65d255630d5c546005f.tar.bz2 vcxsrv-58780b4306bd1254c6c0e65d255630d5c546005f.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/ast_to_hir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ast_to_hir.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index e24914b83..86bb8741b 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -4039,13 +4039,13 @@ detect_conflicting_assignments(struct _mesa_glsl_parse_state *state, foreach_list(node, instructions) { ir_variable *var = ((ir_instruction *)node)->as_variable(); - if (!var) + if (!var || !var->assigned) continue; if (strcmp(var->name, "gl_FragColor") == 0) - gl_FragColor_assigned = var->assigned; + gl_FragColor_assigned = true; else if (strcmp(var->name, "gl_FragData") == 0) - gl_FragData_assigned = var->assigned; + gl_FragData_assigned = true; else if (strncmp(var->name, "gl_", 3) != 0) { if (state->target == fragment_shader && (var->mode == ir_var_out || var->mode == ir_var_inout)) { |