diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
| commit | 72ba71645132923bb8e0b93f7683aef8bc485aa2 (patch) | |
| tree | baeaeff7e7ce5bf65f056625b435b8d55d4a04fa /mesalib/src/glsl/glsl_parser_extras.cpp | |
| parent | 4d64875593956234795d9947ac1d225e5b110f0f (diff) | |
| parent | 7c20de6c7fb53ed404d4df0d975328318810ce01 (diff) | |
| download | vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.gz vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.bz2 vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXext mesa xkeyboard-config pixman 18 nov 2013
Conflicts:
libXext/src/eat.h
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.cpp')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index d922db9db..f401f03bc 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -1529,7 +1529,6 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader, shader->CompileStatus = !state->error; shader->InfoLog = state->info_log; shader->Version = state->language_version; - shader->InfoLog = state->info_log; shader->IsES = state->es_shader; memcpy(shader->builtins_to_link, state->builtins_to_link, |