summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/slang/slang_link.h
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-02-20 08:04:40 -0700
committerBrian <[email protected]>2007-02-20 08:04:40 -0700
commit3d001b81c23dc1981cd5f4b0885d935d2c9a098b (patch)
tree7fbfcea0358a7c4cad634860d9bf8342e0782055 /src/mesa/shader/slang/slang_link.h
parentd434019633ccc537f07ec4e7d409bc93134367c8 (diff)
parent9449a4d8945de684609663468b96b7ed3aa884b9 (diff)
Merge branch 'glsl-compiler-1' of git+ssh://[email protected]/git/mesa/mesa into glsl-compiler-1
Diffstat (limited to 'src/mesa/shader/slang/slang_link.h')
-rw-r--r--src/mesa/shader/slang/slang_link.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/slang/slang_link.h b/src/mesa/shader/slang/slang_link.h
index edd4a097d5a..606b9e46b16 100644
--- a/src/mesa/shader/slang/slang_link.h
+++ b/src/mesa/shader/slang/slang_link.h
@@ -29,8 +29,8 @@
extern void
-_slang_link2(GLcontext *ctx, GLhandleARB h,
- struct gl_shader_program *shProg);
+_slang_link(GLcontext *ctx, GLhandleARB h,
+ struct gl_shader_program *shProg);
extern void
_slang_resolve_samplers(struct gl_shader_program *shProg,