summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2015-08-19 14:29:53 -0700
committerJason Ekstrand <[email protected]>2015-08-27 12:09:36 -0700
commitfee0c5af11dd0995de96e7053377d425a66d03a0 (patch)
treed2a6fa7e443123105b897ca590bdc0d0fe44a423
parentf2e667172a6382f81d1f3e709f02c7ee6cfda4c7 (diff)
i965/fs: Split VGRFs after lowering pull constants
The split_virtual_grfs code doesn't properly rewrite reladdr so we need to make sure that any uniform indirects are lowered away first. This fixes the glsl-fs-uniform-indexed-by-swizzled-vec4.shader_test in piglit Cc: "10.6" <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index a575181a74a..81009a09128 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -4780,11 +4780,11 @@ fs_visitor::optimize()
*/
bld = fs_builder(this, 64);
- split_virtual_grfs();
-
assign_constant_locations();
demote_pull_constants();
+ split_virtual_grfs();
+
#define OPT(pass, args...) ({ \
pass_num++; \
bool this_progress = pass(args); \