diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-29 15:02:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-29 15:02:10 +0200 |
| commit | 1ccf18dc09e288ddf937aa890b50c8d0a9df4319 (patch) | |
| tree | a08f093a56109dd213582d26534b7ead87e86695 /mesalib/src/mesa/program | |
| parent | 741ef6e15af761d44ca0d8d54f6b99c33dd1b6bd (diff) | |
| download | vcxsrv-1ccf18dc09e288ddf937aa890b50c8d0a9df4319.tar.gz vcxsrv-1ccf18dc09e288ddf937aa890b50c8d0a9df4319.tar.bz2 vcxsrv-1ccf18dc09e288ddf937aa890b50c8d0a9df4319.zip | |
libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/ir_to_mesa.cpp | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/prog_parameter_layout.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp index 510aeab82..00869979d 100644 --- a/mesalib/src/mesa/program/ir_to_mesa.cpp +++ b/mesalib/src/mesa/program/ir_to_mesa.cpp @@ -3172,7 +3172,8 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader) &ctx->Extensions, ctx->API); if (ctx->Shader.Flags & GLSL_DUMP) { - printf("GLSL source for shader %d:\n", shader->Name); + printf("GLSL source for %s shader %d:\n", + _mesa_glsl_shader_target_name(state->target), shader->Name); printf("%s\n", shader->Source); } diff --git a/mesalib/src/mesa/program/prog_parameter_layout.c b/mesalib/src/mesa/program/prog_parameter_layout.c index d7dc97edb..90a977108 100644 --- a/mesalib/src/mesa/program/prog_parameter_layout.c +++ b/mesalib/src/mesa/program/prog_parameter_layout.c @@ -207,6 +207,7 @@ _mesa_layout_parameters(struct asm_parser_state *state) } } + layout->StateFlags = state->prog->Parameters->StateFlags; _mesa_free_parameter_list(state->prog->Parameters); state->prog->Parameters = layout; |