diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-05 17:18:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-05 17:18:15 +0100 |
| commit | 0fd65ec557757ec8760a96400a09b8a8a92a7b14 (patch) | |
| tree | 961d86d49281cf94e2dc85ffb88c6b1491036338 /mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | |
| parent | 68c12003597662f95eac07ddeee99637f7caa3e5 (diff) | |
| parent | 1b37f71714e2ca4af60bd050adbbb7969534dfd6 (diff) | |
| download | vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.gz vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.bz2 vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
randrproto libXau libxcb mesa mkfontscale pixman git update 5 Jan 2014
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 1331c73dc..eb12426a5 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -5143,7 +5143,7 @@ get_mesa_program(struct gl_context *ctx, if (ctx->Shader.Flags & GLSL_DUMP) { printf("\n"); printf("GLSL IR for linked %s program %d:\n", - _mesa_glsl_shader_target_name(shader->Type), + _mesa_shader_enum_to_string(shader->Type), shader_program->Name); _mesa_print_ir(shader->ir, NULL); printf("\n"); |