Mesa (master): i965/fs: Split VGRFs after lowering pull constants
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Thu Aug 27 19:10:17 UTC 2015
Module: Mesa
Branch: master
Commit: fee0c5af11dd0995de96e7053377d425a66d03a0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fee0c5af11dd0995de96e7053377d425a66d03a0
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Wed Aug 19 14:29:53 2015 -0700
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" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_fs.cpp | 4 ++--
1 file 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 a575181..81009a0 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); \
More information about the mesa-commit
mailing list