summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian@nostromo.localnet.net>2007-02-16 09:56:19 -0700
committerBrian <brian@nostromo.localnet.net>2007-02-16 09:56:19 -0700
commitc1771918042a26c8f5f27f9e28cf1890c04d891f (patch)
tree584515e4ca110b395c266854fb29d293fd732ab3
parent1c1a0a23d32f889971de61c2c25fa1eebb9889a3 (diff)
s/_slang_link2/_slang_link/
-rw-r--r--src/mesa/shader/shader_api.c2
-rw-r--r--src/mesa/shader/slang/slang_link.c12
-rw-r--r--src/mesa/shader/slang/slang_link.h4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 842960099e..c439f71f41 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -832,7 +832,7 @@ _mesa_link_program(GLcontext *ctx, GLuint program)
return;
}
- _slang_link2(ctx, program, shProg);
+ _slang_link(ctx, program, shProg);
}
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index b1d355ff80..1af8652d54 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -2,7 +2,7 @@
* Mesa 3-D graphics library
* Version: 6.5.3
*
- * Copyright (C) 2006 Brian Paul All Rights Reserved.
+ * Copyright (C) 2007 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -23,7 +23,7 @@
*/
/**
- * \file slang_link2.c
+ * \file slang_link.c
* GLSL linker
* \author Brian Paul
*/
@@ -506,9 +506,9 @@ fragment_program(struct gl_program *prog)
* varying storage locations.
*/
void
-_slang_link2(GLcontext *ctx,
- GLhandleARB programObj,
- struct gl_shader_program *shProg)
+_slang_link(GLcontext *ctx,
+ GLhandleARB programObj,
+ struct gl_shader_program *shProg)
{
const struct gl_vertex_program *vertProg;
const struct gl_fragment_program *fragProg;
@@ -530,7 +530,7 @@ _slang_link2(GLcontext *ctx,
else if (shProg->Shaders[i]->Type == GL_FRAGMENT_SHADER)
fragProg = fragment_program(shProg->Shaders[i]->Programs[0]);
else
- _mesa_problem(ctx, "unexpected shader target in slang_link2()");
+ _mesa_problem(ctx, "unexpected shader target in slang_link()");
}
#if 00
if (!vertProg || !fragProg) {
diff --git a/src/mesa/shader/slang/slang_link.h b/src/mesa/shader/slang/slang_link.h
index edd4a097d5..606b9e46b1 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,