497 files changed, 498 insertions, 84 deletions

diff --git a/configure.ac b/configure.ac
index dc1e995b8d..4172eaeefd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2506,7 +2506,6 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/winsys/virgl/vtest/Makefile
 		src/gbm/Makefile
 		src/gbm/main/gbm.pc
-		src/glsl/Makefile
 		src/glx/Makefile
 		src/glx/apple/Makefile
 		src/glx/tests/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index a0ec40146b..9b23cf58f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi
 SUBDIRS += compiler
 
 if NEED_OPENGL_COMMON
-SUBDIRS += glsl mesa
+SUBDIRS += mesa
 endif
 
 SUBDIRS += loader
diff --git a/src/SConscript b/src/SConscript
index 8acf9b04ab..4ba0a32d66 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -6,7 +6,6 @@ if env['platform'] == 'windows':
 
 SConscript('util/SConscript')
 SConscript('compiler/SConscript')
-SConscript('glsl/SConscript')
 
 if env['hostonly']:
     # We are just compiling the things necessary on the host for cross
diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index 1e3778df8d..0bc8e48efa 100644
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -1,4 +1,5 @@
 #
+# Copyright © 2012 Jon TURNEY
 # Copyright (C) 2015 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,6 +28,9 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa/ \
+	-I$(top_builddir)/src/compiler/glsl\
+	-I$(top_srcdir)/src/compiler/glsl\
+	-I$(top_srcdir)/src/compiler/glsl/glcpp\
 	-I$(top_srcdir)/src/gallium/include \
 	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/gtest/include \
@@ -51,6 +55,201 @@ CLEANFILES =
 EXTRA_DIST = SConscript
 
 
+EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README	\
+	glsl/TODO glsl/glcpp/README			\
+	glsl/glsl_lexer.ll				\
+	glsl/glsl_parser.yy				\
+	glsl/glcpp/glcpp-lex.l				\
+	glsl/glcpp/glcpp-parse.y			\
+	glsl/Makefile.sources				\
+	glsl/SConscript
+
+TESTS += glsl/glcpp/tests/glcpp-test			\
+	glsl/glcpp/tests/glcpp-test-cr-lf		\
+	glsl/tests/blob-test				\
+	glsl/tests/general-ir-test			\
+	glsl/tests/optimization-test			\
+	glsl/tests/sampler-types-test			\
+	glsl/tests/uniform-initializer-test
+
+TESTS_ENVIRONMENT= \
+	export PYTHON2=$(PYTHON2); \
+	export PYTHON_FLAGS=$(PYTHON_FLAGS);
+
+check_PROGRAMS +=					\
+	glsl/glcpp/glcpp				\
+	glsl/glsl_test					\
+	glsl/tests/blob-test				\
+	glsl/tests/general-ir-test			\
+	glsl/tests/sampler-types-test			\
+	glsl/tests/uniform-initializer-test
+
+noinst_PROGRAMS = glsl_compiler
+
+glsl_tests_blob_test_SOURCES =				\
+	glsl/tests/blob_test.c
+glsl_tests_blob_test_LDADD =				\
+	glsl/libglsl.la
+
+glsl_tests_general_ir_test_SOURCES =			\
+	glsl/standalone_scaffolding.cpp			\
+	glsl/tests/builtin_variable_test.cpp		\
+	glsl/tests/invalidate_locations_test.cpp	\
+	glsl/tests/general_ir_test.cpp			\
+	glsl/tests/varyings_test.cpp
+glsl_tests_general_ir_test_CFLAGS =			\
+	$(PTHREAD_CFLAGS)
+glsl_tests_general_ir_test_LDADD =			\
+	$(top_builddir)/src/gtest/libgtest.la		\
+	glsl/libglsl.la		\
+	$(top_builddir)/src/libglsl_util.la		\
+	$(PTHREAD_LIBS)
+
+glsl_tests_uniform_initializer_test_SOURCES =		\
+	glsl/tests/copy_constant_to_storage_tests.cpp	\
+	glsl/tests/set_uniform_initializer_tests.cpp	\
+	glsl/tests/uniform_initializer_utils.cpp	\
+	glsl/tests/uniform_initializer_utils.h
+glsl_tests_uniform_initializer_test_CFLAGS =		\
+	$(PTHREAD_CFLAGS)
+glsl_tests_uniform_initializer_test_LDADD =		\
+	$(top_builddir)/src/gtest/libgtest.la		\
+	glsl/libglsl.la		\
+	$(top_builddir)/src/libglsl_util.la		\
+	$(PTHREAD_LIBS)
+
+glsl_tests_sampler_types_test_SOURCES =			\
+	glsl/tests/sampler_types_test.cpp
+glsl_tests_sampler_types_test_CFLAGS =			\
+	$(PTHREAD_CFLAGS)
+glsl_tests_sampler_types_test_LDADD =			\
+	$(top_builddir)/src/gtest/libgtest.la		\
+	glsl/libglsl.la					\
+	$(top_builddir)/src/libglsl_util.la		\
+	$(PTHREAD_LIBS)
+
+noinst_LTLIBRARIES += glsl/libglsl.la glsl/libglcpp.la
+
+glsl_libglcpp_la_LIBADD =				\
+	$(top_builddir)/src/util/libmesautil.la
+glsl_libglcpp_la_SOURCES =				\
+	glsl/glcpp/glcpp-lex.c				\
+	glsl/glcpp/glcpp-parse.c			\
+	glsl/glcpp/glcpp-parse.h			\
+	$(LIBGLCPP_FILES)
+
+glsl_glcpp_glcpp_SOURCES =				\
+	glsl/glcpp/glcpp.c
+glsl_glcpp_glcpp_LDADD =				\
+	glsl/libglcpp.la	\
+	$(top_builddir)/src/libglsl_util.la		\
+	-lm
+
+glsl_libglsl_la_LIBADD = \
+	nir/libnir.la \
+	glsl/libglcpp.la
+
+glsl_libglsl_la_SOURCES =				\
+	glsl/glsl_lexer.cpp				\
+	glsl/glsl_parser.cpp				\
+	glsl/glsl_parser.h				\
+	$(LIBGLSL_FILES)
+
+
+glsl_compiler_SOURCES = \
+	$(GLSL_COMPILER_CXX_FILES)
+
+glsl_compiler_LDADD =					\
+	glsl/libglsl.la					\
+	$(top_builddir)/src/libglsl_util.la		\
+	$(top_builddir)/src/util/libmesautil.la		\
+	$(PTHREAD_LIBS)
+
+glsl_glsl_test_SOURCES = \
+	glsl/standalone_scaffolding.cpp \
+	glsl/test.cpp \
+	glsl/test_optpass.cpp \
+	glsl/test_optpass.h
+
+glsl_glsl_test_LDADD =					\
+	glsl/libglsl.la					\
+	$(top_builddir)/src/libglsl_util.la		\
+	$(PTHREAD_LIBS)
+
+# We write our own rules for yacc and lex below. We'd rather use automake,
+# but automake makes it especially difficult for a number of reasons:
+#
+#  * < automake-1.12 generates .h files from .yy and .ypp files, but
+#    >=automake-1.12 generates .hh and .hpp files respectively. There's no
+#    good way of making a project that uses C++ yacc files compatible with
+#    both versions of automake. Strong work automake developers.
+#
+#  * Since we're generating code from .l/.y files in a subdirectory (glcpp/)
+#    we'd like the resulting generated code to also go in glcpp/ for purposes
+#    of distribution. Automake gives no way to do this.
+#
+#  * Since we're building multiple yacc parsers into one library (and via one
+#    Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes
+#    automake to name the resulting generated code as <library-name>_filename.c.
+#    Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file.
+
+# In order to make build output print "LEX" and "YACC", we reproduce the
+# automake variables below.
+
+AM_V_LEX = $(am__v_LEX_$(V))
+am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY))
+am__v_LEX_0 = @echo "  LEX     " $@;
+am__v_LEX_1 =
+
+AM_V_YACC = $(am__v_YACC_$(V))
+am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
+am__v_YACC_0 = @echo "  YACC    " $@;
+am__v_YACC_1 =
+
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
+LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
+
+glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy
+	$(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl/glsl_parser.h $(srcdir)/glsl/glsl_parser.yy
+
+glsl/glsl_lexer.cpp: glsl/glsl_lexer.ll
+	$(LEX_GEN) -o $@ $(srcdir)/glsl/glsl_lexer.ll
+
+glsl/glcpp/glcpp-parse.c glsl/glcpp/glcpp-parse.h: glsl/glcpp/glcpp-parse.y
+	$(MKDIR_GEN)
+	$(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glsl/glcpp/glcpp-parse.h $(srcdir)/glsl/glcpp/glcpp-parse.y
+
+glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l
+	$(MKDIR_GEN)
+	$(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l
+
+# Only the parsers (specifically the header files generated at the same time)
+# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is
+# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files
+# YACC is only executed once for each parser. The rest of the generated code
+# will be created at the appropriate times according to standard automake
+# dependency rules.
+BUILT_SOURCES +=					\
+	glsl/glsl_parser.cpp				\
+	glsl/glsl_lexer.cpp				\
+	glsl/glcpp/glcpp-parse.c			\
+	glsl/glcpp/glcpp-lex.c
+CLEANFILES +=						\
+	glsl/glcpp/glcpp-parse.h			\
+	glsl/glsl_parser.h				\
+	glsl/glsl_parser.cpp				\
+	glsl/glsl_lexer.cpp				\
+	glsl/glcpp/glcpp-parse.c			\
+	glsl/glcpp/glcpp-lex.c
+
+clean-local:
+	$(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr
+
+dist-hook:
+	$(RM) glsl/glcpp/tests/*.out
+	$(RM) glsl/glcpp/tests/subtest*/*.out
+
 noinst_LTLIBRARIES += nir/libnir.la
 
 nir_libnir_la_CPPFLAGS = \
@@ -101,7 +300,7 @@ nir_tests_control_flow_tests_CFLAGS =			\
 	$(PTHREAD_CFLAGS)
 nir_tests_control_flow_tests_LDADD =			\
 	$(top_builddir)/src/gtest/libgtest.la		\
-	$(top_builddir)/src/compiler/nir/libnir.la	\
+	nir/libnir.la	\
 	$(top_builddir)/src/util/libmesautil.la		\
 	$(PTHREAD_LIBS)
 
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index fe12e419af..c9780d6d6f 100644
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -7,6 +7,153 @@ LIBCOMPILER_FILES = \
 	shader_enums.c \
 	shader_enums.h
 
+# libglsl
+
+LIBGLSL_FILES = \
+	glsl/ast.h \
+	glsl/ast_array_index.cpp \
+	glsl/ast_expr.cpp \
+	glsl/ast_function.cpp \
+	glsl/ast_to_hir.cpp \
+	glsl/ast_type.cpp \
+	glsl/blob.c \
+	glsl/blob.h \
+	glsl/builtin_functions.cpp \
+	glsl/builtin_types.cpp \
+	glsl/builtin_variables.cpp \
+	glsl/glsl_parser_extras.cpp \
+	glsl/glsl_parser_extras.h \
+	glsl/glsl_symbol_table.cpp \
+	glsl/glsl_symbol_table.h \
+	glsl/hir_field_selection.cpp \
+	glsl/ir_basic_block.cpp \
+	glsl/ir_basic_block.h \
+	glsl/ir_builder.cpp \
+	glsl/ir_builder.h \
+	glsl/ir_clone.cpp \
+	glsl/ir_constant_expression.cpp \
+	glsl/ir.cpp \
+	glsl/ir.h \
+	glsl/ir_equals.cpp \
+	glsl/ir_expression_flattening.cpp \
+	glsl/ir_expression_flattening.h \
+	glsl/ir_function_can_inline.cpp \
+	glsl/ir_function_detect_recursion.cpp \
+	glsl/ir_function_inlining.h \
+	glsl/ir_function.cpp \
+	glsl/ir_hierarchical_visitor.cpp \
+	glsl/ir_hierarchical_visitor.h \
+	glsl/ir_hv_accept.cpp \
+	glsl/ir_import_prototypes.cpp \
+	glsl/ir_optimization.h \
+	glsl/ir_print_visitor.cpp \
+	glsl/ir_print_visitor.h \
+	glsl/ir_reader.cpp \
+	glsl/ir_reader.h \
+	glsl/ir_rvalue_visitor.cpp \
+	glsl/ir_rvalue_visitor.h \
+	glsl/ir_set_program_inouts.cpp \
+	glsl/ir_uniform.h \
+	glsl/ir_validate.cpp \
+	glsl/ir_variable_refcount.cpp \
+	glsl/ir_variable_refcount.h \
+	glsl/ir_visitor.h \
+	glsl/linker.cpp \
+	glsl/linker.h \
+	glsl/link_atomics.cpp \
+	glsl/link_functions.cpp \
+	glsl/link_interface_blocks.cpp \
+	glsl/link_uniforms.cpp \
+	glsl/link_uniform_initializers.cpp \
+	glsl/link_uniform_block_active_visitor.cpp \
+	glsl/link_uniform_block_active_visitor.h \
+	glsl/link_uniform_blocks.cpp \
+	glsl/link_varyings.cpp \
+	glsl/link_varyings.h \
+	glsl/list.h \
+	glsl/loop_analysis.cpp \
+	glsl/loop_analysis.h \
+	glsl/loop_controls.cpp \
+	glsl/loop_unroll.cpp \
+	glsl/lower_buffer_access.cpp \
+	glsl/lower_buffer_access.h \
+	glsl/lower_clip_distance.cpp \
+	glsl/lower_const_arrays_to_uniforms.cpp \
+	glsl/lower_discard.cpp \
+	glsl/lower_discard_flow.cpp \
+	glsl/lower_if_to_cond_assign.cpp \
+	glsl/lower_instructions.cpp \
+	glsl/lower_jumps.cpp \
+	glsl/lower_mat_op_to_vec.cpp \
+	glsl/lower_noise.cpp \
+	glsl/lower_offset_array.cpp \
+	glsl/lower_packed_varyings.cpp \
+	glsl/lower_named_interface_blocks.cpp \
+	glsl/lower_packing_builtins.cpp \
+	glsl/lower_subroutine.cpp \
+	glsl/lower_tess_level.cpp \
+	glsl/lower_texture_projection.cpp \
+	glsl/lower_variable_index_to_cond_assign.cpp \
+	glsl/lower_vec_index_to_cond_assign.cpp \
+	glsl/lower_vec_index_to_swizzle.cpp \
+	glsl/lower_vector.cpp \
+	glsl/lower_vector_derefs.cpp \
+	glsl/lower_vector_insert.cpp \
+	glsl/lower_vertex_id.cpp \
+	glsl/lower_output_reads.cpp \
+	glsl/lower_shared_reference.cpp \
+	glsl/lower_ubo_reference.cpp \
+	glsl/opt_algebraic.cpp \
+	glsl/opt_array_splitting.cpp \
+	glsl/opt_conditional_discard.cpp \
+	glsl/opt_constant_folding.cpp \
+	glsl/opt_constant_propagation.cpp \
+	glsl/opt_constant_variable.cpp \
+	glsl/opt_copy_propagation.cpp \
+	glsl/opt_copy_propagation_elements.cpp \
+	glsl/opt_dead_builtin_variables.cpp \
+	glsl/opt_dead_builtin_varyings.cpp \
+	glsl/opt_dead_code.cpp \
+	glsl/opt_dead_code_local.cpp \
+	glsl/opt_dead_functions.cpp \
+	glsl/opt_flatten_nested_if_blocks.cpp \
+	glsl/opt_flip_matrices.cpp \
+	glsl/opt_function_inlining.cpp \
+	glsl/opt_if_simplification.cpp \
+	glsl/opt_minmax.cpp \
+	glsl/opt_noop_swizzle.cpp \
+	glsl/opt_rebalance_tree.cpp \
+	glsl/opt_redundant_jumps.cpp \
+	glsl/opt_structure_splitting.cpp \
+	glsl/opt_swizzle_swizzle.cpp \
+	glsl/opt_tree_grafting.cpp \
+	glsl/opt_vectorize.cpp \
+	glsl/program.h \
+	glsl/s_expression.cpp \
+	glsl/s_expression.h
+
+# glsl_compiler
+
+GLSL_COMPILER_CXX_FILES = \
+	glsl/standalone_scaffolding.cpp \
+	glsl/standalone_scaffolding.h \
+	glsl/main.cpp
+
+# libglsl generated sources
+LIBGLSL_GENERATED_CXX_FILES = \
+	glsl/glsl_lexer.cpp \
+	glsl/glsl_parser.cpp
+
+# libglcpp
+
+LIBGLCPP_FILES = \
+	glsl/glcpp/glcpp.h \
+	glsl/glcpp/pp.c
+
+LIBGLCPP_GENERATED_FILES = \
+	glsl/glcpp/glcpp-lex.c \
+	glsl/glcpp/glcpp-parse.c
+
 NIR_GENERATED_FILES = \
 	nir/nir_builder_opcodes.h \
 	nir/nir_constant_expressions.c \
diff --git a/src/compiler/SConscript b/src/compiler/SConscript
index 412da0e62b..8d71b82bee 100644
--- a/src/compiler/SConscript
+++ b/src/compiler/SConscript
@@ -20,3 +20,5 @@ compiler = env.ConvenienceLibrary(
     source = sources
 )
 Export('compiler')
+
+SConscript('glsl/SConscript')
diff --git a/src/glsl/.gitignore b/src/compiler/glsl/.gitignore
index dda423f83d..dda423f83d 100644
--- a/src/glsl/.gitignore
+++ b/src/compiler/glsl/.gitignore
diff --git a/src/glsl/Android.gen.mk b/src/compiler/glsl/Android.gen.mk
index c5741b40bc..c5741b40bc 100644
--- a/src/glsl/Android.gen.mk
+++ b/src/compiler/glsl/Android.gen.mk
diff --git a/src/glsl/Android.mk b/src/compiler/glsl/Android.mk
index 9cbb9a339a..9cbb9a339a 100644
--- a/src/glsl/Android.mk
+++ b/src/compiler/glsl/Android.mk
diff --git a/src/glsl/Makefile.am b/src/compiler/glsl/Makefile.am
index 9954b81240..9954b81240 100644
--- a/src/glsl/Makefile.am
+++ b/src/compiler/glsl/Makefile.am
diff --git a/src/glsl/Makefile.sources b/src/compiler/glsl/Makefile.sources
index 08b40c5cc8..08b40c5cc8 100644
--- a/src/glsl/Makefile.sources
+++ b/src/compiler/glsl/Makefile.sources
diff --git a/src/glsl/README b/src/compiler/glsl/README
index bfcf69f903..bfcf69f903 100644
--- a/src/glsl/README
+++ b/src/compiler/glsl/README
diff --git a/src/glsl/SConscript b/src/compiler/glsl/SConscript
index ef82a9d317..ef82a9d317 100644
--- a/src/glsl/SConscript
+++ b/src/compiler/glsl/SConscript
diff --git a/src/glsl/TODO b/src/compiler/glsl/TODO
index bd077a8567..bd077a8567 100644
--- a/src/glsl/TODO
+++ b/src/compiler/glsl/TODO
diff --git a/src/glsl/ast.h b/src/compiler/glsl/ast.h
index 03df6c08b2..03df6c08b2 100644
--- a/src/glsl/ast.h
+++ b/src/compiler/glsl/ast.h
diff --git a/src/glsl/ast_array_index.cpp b/src/compiler/glsl/ast_array_index.cpp
index f5baeb9ea3..f5baeb9ea3 100644
--- a/src/glsl/ast_array_index.cpp
+++ b/src/compiler/glsl/ast_array_index.cpp
diff --git a/src/glsl/ast_expr.cpp b/src/compiler/glsl/ast_expr.cpp
index e624d11cf3..e624d11cf3 100644
--- a/src/glsl/ast_expr.cpp
+++ b/src/compiler/glsl/ast_expr.cpp
diff --git a/src/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp
index 0eb456a2b1..0eb456a2b1 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/compiler/glsl/ast_function.cpp
diff --git a/src/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index dfd31966eb..dfd31966eb 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
diff --git a/src/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
index e0e331152d..e0e331152d 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/compiler/glsl/ast_type.cpp
diff --git a/src/glsl/blob.c b/src/compiler/glsl/blob.c
index dd4341be96..dd4341be96 100644
--- a/src/glsl/blob.c
+++ b/src/compiler/glsl/blob.c
diff --git a/src/glsl/blob.h b/src/compiler/glsl/blob.h
index ec903ec140..ec903ec140 100644
--- a/src/glsl/blob.h
+++ b/src/compiler/glsl/blob.h
diff --git a/src/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp
index 95e86df1cd..95e86df1cd 100644
--- a/src/glsl/builtin_functions.cpp
+++ b/src/compiler/glsl/builtin_functions.cpp
diff --git a/src/glsl/builtin_types.cpp b/src/compiler/glsl/builtin_types.cpp
index ee24bd5e41..ee24bd5e41 100644
--- a/src/glsl/builtin_types.cpp
+++ b/src/compiler/glsl/builtin_types.cpp
diff --git a/src/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp
index ccc04c00ce..ccc04c00ce 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/compiler/glsl/builtin_variables.cpp
diff --git a/src/glsl/glcpp/.gitignore b/src/compiler/glsl/glcpp/.gitignore
index 24a7119caa..24a7119caa 100644
--- a/src/glsl/glcpp/.gitignore
+++ b/src/compiler/glsl/glcpp/.gitignore
diff --git a/src/glsl/glcpp/README b/src/compiler/glsl/glcpp/README
index 0637935e28..0637935e28 100644
--- a/src/glsl/glcpp/README
+++ b/src/compiler/glsl/glcpp/README
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/compiler/glsl/glcpp/glcpp-lex.l
index fa9aa50691..fa9aa50691 100644
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/compiler/glsl/glcpp/glcpp-lex.l
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y
index ef1a6575aa..ef1a6575aa 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/compiler/glsl/glcpp/glcpp-parse.y
diff --git a/src/glsl/glcpp/glcpp.c b/src/compiler/glsl/glcpp/glcpp.c
index c62f4efec9..c62f4efec9 100644
--- a/src/glsl/glcpp/glcpp.c
+++ b/src/compiler/glsl/glcpp/glcpp.c
diff --git a/src/glsl/glcpp/glcpp.h b/src/compiler/glsl/glcpp/glcpp.h
index 70aa14b6ec..70aa14b6ec 100644
--- a/src/glsl/glcpp/glcpp.h
+++ b/src/compiler/glsl/glcpp/glcpp.h
diff --git a/src/glsl/glcpp/pp.c b/src/compiler/glsl/glcpp/pp.c
index 160c6662ff..160c6662ff 100644
--- a/src/glsl/glcpp/pp.c
+++ b/src/compiler/glsl/glcpp/pp.c
diff --git a/src/glsl/glcpp/tests/.gitignore b/src/compiler/glsl/glcpp/tests/.gitignore
index 3802c850a3..3802c850a3 100644
--- a/src/glsl/glcpp/tests/.gitignore
+++ b/src/compiler/glsl/glcpp/tests/.gitignore
diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c
index 1f2320e6fc..1f2320e6fc 100644
--- a/src/glsl/glcpp/tests/000-content-with-spaces.c
+++ b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c
diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected
index 00791910ed..00791910ed 100644
--- a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected
+++ b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected
diff --git a/src/glsl/glcpp/tests/001-define.c b/src/compiler/glsl/glcpp/tests/001-define.c
index cbf2fee0e7..cbf2fee0e7 100644
--- a/src/glsl/glcpp/tests/001-define.c
+++ b/src/compiler/glsl/glcpp/tests/001-define.c
diff --git a/src/glsl/glcpp/tests/001-define.c.expected b/src/compiler/glsl/glcpp/tests/001-define.c.expected
index a464d9da74..a464d9da74 100644
--- a/src/glsl/glcpp/tests/001-define.c.expected
+++ b/src/compiler/glsl/glcpp/tests/001-define.c.expected
diff --git a/src/glsl/glcpp/tests/002-define-chain.c b/src/compiler/glsl/glcpp/tests/002-define-chain.c
index 87d75c6875..87d75c6875 100644
--- a/src/glsl/glcpp/tests/002-define-chain.c
+++ b/src/compiler/glsl/glcpp/tests/002-define-chain.c
diff --git a/src/glsl/glcpp/tests/002-define-chain.c.expected b/src/compiler/glsl/glcpp/tests/002-define-chain.c.expected
index c6c9ee38a9..c6c9ee38a9 100644
--- a/src/glsl/glcpp/tests/002-define-chain.c.expected
+++ b/src/compiler/glsl/glcpp/tests/002-define-chain.c.expected
diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c
index a18b724eca..a18b724eca 100644
--- a/src/glsl/glcpp/tests/003-define-chain-reverse.c
+++ b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c
diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected
index c6c9ee38a9..c6c9ee38a9 100644
--- a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected
+++ b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected
diff --git a/src/glsl/glcpp/tests/004-define-recursive.c b/src/compiler/glsl/glcpp/tests/004-define-recursive.c
index 2ac56ea3dc..2ac56ea3dc 100644
--- a/src/glsl/glcpp/tests/004-define-recursive.c
+++ b/src/compiler/glsl/glcpp/tests/004-define-recursive.c
diff --git a/src/glsl/glcpp/tests/004-define-recursive.c.expected b/src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected
index 2d07687f8c..2d07687f8c 100644
--- a/src/glsl/glcpp/tests/004-define-recursive.c.expected
+++ b/src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected
diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c
index f5521df968..f5521df968 100644
--- a/src/glsl/glcpp/tests/005-define-composite-chain.c
+++ b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c
diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected
index 892975c268..892975c268 100644
--- a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected
+++ b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected
diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c
index 4bb91a1221..4bb91a1221 100644
--- a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c
+++ b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c
diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
index 892975c268..892975c268 100644
--- a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
+++ b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c
index 5784565bdf..5784565bdf 100644
--- a/src/glsl/glcpp/tests/007-define-composite-recursive.c
+++ b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c
diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected
index 0b0b477d9d..0b0b477d9d 100644
--- a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected
+++ b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected
diff --git a/src/glsl/glcpp/tests/008-define-empty.c b/src/compiler/glsl/glcpp/tests/008-define-empty.c
index b1bd17ec21..b1bd17ec21 100644
--- a/src/glsl/glcpp/tests/008-define-empty.c
+++ b/src/compiler/glsl/glcpp/tests/008-define-empty.c
diff --git a/src/glsl/glcpp/tests/008-define-empty.c.expected b/src/compiler/glsl/glcpp/tests/008-define-empty.c.expected
index d148bc8e80..d148bc8e80 100644
--- a/src/glsl/glcpp/tests/008-define-empty.c.expected
+++ b/src/compiler/glsl/glcpp/tests/008-define-empty.c.expected
diff --git a/src/glsl/glcpp/tests/009-undef.c b/src/compiler/glsl/glcpp/tests/009-undef.c
index 3fc1fb4424..3fc1fb4424 100644
--- a/src/glsl/glcpp/tests/009-undef.c
+++ b/src/compiler/glsl/glcpp/tests/009-undef.c
diff --git a/src/glsl/glcpp/tests/009-undef.c.expected b/src/compiler/glsl/glcpp/tests/009-undef.c.expected
index 9c0b35a451..9c0b35a451 100644
--- a/src/glsl/glcpp/tests/009-undef.c.expected
+++ b/src/compiler/glsl/glcpp/tests/009-undef.c.expected
diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c
index 32ff73798b..32ff73798b 100644
--- a/src/glsl/glcpp/tests/010-undef-re-define.c
+++ b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c
diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c.expected b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected
index 5970f49028..5970f49028 100644
--- a/src/glsl/glcpp/tests/010-undef-re-define.c.expected
+++ b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected
diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c
index d9ce13c228..d9ce13c228 100644
--- a/src/glsl/glcpp/tests/011-define-func-empty.c
+++ b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c
diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c.expected b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected
index d148bc8e80..d148bc8e80 100644
--- a/src/glsl/glcpp/tests/011-define-func-empty.c.expected
+++ b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected
diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c
index c2bb730b11..c2bb730b11 100644
--- a/src/glsl/glcpp/tests/012-define-func-no-args.c
+++ b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c
diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected
index 9f075f2600..9f075f2600 100644
--- a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected
+++ b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected
diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c
index f78fb8b118..f78fb8b118 100644
--- a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c
+++ b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c
diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
index a464d9da74..a464d9da74 100644
--- a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
+++ b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c
index 11feb2624b..11feb2624b 100644
--- a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c
+++ b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c
diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
index a464d9da74..a464d9da74 100644
--- a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
+++ b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c
index 558da9c617..558da9c617 100644
--- a/src/glsl/glcpp/tests/015-define-object-with-parens.c
+++ b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c
diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected
index a70321a4c5..a70321a4c5 100644
--- a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected
+++ b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected
diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c
index a2e2404c7c..a2e2404c7c 100644
--- a/src/glsl/glcpp/tests/016-define-func-1-arg.c
+++ b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c
diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected
index 6bfe04f738..6bfe04f738 100644
--- a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected
+++ b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected
diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c
index c725383527..c725383527 100644
--- a/src/glsl/glcpp/tests/017-define-func-2-args.c
+++ b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c
diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected
index f7a2b8c26c..f7a2b8c26c 100644
--- a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected
+++ b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected
diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c
index 668130b8f9..668130b8f9 100644
--- a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c
+++ b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c
diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
index c6c9ee38a9..c6c9ee38a9 100644
--- a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
+++ b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c
index c4e62b2550..c4e62b2550 100644
--- a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c
+++ b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c
diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
index 1e89b8cfd0..1e89b8cfd0 100644
--- a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
+++ b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c
index 3049ad1546..3049ad1546 100644
--- a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c
+++ b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c
diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
index 19f59f5ecb..19f59f5ecb 100644
--- a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
+++ b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c
index 21ddd0e65f..21ddd0e65f 100644
--- a/src/glsl/glcpp/tests/021-define-func-compose.c
+++ b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c
diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected
index 87f51f0bac..87f51f0bac 100644
--- a/src/glsl/glcpp/tests/021-define-func-compose.c.expected
+++ b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected
diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c
index c20d73a4a2..c20d73a4a2 100644
--- a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c
+++ b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c
diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
index 1dfc6698bb..1dfc6698bb 100644
--- a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
+++ b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c
index 7ebfed6516..7ebfed6516 100644
--- a/src/glsl/glcpp/tests/023-define-extra-whitespace.c
+++ b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c
diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
index 9c58275d0f..9c58275d0f 100644
--- a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
+++ b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c
index e788adce30..e788adce30 100644
--- a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c
+++ b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c
diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
index 15600af546..15600af546 100644
--- a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
+++ b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c
index b433671d1b..b433671d1b 100644
--- a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c
+++ b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c
diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
index 4a59f0520e..4a59f0520e 100644
--- a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
+++ b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c
index 0d83740530..0d83740530 100644
--- a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c
+++ b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c
diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
index 5e3c70f2cc..5e3c70f2cc 100644
--- a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
+++ b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c
index 5ccb52caba..5ccb52caba 100644
--- a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c
+++ b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c
diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
index 94c15f9505..94c15f9505 100644
--- a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
+++ b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c
index 44962a7187..44962a7187 100644
--- a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c
+++ b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c
diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
index 94c15f9505..94c15f9505 100644
--- a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
+++ b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c
index 261f7d28fc..261f7d28fc 100644
--- a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c
+++ b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c
diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
index 94c15f9505..94c15f9505 100644
--- a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
+++ b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c
index e56fbefd62..e56fbefd62 100644
--- a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c
+++ b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c
diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
index bed826e783..bed826e783 100644
--- a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
+++ b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c
index 3f4c8744df..3f4c8744df 100644
--- a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c
+++ b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c
diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
index bed826e783..bed826e783 100644
--- a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
+++ b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c
index b3ac70f499..b3ac70f499 100644
--- a/src/glsl/glcpp/tests/032-define-func-self-recurse.c
+++ b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c
diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
index 983f941740..983f941740 100644
--- a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
+++ b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c
index f65e48286c..f65e48286c 100644
--- a/src/glsl/glcpp/tests/033-define-func-self-compose.c
+++ b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c
diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected
index 0818362364..0818362364 100644
--- a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected
+++ b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected
diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c
index 209a5f7e07..209a5f7e07 100644
--- a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c
+++ b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c
diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
index 3f808fe665..3f808fe665 100644
--- a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
+++ b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c
index c307fbe830..c307fbe830 100644
--- a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c
+++ b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c
diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
index 09dfdd64e9..09dfdd64e9 100644
--- a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
+++ b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c
index b21ff33673..b21ff33673 100644
--- a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c
+++ b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c
diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
index 580ed9599c..580ed9599c 100644
--- a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
+++ b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c
index b3a2f37f1b..b3a2f37f1b 100644
--- a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c
+++ b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c
diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
index e804d7e4f9..e804d7e4f9 100644
--- a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
+++ b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c
index 1407c7d6e3..1407c7d6e3 100644
--- a/src/glsl/glcpp/tests/038-func-arg-with-commas.c
+++ b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c
diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
index 6544adb3a2..6544adb3a2 100644
--- a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
+++ b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c
index a7c053bb40..a7c053bb40 100644
--- a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c
+++ b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c
diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
index 4cc795338b..4cc795338b 100644
--- a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
+++ b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
diff --git a/src/glsl/glcpp/tests/040-token-pasting.c b/src/compiler/glsl/glcpp/tests/040-token-pasting.c
index caab3ba736..caab3ba736 100644
--- a/src/glsl/glcpp/tests/040-token-pasting.c
+++ b/src/compiler/glsl/glcpp/tests/040-token-pasting.c
diff --git a/src/glsl/glcpp/tests/040-token-pasting.c.expected b/src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected
index 48e836ec3f..48e836ec3f 100644
--- a/src/glsl/glcpp/tests/040-token-pasting.c.expected
+++ b/src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected
diff --git a/src/glsl/glcpp/tests/041-if-0.c b/src/compiler/glsl/glcpp/tests/041-if-0.c
index 2cab677d3e..2cab677d3e 100644
--- a/src/glsl/glcpp/tests/041-if-0.c
+++ b/src/compiler/glsl/glcpp/tests/041-if-0.c
diff --git a/src/glsl/glcpp/tests/041-if-0.c.expected b/src/compiler/glsl/glcpp/tests/041-if-0.c.expected
index 8b506b32d5..8b506b32d5 100644
--- a/src/glsl/glcpp/tests/041-if-0.c.expected
+++ b/src/compiler/glsl/glcpp/tests/041-if-0.c.expected
diff --git a/src/glsl/glcpp/tests/042-if-1.c b/src/compiler/glsl/glcpp/tests/042-if-1.c
index 874a25cf41..874a25cf41 100644
--- a/src/glsl/glcpp/tests/042-if-1.c
+++ b/src/compiler/glsl/glcpp/tests/042-if-1.c
diff --git a/src/glsl/glcpp/tests/042-if-1.c.expected b/src/compiler/glsl/glcpp/tests/042-if-1.c.expected
index a6ae9465a9..a6ae9465a9 100644
--- a/src/glsl/glcpp/tests/042-if-1.c.expected
+++ b/src/compiler/glsl/glcpp/tests/042-if-1.c.expected
diff --git a/src/glsl/glcpp/tests/043-if-0-else.c b/src/compiler/glsl/glcpp/tests/043-if-0-else.c
index 323351f9db..323351f9db 100644
--- a/src/glsl/glcpp/tests/043-if-0-else.c
+++ b/src/compiler/glsl/glcpp/tests/043-if-0-else.c
diff --git a/src/glsl/glcpp/tests/043-if-0-else.c.expected b/src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected
index 3d7e6be96c..3d7e6be96c 100644
--- a/src/glsl/glcpp/tests/043-if-0-else.c.expected
+++ b/src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected
diff --git a/src/glsl/glcpp/tests/044-if-1-else.c b/src/compiler/glsl/glcpp/tests/044-if-1-else.c
index 28dfc25c6f..28dfc25c6f 100644
--- a/src/glsl/glcpp/tests/044-if-1-else.c
+++ b/src/compiler/glsl/glcpp/tests/044-if-1-else.c
diff --git a/src/glsl/glcpp/tests/044-if-1-else.c.expected b/src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected
index 4a31e1cfa9..4a31e1cfa9 100644
--- a/src/glsl/glcpp/tests/044-if-1-else.c.expected
+++ b/src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected
diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c
index e50f686d46..e50f686d46 100644
--- a/src/glsl/glcpp/tests/045-if-0-elif.c
+++ b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c
diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c.expected b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected
index a9bb1588e4..a9bb1588e4 100644
--- a/src/glsl/glcpp/tests/045-if-0-elif.c.expected
+++ b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected
diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c
index 130515a01e..130515a01e 100644
--- a/src/glsl/glcpp/tests/046-if-1-elsif.c
+++ b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c
diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected
index a4995713ca..a4995713ca 100644
--- a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected
+++ b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected
diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c
index e8f0838a9e..e8f0838a9e 100644
--- a/src/glsl/glcpp/tests/047-if-elif-else.c
+++ b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c
diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c.expected b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected
index 54d3086119..54d3086119 100644
--- a/src/glsl/glcpp/tests/047-if-elif-else.c.expected
+++ b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected
diff --git a/src/glsl/glcpp/tests/048-if-nested.c b/src/compiler/glsl/glcpp/tests/048-if-nested.c
index fc4679c3be..fc4679c3be 100644
--- a/src/glsl/glcpp/tests/048-if-nested.c
+++ b/src/compiler/glsl/glcpp/tests/048-if-nested.c
diff --git a/src/glsl/glcpp/tests/048-if-nested.c.expected b/src/compiler/glsl/glcpp/tests/048-if-nested.c.expected
index 8beb9c32c3..8beb9c32c3 100644
--- a/src/glsl/glcpp/tests/048-if-nested.c.expected
+++ b/src/compiler/glsl/glcpp/tests/048-if-nested.c.expected
diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c
index 833ea03882..833ea03882 100644
--- a/src/glsl/glcpp/tests/049-if-expression-precedence.c
+++ b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c
diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected
index 729bdd15f8..729bdd15f8 100644
--- a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected
+++ b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected
diff --git a/src/glsl/glcpp/tests/050-if-defined.c b/src/compiler/glsl/glcpp/tests/050-if-defined.c
index 34f0f95140..34f0f95140 100644
--- a/src/glsl/glcpp/tests/050-if-defined.c
+++ b/src/compiler/glsl/glcpp/tests/050-if-defined.c
diff --git a/src/glsl/glcpp/tests/050-if-defined.c.expected b/src/compiler/glsl/glcpp/tests/050-if-defined.c.expected
index 737eb8d940..737eb8d940 100644
--- a/src/glsl/glcpp/tests/050-if-defined.c.expected
+++ b/src/compiler/glsl/glcpp/tests/050-if-defined.c.expected
diff --git a/src/glsl/glcpp/tests/051-if-relational.c b/src/compiler/glsl/glcpp/tests/051-if-relational.c
index c3db488e0d..c3db488e0d 100644
--- a/src/glsl/glcpp/tests/051-if-relational.c
+++ b/src/compiler/glsl/glcpp/tests/051-if-relational.c
diff --git a/src/glsl/glcpp/tests/051-if-relational.c.expected b/src/compiler/glsl/glcpp/tests/051-if-relational.c.expected
index 652fefdd43..652fefdd43 100644
--- a/src/glsl/glcpp/tests/051-if-relational.c.expected
+++ b/src/compiler/glsl/glcpp/tests/051-if-relational.c.expected
diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c
index 2d8e45eb61..2d8e45eb61 100644
--- a/src/glsl/glcpp/tests/052-if-bitwise.c
+++ b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c
diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c.expected b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected
index 44e52b206e..44e52b206e 100644
--- a/src/glsl/glcpp/tests/052-if-bitwise.c.expected
+++ b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected
diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c
index d24c54a88d..d24c54a88d 100644
--- a/src/glsl/glcpp/tests/053-if-divide-and-shift.c
+++ b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c
diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
index 7e78e0454e..7e78e0454e 100644
--- a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
+++ b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c
index 3da79a0d96..3da79a0d96 100644
--- a/src/glsl/glcpp/tests/054-if-with-macros.c
+++ b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c
diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c.expected b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected
index 70f737c90a..70f737c90a 100644
--- a/src/glsl/glcpp/tests/054-if-with-macros.c.expected
+++ b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected
diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c
index 00f2c2346d..00f2c2346d 100644
--- a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c
+++ b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c
diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
index 94c15f9505..94c15f9505 100644
--- a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
+++ b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c
index 58701d1f25..58701d1f25 100644
--- a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c
+++ b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c
diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
index bed826e783..bed826e783 100644
--- a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
+++ b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c
index 6140232865..6140232865 100644
--- a/src/glsl/glcpp/tests/057-empty-arguments.c
+++ b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c
diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c.expected b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected
index 7d97e15e29..7d97e15e29 100644
--- a/src/glsl/glcpp/tests/057-empty-arguments.c.expected
+++ b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected
diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c
index 8ac260c76b..8ac260c76b 100644
--- a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c
+++ b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c
diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
index e0967a1b95..e0967a1b95 100644
--- a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
+++ b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c
index 37b895a423..37b895a423 100644
--- a/src/glsl/glcpp/tests/059-token-pasting-integer.c
+++ b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c
diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected
index f1288aa7cb..f1288aa7cb 100644
--- a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected
+++ b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected
diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c
index ed80ea879c..ed80ea879c 100644
--- a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c
+++ b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c
diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
index 3e5501aa6e..3e5501aa6e 100644
--- a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
+++ b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c
index 6dbfd1f62d..6dbfd1f62d 100644
--- a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c
+++ b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c
diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
index 15eb64b97f..15eb64b97f 100644
--- a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
+++ b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c
index d9e439bb89..d9e439bb89 100644
--- a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c
+++ b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c
diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
index 3f2ff2d6cc..3f2ff2d6cc 100644
--- a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
+++ b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
diff --git a/src/glsl/glcpp/tests/063-comments.c b/src/compiler/glsl/glcpp/tests/063-comments.c
index e641d2f0f9..e641d2f0f9 100644
--- a/src/glsl/glcpp/tests/063-comments.c
+++ b/src/compiler/glsl/glcpp/tests/063-comments.c
diff --git a/src/glsl/glcpp/tests/063-comments.c.expected b/src/compiler/glsl/glcpp/tests/063-comments.c.expected
index f6e10ce037..f6e10ce037 100644
--- a/src/glsl/glcpp/tests/063-comments.c.expected
+++ b/src/compiler/glsl/glcpp/tests/063-comments.c.expected
diff --git a/src/glsl/glcpp/tests/064-version.c b/src/compiler/glsl/glcpp/tests/064-version.c
index 21326481b8..21326481b8 100644
--- a/src/glsl/glcpp/tests/064-version.c
+++ b/src/compiler/glsl/glcpp/tests/064-version.c
diff --git a/src/glsl/glcpp/tests/064-version.c.expected b/src/compiler/glsl/glcpp/tests/064-version.c.expected
index 4036b1ee37..4036b1ee37 100644
--- a/src/glsl/glcpp/tests/064-version.c.expected
+++ b/src/compiler/glsl/glcpp/tests/064-version.c.expected
diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c
index 48aa0f8c3e..48aa0f8c3e 100644
--- a/src/glsl/glcpp/tests/065-if-defined-parens.c
+++ b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c
diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected
index 737eb8d940..737eb8d940 100644
--- a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected
+++ b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected
diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c
index 3b0b47349d..3b0b47349d 100644
--- a/src/glsl/glcpp/tests/066-if-nospace-expression.c
+++ b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c
diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected
index 5a28fb3b66..5a28fb3b66 100644
--- a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected
+++ b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected
diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c
index f46cce4e60..f46cce4e60 100644
--- a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c
+++ b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c
diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected
index 9a5ed2eb2d..9a5ed2eb2d 100644
--- a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected
+++ b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected
diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c
index 699ac5144e..699ac5144e 100644
--- a/src/glsl/glcpp/tests/068-accidental-pasting.c
+++ b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c
diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected
index 27582cda5e..27582cda5e 100644
--- a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected
+++ b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected
diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c
index 2b46ead294..2b46ead294 100644
--- a/src/glsl/glcpp/tests/069-repeated-argument.c
+++ b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c
diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c.expected b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected
index 8b4b095e48..8b4b095e48 100644
--- a/src/glsl/glcpp/tests/069-repeated-argument.c.expected
+++ b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected
diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c
index d15a4840b0..d15a4840b0 100644
--- a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c
+++ b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c
diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected
index 44b93a434f..44b93a434f 100644
--- a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected
+++ b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected
diff --git a/src/glsl/glcpp/tests/071-punctuator.c b/src/compiler/glsl/glcpp/tests/071-punctuator.c
index 959d682598..959d682598 100644
--- a/src/glsl/glcpp/tests/071-punctuator.c
+++ b/src/compiler/glsl/glcpp/tests/071-punctuator.c
diff --git a/src/glsl/glcpp/tests/071-punctuator.c.expected b/src/compiler/glsl/glcpp/tests/071-punctuator.c.expected
index 959d682598..959d682598 100644
--- a/src/glsl/glcpp/tests/071-punctuator.c.expected
+++ b/src/compiler/glsl/glcpp/tests/071-punctuator.c.expected
diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c
index e421e9d5e2..e421e9d5e2 100644
--- a/src/glsl/glcpp/tests/072-token-pasting-same-line.c
+++ b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c
diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
index 7b80af7e46..7b80af7e46 100644
--- a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
+++ b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c
index 61a48097ca..61a48097ca 100644
--- a/src/glsl/glcpp/tests/073-if-in-ifdef.c
+++ b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c
diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected
index fd40910d9e..fd40910d9e 100644
--- a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected
+++ b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected
diff --git a/src/glsl/glcpp/tests/074-elif-undef.c b/src/compiler/glsl/glcpp/tests/074-elif-undef.c
index 67aac8977e..67aac8977e 100644
--- a/src/glsl/glcpp/tests/074-elif-undef.c
+++ b/src/compiler/glsl/glcpp/tests/074-elif-undef.c
diff --git a/src/glsl/glcpp/tests/074-elif-undef.c.expected b/src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected
index b28b04f643..b28b04f643 100644
--- a/src/glsl/glcpp/tests/074-elif-undef.c.expected
+++ b/src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected
diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c
index 264bc4f10e..264bc4f10e 100644
--- a/src/glsl/glcpp/tests/075-elif-elif-undef.c
+++ b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c
diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected
index fd40910d9e..fd40910d9e 100644
--- a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected
+++ b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected
diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c
index ebd550ed00..ebd550ed00 100644
--- a/src/glsl/glcpp/tests/076-elif-undef-nested.c
+++ b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c
diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected
index 3f2ff2d6cc..3f2ff2d6cc 100644
--- a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected
+++ b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected
diff --git a/src/glsl/glcpp/tests/077-else-without-if.c b/src/compiler/glsl/glcpp/tests/077-else-without-if.c
index 81f00bfe27..81f00bfe27 100644
--- a/src/glsl/glcpp/tests/077-else-without-if.c
+++ b/src/compiler/glsl/glcpp/tests/077-else-without-if.c
diff --git a/src/glsl/glcpp/tests/077-else-without-if.c.expected b/src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected
index 69f3404703..69f3404703 100644
--- a/src/glsl/glcpp/tests/077-else-without-if.c.expected
+++ b/src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected
diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c
index 60466b3890..60466b3890 100644
--- a/src/glsl/glcpp/tests/078-elif-without-if.c
+++ b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c
diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c.expected b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected
index b8e40ecc09..b8e40ecc09 100644
--- a/src/glsl/glcpp/tests/078-elif-without-if.c.expected
+++ b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected
diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c
index 69331c3ca9..69331c3ca9 100644
--- a/src/glsl/glcpp/tests/079-endif-without-if.c
+++ b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c
diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c.expected b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected
index 7ae579dd25..7ae579dd25 100644
--- a/src/glsl/glcpp/tests/079-endif-without-if.c.expected
+++ b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected
diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c
index a27ba36a36..a27ba36a36 100644
--- a/src/glsl/glcpp/tests/080-if-without-expression.c
+++ b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c
diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c.expected b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected
index 2e4cd7323c..2e4cd7323c 100644
--- a/src/glsl/glcpp/tests/080-if-without-expression.c.expected
+++ b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected
diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c
index 79c78663dd..79c78663dd 100644
--- a/src/glsl/glcpp/tests/081-elif-without-expression.c
+++ b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c
diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected
index b607b84906..b607b84906 100644
--- a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
+++ b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected
diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c
index 8b84d50c3a..8b84d50c3a 100644
--- a/src/glsl/glcpp/tests/082-invalid-paste.c
+++ b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c
diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c.expected b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected
index b48a2d6d29..b48a2d6d29 100644
--- a/src/glsl/glcpp/tests/082-invalid-paste.c.expected
+++ b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected
diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c
index 9180635092..9180635092 100644
--- a/src/glsl/glcpp/tests/083-unterminated-if.c
+++ b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c
diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c.expected b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected
index 4659ab6fe6..4659ab6fe6 100644
--- a/src/glsl/glcpp/tests/083-unterminated-if.c.expected
+++ b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected
diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c
index 0789ba5e52..0789ba5e52 100644
--- a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c
+++ b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c
diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected
index af49a37369..af49a37369 100644
--- a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected
+++ b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected
diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c
index 91bea60061..91bea60061 100644
--- a/src/glsl/glcpp/tests/085-incorrect-argument-count.c
+++ b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c
diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected
index d23845bfd4..d23845bfd4 100644
--- a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected
+++ b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected
diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c
index a6b7201f95..a6b7201f95 100644
--- a/src/glsl/glcpp/tests/086-reserved-macro-names.c
+++ b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c
diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected
index 38b089daec..38b089daec 100644
--- a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected
+++ b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected
diff --git a/src/glsl/glcpp/tests/087-if-comments.c b/src/compiler/glsl/glcpp/tests/087-if-comments.c
index ce8dc43057..ce8dc43057 100644
--- a/src/glsl/glcpp/tests/087-if-comments.c
+++ b/src/compiler/glsl/glcpp/tests/087-if-comments.c
diff --git a/src/glsl/glcpp/tests/087-if-comments.c.expected b/src/compiler/glsl/glcpp/tests/087-if-comments.c.expected
index 2783a9c14d..2783a9c14d 100644
--- a/src/glsl/glcpp/tests/087-if-comments.c.expected
+++ b/src/compiler/glsl/glcpp/tests/087-if-comments.c.expected
diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c
index 422c654641..422c654641 100644
--- a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c
+++ b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c
diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected
index 3f2ff2d6cc..3f2ff2d6cc 100644
--- a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected
+++ b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected
diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c
index b3d1391e16..b3d1391e16 100644
--- a/src/glsl/glcpp/tests/089-redefine-macro-error.c
+++ b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c
diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected
index a945161497..a945161497 100644
--- a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected
+++ b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected
diff --git a/src/glsl/glcpp/tests/090-hash-error.c b/src/compiler/glsl/glcpp/tests/090-hash-error.c
index d19bb7faed..d19bb7faed 100644
--- a/src/glsl/glcpp/tests/090-hash-error.c
+++ b/src/compiler/glsl/glcpp/tests/090-hash-error.c
diff --git a/src/glsl/glcpp/tests/090-hash-error.c.expected b/src/compiler/glsl/glcpp/tests/090-hash-error.c.expected
index 876a6ea9cc..876a6ea9cc 100644
--- a/src/glsl/glcpp/tests/090-hash-error.c.expected
+++ b/src/compiler/glsl/glcpp/tests/090-hash-error.c.expected
diff --git a/src/glsl/glcpp/tests/091-hash-line.c b/src/compiler/glsl/glcpp/tests/091-hash-line.c
index 26d70382a8..26d70382a8 100644
--- a/src/glsl/glcpp/tests/091-hash-line.c
+++ b/src/compiler/glsl/glcpp/tests/091-hash-line.c
diff --git a/src/glsl/glcpp/tests/091-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/091-hash-line.c.expected
index ac9ab252f1..ac9ab252f1 100644
--- a/src/glsl/glcpp/tests/091-hash-line.c.expected
+++ b/src/compiler/glsl/glcpp/tests/091-hash-line.c.expected
diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c
index 3c161a5c50..3c161a5c50 100644
--- a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c
+++ b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c
diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected
index 698294d91f..698294d91f 100644
--- a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected
+++ b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected
diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c
index bf65d4f527..bf65d4f527 100644
--- a/src/glsl/glcpp/tests/093-divide-by-zero.c
+++ b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c
diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected
index a858870b79..a858870b79 100644
--- a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected
+++ b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected
diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c
index 04497b1791..04497b1791 100644
--- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c
+++ b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c
diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
index 570952b245..570952b245 100644
--- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
+++ b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
diff --git a/src/glsl/glcpp/tests/095-recursive-define.c b/src/compiler/glsl/glcpp/tests/095-recursive-define.c
index 801d90ce2e..801d90ce2e 100644
--- a/src/glsl/glcpp/tests/095-recursive-define.c
+++ b/src/compiler/glsl/glcpp/tests/095-recursive-define.c
diff --git a/src/glsl/glcpp/tests/095-recursive-define.c.expected b/src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected
index 493ab091be..493ab091be 100644
--- a/src/glsl/glcpp/tests/095-recursive-define.c.expected
+++ b/src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected
diff --git a/src/glsl/glcpp/tests/096-paste-twice.c b/src/compiler/glsl/glcpp/tests/096-paste-twice.c
index 8da756fcba..8da756fcba 100644
--- a/src/glsl/glcpp/tests/096-paste-twice.c
+++ b/src/compiler/glsl/glcpp/tests/096-paste-twice.c
diff --git a/src/glsl/glcpp/tests/096-paste-twice.c.expected b/src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected
index 96c57d2a6e..96c57d2a6e 100644
--- a/src/glsl/glcpp/tests/096-paste-twice.c.expected
+++ b/src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected
diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c
index 0f46835c29..0f46835c29 100644
--- a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c
+++ b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c
diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
index 36f6699253..36f6699253 100644
--- a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
+++ b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c
index 1f520d4d43..1f520d4d43 100644
--- a/src/glsl/glcpp/tests/098-elif-undefined.c
+++ b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c
diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c.expected b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected
index c6ef689ce4..c6ef689ce4 100644
--- a/src/glsl/glcpp/tests/098-elif-undefined.c.expected
+++ b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected
diff --git a/src/glsl/glcpp/tests/099-c99-example.c b/src/compiler/glsl/glcpp/tests/099-c99-example.c
index d1976b1f26..d1976b1f26 100644
--- a/src/glsl/glcpp/tests/099-c99-example.c
+++ b/src/compiler/glsl/glcpp/tests/099-c99-example.c
diff --git a/src/glsl/glcpp/tests/099-c99-example.c.expected b/src/compiler/glsl/glcpp/tests/099-c99-example.c.expected
index 352bbff48f..352bbff48f 100644
--- a/src/glsl/glcpp/tests/099-c99-example.c.expected
+++ b/src/compiler/glsl/glcpp/tests/099-c99-example.c.expected
diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c
index 31dbb9a9ed..31dbb9a9ed 100644
--- a/src/glsl/glcpp/tests/100-macro-with-colon.c
+++ b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c
diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected
index 09f1f417bd..09f1f417bd 100644
--- a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected
+++ b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected
diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c
index e1693805b6..e1693805b6 100644
--- a/src/glsl/glcpp/tests/101-macros-used-twice.c
+++ b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c
diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected
index 1e0b30696c..1e0b30696c 100644
--- a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected
+++ b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected
diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c
index 301779eb94..301779eb94 100644
--- a/src/glsl/glcpp/tests/102-garbage-after-endif.c
+++ b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c
diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected
index d9f3bdc946..d9f3bdc946 100644
--- a/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected
+++ b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected
diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c
index c460feadf5..c460feadf5 100644
--- a/src/glsl/glcpp/tests/103-garbage-after-else-0.c
+++ b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c
diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected
index b053b39977..b053b39977 100644
--- a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected
+++ b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected
diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c
index 3fbeec48e4..3fbeec48e4 100644
--- a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c
+++ b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c
diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected
index 3fbeec48e4..3fbeec48e4 100644
--- a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected
+++ b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected
diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c
index da156c6a59..da156c6a59 100644
--- a/src/glsl/glcpp/tests/105-multiline-hash-line.c
+++ b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c
diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected
index 814cef1b8c..814cef1b8c 100644
--- a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected
+++ b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected
diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c
index 929e93e782..929e93e782 100644
--- a/src/glsl/glcpp/tests/106-multiline-hash-if.c
+++ b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c
diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected
index 1c0cbc970f..1c0cbc970f 100644
--- a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected
+++ b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected
diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c
index 8c1c67a4d6..8c1c67a4d6 100644
--- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c
+++ b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c
diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected
index b0601d7ee4..b0601d7ee4 100644
--- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected
+++ b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected
diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c
index 0ce36f2eb1..0ce36f2eb1 100644
--- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c
+++ b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c
diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
index 4f4243f947..4f4243f947 100644
--- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
+++ b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c
index f52966a8e8..f52966a8e8 100644
--- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c
+++ b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c
diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
index 4f4243f947..4f4243f947 100644
--- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
+++ b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c
index 6d7d0f38d9..6d7d0f38d9 100644
--- a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c
+++ b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c
diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected
index 4d93de41dd..4d93de41dd 100644
--- a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected
+++ b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected
diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c
index b3413371ec..b3413371ec 100644
--- a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c
+++ b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c
diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected
index 5c005c393a..5c005c393a 100644
--- a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected
+++ b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected
diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c
index e8221bc49c..e8221bc49c 100644
--- a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c
+++ b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c
diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected
index 86b37036b6..86b37036b6 100644
--- a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected
+++ b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected
diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c
index 369c487926..369c487926 100644
--- a/src/glsl/glcpp/tests/113-line-and-file-macros.c
+++ b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c
diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected
index 55bc788ffd..55bc788ffd 100644
--- a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected
+++ b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected
diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c
index d80d9c7ef4..d80d9c7ef4 100644
--- a/src/glsl/glcpp/tests/114-paste-integer-tokens.c
+++ b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c
diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected
index aa9711034a..aa9711034a 100644
--- a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected
+++ b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected
diff --git a/src/glsl/glcpp/tests/115-line-continuations.c b/src/compiler/glsl/glcpp/tests/115-line-continuations.c
index 105590d85e..105590d85e 100644
--- a/src/glsl/glcpp/tests/115-line-continuations.c
+++ b/src/compiler/glsl/glcpp/tests/115-line-continuations.c
diff --git a/src/glsl/glcpp/tests/115-line-continuations.c.expected b/src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected
index 428b5e822c..428b5e822c 100644
--- a/src/glsl/glcpp/tests/115-line-continuations.c.expected
+++ b/src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected
diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c
index 83d5ddf681..83d5ddf681 100644
--- a/src/glsl/glcpp/tests/116-disable-line-continuations.c
+++ b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c
diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected
index 5ca78928a6..5ca78928a6 100644
--- a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected
+++ b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected
diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c
index 6a6f282988..6a6f282988 100644
--- a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c
+++ b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c
diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
index 8aaa04d28e..8aaa04d28e 100644
--- a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
+++ b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c
index 53e80394ab..53e80394ab 100644
--- a/src/glsl/glcpp/tests/118-comment-becomes-space.c
+++ b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c
diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected
index 1fa8135cb1..1fa8135cb1 100644
--- a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected
+++ b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected
diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c
index 9b9e9233bc..9b9e9233bc 100644
--- a/src/glsl/glcpp/tests/119-elif-after-else.c
+++ b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c
diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c.expected b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected
index 636956799c..636956799c 100644
--- a/src/glsl/glcpp/tests/119-elif-after-else.c.expected
+++ b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected
diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c
index 49e7696613..49e7696613 100644
--- a/src/glsl/glcpp/tests/120-undef-builtin.c
+++ b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c
diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c.expected b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
index 3b736df378..3b736df378 100644
--- a/src/glsl/glcpp/tests/120-undef-builtin.c.expected
+++ b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c
index 67ebe73e5c..67ebe73e5c 100644
--- a/src/glsl/glcpp/tests/121-comment-bug-72686.c
+++ b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c
diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected
index 8cb7cb9891..8cb7cb9891 100644
--- a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected
+++ b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected
diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c
index ae7ea09f67..ae7ea09f67 100644
--- a/src/glsl/glcpp/tests/122-redefine-whitespace.c
+++ b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c
diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected
index 602bdef94c..602bdef94c 100644
--- a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected
+++ b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected
diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c
index 0b341a381f..0b341a381f 100644
--- a/src/glsl/glcpp/tests/123-garbage-after-else-1.c
+++ b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c
diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected
index b053b39977..b053b39977 100644
--- a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected
+++ b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected
diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c
index 947ba1885e..947ba1885e 100644
--- a/src/glsl/glcpp/tests/124-preprocessing-numbers.c
+++ b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c
diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected
index 6ec588862d..6ec588862d 100644
--- a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected
+++ b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected
diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c
index 4ee29f6d93..4ee29f6d93 100644
--- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c
+++ b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c
diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
index 616aa912e2..616aa912e2 100644
--- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
+++ b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c
index 4c0d29000a..4c0d29000a 100644
--- a/src/glsl/glcpp/tests/126-garbage-after-directive.c
+++ b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c
diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected
index 82a06f8a3b..82a06f8a3b 100644
--- a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected
+++ b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected
diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c
index 0f9b0b3d38..0f9b0b3d38 100644
--- a/src/glsl/glcpp/tests/127-pragma-empty.c
+++ b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c
diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c.expected b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected
index 92371a07c3..92371a07c3 100644
--- a/src/glsl/glcpp/tests/127-pragma-empty.c.expected
+++ b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected
diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c
index fba9596baf..fba9596baf 100644
--- a/src/glsl/glcpp/tests/128-space-before-hash.c
+++ b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c
diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c.expected b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected
index 9babb6fb07..9babb6fb07 100644
--- a/src/glsl/glcpp/tests/128-space-before-hash.c.expected
+++ b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected
diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c
index a229179f18..a229179f18 100644
--- a/src/glsl/glcpp/tests/129-define-non-identifier.c
+++ b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c
diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected
index fd0b41347f..fd0b41347f 100644
--- a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected
+++ b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected
diff --git a/src/glsl/glcpp/tests/130-define-comment.c b/src/compiler/glsl/glcpp/tests/130-define-comment.c
index 33312362cc..33312362cc 100644
--- a/src/glsl/glcpp/tests/130-define-comment.c
+++ b/src/compiler/glsl/glcpp/tests/130-define-comment.c
diff --git a/src/glsl/glcpp/tests/130-define-comment.c.expected b/src/compiler/glsl/glcpp/tests/130-define-comment.c.expected
index d789e29d5a..d789e29d5a 100644
--- a/src/glsl/glcpp/tests/130-define-comment.c.expected
+++ b/src/compiler/glsl/glcpp/tests/130-define-comment.c.expected
diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c
index 240292dad0..240292dad0 100644
--- a/src/glsl/glcpp/tests/131-eof-without-newline.c
+++ b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c
diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c.expected b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected
index 5780030632..5780030632 100644
--- a/src/glsl/glcpp/tests/131-eof-without-newline.c.expected
+++ b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected
diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c
index 6795e35ea0..6795e35ea0 100644
--- a/src/glsl/glcpp/tests/132-eof-without-newline-define.c
+++ b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c
diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected
index 341e5e2aa6..341e5e2aa6 100644
--- a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected
+++ b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected
diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c
index 56ec5f722c..56ec5f722c 100644
--- a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c
+++ b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c
diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected
index d186f48761..d186f48761 100644
--- a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected
+++ b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected
diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c
index 3015f0e886..3015f0e886 100644
--- a/src/glsl/glcpp/tests/134-hash-comment-directive.c
+++ b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c
diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected
index 760c960cb6..760c960cb6 100644
--- a/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected
+++ b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected
diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c
index fd96bd64c7..fd96bd64c7 100644
--- a/src/glsl/glcpp/tests/135-duplicate-parameter.c
+++ b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c
diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected
index bc1a334ed2..bc1a334ed2 100644
--- a/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected
+++ b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected
diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c
index 167d3c8a3c..167d3c8a3c 100644
--- a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c
+++ b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c
diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected
index 137921b169..137921b169 100644
--- a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected
+++ b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected
diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c
index c8cd47fb57..c8cd47fb57 100644
--- a/src/glsl/glcpp/tests/137-expand-macro-after-period.c
+++ b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c
diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected
index f9f5be13e0..f9f5be13e0 100644
--- a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected
+++ b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected
diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c
index 38967dc57d..38967dc57d 100644
--- a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c
+++ b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c
diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected
index 0d6ef4d9ad..0d6ef4d9ad 100644
--- a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected
+++ b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected
diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c
index 30e128db4c..30e128db4c 100644
--- a/src/glsl/glcpp/tests/139-define-without-macro-name.c
+++ b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c
diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected
index 42b02d1a8a..42b02d1a8a 100644
--- a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected
+++ b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected
diff --git a/src/glsl/glcpp/tests/140-null-directive.c b/src/compiler/glsl/glcpp/tests/140-null-directive.c
index 1dcb26ef8b..1dcb26ef8b 100644
--- a/src/glsl/glcpp/tests/140-null-directive.c
+++ b/src/compiler/glsl/glcpp/tests/140-null-directive.c
diff --git a/src/glsl/glcpp/tests/140-null-directive.c.expected b/src/compiler/glsl/glcpp/tests/140-null-directive.c.expected
index fa103f60e8..fa103f60e8 100644
--- a/src/glsl/glcpp/tests/140-null-directive.c.expected
+++ b/src/compiler/glsl/glcpp/tests/140-null-directive.c.expected
diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c
index a93f3ce35f..a93f3ce35f 100644
--- a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c
+++ b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c
diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected
index 330731dc80..330731dc80 100644
--- a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected
+++ b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected
diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c
index b60c04232a..b60c04232a 100644
--- a/src/glsl/glcpp/tests/142-defined-within-macro.c
+++ b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c
diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c.expected b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected
index 4eca90bc3d..4eca90bc3d 100644
--- a/src/glsl/glcpp/tests/142-defined-within-macro.c.expected
+++ b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected
diff --git a/src/glsl/glcpp/tests/143-multiple-else.c b/src/compiler/glsl/glcpp/tests/143-multiple-else.c
index 62ad49cf7b..62ad49cf7b 100644
--- a/src/glsl/glcpp/tests/143-multiple-else.c
+++ b/src/compiler/glsl/glcpp/tests/143-multiple-else.c
diff --git a/src/glsl/glcpp/tests/143-multiple-else.c.expected b/src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected
index 00b3328c83..00b3328c83 100644
--- a/src/glsl/glcpp/tests/143-multiple-else.c.expected
+++ b/src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected
diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/compiler/glsl/glcpp/tests/glcpp-test
index 825c22e71f..3945ee4f6c 100755
--- a/src/glsl/glcpp/tests/glcpp-test
+++ b/src/compiler/glsl/glcpp/tests/glcpp-test
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 if [ ! -z "$srcdir" ]; then
-   testdir=$srcdir/glcpp/tests
-   outdir=`pwd`/glcpp/tests
-   glcpp=`pwd`/glcpp/glcpp
+   testdir=$srcdir/glsl/glcpp/tests
+   outdir=`pwd`/glsl/glcpp/tests
+   glcpp=`pwd`/glsl/glcpp/glcpp
 else
    testdir=.
    outdir=.
diff --git a/src/glsl/glcpp/tests/glcpp-test-cr-lf b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf
index c4ed0b86d7..c75370f48c 100755
--- a/src/glsl/glcpp/tests/glcpp-test-cr-lf
+++ b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf
@@ -6,8 +6,8 @@
 # glcpp-test script.
 
 if [ ! -z "$srcdir" ]; then
-   testdir="$srcdir/glcpp/tests"
-   glcpp_test="$srcdir/glcpp/tests/glcpp-test"
+   testdir="$srcdir/glsl/glcpp/tests"
+   glcpp_test="$srcdir/glsl/glcpp/tests/glcpp-test"
 else
    testdir=.
    glcpp_test=./glcpp-test
@@ -99,7 +99,7 @@ mkdir subtest-cr
 for file in "$testdir"/*.c; do
     base=$(basename "$file")
     tr "\n" "\r" < "$file" > subtest-cr/"$base"
-    cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected
+    cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected
 done
 
 run_test "${glcpp_test} --testdir=subtest-cr"
@@ -112,7 +112,7 @@ mkdir subtest-cr-lf
 for file in "$testdir"/*.c; do
     base=$(basename "$file")
     sed -e 's/$/
/' < "$file" > subtest-cr-lf/"$base"
-    cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected
+    cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected
 done
 
 run_test "${glcpp_test} --testdir=subtest-cr-lf"
@@ -125,7 +125,7 @@ mkdir subtest-lf-cr
 for file in "$testdir"/*.c; do
     base=$(basename "$file")
     sed -e 's/$/
/' < "$file" | tr "\n\r" "\r\n" > subtest-lf-cr/"$base"
-    cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected
+    cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected
 done
 
 run_test "${glcpp_test} --testdir=subtest-lf-cr"
diff --git a/src/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index e59f93e10e..e59f93e10e 100644
--- a/src/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
diff --git a/src/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
index 99bd0e61d0..99bd0e61d0 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/compiler/glsl/glsl_parser.yy
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index 603895497d..603895497d 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
diff --git a/src/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h
index 3f88e01d59..3f88e01d59 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/compiler/glsl/glsl_parser_extras.h
diff --git a/src/glsl/glsl_symbol_table.cpp b/src/compiler/glsl/glsl_symbol_table.cpp
index 6c682acf56..6c682acf56 100644
--- a/src/glsl/glsl_symbol_table.cpp
+++ b/src/compiler/glsl/glsl_symbol_table.cpp
diff --git a/src/glsl/glsl_symbol_table.h b/src/compiler/glsl/glsl_symbol_table.h
index 5d654e5e6a..5d654e5e6a 100644
--- a/src/glsl/glsl_symbol_table.h
+++ b/src/compiler/glsl/glsl_symbol_table.h
diff --git a/src/glsl/hir_field_selection.cpp b/src/compiler/glsl/hir_field_selection.cpp
index eab08ad823..eab08ad823 100644
--- a/src/glsl/hir_field_selection.cpp
+++ b/src/compiler/glsl/hir_field_selection.cpp
diff --git a/src/glsl/ir.cpp b/src/compiler/glsl/ir.cpp
index de9d314bae..de9d314bae 100644
--- a/src/glsl/ir.cpp
+++ b/src/compiler/glsl/ir.cpp
diff --git a/src/glsl/ir.h b/src/compiler/glsl/ir.h
index bd7b550634..bd7b550634 100644
--- a/src/glsl/ir.h
+++ b/src/compiler/glsl/ir.h
diff --git a/src/glsl/ir_basic_block.cpp b/src/compiler/glsl/ir_basic_block.cpp
index 15481aa47f..15481aa47f 100644
--- a/src/glsl/ir_basic_block.cpp
+++ b/src/compiler/glsl/ir_basic_block.cpp
diff --git a/src/glsl/ir_basic_block.h b/src/compiler/glsl/ir_basic_block.h
index dbd678b5c4..dbd678b5c4 100644
--- a/src/glsl/ir_basic_block.h
+++ b/src/compiler/glsl/ir_basic_block.h
diff --git a/src/glsl/ir_builder.cpp b/src/compiler/glsl/ir_builder.cpp
index c9cf1240df..c9cf1240df 100644
--- a/src/glsl/ir_builder.cpp
+++ b/src/compiler/glsl/ir_builder.cpp
diff --git a/src/glsl/ir_builder.h b/src/compiler/glsl/ir_builder.h
index b483ebf626..b483ebf626 100644
--- a/src/glsl/ir_builder.h
+++ b/src/compiler/glsl/ir_builder.h
diff --git a/src/glsl/ir_clone.cpp b/src/compiler/glsl/ir_clone.cpp
index 0965b0d371..0965b0d371 100644
--- a/src/glsl/ir_clone.cpp
+++ b/src/compiler/glsl/ir_clone.cpp
diff --git a/src/glsl/ir_constant_expression.cpp b/src/compiler/glsl/ir_constant_expression.cpp
index fbbf7794da..fbbf7794da 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/compiler/glsl/ir_constant_expression.cpp
diff --git a/src/glsl/ir_equals.cpp b/src/compiler/glsl/ir_equals.cpp
index b86f4ea16b..b86f4ea16b 100644
--- a/src/glsl/ir_equals.cpp
+++ b/src/compiler/glsl/ir_equals.cpp
diff --git a/src/glsl/ir_expression_flattening.cpp b/src/compiler/glsl/ir_expression_flattening.cpp
index c13ae811d7..c13ae811d7 100644
--- a/src/glsl/ir_expression_flattening.cpp
+++ b/src/compiler/glsl/ir_expression_flattening.cpp
diff --git a/src/glsl/ir_expression_flattening.h b/src/compiler/glsl/ir_expression_flattening.h
index 2eda159000..2eda159000 100644
--- a/src/glsl/ir_expression_flattening.h
+++ b/src/compiler/glsl/ir_expression_flattening.h
diff --git a/src/glsl/ir_function.cpp b/src/compiler/glsl/ir_function.cpp
index 0b4cb4bd30..0b4cb4bd30 100644
--- a/src/glsl/ir_function.cpp
+++ b/src/compiler/glsl/ir_function.cpp
diff --git a/src/glsl/ir_function_can_inline.cpp b/src/compiler/glsl/ir_function_can_inline.cpp
index 3b1d15f80f..3b1d15f80f 100644
--- a/src/glsl/ir_function_can_inline.cpp
+++ b/src/compiler/glsl/ir_function_can_inline.cpp
diff --git a/src/glsl/ir_function_detect_recursion.cpp b/src/compiler/glsl/ir_function_detect_recursion.cpp
index b2334d2e40..b2334d2e40 100644
--- a/src/glsl/ir_function_detect_recursion.cpp
+++ b/src/compiler/glsl/ir_function_detect_recursion.cpp
diff --git a/src/glsl/ir_function_inlining.h b/src/compiler/glsl/ir_function_inlining.h
index 6db011bbca..6db011bbca 100644
--- a/src/glsl/ir_function_inlining.h
+++ b/src/compiler/glsl/ir_function_inlining.h
diff --git a/src/glsl/ir_hierarchical_visitor.cpp b/src/compiler/glsl/ir_hierarchical_visitor.cpp
index 1d23a77664..1d23a77664 100644
--- a/src/glsl/ir_hierarchical_visitor.cpp
+++ b/src/compiler/glsl/ir_hierarchical_visitor.cpp
diff --git a/src/glsl/ir_hierarchical_visitor.h b/src/compiler/glsl/ir_hierarchical_visitor.h
index 28517b6e4f..28517b6e4f 100644
--- a/src/glsl/ir_hierarchical_visitor.h
+++ b/src/compiler/glsl/ir_hierarchical_visitor.h
diff --git a/src/glsl/ir_hv_accept.cpp b/src/compiler/glsl/ir_hv_accept.cpp
index 213992af28..213992af28 100644
--- a/src/glsl/ir_hv_accept.cpp
+++ b/src/compiler/glsl/ir_hv_accept.cpp
diff --git a/src/glsl/ir_import_prototypes.cpp b/src/compiler/glsl/ir_import_prototypes.cpp
index b0429fbc3a..b0429fbc3a 100644
--- a/src/glsl/ir_import_prototypes.cpp
+++ b/src/compiler/glsl/ir_import_prototypes.cpp
diff --git a/src/glsl/ir_optimization.h b/src/compiler/glsl/ir_optimization.h
index be86f547f7..be86f547f7 100644
--- a/src/glsl/ir_optimization.h
+++ b/src/compiler/glsl/ir_optimization.h
diff --git a/src/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp
index 960b23fe0e..960b23fe0e 100644
--- a/src/glsl/ir_print_visitor.cpp
+++ b/src/compiler/glsl/ir_print_visitor.cpp
diff --git a/src/glsl/ir_print_visitor.h b/src/compiler/glsl/ir_print_visitor.h
index 965e63ade8..965e63ade8 100644
--- a/src/glsl/ir_print_visitor.h
+++ b/src/compiler/glsl/ir_print_visitor.h
diff --git a/src/glsl/ir_reader.cpp b/src/compiler/glsl/ir_reader.cpp
index 15315aac52..15315aac52 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/compiler/glsl/ir_reader.cpp
diff --git a/src/glsl/ir_reader.h b/src/compiler/glsl/ir_reader.h
index aef2ca23bd..aef2ca23bd 100644
--- a/src/glsl/ir_reader.h
+++ b/src/compiler/glsl/ir_reader.h
diff --git a/src/glsl/ir_rvalue_visitor.cpp b/src/compiler/glsl/ir_rvalue_visitor.cpp
index 6ab6cf0217..6ab6cf0217 100644
--- a/src/glsl/ir_rvalue_visitor.cpp
+++ b/src/compiler/glsl/ir_rvalue_visitor.cpp
diff --git a/src/glsl/ir_rvalue_visitor.h b/src/compiler/glsl/ir_rvalue_visitor.h
index 185c72a5ba..185c72a5ba 100644
--- a/src/glsl/ir_rvalue_visitor.h
+++ b/src/compiler/glsl/ir_rvalue_visitor.h
diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp
index df06923b87..df06923b87 100644
--- a/src/glsl/ir_set_program_inouts.cpp
+++ b/src/compiler/glsl/ir_set_program_inouts.cpp
diff --git a/src/glsl/ir_uniform.h b/src/compiler/glsl/ir_uniform.h
index 1854279925..1854279925 100644
--- a/src/glsl/ir_uniform.h
+++ b/src/compiler/glsl/ir_uniform.h
diff --git a/src/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp
index cad7069bf9..cad7069bf9 100644
--- a/src/glsl/ir_validate.cpp
+++ b/src/compiler/glsl/ir_validate.cpp
diff --git a/src/glsl/ir_variable_refcount.cpp b/src/compiler/glsl/ir_variable_refcount.cpp
index 8306be10b9..8306be10b9 100644
--- a/src/glsl/ir_variable_refcount.cpp
+++ b/src/compiler/glsl/ir_variable_refcount.cpp
diff --git a/src/glsl/ir_variable_refcount.h b/src/compiler/glsl/ir_variable_refcount.h
index 08a11c0149..08a11c0149 100644
--- a/src/glsl/ir_variable_refcount.h
+++ b/src/compiler/glsl/ir_variable_refcount.h
diff --git a/src/glsl/ir_visitor.h b/src/compiler/glsl/ir_visitor.h
index 7c38481cd5..7c38481cd5 100644
--- a/src/glsl/ir_visitor.h
+++ b/src/compiler/glsl/ir_visitor.h
diff --git a/src/glsl/link_atomics.cpp b/src/compiler/glsl/link_atomics.cpp
index 277d4737ab..277d4737ab 100644
--- a/src/glsl/link_atomics.cpp
+++ b/src/compiler/glsl/link_atomics.cpp
diff --git a/src/glsl/link_functions.cpp b/src/compiler/glsl/link_functions.cpp
index 537f4dc77a..537f4dc77a 100644
--- a/src/glsl/link_functions.cpp
+++ b/src/compiler/glsl/link_functions.cpp
diff --git a/src/glsl/link_interface_blocks.cpp b/src/compiler/glsl/link_interface_blocks.cpp
index 64c30fea9a..64c30fea9a 100644
--- a/src/glsl/link_interface_blocks.cpp
+++ b/src/compiler/glsl/link_interface_blocks.cpp
diff --git a/src/glsl/link_uniform_block_active_visitor.cpp b/src/compiler/glsl/link_uniform_block_active_visitor.cpp
index 54fea700b5..54fea700b5 100644
--- a/src/glsl/link_uniform_block_active_visitor.cpp
+++ b/src/compiler/glsl/link_uniform_block_active_visitor.cpp
diff --git a/src/glsl/link_uniform_block_active_visitor.h b/src/compiler/glsl/link_uniform_block_active_visitor.h
index afb52c14a3..afb52c14a3 100644
--- a/src/glsl/link_uniform_block_active_visitor.h
+++ b/src/compiler/glsl/link_uniform_block_active_visitor.h
diff --git a/src/glsl/link_uniform_blocks.cpp b/src/compiler/glsl/link_uniform_blocks.cpp
index 7d75576585..7d75576585 100644
--- a/src/glsl/link_uniform_blocks.cpp
+++ b/src/compiler/glsl/link_uniform_blocks.cpp
diff --git a/src/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp
index 58d21e5125..58d21e5125 100644
--- a/src/glsl/link_uniform_initializers.cpp
+++ b/src/compiler/glsl/link_uniform_initializers.cpp
diff --git a/src/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp
index 33b2d4c864..33b2d4c864 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/compiler/glsl/link_uniforms.cpp
diff --git a/src/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp
index 264b69ca61..264b69ca61 100644
--- a/src/glsl/link_varyings.cpp
+++ b/src/compiler/glsl/link_varyings.cpp
diff --git a/src/glsl/link_varyings.h b/src/compiler/glsl/link_varyings.h
index b2812614ec..b2812614ec 100644
--- a/src/glsl/link_varyings.h
+++ b/src/compiler/glsl/link_varyings.h
diff --git a/src/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 6657777d74..6657777d74 100644
--- a/src/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
diff --git a/src/glsl/linker.h b/src/compiler/glsl/linker.h
index c80be1c7e2..c80be1c7e2 100644
--- a/src/glsl/linker.h
+++ b/src/compiler/glsl/linker.h
diff --git a/src/glsl/list.h b/src/compiler/glsl/list.h
index a1c4d82b01..a1c4d82b01 100644
--- a/src/glsl/list.h
+++ b/src/compiler/glsl/list.h
diff --git a/src/glsl/loop_analysis.cpp b/src/compiler/glsl/loop_analysis.cpp
index 096a80abb3..096a80abb3 100644
--- a/src/glsl/loop_analysis.cpp
+++ b/src/compiler/glsl/loop_analysis.cpp
diff --git a/src/glsl/loop_analysis.h b/src/compiler/glsl/loop_analysis.h
index 3b1971d7ed..3b1971d7ed 100644
--- a/src/glsl/loop_analysis.h
+++ b/src/compiler/glsl/loop_analysis.h
diff --git a/src/glsl/loop_controls.cpp b/src/compiler/glsl/loop_controls.cpp
index c717605ec7..c717605ec7 100644
--- a/src/glsl/loop_controls.cpp
+++ b/src/compiler/glsl/loop_controls.cpp
diff --git a/src/glsl/loop_unroll.cpp b/src/compiler/glsl/loop_unroll.cpp
index aea2743cdb..aea2743cdb 100644
--- a/src/glsl/loop_unroll.cpp
+++ b/src/compiler/glsl/loop_unroll.cpp
diff --git a/src/glsl/lower_buffer_access.cpp b/src/compiler/glsl/lower_buffer_access.cpp
index f8c8d140ea..f8c8d140ea 100644
--- a/src/glsl/lower_buffer_access.cpp
+++ b/src/compiler/glsl/lower_buffer_access.cpp
diff --git a/src/glsl/lower_buffer_access.h b/src/compiler/glsl/lower_buffer_access.h
index cc4614e979..cc4614e979 100644
--- a/src/glsl/lower_buffer_access.h
+++ b/src/compiler/glsl/lower_buffer_access.h
diff --git a/src/glsl/lower_clip_distance.cpp b/src/compiler/glsl/lower_clip_distance.cpp
index 1ada215796..1ada215796 100644
--- a/src/glsl/lower_clip_distance.cpp
+++ b/src/compiler/glsl/lower_clip_distance.cpp
diff --git a/src/glsl/lower_const_arrays_to_uniforms.cpp b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp
index 2d024d4b78..2d024d4b78 100644
--- a/src/glsl/lower_const_arrays_to_uniforms.cpp
+++ b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp
diff --git a/src/glsl/lower_discard.cpp b/src/compiler/glsl/lower_discard.cpp
index b62eb20dcb..b62eb20dcb 100644
--- a/src/glsl/lower_discard.cpp
+++ b/src/compiler/glsl/lower_discard.cpp
diff --git a/src/glsl/lower_discard_flow.cpp b/src/compiler/glsl/lower_discard_flow.cpp
index 9d0a56b230..9d0a56b230 100644
--- a/src/glsl/lower_discard_flow.cpp
+++ b/src/compiler/glsl/lower_discard_flow.cpp
diff --git a/src/glsl/lower_if_to_cond_assign.cpp b/src/compiler/glsl/lower_if_to_cond_assign.cpp
index 6a7034794b..6a7034794b 100644
--- a/src/glsl/lower_if_to_cond_assign.cpp
+++ b/src/compiler/glsl/lower_if_to_cond_assign.cpp
diff --git a/src/glsl/lower_instructions.cpp b/src/compiler/glsl/lower_instructions.cpp
index 1875149b7a..1875149b7a 100644
--- a/src/glsl/lower_instructions.cpp
+++ b/src/compiler/glsl/lower_instructions.cpp
diff --git a/src/glsl/lower_jumps.cpp b/src/compiler/glsl/lower_jumps.cpp
index 3cfa2e00ae..3cfa2e00ae 100644
--- a/src/glsl/lower_jumps.cpp
+++ b/src/compiler/glsl/lower_jumps.cpp
diff --git a/src/glsl/lower_mat_op_to_vec.cpp b/src/compiler/glsl/lower_mat_op_to_vec.cpp
index 266fdc6a25..266fdc6a25 100644
--- a/src/glsl/lower_mat_op_to_vec.cpp
+++ b/src/compiler/glsl/lower_mat_op_to_vec.cpp
diff --git a/src/glsl/lower_named_interface_blocks.cpp b/src/compiler/glsl/lower_named_interface_blocks.cpp
index f29eba4f75..f29eba4f75 100644
--- a/src/glsl/lower_named_interface_blocks.cpp
+++ b/src/compiler/glsl/lower_named_interface_blocks.cpp
diff --git a/src/glsl/lower_noise.cpp b/src/compiler/glsl/lower_noise.cpp
index 85f59b675e..85f59b675e 100644
--- a/src/glsl/lower_noise.cpp
+++ b/src/compiler/glsl/lower_noise.cpp
diff --git a/src/glsl/lower_offset_array.cpp b/src/compiler/glsl/lower_offset_array.cpp
index 96486c3a71..96486c3a71 100644
--- a/src/glsl/lower_offset_array.cpp
+++ b/src/compiler/glsl/lower_offset_array.cpp
diff --git a/src/glsl/lower_output_reads.cpp b/src/compiler/glsl/lower_output_reads.cpp
index 79488df293..79488df293 100644
--- a/src/glsl/lower_output_reads.cpp
+++ b/src/compiler/glsl/lower_output_reads.cpp
diff --git a/src/glsl/lower_packed_varyings.cpp b/src/compiler/glsl/lower_packed_varyings.cpp
index 8d1eb1725d..8d1eb1725d 100644
--- a/src/glsl/lower_packed_varyings.cpp
+++ b/src/compiler/glsl/lower_packed_varyings.cpp
diff --git a/src/glsl/lower_packing_builtins.cpp b/src/compiler/glsl/lower_packing_builtins.cpp
index 7f18238bc6..7f18238bc6 100644
--- a/src/glsl/lower_packing_builtins.cpp
+++ b/src/compiler/glsl/lower_packing_builtins.cpp
diff --git a/src/glsl/lower_shared_reference.cpp b/src/compiler/glsl/lower_shared_reference.cpp
index 533cd9202f..533cd9202f 100644
--- a/src/glsl/lower_shared_reference.cpp
+++ b/src/compiler/glsl/lower_shared_reference.cpp
diff --git a/src/glsl/lower_subroutine.cpp b/src/compiler/glsl/lower_subroutine.cpp
index e80c1be768..e80c1be768 100644
--- a/src/glsl/lower_subroutine.cpp
+++ b/src/compiler/glsl/lower_subroutine.cpp
diff --git a/src/glsl/lower_tess_level.cpp b/src/compiler/glsl/lower_tess_level.cpp
index bed2553222..bed2553222 100644
--- a/src/glsl/lower_tess_level.cpp
+++ b/src/compiler/glsl/lower_tess_level.cpp
diff --git a/src/glsl/lower_texture_projection.cpp b/src/compiler/glsl/lower_texture_projection.cpp
index 95df106d93..95df106d93 100644
--- a/src/glsl/lower_texture_projection.cpp
+++ b/src/compiler/glsl/lower_texture_projection.cpp
diff --git a/src/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp
index a172054bac..a172054bac 100644
--- a/src/glsl/lower_ubo_reference.cpp
+++ b/src/compiler/glsl/lower_ubo_reference.cpp
diff --git a/src/glsl/lower_variable_index_to_cond_assign.cpp b/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp
index 278d5450bf..278d5450bf 100644
--- a/src/glsl/lower_variable_index_to_cond_assign.cpp
+++ b/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp
diff --git a/src/glsl/lower_vec_index_to_cond_assign.cpp b/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp
index 784db08592..784db08592 100644
--- a/src/glsl/lower_vec_index_to_cond_assign.cpp
+++ b/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp
diff --git a/src/glsl/lower_vec_index_to_swizzle.cpp b/src/compiler/glsl/lower_vec_index_to_swizzle.cpp
index 8b18e95509..8b18e95509 100644
--- a/src/glsl/lower_vec_index_to_swizzle.cpp
+++ b/src/compiler/glsl/lower_vec_index_to_swizzle.cpp
diff --git a/src/glsl/lower_vector.cpp b/src/compiler/glsl/lower_vector.cpp
index a658410ae6..a658410ae6 100644
--- a/src/glsl/lower_vector.cpp
+++ b/src/compiler/glsl/lower_vector.cpp
diff --git a/src/glsl/lower_vector_derefs.cpp b/src/compiler/glsl/lower_vector_derefs.cpp
index 4a5d6f0da4..4a5d6f0da4 100644
--- a/src/glsl/lower_vector_derefs.cpp
+++ b/src/compiler/glsl/lower_vector_derefs.cpp
diff --git a/src/glsl/lower_vector_insert.cpp b/src/compiler/glsl/lower_vector_insert.cpp
index 26d31b03c1..26d31b03c1 100644
--- a/src/glsl/lower_vector_insert.cpp
+++ b/src/compiler/glsl/lower_vector_insert.cpp
diff --git a/src/glsl/lower_vertex_id.cpp b/src/compiler/glsl/lower_vertex_id.cpp
index 3da7a2f1b3..3da7a2f1b3 100644
--- a/src/glsl/lower_vertex_id.cpp
+++ b/src/compiler/glsl/lower_vertex_id.cpp
diff --git a/src/glsl/main.cpp b/src/compiler/glsl/main.cpp
index df93a013ed..df93a013ed 100644
--- a/src/glsl/main.cpp
+++ b/src/compiler/glsl/main.cpp
diff --git a/src/glsl/opt_algebraic.cpp b/src/compiler/glsl/opt_algebraic.cpp
index 1e58062cb0..1e58062cb0 100644
--- a/src/glsl/opt_algebraic.cpp
+++ b/src/compiler/glsl/opt_algebraic.cpp
diff --git a/src/glsl/opt_array_splitting.cpp b/src/compiler/glsl/opt_array_splitting.cpp
index cceec6b643..cceec6b643 100644
--- a/src/glsl/opt_array_splitting.cpp
+++ b/src/compiler/glsl/opt_array_splitting.cpp
diff --git a/src/glsl/opt_conditional_discard.cpp b/src/compiler/glsl/opt_conditional_discard.cpp
index 1ca8803f64..1ca8803f64 100644
--- a/src/glsl/opt_conditional_discard.cpp
+++ b/src/compiler/glsl/opt_conditional_discard.cpp
diff --git a/src/glsl/opt_constant_folding.cpp b/src/compiler/glsl/opt_constant_folding.cpp
index 150a17b2af..150a17b2af 100644
--- a/src/glsl/opt_constant_folding.cpp
+++ b/src/compiler/glsl/opt_constant_folding.cpp
diff --git a/src/glsl/opt_constant_propagation.cpp b/src/compiler/glsl/opt_constant_propagation.cpp
index 416ba16a3c..416ba16a3c 100644
--- a/src/glsl/opt_constant_propagation.cpp
+++ b/src/compiler/glsl/opt_constant_propagation.cpp
diff --git a/src/glsl/opt_constant_variable.cpp b/src/compiler/glsl/opt_constant_variable.cpp
index 3ddb12904c..3ddb12904c 100644
--- a/src/glsl/opt_constant_variable.cpp
+++ b/src/compiler/glsl/opt_constant_variable.cpp
diff --git a/src/glsl/opt_copy_propagation.cpp b/src/compiler/glsl/opt_copy_propagation.cpp
index 310708db86..310708db86 100644
--- a/src/glsl/opt_copy_propagation.cpp
+++ b/src/compiler/glsl/opt_copy_propagation.cpp
diff --git a/src/glsl/opt_copy_propagation_elements.cpp b/src/compiler/glsl/opt_copy_propagation_elements.cpp
index a679180194..a679180194 100644
--- a/src/glsl/opt_copy_propagation_elements.cpp
+++ b/src/compiler/glsl/opt_copy_propagation_elements.cpp
diff --git a/src/glsl/opt_dead_builtin_variables.cpp b/src/compiler/glsl/opt_dead_builtin_variables.cpp
index 03e578982b..03e578982b 100644
--- a/src/glsl/opt_dead_builtin_variables.cpp
+++ b/src/compiler/glsl/opt_dead_builtin_variables.cpp
diff --git a/src/glsl/opt_dead_builtin_varyings.cpp b/src/compiler/glsl/opt_dead_builtin_varyings.cpp
index 37bcbccf0c..37bcbccf0c 100644
--- a/src/glsl/opt_dead_builtin_varyings.cpp
+++ b/src/compiler/glsl/opt_dead_builtin_varyings.cpp
diff --git a/src/glsl/opt_dead_code.cpp b/src/compiler/glsl/opt_dead_code.cpp
index dbdb7de8bb..dbdb7de8bb 100644
--- a/src/glsl/opt_dead_code.cpp
+++ b/src/compiler/glsl/opt_dead_code.cpp
diff --git a/src/glsl/opt_dead_code_local.cpp b/src/compiler/glsl/opt_dead_code_local.cpp
index d38fd2bf63..d38fd2bf63 100644
--- a/src/glsl/opt_dead_code_local.cpp
+++ b/src/compiler/glsl/opt_dead_code_local.cpp
diff --git a/src/glsl/opt_dead_functions.cpp b/src/compiler/glsl/opt_dead_functions.cpp
index 2e90b650fa..2e90b650fa 100644
--- a/src/glsl/opt_dead_functions.cpp
+++ b/src/compiler/glsl/opt_dead_functions.cpp
diff --git a/src/glsl/opt_flatten_nested_if_blocks.cpp b/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp
index c702102045..c702102045 100644
--- a/src/glsl/opt_flatten_nested_if_blocks.cpp
+++ b/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp
diff --git a/src/glsl/opt_flip_matrices.cpp b/src/compiler/glsl/opt_flip_matrices.cpp
index 04c6170b84..04c6170b84 100644
--- a/src/glsl/opt_flip_matrices.cpp
+++ b/src/compiler/glsl/opt_flip_matrices.cpp
diff --git a/src/glsl/opt_function_inlining.cpp b/src/compiler/glsl/opt_function_inlining.cpp
index 19f5fae0a1..19f5fae0a1 100644
--- a/src/glsl/opt_function_inlining.cpp
+++ b/src/compiler/glsl/opt_function_inlining.cpp
diff --git a/src/glsl/opt_if_simplification.cpp b/src/compiler/glsl/opt_if_simplification.cpp
index e05f03190a..e05f03190a 100644
--- a/src/glsl/opt_if_simplification.cpp
+++ b/src/compiler/glsl/opt_if_simplification.cpp
diff --git a/src/glsl/opt_minmax.cpp b/src/compiler/glsl/opt_minmax.cpp
index 29482ee69d..29482ee69d 100644
--- a/src/glsl/opt_minmax.cpp
+++ b/src/compiler/glsl/opt_minmax.cpp
diff --git a/src/glsl/opt_noop_swizzle.cpp b/src/compiler/glsl/opt_noop_swizzle.cpp
index 41890ab2b1..41890ab2b1 100644
--- a/src/glsl/opt_noop_swizzle.cpp
+++ b/src/compiler/glsl/opt_noop_swizzle.cpp
diff --git a/src/glsl/opt_rebalance_tree.cpp b/src/compiler/glsl/opt_rebalance_tree.cpp
index 095f2d7d2f..095f2d7d2f 100644
--- a/src/glsl/opt_rebalance_tree.cpp
+++ b/src/compiler/glsl/opt_rebalance_tree.cpp
diff --git a/src/glsl/opt_redundant_jumps.cpp b/src/compiler/glsl/opt_redundant_jumps.cpp
index ee384d0f23..ee384d0f23 100644
--- a/src/glsl/opt_redundant_jumps.cpp
+++ b/src/compiler/glsl/opt_redundant_jumps.cpp
diff --git a/src/glsl/opt_structure_splitting.cpp b/src/compiler/glsl/opt_structure_splitting.cpp
index 0d18a2f758..0d18a2f758 100644
--- a/src/glsl/opt_structure_splitting.cpp
+++ b/src/compiler/glsl/opt_structure_splitting.cpp
diff --git a/src/glsl/opt_swizzle_swizzle.cpp b/src/compiler/glsl/opt_swizzle_swizzle.cpp
index 7285474b08..7285474b08 100644
--- a/src/glsl/opt_swizzle_swizzle.cpp
+++ b/src/compiler/glsl/opt_swizzle_swizzle.cpp
diff --git a/src/glsl/opt_tree_grafting.cpp b/src/compiler/glsl/opt_tree_grafting.cpp
index 83effb7424..83effb7424 100644
--- a/src/glsl/opt_tree_grafting.cpp
+++ b/src/compiler/glsl/opt_tree_grafting.cpp
diff --git a/src/glsl/opt_vectorize.cpp b/src/compiler/glsl/opt_vectorize.cpp
index 88318cd8a6..88318cd8a6 100644
--- a/src/glsl/opt_vectorize.cpp
+++ b/src/compiler/glsl/opt_vectorize.cpp
diff --git a/src/glsl/program.h b/src/compiler/glsl/program.h
index 64f54635f6..64f54635f6 100644
--- a/src/glsl/program.h
+++ b/src/compiler/glsl/program.h
diff --git a/src/glsl/s_expression.cpp b/src/compiler/glsl/s_expression.cpp
index f82e155a6b..f82e155a6b 100644
--- a/src/glsl/s_expression.cpp
+++ b/src/compiler/glsl/s_expression.cpp
diff --git a/src/glsl/s_expression.h b/src/compiler/glsl/s_expression.h
index f0dffb1b2f..f0dffb1b2f 100644
--- a/src/glsl/s_expression.h
+++ b/src/compiler/glsl/s_expression.h
diff --git a/src/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp
index d5d214b57c..d5d214b57c 100644
--- a/src/glsl/standalone_scaffolding.cpp
+++ b/src/compiler/glsl/standalone_scaffolding.cpp
diff --git a/src/glsl/standalone_scaffolding.h b/src/compiler/glsl/standalone_scaffolding.h
index f853a187bf..f853a187bf 100644
--- a/src/glsl/standalone_scaffolding.h
+++ b/src/compiler/glsl/standalone_scaffolding.h
diff --git a/src/glsl/test.cpp b/src/compiler/glsl/test.cpp
index b1ff92ed1d..b1ff92ed1d 100644
--- a/src/glsl/test.cpp
+++ b/src/compiler/glsl/test.cpp
diff --git a/src/glsl/test_optpass.cpp b/src/compiler/glsl/test_optpass.cpp
index fed1fabf30..fed1fabf30 100644
--- a/src/glsl/test_optpass.cpp
+++ b/src/compiler/glsl/test_optpass.cpp
diff --git a/src/glsl/test_optpass.h b/src/compiler/glsl/test_optpass.h
index 923ccf3dec..923ccf3dec 100644
--- a/src/glsl/test_optpass.h
+++ b/src/compiler/glsl/test_optpass.h
diff --git a/src/glsl/tests/.gitignore b/src/compiler/glsl/tests/.gitignore
index 13dcdc4ab7..13dcdc4ab7 100644
--- a/src/glsl/tests/.gitignore
+++ b/src/compiler/glsl/tests/.gitignore
diff --git a/src/glsl/tests/blob_test.c b/src/compiler/glsl/tests/blob_test.c
index 4806029bca..4806029bca 100644
--- a/src/glsl/tests/blob_test.c
+++ b/src/compiler/glsl/tests/blob_test.c
diff --git a/src/glsl/tests/builtin_variable_test.cpp b/src/compiler/glsl/tests/builtin_variable_test.cpp
index 11e384a072..11e384a072 100644
--- a/src/glsl/tests/builtin_variable_test.cpp
+++ b/src/compiler/glsl/tests/builtin_variable_test.cpp
diff --git a/src/glsl/tests/compare_ir b/src/compiler/glsl/tests/compare_ir
index a40fc810cf..a40fc810cf 100755
--- a/src/glsl/tests/compare_ir
+++ b/src/compiler/glsl/tests/compare_ir
diff --git a/src/glsl/tests/copy_constant_to_storage_tests.cpp b/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp
index cd48bc523c..cd48bc523c 100644
--- a/src/glsl/tests/copy_constant_to_storage_tests.cpp
+++ b/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp
diff --git a/src/glsl/tests/general_ir_test.cpp b/src/compiler/glsl/tests/general_ir_test.cpp
index 217305bf84..217305bf84 100644
--- a/src/glsl/tests/general_ir_test.cpp
+++ b/src/compiler/glsl/tests/general_ir_test.cpp
diff --git a/src/glsl/tests/invalidate_locations_test.cpp b/src/compiler/glsl/tests/invalidate_locations_test.cpp
index ba94d7e3a2..ba94d7e3a2 100644
--- a/src/glsl/tests/invalidate_locations_test.cpp
+++ b/src/compiler/glsl/tests/invalidate_locations_test.cpp
diff --git a/src/glsl/tests/lower_jumps/.gitignore b/src/compiler/glsl/tests/lower_jumps/.gitignore
index e98df627fd..e98df627fd 100644
--- a/src/glsl/tests/lower_jumps/.gitignore
+++ b/src/compiler/glsl/tests/lower_jumps/.gitignore
diff --git a/src/glsl/tests/lower_jumps/create_test_cases.py b/src/compiler/glsl/tests/lower_jumps/create_test_cases.py
index 3be1079bc1..3be1079bc1 100644
--- a/src/glsl/tests/lower_jumps/create_test_cases.py
+++ b/src/compiler/glsl/tests/lower_jumps/create_test_cases.py
diff --git a/src/glsl/tests/optimization-test b/src/compiler/glsl/tests/optimization-test
index 26a51be698..26a51be698 100755
--- a/src/glsl/tests/optimization-test
+++ b/src/compiler/glsl/tests/optimization-test
diff --git a/src/glsl/tests/sampler_types_test.cpp b/src/compiler/glsl/tests/sampler_types_test.cpp
index 04dd65e6e8..04dd65e6e8 100644
--- a/src/glsl/tests/sampler_types_test.cpp
+++ b/src/compiler/glsl/tests/sampler_types_test.cpp
diff --git a/src/glsl/tests/set_uniform_initializer_tests.cpp b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp
index 0b1f66cb34..0b1f66cb34 100644
--- a/src/glsl/tests/set_uniform_initializer_tests.cpp
+++ b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp
diff --git a/src/glsl/tests/sexps.py b/src/compiler/glsl/tests/sexps.py
index a714af8d23..a714af8d23 100644
--- a/src/glsl/tests/sexps.py
+++ b/src/compiler/glsl/tests/sexps.py
diff --git a/src/glsl/tests/uniform_initializer_utils.cpp b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
index 5006387036..5006387036 100644
--- a/src/glsl/tests/uniform_initializer_utils.cpp
+++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
diff --git a/src/glsl/tests/uniform_initializer_utils.h b/src/compiler/glsl/tests/uniform_initializer_utils.h
index b4d0c10220..b4d0c10220 100644
--- a/src/glsl/tests/uniform_initializer_utils.h
+++ b/src/compiler/glsl/tests/uniform_initializer_utils.h
diff --git a/src/glsl/tests/varyings_test.cpp b/src/compiler/glsl/tests/varyings_test.cpp
index 0c4e0a471b..0c4e0a471b 100644
--- a/src/glsl/tests/varyings_test.cpp
+++ b/src/compiler/glsl/tests/varyings_test.cpp
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index 7e60e7c109..17ebf07acb 100644
--- a/src/compiler/glsl_types.cpp
+++ b/src/compiler/glsl_types.cpp
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "main/macros.h"
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
 #include "glsl_types.h"
 #include "util/hash_table.h"
 
diff --git a/src/compiler/nir/Makefile.sources b/src/compiler/nir/Makefile.sources
new file mode 100644
index 0000000000..0755a100e6
--- /dev/null
+++ b/src/compiler/nir/Makefile.sources
@@ -0,0 +1,71 @@
+NIR_GENERATED_FILES = \
+	nir_builder_opcodes.h \
+	nir_constant_expressions.c \
+	nir_opcodes.c \
+	nir_opcodes.h \
+	nir_opt_algebraic.c
+
+NIR_FILES = \
+	glsl_to_nir.cpp \
+	glsl_to_nir.h \
+	nir.c \
+	nir.h \
+	nir_array.h \
+	nir_builder.h \
+	nir_clone.c \
+	nir_constant_expressions.h \
+	nir_control_flow.c \
+	nir_control_flow.h \
+	nir_control_flow_private.h \
+	nir_dominance.c \
+	nir_from_ssa.c \
+	nir_gs_count_vertices.c \
+	nir_intrinsics.c \
+	nir_intrinsics.h \
+	nir_instr_set.c \
+	nir_instr_set.h \
+	nir_liveness.c \
+	nir_lower_alu_to_scalar.c \
+	nir_lower_atomics.c \
+	nir_lower_clip.c \
+	nir_lower_global_vars_to_local.c \
+	nir_lower_gs_intrinsics.c \
+	nir_lower_load_const_to_scalar.c \
+	nir_lower_locals_to_regs.c \
+	nir_lower_idiv.c \
+	nir_lower_io.c \
+	nir_lower_outputs_to_temporaries.c \
+	nir_lower_phis_to_scalar.c \
+	nir_lower_samplers.c \
+	nir_lower_system_values.c \
+	nir_lower_tex.c \
+	nir_lower_to_source_mods.c \
+	nir_lower_two_sided_color.c \
+	nir_lower_vars_to_ssa.c \
+	nir_lower_var_copies.c \
+	nir_lower_vec_to_movs.c \
+	nir_metadata.c \
+	nir_move_vec_src_uses_to_dest.c \
+	nir_normalize_cubemap_coords.c \
+	nir_opt_constant_folding.c \
+	nir_opt_copy_propagate.c \
+	nir_opt_cse.c \
+	nir_opt_dce.c \
+	nir_opt_dead_cf.c \
+	nir_opt_gcm.c \
+	nir_opt_global_to_local.c \
+	nir_opt_peephole_select.c \
+	nir_opt_remove_phis.c \
+	nir_opt_undef.c \
+	nir_print.c \
+	nir_remove_dead_variables.c \
+	nir_search.c \
+	nir_search.h \
+	nir_split_var_copies.c \
+	nir_sweep.c \
+	nir_to_ssa.c \
+	nir_validate.c \
+	nir_vla.h \
+	nir_worklist.c \
+	nir_worklist.h
+
diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp
index 33b1f5c7b9..4b76d23442 100644
--- a/src/compiler/nir/glsl_to_nir.cpp
+++ b/src/compiler/nir/glsl_to_nir.cpp
@@ -28,9 +28,9 @@
 #include "glsl_to_nir.h"
 #include "nir_control_flow.h"
 #include "nir_builder.h"
-#include "glsl/ir_visitor.h"
-#include "glsl/ir_hierarchical_visitor.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir_visitor.h"
+#include "compiler/glsl/ir_hierarchical_visitor.h"
+#include "compiler/glsl/ir.h"
 #include "main/imports.h"
 
 /*
diff --git a/src/compiler/nir/glsl_to_nir.h b/src/compiler/nir/glsl_to_nir.h
index 20d2a380a2..e3fe9b0246 100644
--- a/src/compiler/nir/glsl_to_nir.h
+++ b/src/compiler/nir/glsl_to_nir.h
@@ -26,7 +26,7 @@
  */
 
 #include "nir.h"
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 54e23eb475..aec75fb930 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -28,7 +28,7 @@
 #pragma once
 
 #include "util/hash_table.h"
-#include "glsl/list.h"
+#include "compiler/glsl/list.h"
 #include "GL/gl.h" /* GLenum */
 #include "util/list.h"
 #include "util/ralloc.h"
diff --git a/src/compiler/nir/nir_lower_atomics.c b/src/compiler/nir/nir_lower_atomics.c
index 2cbc1b7534..1a4458d4f8 100644
--- a/src/compiler/nir/nir_lower_atomics.c
+++ b/src/compiler/nir/nir_lower_atomics.c
@@ -25,7 +25,7 @@
  *
  */
 
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 #include "nir.h"
 #include "main/config.h"
 #include <assert.h>
diff --git a/src/compiler/nir/nir_lower_samplers.c b/src/compiler/nir/nir_lower_samplers.c
index 9c912129f0..96e8291401 100644
--- a/src/compiler/nir/nir_lower_samplers.c
+++ b/src/compiler/nir/nir_lower_samplers.c
@@ -26,7 +26,7 @@
 #include "nir.h"
 #include "nir_builder.h"
 #include "program/hash_table.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 
 #include "main/compiler.h"
 #include "main/mtypes.h"
diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp
index ddc43becf9..a87dcd8dc6 100644
--- a/src/compiler/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "nir_types.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
 
 void
 glsl_print_type(const glsl_type *type, FILE *fp)
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 6649e403d0..3e7d69f73e 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -26,7 +26,7 @@
 #include "compiler/nir/nir.h"
 #include "compiler/nir/nir_control_flow.h"
 #include "compiler/nir/nir_builder.h"
-#include "glsl/list.h"
+#include "compiler/glsl/list.h"
 #include "compiler/shader_enums.h"
 
 #include "tgsi_to_nir.h"
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 69506f2a3f..8dc44fda0f 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -165,7 +165,7 @@ libmesa_la_SOURCES = \
 	$(MESA_ASM_FILES_FOR_ARCH)
 
 libmesa_la_LIBADD = \
-	$(top_builddir)/src/glsl/libglsl.la \
+	$(top_builddir)/src/compiler/glsl/libglsl.la \
 	$(ARCH_LIBS)
 
 libmesagallium_la_SOURCES = \
@@ -175,7 +175,7 @@ libmesagallium_la_SOURCES = \
 	$(MESA_ASM_FILES_FOR_ARCH)
 
 libmesagallium_la_LIBADD = \
-	$(top_builddir)/src/glsl/libglsl.la \
+	$(top_builddir)/src/compiler/glsl/libglsl.la \
 	$(ARCH_LIBS)
 
 libmesa_sse41_la_SOURCES = \
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 386d6aa381..7af8becd60 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -623,10 +623,7 @@ MESA_GALLIUM_FILES = \
 INCLUDE_DIRS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/glsl \
 	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_builddir)/src/glsl \
-	-I$(top_srcdir)/src/glsl/glcpp \
 	-I$(top_srcdir)/src/mesa \
 	-I$(top_builddir)/src/mesa \
 	-I$(top_srcdir)/src/mesa/main \
diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c
index 9eadb7e00f..0ab9ebdab3 100644
--- a/src/mesa/drivers/dri/i965/brw_cs.c
+++ b/src/mesa/drivers/dri/i965/brw_cs.c
@@ -32,7 +32,7 @@
 #include "intel_batchbuffer.h"
 #include "brw_nir.h"
 #include "brw_program.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 
 static void
 assign_cs_binding_table_offsets(const struct brw_device_info *devinfo,
diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
index 3d6aa74d83..2ff9ec16fd 100644
--- a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
+++ b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "compiler/glsl_types.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
 #include "program/prog_instruction.h" /* For WRITEMASK_* */
 
 class brw_cubemap_normalize_visitor : public ir_hierarchical_visitor {
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index b75ebfedb3..4612a287bb 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -30,7 +30,7 @@
 #include "brw_shader.h"
 #include "brw_ir_fs.h"
 #include "brw_fs_builder.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
 #include "compiler/nir/nir.h"
 
 struct bblock_t;
diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
index 2287779752..689e0911b1 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
@@ -41,8 +41,8 @@
  * we do retain the vector types in that case.
  */
 
-#include "glsl/ir.h"
-#include "glsl/ir_expression_flattening.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_expression_flattening.h"
 #include "compiler/glsl_types.h"
 
 class ir_channel_expressions_visitor : public ir_hierarchical_visitor {
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index f9df2a4e3b..68a86a9a85 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
 #include "main/shaderimage.h"
 #include "brw_fs.h"
 #include "brw_fs_surface_builder.h"
diff --git a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
index 0970959bbd..5fe24debee 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
@@ -38,8 +38,8 @@
  */
 
 #include "main/imports.h"
-#include "glsl/ir.h"
-#include "glsl/ir_rvalue_visitor.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_rvalue_visitor.h"
 #include "compiler/glsl_types.h"
 #include "util/hash_table.h"
 
diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c
index edb52ac44b..c888ef2bd6 100644
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@@ -34,7 +34,7 @@
 #include "brw_ff_gs.h"
 #include "brw_nir.h"
 #include "brw_program.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 
 static void
 brw_gs_debug_recompile(struct brw_context *brw,
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index 234afd554d..db4ba88cb1 100644
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -26,7 +26,7 @@
 #include "brw_fs.h"
 #include "brw_nir.h"
 #include "brw_program.h"
-#include "glsl/ir_optimization.h"
+#include "compiler/glsl/ir_optimization.h"
 #include "program/program.h"
 #include "main/shaderapi.h"
 #include "main/uniforms.h"
diff --git a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp
index c83b2728b9..0848e1ec53 100644
--- a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp
+++ b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp
@@ -25,8 +25,8 @@
  * \file brw_lower_texture_gradients.cpp
  */
 
-#include "glsl/ir.h"
-#include "glsl/ir_builder.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_builder.h"
 #include "program/prog_instruction.h"
 #include "brw_context.h"
 
diff --git a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp
index eafbdf68ea..f5d7baee6d 100644
--- a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp
+++ b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp
@@ -32,8 +32,8 @@
  */
 
 #include "compiler/glsl_types.h"
-#include "glsl/ir.h"
-#include "glsl/ir_builder.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_builder.h"
 
 using namespace ir_builder;
 
diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
index 0849ca4004..f3361d6978 100644
--- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
+++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
@@ -23,7 +23,7 @@
 
 #include "brw_shader.h"
 #include "brw_nir.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 
 static void
 brw_nir_setup_glsl_builtin_uniform(nir_variable *var,
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 20d4e0d6c4..368efeecb2 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -37,7 +37,7 @@
 #include "program/programopt.h"
 #include "tnl/tnl.h"
 #include "util/ralloc.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
 
 #include "brw_program.h"
 #include "brw_context.h"
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
index 4e00fd0ec0..1460f4599b 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@ -31,7 +31,7 @@
 #include "brw_ir_vec4.h"
 #endif
 
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
 #include "compiler/nir/nir.h"
 
 
diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c
index 6d6988c6a4..e07c05a92c 100644
--- a/src/mesa/drivers/dri/i965/gen7_cs_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c
@@ -31,7 +31,7 @@
 #include "intel_batchbuffer.h"
 #include "brw_state.h"
 #include "program/prog_statevars.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 
 static unsigned
 get_cs_thread_count(const struct brw_cs_prog_data *cs_prog_data)
diff --git a/src/mesa/drivers/dri/i965/intel_resolve_map.h b/src/mesa/drivers/dri/i965/intel_resolve_map.h
index 9bb9fca045..726b287722 100644
--- a/src/mesa/drivers/dri/i965/intel_resolve_map.h
+++ b/src/mesa/drivers/dri/i965/intel_resolve_map.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "glsl/list.h"
+#include "compiler/glsl/list.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index f3fd01f395..8b415ed601 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -142,7 +142,7 @@
 #include "sparc/sparc.h"
 #endif
 
-#include "glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
 #include <stdbool.h>
 
 
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index b2b1ee9ba4..b0ce8c472e 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -36,10 +36,10 @@
 #include "main/texenvprogram.h"
 #include "main/texobj.h"
 #include "main/uniforms.h"
-#include "glsl/ir_builder.h"
-#include "glsl/ir_optimization.h"
-#include "glsl/glsl_parser_extras.h"
-#include "glsl/glsl_symbol_table.h"
+#include "compiler/glsl/ir_builder.h"
+#include "compiler/glsl/ir_optimization.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_symbol_table.h"
 #include "compiler/glsl_types.h"
 #include "program/ir_to_mesa.h"
 #include "program/program.h"
diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
index f2a872dc83..0e4a0af0b0 100644
--- a/src/mesa/main/pipelineobj.c
+++ b/src/mesa/main/pipelineobj.c
@@ -43,8 +43,8 @@
 #include "main/shaderobj.h"
 #include "main/transformfeedback.h"
 #include "main/uniforms.h"
-#include "glsl/glsl_parser_extras.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/ir_uniform.h"
 #include "program/program.h"
 #include "program/prog_parameter.h"
 #include "util/ralloc.h"
diff --git a/src/mesa/main/program_resource.c b/src/mesa/main/program_resource.c
index 9a15cfe70b..50659b0cd2 100644
--- a/src/mesa/main/program_resource.c
+++ b/src/mesa/main/program_resource.c
@@ -30,7 +30,7 @@
 #include "main/shaderobj.h"
 #include "main/context.h"
 #include "program_resource.h"
-#include "ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 static bool
 supported_interface_enum(struct gl_context *ctx, GLenum iface)
 {
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp
index e902585924..4967e4b1df 100644
--- a/src/mesa/main/shader_query.cpp
+++ b/src/mesa/main/shader_query.cpp
@@ -34,9 +34,9 @@
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/uniforms.h"
-#include "glsl/glsl_symbol_table.h"
-#include "glsl/ir.h"
-#include "glsl/program.h"
+#include "compiler/glsl/glsl_symbol_table.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/program.h"
 #include "program/hash_table.h"
 #include "util/strndup.h"
 
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index a988f41697..df92c0912a 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -49,10 +49,10 @@
 #include "main/shaderobj.h"
 #include "main/transformfeedback.h"
 #include "main/uniforms.h"
-#include "glsl/glsl_parser_extras.h"
-#include "glsl/ir.h"
-#include "glsl/ir_uniform.h"
-#include "glsl/program.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_uniform.h"
+#include "compiler/glsl/program.h"
 #include "program/program.h"
 #include "program/prog_print.h"
 #include "program/prog_parameter.h"
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 766a465cb1..2ced201ebc 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -31,10 +31,10 @@
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/uniforms.h"
-#include "glsl/ir.h"
-#include "glsl/ir_uniform.h"
-#include "glsl/glsl_parser_extras.h"
-#include "glsl/program.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_uniform.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/program.h"
 #include "program/hash_table.h"
 
 
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index 47010badbc..b1968b3f79 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -43,7 +43,7 @@
 #include "main/shaderobj.h"
 #include "main/uniforms.h"
 #include "main/enums.h"
-#include "ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 #include "compiler/glsl_types.h"
 #include "program/program.h"
 
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
index baf49a752b..88fe958016 100644
--- a/src/mesa/main/uniforms.h
+++ b/src/mesa/main/uniforms.h
@@ -28,7 +28,7 @@
 
 #include "main/glheader.h"
 #include "compiler/glsl_types.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 #include "program/prog_parameter.h"
 
 #ifdef __cplusplus
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 70c477ec4f..c9c3044973 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -35,16 +35,16 @@
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/uniforms.h"
-#include "glsl/ast.h"
-#include "glsl/ir.h"
-#include "glsl/ir_expression_flattening.h"
-#include "glsl/ir_visitor.h"
-#include "glsl/ir_optimization.h"
-#include "glsl/ir_uniform.h"
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/ast.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_expression_flattening.h"
+#include "compiler/glsl/ir_visitor.h"
+#include "compiler/glsl/ir_optimization.h"
+#include "compiler/glsl/ir_uniform.h"
+#include "compiler/glsl/glsl_parser_extras.h"
 #include "compiler/glsl_types.h"
-#include "glsl/linker.h"
-#include "glsl/program.h"
+#include "compiler/glsl/linker.h"
+#include "compiler/glsl/program.h"
 #include "program/hash_table.h"
 #include "program/prog_instruction.h"
 #include "program/prog_optimize.h"
diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c
index a2ebb1ba77..ebcc5288c2 100644
--- a/src/mesa/program/prog_to_nir.c
+++ b/src/mesa/program/prog_to_nir.c
@@ -25,7 +25,7 @@
 
 #include "compiler/nir/nir.h"
 #include "compiler/nir/nir_builder.h"
-#include "glsl/list.h"
+#include "compiler/glsl/list.h"
 #include "main/imports.h"
 #include "util/ralloc.h"
 
diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp
index 9137d1858e..f118552d64 100644
--- a/src/mesa/program/sampler.cpp
+++ b/src/mesa/program/sampler.cpp
@@ -25,10 +25,10 @@
 
 #include "main/mtypes.h"
 #include "compiler/glsl_types.h"
-#include "glsl/ir.h"
-#include "glsl/ir_uniform.h"
-#include "glsl/ir_visitor.h"
-#include "glsl/program.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_uniform.h"
+#include "compiler/glsl/ir_visitor.h"
+#include "compiler/glsl/program.h"
 #include "program/hash_table.h"
 #include "program/prog_parameter.h"
 #include "program/program.h"
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 03788f3346..10e294cd14 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -42,7 +42,7 @@
 #include "main/macros.h"
 #include "main/varray.h"
 
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
 
 #include "vbo/vbo.h"
 
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index d424e3b335..f5b8c33622 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -32,8 +32,8 @@
 
 #include "st_glsl_to_tgsi.h"
 
-#include "glsl_parser_extras.h"
-#include "ir_optimization.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/ir_optimization.h"
 
 #include "main/errors.h"
 #include "main/shaderobj.h"