Mesa (glsl2): ir_to_mesa: Fix up handling of void function returns.
Eric Anholt
anholt at kemper.freedesktop.org
Tue Jul 27 02:43:53 UTC 2010
Module: Mesa
Branch: glsl2
Commit: 576d01ad8c8b8aa57b4711c98d8e004d4f20fc0b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=576d01ad8c8b8aa57b4711c98d8e004d4f20fc0b
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jul 26 19:36:53 2010 -0700
ir_to_mesa: Fix up handling of void function returns.
void functions have a type of glsl_type::void_type, not a null type.
---
src/mesa/program/ir_to_mesa.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 6eceddf..d06b832 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -1501,7 +1501,7 @@ ir_to_mesa_visitor::get_function_signature(ir_function_signature *sig)
break;
}
- if (sig->return_type) {
+ if (!sig->return_type->is_void()) {
entry->return_reg = get_temp(sig->return_type);
} else {
entry->return_reg = ir_to_mesa_undef;
More information about the mesa-commit
mailing list