From: Gregory Hainaut Date: Sun, 25 Oct 2015 14:01:35 +0000 (+0100) Subject: glsl: don't dead code remove SSO varyings marked as active X-Git-Tag: upstream/17.1.0~14117 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8117f46f496fb31339fc97a2501d5b3325a1fefb;p=platform%2Fupstream%2Fmesa.git glsl: don't dead code remove SSO varyings marked as active GL_ARB_separate_shader_objects allow matching by name variable or block interface. Input varyings can't be removed because it is will impact the location assignment. This fixes the bug 79783 and likely any application that uses GL_ARB_separate_shader_objects extension. V2 (by Timothy Arceri): * simplify now that builtins are not set as always active Signed-off-by: Gregory Hainaut Reviewed-by: Timothy Arceri Reviewed-by: Tapani Pälli https://bugs.freedesktop.org/show_bug.cgi?id=79783 --- diff --git a/src/glsl/opt_dead_code.cpp b/src/glsl/opt_dead_code.cpp index c5be166..c2ce0b9 100644 --- a/src/glsl/opt_dead_code.cpp +++ b/src/glsl/opt_dead_code.cpp @@ -75,6 +75,20 @@ do_dead_code(exec_list *instructions, bool uniform_locations_assigned) || !entry->declaration) continue; + /* Section 7.4.1 (Shader Interface Matching) of the OpenGL 4.5 + * (Core Profile) spec says: + * + * "With separable program objects, interfaces between shader + * stages may involve the outputs from one program object and the + * inputs from a second program object. For such interfaces, it is + * not possible to detect mismatches at link time, because the + * programs are linked separately. When each such program is + * linked, all inputs or outputs interfacing with another program + * stage are treated as active." + */ + if (entry->var->data.always_active_io) + continue; + if (!entry->assign_list.is_empty()) { /* Remove all the dead assignments to the variable we found. * Don't do so if it's a shader or function output, though.