[Mesa-dev] [PATCH] glsl: Fix erroneous cast in ast_jump_statement::hir()

Chad Versace chad.versace at intel.com
Wed Nov 17 10:28:01 PST 2010


Return values were erroneously cast from (ir_rvalue*) to (ir_expression*).
---
 src/glsl/ast_to_hir.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 4540e98..d615b30 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. */
-- 
1.7.1



More information about the mesa-dev mailing list