[Mesa-dev] [PATCH] glsl_to_tgsi: fix a bug in copy propagation

[Brian Paul]

On 01/02/2015 06:16 AM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> This fixes the new piglit test: arb_uniform_buffer_object/2-buffers-bug
>
> Cc: 10.2 10.3 10.4 <mesa-stable at lists.freedesktop.org>
> ---
>   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 2631348..8965434 100644
> --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> @@ -3553,7 +3553,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;
>                  }
>

Reviewed-by: Brian Paul <brianp at vmware.com>