diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-10-07 17:20:15 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-10-08 14:21:22 -0700 |
| commit | 4b5489dd6f6d21c9d2e3f3d6d6467dcd429264a2 (patch) | |
| tree | 34a74532cc45b259f8913ad235209be4eab92c2e /src/glsl/linker.cpp | |
| parent | 3b16c591a4b0b8477874290bbe19333f9524b8c2 (diff) | |
glsl: Fail linking if assign_attribute_locations fails
Diffstat (limited to 'src/glsl/linker.cpp')
| -rw-r--r-- | src/glsl/linker.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 4bb4e2a994..bddf8788b4 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -1486,8 +1486,10 @@ link_shaders(GLcontext *ctx, struct gl_shader_program *prog) * FINISHME: GL_MAX_VERTEX_ATTRIBS. GL_MAX_VERTEX_ATTRIBS must be * FINISHME: at least 16, so hardcode 16 for now. */ - if (!assign_attribute_locations(prog, 16)) + if (!assign_attribute_locations(prog, 16)) { + prog->LinkStatus = false; goto done; + } if (prog->_NumLinkedShaders == 1) demote_unread_shader_outputs(prog->_LinkedShaders[0]); |