diff options
| author | Brian Paul <[email protected]> | 2008-05-14 16:09:46 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-05-14 16:09:46 -0600 |
| commit | ade508312c701ce89d3c2cd717994dbbabb4f207 (patch) | |
| tree | 7c7a35935143d90c99820025a8887c5606041db6 /src/mesa/shader/slang/slang_link.h | |
| parent | c807c1a23fc918591e9d2f6f26c4e071a725bced (diff) | |
Updated GLSL uniform/sampler handling from gallium-0.1 branch
Previously, the shader linker combined the uniforms used by the vertex and
fragment shaders into a combined set of uniforms. This made the implementation
of glUniform*() simple, but was rather inefficient otherwise. Now each shader
gets its own set of uniforms (no more modelview matrix showing up in the
fragment shader uniforms, for example).
cherry-picked by hand from gallium-0.1 branch
Diffstat (limited to 'src/mesa/shader/slang/slang_link.h')
| -rw-r--r-- | src/mesa/shader/slang/slang_link.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/shader/slang/slang_link.h b/src/mesa/shader/slang/slang_link.h index 606b9e46b16..8ef8a6b4b3e 100644 --- a/src/mesa/shader/slang/slang_link.h +++ b/src/mesa/shader/slang/slang_link.h @@ -33,10 +33,6 @@ _slang_link(GLcontext *ctx, GLhandleARB h, struct gl_shader_program *shProg); extern void -_slang_resolve_samplers(struct gl_shader_program *shProg, - struct gl_program *prog); - -extern void _slang_remap_attribute(struct gl_program *prog, GLuint oldAttrib, GLuint newAttrib); |