glsl: simplifies the merge of the default in layout qualifier
glsl: simplifies the merge of the default in layout qualifier

The merge into the default in layout qualifier duplicates a lot of
code that can be reused from the generic merge method.

Now, we use the generic merge method inside the specific merge for the
default in layout qualifier. The generic merge method has been
completed with some bits that were only present in the merge for the
default in layout qualifier and the specific validation bits have been
moved to the validation method for the default in layout qualifier.

Reviewed-by: Timothy Arceri <5dd83789ef3714029244367ba1ca09f1d7627408@collabora.com>
Signed-off-by: Andres Gomez <1948e91ee7852f22bc880d172a32ffca98fb60fa@igalia.com>

metora/MesaGLSLCompiler,metora/MesaGLSLCompiler,metora/MesaGLSLCompiler