diff options
| author | Dave Airlie <[email protected]> | 2012-12-10 14:22:34 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2012-12-10 14:22:34 +1000 |
| commit | 7a66c8acd382414a73c2db0ffdc9d95b980f770d (patch) | |
| tree | 8d0a4c32091e8610a5f21d629aa684e406554cf5 /src/mesa/state_tracker | |
| parent | af2d9affb19e34e8de08420cee83aeb3da02d4be (diff) | |
st_glsl_to_tgsi: call ubo load pass earlier
This calls it in around the same place as the 965 driver.
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index efbbed2fd6a..07f4e848894 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -5112,6 +5112,8 @@ st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) do_mat_op_to_vec(ir); lower_instructions(ir, what_to_lower); + lower_ubo_reference(prog->_LinkedShaders[i], ir); + progress = do_lower_jumps(ir, true, true, options->EmitNoMainReturn, options->EmitNoCont, options->EmitNoLoops) || progress; progress = do_common_optimization(ir, true, true, @@ -5143,7 +5145,6 @@ st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) progress = do_vec_index_to_cond_assign(ir) || progress; - lower_ubo_reference(prog->_LinkedShaders[i], ir); } while (progress); validate_ir_tree(ir); |