From: Ian Romanick Date: Wed, 1 Nov 2017 05:18:10 +0000 (-0700) Subject: glsl/linker: Optimize swizzles again after linking X-Git-Tag: upstream/18.1.0~4330 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88f5588f777d76fe48fded8add745b4da2024ebc;p=platform%2Fupstream%2Fmesa.git glsl/linker: Optimize swizzles again after linking Without this, the SPIR-V generator has to deal with a bunch of junk like: (swiz z (swiz xxx (swiz x (var_ref packed:binormal.z,light_dir)))) It seems better to cull that stuff out than to add code to deal with it. The problem is the way swizzles to and from scalars have to be handled in SPIR-V. Signed-off-by: Ian Romanick Reviewed-by: Thomas Helland --- diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index d6f9c2d..33fd76d 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -5079,6 +5079,16 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) if(!link_varyings_and_uniforms(first, last, ctx, prog, mem_ctx)) goto done; + /* Linking varyings can cause some extra, useless swizzles to be generated + * due to packing and unpacking. + */ + for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { + if (prog->_LinkedShaders[i] == NULL) + continue; + + optimize_swizzles(prog->_LinkedShaders[i]->ir); + } + /* OpenGL ES < 3.1 requires that a vertex shader and a fragment shader both * be present in a linked program. GL_ARB_ES2_compatibility doesn't say * anything about shader linking when one of the shaders (vertex or