Mesa (master): glsl: Don' t choke when printing an anonymous function parameter
Ian Romanick
idr at kemper.freedesktop.org
Thu Jul 7 00:01:50 UTC 2011
Module: Mesa
Branch: master
Commit: 174cef7fee7d400fc89a3ce68b7791d2aa3eb90f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=174cef7fee7d400fc89a3ce68b7791d2aa3eb90f
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Jun 24 17:30:41 2011 -0700
glsl: Don't choke when printing an anonymous function parameter
NOTE: This is a candidate for the 7.10 and 7.11 branches.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38584
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/glsl/ir_print_visitor.cpp | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/glsl/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp
index 5b5409d..518910b 100644
--- a/src/glsl/ir_print_visitor.cpp
+++ b/src/glsl/ir_print_visitor.cpp
@@ -96,6 +96,16 @@ void ir_print_visitor::indent(void)
const char *
ir_print_visitor::unique_name(ir_variable *var)
{
+ /* var->name can be NULL in function prototypes when a type is given for a
+ * parameter but no name is given. In that case, just return an empty
+ * string. Don't worry about tracking the generated name in the printable
+ * names hash because this is the only scope where it can ever appear.
+ */
+ if (var->name == NULL) {
+ static unsigned arg = 1;
+ return ralloc_asprintf(this->mem_ctx, "parameter@%u", arg++);
+ }
+
/* Do we already have a name for this variable? */
const char *name = (const char *) hash_table_find(this->printable_names, var);
if (name != NULL)
More information about the mesa-commit
mailing list