summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Versace <chad.versace@intel.com>2010-11-17 10:28:01 -0800
committerKenneth Graunke <kenneth@whitecape.org>2010-11-17 11:59:32 -0800
commitb4cdba687c098eea2ecc61349a4ea02a8769909e (patch)
treebfdb12dd22d8d5f65fe8dc3db15fdbe78f1e304b
parente16c9d5d03a4606b37cbeb84358925913086d6eb (diff)
glsl: Fix erroneous cast in ast_jump_statement::hir()
Return values were erroneously cast from (ir_rvalue*) to (ir_expression*). NOTE: This is a candidate for the 7.9 branch.
-rw-r--r--src/glsl/ast_to_hir.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 4540e98e69b..d615b30e7da 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2636,8 +2636,7 @@ ast_jump_statement::hir(exec_list *instructions,
state->current_function->function_name());
}
- ir_expression *const ret = (ir_expression *)
- opt_return_value->hir(instructions, state);
+ ir_rvalue *const ret = opt_return_value->hir(instructions, state);
assert(ret != NULL);
/* Implicit conversions are not allowed for return values. */