Mesa (7.10): linker: Add imported functions to the linked IR
Ian Romanick
idr at kemper.freedesktop.org
Thu Mar 24 20:39:45 UTC 2011
Module: Mesa
Branch: 7.10
Commit: 55d86204f3f659fadc8e6dee694147afc35dfd97
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=55d86204f3f659fadc8e6dee694147afc35dfd97
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Mar 8 11:41:35 2011 -0800
linker: Add imported functions to the linked IR
Fixes piglit test glsl-function-chain16 and bugzilla #34203.
NOTE: This is a candidate for stable release branches.
(cherry picked from commit 60f898a90ebd29d2593866faa1f2d6f65961a414)
---
src/glsl/link_functions.cpp | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp
index 19a2eeb..256652a 100644
--- a/src/glsl/link_functions.cpp
+++ b/src/glsl/link_functions.cpp
@@ -103,9 +103,15 @@ public:
* details that may be missing.
*/
ir_function *f = linked->symbols->get_function(name);
- if (f == NULL)
+ if (f == NULL) {
f = new(linked) ir_function(name);
+ /* Add the new function to the linked IR.
+ */
+ linked->symbols->add_function(f);
+ linked->ir->push_head(f);
+ }
+
ir_function_signature *linked_sig =
f->exact_matching_signature(&callee->parameters);
if (linked_sig == NULL) {
More information about the mesa-commit
mailing list