glsl: Move all var decls to the front of the IR list in reverse order
This has the (intended!) side effect that vertex shader inputs and fragment shader outputs will appear in the IR in the same order that they appeared in the shader code. This results in the locations being assigned in the declared order. Many (arguably buggy) applications depend on this behavior, and it matches what nearly all other drivers do. Fixes the (new) piglit test attrib-assignments. NOTE: This is a candidate for stable release branches (and requires the previous commit to prevent a regression in OpenGL ES 2.0 conformance test stencil_plane_operation). Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
@@ -94,6 +94,24 @@ _mesa_ast_to_hir(exec_list *instructions, struct _mesa_glsl_parse_state *state)
|
||||
detect_conflicting_assignments(state, instructions);
|
||||
|
||||
state->toplevel_ir = NULL;
|
||||
|
||||
/* Move all of the variable declarations to the front of the IR list, and
|
||||
* reverse the order. This has the (intended!) side effect that vertex
|
||||
* shader inputs and fragment shader outputs will appear in the IR in the
|
||||
* same order that they appeared in the shader code. This results in the
|
||||
* locations being assigned in the declared order. Many (arguably buggy)
|
||||
* applications depend on this behavior, and it matches what nearly all
|
||||
* other drivers do.
|
||||
*/
|
||||
foreach_list_safe(node, instructions) {
|
||||
ir_variable *const var = ((ir_instruction *) node)->as_variable();
|
||||
|
||||
if (var == NULL)
|
||||
continue;
|
||||
|
||||
var->remove();
|
||||
instructions->push_head(var);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user