diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-04 09:40:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-04 09:40:31 +0200 |
| commit | 63918271b55923e417b14b9e7add4443582cfab3 (patch) | |
| tree | 59fc1c26991bbdb97d306da11408e98f49e05607 /mesalib/src/glsl | |
| parent | 7d6bc8457187e6c4284201b3a6625357c4aca9b4 (diff) | |
| parent | 1af6fc1b5d93e54d6674de8b5870448b29f139a7 (diff) | |
| download | vcxsrv-63918271b55923e417b14b9e7add4443582cfab3.tar.gz vcxsrv-63918271b55923e417b14b9e7add4443582cfab3.tar.bz2 vcxsrv-63918271b55923e417b14b9e7add4443582cfab3.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl')
| -rw-r--r-- | mesalib/src/glsl/ast_to_hir.cpp | 3 | ||||
| -rw-r--r-- | mesalib/src/glsl/ralloc.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index e23718bdb..15aa88ea9 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -3733,13 +3733,10 @@ ast_case_label::hir(exec_list *instructions, instructions->push_tail(set_fallthru_on_test); } else { /* default case */ if (state->switch_state.previous_default) { - printf("a\n"); YYLTYPE loc = this->get_location(); _mesa_glsl_error(& loc, state, "multiple default labels in one switch"); - printf("b\n"); - loc = state->switch_state.previous_default->get_location(); _mesa_glsl_error(& loc, state, "this is the first default label"); diff --git a/mesalib/src/glsl/ralloc.c b/mesalib/src/glsl/ralloc.c index 2f93dcdea..3da09b559 100644 --- a/mesalib/src/glsl/ralloc.c +++ b/mesalib/src/glsl/ralloc.c @@ -278,7 +278,7 @@ ralloc_parent(const void *ptr) return NULL; info = get_header(ptr); - return PTR_FROM_HEADER(info->parent); + return info->parent ? PTR_FROM_HEADER(info->parent) : NULL; } static void *autofree_context = NULL; |