summaryrefslogtreecommitdiffstats
path: root/src/glsl/link_functions.cpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-09-20 18:08:11 -0700
committerKenneth Graunke <kenneth@whitecape.org>2012-04-02 14:15:43 -0700
commit82065fa20ee3f2880a070f1f4f75509b910cedde (patch)
treebceb87a9745496accbec6e71a96be2873231ea0a /src/glsl/link_functions.cpp
parentd884f60861f270cdcf7d9d47765efcf1e1de30b6 (diff)
downloadexternal_mesa3d-82065fa20ee3f2880a070f1f4f75509b910cedde.zip
external_mesa3d-82065fa20ee3f2880a070f1f4f75509b910cedde.tar.gz
external_mesa3d-82065fa20ee3f2880a070f1f4f75509b910cedde.tar.bz2
glsl: Remove ir_call::get_callee() and set_callee().
Previously, set_callee() performed some assertions about the type of the ir_call; protecting the bare pointer ensured these checks would be run. However, ir_call no longer has a type, so the getter and setter methods don't actually do anything useful. Remove them in favor of accessing callee directly, as is done with most other fields in our IR. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/link_functions.cpp')
-rw-r--r--src/glsl/link_functions.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp
index acee327..6b3e154 100644
--- a/src/glsl/link_functions.cpp
+++ b/src/glsl/link_functions.cpp
@@ -68,7 +68,7 @@ public:
* Doing so will modify the original shader. This may prevent that
* shader from being linkable in other programs.
*/
- const ir_function_signature *const callee = ir->get_callee();
+ const ir_function_signature *const callee = ir->callee;
assert(callee != NULL);
const char *const name = callee->function_name();
@@ -79,7 +79,7 @@ public:
find_matching_signature(name, &callee->parameters, &linked, 1,
ir->use_builtin);
if (sig != NULL) {
- ir->set_callee(sig);
+ ir->callee = sig;
return visit_continue;
}
@@ -168,7 +168,7 @@ public:
*/
linked_sig->accept(this);
- ir->set_callee(linked_sig);
+ ir->callee = linked_sig;
return visit_continue;
}