From 6b0706b2aab5ec56f13357e9957fbf99a63839f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 12 Jan 2016 11:03:14 +0200 Subject: [PATCH] glsl: add packed varyings for outputs with single stage program MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 8926dc8 added a check where we add packed varyings of output stage only when we have multiple stages, however duplicates are already handled by changes in commit 0508d950 and we want to add outputs also in case where we have only one stage. Fixes regression caused by 8926dc8 for following test: ES31-CTS.program_interface_query.separate-programs-vertex Signed-off-by: Tapani Pälli Reviewed-by: Marta Lofstedt Reviewed-by: Timothy Arceri --- src/glsl/linker.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index eb1bdc05932..e8c0b981760 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -3753,13 +3753,8 @@ build_program_resource_list(struct gl_shader_program *shProg) if (!add_packed_varyings(shProg, input_stage, GL_PROGRAM_INPUT)) return; - /* Only when dealing with multiple stages, otherwise we would have - * duplicate gl_shader_variable entries. - */ - if (input_stage != output_stage) { - if (!add_packed_varyings(shProg, output_stage, GL_PROGRAM_OUTPUT)) - return; - } + if (!add_packed_varyings(shProg, output_stage, GL_PROGRAM_OUTPUT)) + return; } if (!add_fragdata_arrays(shProg)) -- 2.30.2