From: Dave Airlie <airlied@redhat.com>
Date: Wed, 25 May 2016 23:23:54 +0000 (+1000)
Subject: glsl/ast: assign explicit_xfb_buffer from correct place
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c952c0e713ea0952ede90483d8f7d780adf45cc0;p=mesa.git

glsl/ast: assign explicit_xfb_buffer from correct place

This fixes:
GL44-CTS.tessellation_shader.tessellation_control_to_tessellation_evaluation.data_pass_through

As the OUT_TC interface structures weren't matching because
one of them had explicit_xfb_buffer set when it shouldn't.

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index 1ddb2bf43db..b818de6fe1c 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -6656,7 +6656,7 @@ ast_process_struct_or_iface_block_members(exec_list *instructions,
          xfb_buffer = (int) qual_xfb_buffer;
       } else {
          if (layout)
-            explicit_xfb_buffer = layout->flags.q.xfb_buffer;
+            explicit_xfb_buffer = layout->flags.q.explicit_xfb_buffer;
          xfb_buffer = (int) block_xfb_buffer;
       }