diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 10:49:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 10:49:59 +0200 |
| commit | c6f80401dc533b04341afe8d596960d1bc25efce (patch) | |
| tree | 2826007946218a8370d2eebc6aa32083618e2bfe /mesalib/src/glsl/ast_to_hir.cpp | |
| parent | 31706e67674f308e3e7f2a8aaf02f1e0a00fbade (diff) | |
| download | vcxsrv-c6f80401dc533b04341afe8d596960d1bc25efce.tar.gz vcxsrv-c6f80401dc533b04341afe8d596960d1bc25efce.tar.bz2 vcxsrv-c6f80401dc533b04341afe8d596960d1bc25efce.zip | |
fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012
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 ff56e33b7..f4dfc4ce3 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -1699,7 +1699,7 @@ ast_expression::hir(exec_list *instructions, _mesa_glsl_error(& loc, state, "`%s' undeclared", this->primary_expression.identifier); - result = ir_call::get_error_instruction(ctx); + result = ir_rvalue::error_value(ctx); error_emitted = true; } break; @@ -3904,8 +3904,8 @@ ast_type_specifier::hir(exec_list *instructions, "arrays"); return NULL; } - if (this->type_specifier != ast_float - && this->type_specifier != ast_int) { + if (strcmp(this->type_name, "float") != 0 && + strcmp(this->type_name, "int") != 0) { _mesa_glsl_error(&loc, state, "default precision statements apply only to types " "float and int"); |