diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-06 19:47:46 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2012-01-06 19:47:46 +0100 |
| commit | 2d52fd67e716caae85bce150b01bc5c284b12de7 (patch) | |
| tree | 2a641392a6affe99603cbaf169c1ab5173879d27 /mesalib/src/mesa/main/shaderapi.c | |
| parent | d515b895dc5151d102f33b577cafbf63473bbafa (diff) | |
| parent | 7e9f4ea970e8f7008c212d7d3918a974eb0066da (diff) | |
| download | vcxsrv-2d52fd67e716caae85bce150b01bc5c284b12de7.tar.gz vcxsrv-2d52fd67e716caae85bce150b01bc5c284b12de7.tar.bz2 vcxsrv-2d52fd67e716caae85bce150b01bc5c284b12de7.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/link_uniforms.cpp
mesalib/src/mesa/drivers/dri/common/drisw_util.c
Diffstat (limited to 'mesalib/src/mesa/main/shaderapi.c')
| -rw-r--r-- | mesalib/src/mesa/main/shaderapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c index b71b44b70..52a9bd452 100644 --- a/mesalib/src/mesa/main/shaderapi.c +++ b/mesalib/src/mesa/main/shaderapi.c @@ -751,7 +751,7 @@ link_program(struct gl_context *ctx, GLuint program) || shProg == ctx->Shader.CurrentGeometryProgram || shProg == ctx->Shader.CurrentFragmentProgram)) { _mesa_error(ctx, GL_INVALID_OPERATION, - "glLinkProgram(transform feedback active"); + "glLinkProgram(transform feedback active)"); return; } |