diff options
| author | Yuanhan Liu <yuanhan.liu@linux.intel.com> | 2011-11-09 14:55:53 +0800 |
|---|---|---|
| committer | Yuanhan Liu <yuanhan.liu@linux.intel.com> | 2011-11-15 16:25:40 +0800 |
| commit | 9d4d9d34d82646e4e7781bb25a64174d35680578 (patch) | |
| tree | 5c3d211a2a30826fcf2fce1ac526117a642d4d97 | |
| parent | f1a677cefbe91a5c1a72dbeda94d2f13a9369e54 (diff) | |
ir_to_mesa: don't init unfirom if link failed
Don't call set_unfiform_initializers if link failed, or it would trigger
a GL_INVALID_OPERATION error. That's not an expected behavior of
glLinkProgram function.
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 0dd44bd792..5cee837781 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -3458,7 +3458,9 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) } } - set_uniform_initializers(ctx, prog); + if (prog->LinkStatus) { + set_uniform_initializers(ctx, prog); + } if (ctx->Shader.Flags & GLSL_DUMP) { if (!prog->LinkStatus) { |