diff options
| author | Eric Anholt <[email protected]> | 2012-11-13 14:40:22 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-11-17 12:55:54 -0800 |
| commit | 94e82b2e6cabd7ad26ff35067f6b6675168649d3 (patch) | |
| tree | ada17a21c2d8c6c24c7e5e68884d79599c55f24d | |
| parent | 5c99697f74c68f7e170564d791b95d986a18774a (diff) | |
mesa: Fix linker-assigned varying component counting since 8fb1e4a462
The goal of that change was to skip counting things that aren't actually
outputs from the VS to the FS. However, explicit_location isn't set in
the case of linker-assigned locations (the common case), so basically
varying component counting got disabled. At this stage of the linker,
we've already ensured that var->location is set, so we can just look at
it without worrying.
Fixes i965 assertion failure with the new
piglit glsl-max-varyings --exceed-limits.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51545
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/glsl/linker.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 86371b5e635..3b2ab962b4e 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -2010,8 +2010,7 @@ is_varying_var(GLenum shaderType, const ir_variable *var) { /* Only fragment shaders will take a varying variable as an input */ if (shaderType == GL_FRAGMENT_SHADER && - var->mode == ir_var_in && - var->explicit_location) { + var->mode == ir_var_in) { switch (var->location) { case FRAG_ATTRIB_WPOS: case FRAG_ATTRIB_FACE: |