From b4cdba687c098eea2ecc61349a4ea02a8769909e Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Wed, 17 Nov 2010 10:28:01 -0800 Subject: 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. --- src/glsl/ast_to_hir.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/glsl/ast_to_hir.cpp') diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 4540e98e69..d615b30e7d 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. */ -- cgit v1.2.3