Mesa (master): glsl: Fix erroneous cast in ast_jump_statement::hir()
Kenneth Graunke
kwg at kemper.freedesktop.org
Wed Nov 17 20:02:25 UTC 2010
Module: Mesa
Branch: master
Commit: b4cdba687c098eea2ecc61349a4ea02a8769909e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4cdba687c098eea2ecc61349a4ea02a8769909e
Author: Chad Versace <chad.versace at intel.com>
Date: Wed Nov 17 10:28:01 2010 -0800
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 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. */
More information about the mesa-commit
mailing list