Module: Mesa Branch: 10.3 Commit: 87017f210d519b7bb460dbcb0bb814212969ffff URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=87017f210d519b7bb460dbcb0bb814212969ffff
Author: Marek Olšák <[email protected]> Date: Fri Jan 2 14:13:43 2015 +0100 glsl_to_tgsi: fix a bug in copy propagation This fixes the new piglit test: arb_uniform_buffer_object/2-buffers-bug Cc: 10.2 10.3 10.4 <[email protected]> Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit 48094d0e6554a9df36bf00fc2793ade46cf92406) --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index a5117fd..22d586e 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -3564,7 +3564,8 @@ glsl_to_tgsi_visitor::copy_propagate(void) first = copy_chan; } else { if (first->src[0].file != copy_chan->src[0].file || - first->src[0].index != copy_chan->src[0].index) { + first->src[0].index != copy_chan->src[0].index || + first->src[0].index2D != copy_chan->src[0].index2D) { good = false; break; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
