fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: add packed varyings for outputs with single stage program

Browse source 
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 <tapani.palli@intel.com>
Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
This commit is contained in:
Tapani Pälli 2016-01-12 11:03:14 +02:00
parent 38cdcb000d
commit 6b0706b2aa
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/glsl/linker.cpp
View file

@ -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))