summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/slang/slang_link.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-02-06 10:00:34 -0700
committerBrian Paul <[email protected]>2009-02-06 10:00:34 -0700
commitaafcc26642d5243944a1abb816c2657f644c0649 (patch)
treed01e92f80033b7db995581afcc1fdd45d572971d /src/mesa/shader/slang/slang_link.c
parentb2e779988eeb595187933fe2122d86f8ccfe059c (diff)
Revert "mesa: meaningless whitespace change to see if git's working (ignore)"
This reverts commit b2e779988eeb595187933fe2122d86f8ccfe059c. I didn't mean to push this stuff yet. I'm having a bad git day...
Diffstat (limited to 'src/mesa/shader/slang/slang_link.c')
-rw-r--r--src/mesa/shader/slang/slang_link.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 4ee1beccd46..77bcda08716 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -675,12 +675,12 @@ _slang_link(GLcontext *ctx,
/* notify driver that a new fragment program has been compiled/linked */
ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_PROGRAM_ARB,
&shProg->FragmentProgram->Base);
- if (ctx->Shader.Flags & GLSL_DUMP) {
- _mesa_printf("Mesa original fragment program:\n");
+ if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
+ printf("Mesa original fragment program:\n");
_mesa_print_program(&fragProg->Base);
_mesa_print_program_parameters(ctx, &fragProg->Base);
- _mesa_printf("Mesa post-link fragment program:\n");
+ printf("Mesa post-link fragment program:\n");
_mesa_print_program(&shProg->FragmentProgram->Base);
_mesa_print_program_parameters(ctx, &shProg->FragmentProgram->Base);
}
@@ -693,26 +693,22 @@ _slang_link(GLcontext *ctx,
/* notify driver that a new vertex program has been compiled/linked */
ctx->Driver.ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB,
&shProg->VertexProgram->Base);
- if (ctx->Shader.Flags & GLSL_DUMP) {
- _mesa_printf("Mesa original vertex program:\n");
+ if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
+ printf("Mesa original vertex program:\n");
_mesa_print_program(&vertProg->Base);
_mesa_print_program_parameters(ctx, &vertProg->Base);
- _mesa_printf("Mesa post-link vertex program:\n");
+ printf("Mesa post-link vertex program:\n");
_mesa_print_program(&shProg->VertexProgram->Base);
_mesa_print_program_parameters(ctx, &shProg->VertexProgram->Base);
}
}
- if (ctx->Shader.Flags & GLSL_DUMP) {
- _mesa_printf("Varying vars:\n");
+ if (MESA_VERBOSE & VERBOSE_GLSL_DUMP) {
+ printf("Varying vars:\n");
_mesa_print_parameter_list(shProg->Varying);
- if (shProg->InfoLog) {
- _mesa_printf("Info Log: %s\n", shProg->InfoLog);
- }
}
-
shProg->LinkStatus = (shProg->VertexProgram || shProg->FragmentProgram);
}