diff options
author | Brian <brian@yutani.localnet.net> | 2006-12-15 15:35:57 -0700 |
---|---|---|
committer | Brian <brian@yutani.localnet.net> | 2006-12-15 15:35:57 -0700 |
commit | bfc02dd30f625c134638b20a903065dc78e9ccd3 (patch) | |
tree | bba3a363cde7d86b52c4d7441937392d4041a1b6 /src/mesa/shader/slang/slang_link2.c | |
parent | 6579245800f39c14f738db8e8ae1d93a65a32a4c (diff) |
Lots of assorted changes.
Implement assignment/move for types larger than 4 floats.
Fix codegen bug for "return expr" in inlined functions.
More clean-up of storage allocation code (slang_resolve_storage).
Diffstat (limited to 'src/mesa/shader/slang/slang_link2.c')
-rw-r--r-- | src/mesa/shader/slang/slang_link2.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mesa/shader/slang/slang_link2.c b/src/mesa/shader/slang/slang_link2.c index 9fa5399e53..50e62d89de 100644 --- a/src/mesa/shader/slang/slang_link2.c +++ b/src/mesa/shader/slang/slang_link2.c @@ -320,18 +320,6 @@ _slang_link2(GLcontext *ctx, linked->FragmentProgram = (struct gl_fragment_program *) _mesa_clone_program(ctx, &fragProg->Base); -#if 1 - printf("************** orig fragment program\n"); - _mesa_print_program(&fragProg->Base); - _mesa_print_program_parameters(ctx, &fragProg->Base); -#endif - -#if 1 - printf("************** orig vertex program\n"); - _mesa_print_program(&vertProg->Base); - _mesa_print_program_parameters(ctx, &fragProg->Base); -#endif - link_varying_vars(linked, &linked->VertexProgram->Base); link_varying_vars(linked, &linked->FragmentProgram->Base); @@ -345,10 +333,22 @@ _slang_link2(GLcontext *ctx, linked->FragmentProgram->Base.Parameters = linked->Uniforms; #if 1 - printf("************** linked/cloned frag prog\n"); + printf("************** original fragment program\n"); + _mesa_print_program(&fragProg->Base); + _mesa_print_program_parameters(ctx, &fragProg->Base); +#endif +#if 1 + printf("************** linked fragment prog\n"); _mesa_print_program(&linked->FragmentProgram->Base); _mesa_print_program_parameters(ctx, &linked->FragmentProgram->Base); - printf("************** linked/cloned vert prog\n"); +#endif +#if 1 + printf("************** original vertex program\n"); + _mesa_print_program(&vertProg->Base); + _mesa_print_program_parameters(ctx, &fragProg->Base); +#endif +#if 1 + printf("************** linked vertex prog\n"); _mesa_print_program(&linked->VertexProgram->Base); _mesa_print_program_parameters(ctx, &linked->VertexProgram->Base); #endif |