d3d1x: fix progs linking if not all EGL platforms are enabled

[mesa.git] / src / glsl / link_functions.cpp

diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp
index fdf886f66275142e27eb595970fb4871ac056a00..78c8b48cf179c4060caa13c2a3cc91644eeaccb5 100644 (file)
--- a/src/glsl/link_functions.cpp
+++ b/src/glsl/link_functions.cpp
@@ -29,7 +29,7 @@ extern "C" {
 #include <talloc.h>
 }
 
-#include "main/mtypes.h"
+#include "main/core.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"
 #include "ir.h"
@@ -111,7 +111,7 @@ public:
         f = new(linked) ir_function(name);
 
       ir_function_signature *linked_sig =
-        f->matching_signature(&callee->parameters);
+        f->exact_matching_signature(&callee->parameters);
       if (linked_sig == NULL) {
         linked_sig = new(linked) ir_function_signature(callee->return_type);
         f->add_signature(linked_sig);
@@ -143,7 +143,7 @@ public:
         const ir_instruction *const original = (ir_instruction *) node;
         assert(const_cast<ir_instruction *>(original)->as_variable());
 
-        ir_instruction *copy = original->clone(ht);
+        ir_instruction *copy = original->clone(linked, ht);
         formal_parameters.push_tail(copy);
       }
 
@@ -152,7 +152,7 @@ public:
       foreach_list_const(node, &sig->body) {
         const ir_instruction *const original = (ir_instruction *) node;
 
-        ir_instruction *copy = original->clone(ht);
+        ir_instruction *copy = original->clone(linked, ht);
         linked_sig->body.push_tail(copy);
       }
 
@@ -182,7 +182,7 @@ public:
            /* Clone the ir_variable that the dereference already has and add
             * it to the linked shader.
             */
-           var = ir->var->clone(NULL);
+           var = ir->var->clone(linked, NULL);
            linked->symbols->add_variable(var->name, var);
            linked->ir->push_head(var);
         }