glsl2: Move the compiler to the subdirectory it will live in in Mesa.

375 files changed, 0 insertions, 0 deletions

diff --git a/.dir-locals.el b/src/glsl/.dir-locals.el
index be19e29a5ab..be19e29a5ab 100644
--- a/.dir-locals.el
+++ b/src/glsl/.dir-locals.el
diff --git a/.gitignore b/src/glsl/.gitignore
index 376aaeda13a..376aaeda13a 100644
--- a/.gitignore
+++ b/src/glsl/.gitignore
diff --git a/Makefile.am b/src/glsl/Makefile.am
index c34f7d8abfb..c34f7d8abfb 100644
--- a/Makefile.am
+++ b/src/glsl/Makefile.am
diff --git a/TODO b/src/glsl/TODO
index 193cfc767d8..193cfc767d8 100644
--- a/TODO
+++ b/src/glsl/TODO
diff --git a/ast.h b/src/glsl/ast.h
index de300e719c4..de300e719c4 100644
--- a/ast.h
+++ b/src/glsl/ast.h
diff --git a/ast_expr.cpp b/src/glsl/ast_expr.cpp
index 4e83decb924..4e83decb924 100644
--- a/ast_expr.cpp
+++ b/src/glsl/ast_expr.cpp
diff --git a/ast_function.cpp b/src/glsl/ast_function.cpp
index 761af00b95e..761af00b95e 100644
--- a/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
diff --git a/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 33eb27533fd..33eb27533fd 100644
--- a/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
diff --git a/ast_type.cpp b/src/glsl/ast_type.cpp
index cb0852bb773..cb0852bb773 100644
--- a/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
diff --git a/autogen.sh b/src/glsl/autogen.sh
index 904cd6746c8..904cd6746c8 100755
--- a/autogen.sh
+++ b/src/glsl/autogen.sh
diff --git a/builtin_function.cpp b/src/glsl/builtin_function.cpp
index d248388a1ab..d248388a1ab 100644
--- a/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
diff --git a/builtin_types.h b/src/glsl/builtin_types.h
index 48202f56454..48202f56454 100644
--- a/builtin_types.h
+++ b/src/glsl/builtin_types.h
diff --git a/builtin_variables.h b/src/glsl/builtin_variables.h
index 77f2fe55023..77f2fe55023 100644
--- a/builtin_variables.h
+++ b/src/glsl/builtin_variables.h
diff --git a/builtins/110/abs b/src/glsl/builtins/110/abs
index 904845307c4..904845307c4 100644
--- a/builtins/110/abs
+++ b/src/glsl/builtins/110/abs
diff --git a/builtins/110/all b/src/glsl/builtins/110/all
index 2cac0dfb684..2cac0dfb684 100644
--- a/builtins/110/all
+++ b/src/glsl/builtins/110/all
diff --git a/builtins/110/any b/src/glsl/builtins/110/any
index f10e8a7b478..f10e8a7b478 100644
--- a/builtins/110/any
+++ b/src/glsl/builtins/110/any
diff --git a/builtins/110/asin b/src/glsl/builtins/110/asin
index fe93337bffc..fe93337bffc 100644
--- a/builtins/110/asin
+++ b/src/glsl/builtins/110/asin
diff --git a/builtins/110/atan b/src/glsl/builtins/110/atan
index e5542350b51..e5542350b51 100644
--- a/builtins/110/atan
+++ b/src/glsl/builtins/110/atan
diff --git a/builtins/110/ceil b/src/glsl/builtins/110/ceil
index a26a7750493..a26a7750493 100644
--- a/builtins/110/ceil
+++ b/src/glsl/builtins/110/ceil
diff --git a/builtins/110/clamp b/src/glsl/builtins/110/clamp
index 94c8e5ed168..94c8e5ed168 100644
--- a/builtins/110/clamp
+++ b/src/glsl/builtins/110/clamp
diff --git a/builtins/110/cos b/src/glsl/builtins/110/cos
index 88f266eccbe..88f266eccbe 100644
--- a/builtins/110/cos
+++ b/src/glsl/builtins/110/cos
diff --git a/builtins/110/cross b/src/glsl/builtins/110/cross
index deb2f952bfc..deb2f952bfc 100644
--- a/builtins/110/cross
+++ b/src/glsl/builtins/110/cross
diff --git a/builtins/110/degrees b/src/glsl/builtins/110/degrees
index dc0d7b9e20d..dc0d7b9e20d 100644
--- a/builtins/110/degrees
+++ b/src/glsl/builtins/110/degrees
diff --git a/builtins/110/distance b/src/glsl/builtins/110/distance
index a2309c484f9..a2309c484f9 100644
--- a/builtins/110/distance
+++ b/src/glsl/builtins/110/distance
diff --git a/builtins/110/dot b/src/glsl/builtins/110/dot
index a91a6d2c56d..a91a6d2c56d 100644
--- a/builtins/110/dot
+++ b/src/glsl/builtins/110/dot
diff --git a/builtins/110/equal b/src/glsl/builtins/110/equal
index ae7ddc53bdc..ae7ddc53bdc 100644
--- a/builtins/110/equal
+++ b/src/glsl/builtins/110/equal
diff --git a/builtins/110/exp b/src/glsl/builtins/110/exp
index a73bd6a7f84..a73bd6a7f84 100644
--- a/builtins/110/exp
+++ b/src/glsl/builtins/110/exp
diff --git a/builtins/110/exp2 b/src/glsl/builtins/110/exp2
index a842d3fe65b..a842d3fe65b 100644
--- a/builtins/110/exp2
+++ b/src/glsl/builtins/110/exp2
diff --git a/builtins/110/faceforward b/src/glsl/builtins/110/faceforward
index d1703972388..d1703972388 100644
--- a/builtins/110/faceforward
+++ b/src/glsl/builtins/110/faceforward
diff --git a/builtins/110/floor b/src/glsl/builtins/110/floor
index 8dd8052799b..8dd8052799b 100644
--- a/builtins/110/floor
+++ b/src/glsl/builtins/110/floor
diff --git a/builtins/110/fract b/src/glsl/builtins/110/fract
index 3995bfaf3f9..3995bfaf3f9 100644
--- a/builtins/110/fract
+++ b/src/glsl/builtins/110/fract
diff --git a/builtins/110/greaterThan b/src/glsl/builtins/110/greaterThan
index ae03030e495..ae03030e495 100644
--- a/builtins/110/greaterThan
+++ b/src/glsl/builtins/110/greaterThan
diff --git a/builtins/110/greaterThanEqual b/src/glsl/builtins/110/greaterThanEqual
index 204d5fd1439..204d5fd1439 100644
--- a/builtins/110/greaterThanEqual
+++ b/src/glsl/builtins/110/greaterThanEqual
diff --git a/builtins/110/inversesqrt b/src/glsl/builtins/110/inversesqrt
index 5b66d2b3695..5b66d2b3695 100644
--- a/builtins/110/inversesqrt
+++ b/src/glsl/builtins/110/inversesqrt
diff --git a/builtins/110/length b/src/glsl/builtins/110/length
index 89ff7f3ef12..89ff7f3ef12 100644
--- a/builtins/110/length
+++ b/src/glsl/builtins/110/length
diff --git a/builtins/110/lessThan b/src/glsl/builtins/110/lessThan
index 5c4254165c7..5c4254165c7 100644
--- a/builtins/110/lessThan
+++ b/src/glsl/builtins/110/lessThan
diff --git a/builtins/110/lessThanEqual b/src/glsl/builtins/110/lessThanEqual
index ccb955b8a76..ccb955b8a76 100644
--- a/builtins/110/lessThanEqual
+++ b/src/glsl/builtins/110/lessThanEqual
diff --git a/builtins/110/log b/src/glsl/builtins/110/log
index d168abb5a73..d168abb5a73 100644
--- a/builtins/110/log
+++ b/src/glsl/builtins/110/log
diff --git a/builtins/110/log2 b/src/glsl/builtins/110/log2
index b96c6276f0a..b96c6276f0a 100644
--- a/builtins/110/log2
+++ b/src/glsl/builtins/110/log2
diff --git a/builtins/110/matrixCompMult b/src/glsl/builtins/110/matrixCompMult
index cb5a2cb1f7b..cb5a2cb1f7b 100644
--- a/builtins/110/matrixCompMult
+++ b/src/glsl/builtins/110/matrixCompMult
diff --git a/builtins/110/max b/src/glsl/builtins/110/max
index c05545f3d93..c05545f3d93 100644
--- a/builtins/110/max
+++ b/src/glsl/builtins/110/max
diff --git a/builtins/110/min b/src/glsl/builtins/110/min
index 31e79489405..31e79489405 100644
--- a/builtins/110/min
+++ b/src/glsl/builtins/110/min
diff --git a/builtins/110/mix b/src/glsl/builtins/110/mix
index 032f29e5fa8..032f29e5fa8 100644
--- a/builtins/110/mix
+++ b/src/glsl/builtins/110/mix
diff --git a/builtins/110/mod b/src/glsl/builtins/110/mod
index 9e08bbc7ef4..9e08bbc7ef4 100644
--- a/builtins/110/mod
+++ b/src/glsl/builtins/110/mod
diff --git a/builtins/110/noise_fake b/src/glsl/builtins/110/noise_fake
index bcfb17b04b8..bcfb17b04b8 100644
--- a/builtins/110/noise_fake
+++ b/src/glsl/builtins/110/noise_fake
diff --git a/builtins/110/normalize b/src/glsl/builtins/110/normalize
index be88a9830d1..be88a9830d1 100644
--- a/builtins/110/normalize
+++ b/src/glsl/builtins/110/normalize
diff --git a/builtins/110/not b/src/glsl/builtins/110/not
index b696b06557f..b696b06557f 100644
--- a/builtins/110/not
+++ b/src/glsl/builtins/110/not
diff --git a/builtins/110/notEqual b/src/glsl/builtins/110/notEqual
index c87efa317f7..c87efa317f7 100644
--- a/builtins/110/notEqual
+++ b/src/glsl/builtins/110/notEqual
diff --git a/builtins/110/pow b/src/glsl/builtins/110/pow
index a61bc4418e3..a61bc4418e3 100644
--- a/builtins/110/pow
+++ b/src/glsl/builtins/110/pow
diff --git a/builtins/110/radians b/src/glsl/builtins/110/radians
index 6a0f5d2e219..6a0f5d2e219 100644
--- a/builtins/110/radians
+++ b/src/glsl/builtins/110/radians
diff --git a/builtins/110/reflect b/src/glsl/builtins/110/reflect
index 8238fdc93fd..8238fdc93fd 100644
--- a/builtins/110/reflect
+++ b/src/glsl/builtins/110/reflect
diff --git a/builtins/110/refract b/src/glsl/builtins/110/refract
index e9b1475294a..e9b1475294a 100644
--- a/builtins/110/refract
+++ b/src/glsl/builtins/110/refract
diff --git a/builtins/110/sign b/src/glsl/builtins/110/sign
index 7d540de405b..7d540de405b 100644
--- a/builtins/110/sign
+++ b/src/glsl/builtins/110/sign
diff --git a/builtins/110/sin b/src/glsl/builtins/110/sin
index e6009d8ef12..e6009d8ef12 100644
--- a/builtins/110/sin
+++ b/src/glsl/builtins/110/sin
diff --git a/builtins/110/smoothstep b/src/glsl/builtins/110/smoothstep
index b4255ba78f1..b4255ba78f1 100644
--- a/builtins/110/smoothstep
+++ b/src/glsl/builtins/110/smoothstep
diff --git a/builtins/110/sqrt b/src/glsl/builtins/110/sqrt
index 0302d164ae5..0302d164ae5 100644
--- a/builtins/110/sqrt
+++ b/src/glsl/builtins/110/sqrt
diff --git a/builtins/110/step b/src/glsl/builtins/110/step
index 1cc2b51f8fb..1cc2b51f8fb 100644
--- a/builtins/110/step
+++ b/src/glsl/builtins/110/step
diff --git a/builtins/110/tan b/src/glsl/builtins/110/tan
index 3e04892a76c..3e04892a76c 100644
--- a/builtins/110/tan
+++ b/src/glsl/builtins/110/tan
diff --git a/builtins/110/textures b/src/glsl/builtins/110/textures
index c81b7e8ad49..c81b7e8ad49 100644
--- a/builtins/110/textures
+++ b/src/glsl/builtins/110/textures
diff --git a/builtins/110_fs/derivatives b/src/glsl/builtins/110_fs/derivatives
index b79852ee1ff..b79852ee1ff 100644
--- a/builtins/110_fs/derivatives
+++ b/src/glsl/builtins/110_fs/derivatives
diff --git a/builtins/110_fs/textures b/src/glsl/builtins/110_fs/textures
index 38f3787e9ef..38f3787e9ef 100644
--- a/builtins/110_fs/textures
+++ b/src/glsl/builtins/110_fs/textures
diff --git a/builtins/110_vs/ftransform b/src/glsl/builtins/110_vs/ftransform
index 3a5e8ccecfc..3a5e8ccecfc 100644
--- a/builtins/110_vs/ftransform
+++ b/src/glsl/builtins/110_vs/ftransform
diff --git a/builtins/120/matrixCompMult b/src/glsl/builtins/120/matrixCompMult
index 69331e26525..69331e26525 100644
--- a/builtins/120/matrixCompMult
+++ b/src/glsl/builtins/120/matrixCompMult
diff --git a/builtins/120/outerProduct b/src/glsl/builtins/120/outerProduct
index b401ba02337..b401ba02337 100644
--- a/builtins/120/outerProduct
+++ b/src/glsl/builtins/120/outerProduct
diff --git a/builtins/120/transpose b/src/glsl/builtins/120/transpose
index 416a0ee4677..416a0ee4677 100644
--- a/builtins/120/transpose
+++ b/src/glsl/builtins/120/transpose
diff --git a/builtins/130/clamp b/src/glsl/builtins/130/clamp
index 3aed22c20df..3aed22c20df 100644
--- a/builtins/130/clamp
+++ b/src/glsl/builtins/130/clamp
diff --git a/builtins/130/cosh b/src/glsl/builtins/130/cosh
index 45e0ae427d6..45e0ae427d6 100644
--- a/builtins/130/cosh
+++ b/src/glsl/builtins/130/cosh
diff --git a/builtins/130/equal b/src/glsl/builtins/130/equal
index 079c3e97fb2..079c3e97fb2 100644
--- a/builtins/130/equal
+++ b/src/glsl/builtins/130/equal
diff --git a/builtins/130/greaterThan b/src/glsl/builtins/130/greaterThan
index a9fb7b3a43e..a9fb7b3a43e 100644
--- a/builtins/130/greaterThan
+++ b/src/glsl/builtins/130/greaterThan
diff --git a/builtins/130/greaterThanEqual b/src/glsl/builtins/130/greaterThanEqual
index 293c93c7cca..293c93c7cca 100644
--- a/builtins/130/greaterThanEqual
+++ b/src/glsl/builtins/130/greaterThanEqual
diff --git a/builtins/130/lessThan b/src/glsl/builtins/130/lessThan
index d9f693fd63f..d9f693fd63f 100644
--- a/builtins/130/lessThan
+++ b/src/glsl/builtins/130/lessThan
diff --git a/builtins/130/lessThanEqual b/src/glsl/builtins/130/lessThanEqual
index 494411b869a..494411b869a 100644
--- a/builtins/130/lessThanEqual
+++ b/src/glsl/builtins/130/lessThanEqual
diff --git a/builtins/130/max b/src/glsl/builtins/130/max
index 45a6089c9f2..45a6089c9f2 100644
--- a/builtins/130/max
+++ b/src/glsl/builtins/130/max
diff --git a/builtins/130/min b/src/glsl/builtins/130/min
index d98ec1e79da..d98ec1e79da 100644
--- a/builtins/130/min
+++ b/src/glsl/builtins/130/min
diff --git a/builtins/130/notEqual b/src/glsl/builtins/130/notEqual
index 81e6376bd9c..81e6376bd9c 100644
--- a/builtins/130/notEqual
+++ b/src/glsl/builtins/130/notEqual
diff --git a/builtins/130/sign b/src/glsl/builtins/130/sign
index 0bdc0e09d25..0bdc0e09d25 100644
--- a/builtins/130/sign
+++ b/src/glsl/builtins/130/sign
diff --git a/builtins/130/sinh b/src/glsl/builtins/130/sinh
index 7ad4f58e204..7ad4f58e204 100644
--- a/builtins/130/sinh
+++ b/src/glsl/builtins/130/sinh
diff --git a/builtins/130/tanh b/src/glsl/builtins/130/tanh
index 3b7271bf779..3b7271bf779 100644
--- a/builtins/130/tanh
+++ b/src/glsl/builtins/130/tanh
diff --git a/builtins/130/texelFetch b/src/glsl/builtins/130/texelFetch
index d51ce65a897..d51ce65a897 100644
--- a/builtins/130/texelFetch
+++ b/src/glsl/builtins/130/texelFetch
diff --git a/builtins/130/texture b/src/glsl/builtins/130/texture
index b170b583094..b170b583094 100644
--- a/builtins/130/texture
+++ b/src/glsl/builtins/130/texture
diff --git a/builtins/130/textureGrad b/src/glsl/builtins/130/textureGrad
index 0ef428c224a..0ef428c224a 100644
--- a/builtins/130/textureGrad
+++ b/src/glsl/builtins/130/textureGrad
diff --git a/builtins/130/textureLod b/src/glsl/builtins/130/textureLod
index 7d7059d848c..7d7059d848c 100644
--- a/builtins/130/textureLod
+++ b/src/glsl/builtins/130/textureLod
diff --git a/builtins/130/textureProj b/src/glsl/builtins/130/textureProj
index 40ea1c2af68..40ea1c2af68 100644
--- a/builtins/130/textureProj
+++ b/src/glsl/builtins/130/textureProj
diff --git a/builtins/130/textureProjGrad b/src/glsl/builtins/130/textureProjGrad
index a0142c5e683..a0142c5e683 100644
--- a/builtins/130/textureProjGrad
+++ b/src/glsl/builtins/130/textureProjGrad
diff --git a/builtins/130/textureProjLod b/src/glsl/builtins/130/textureProjLod
index 9f4ce1b493d..9f4ce1b493d 100644
--- a/builtins/130/textureProjLod
+++ b/src/glsl/builtins/130/textureProjLod
diff --git a/builtins/130_fs/texture b/src/glsl/builtins/130_fs/texture
index 0de981397f0..0de981397f0 100644
--- a/builtins/130_fs/texture
+++ b/src/glsl/builtins/130_fs/texture
diff --git a/builtins/130_fs/textureProj b/src/glsl/builtins/130_fs/textureProj
index b1d8f0a2f33..b1d8f0a2f33 100644
--- a/builtins/130_fs/textureProj
+++ b/src/glsl/builtins/130_fs/textureProj
diff --git a/builtins/ARB_texture_rectangle/textures b/src/glsl/builtins/ARB_texture_rectangle/textures
index 161d8c4a541..161d8c4a541 100644
--- a/builtins/ARB_texture_rectangle/textures
+++ b/src/glsl/builtins/ARB_texture_rectangle/textures
diff --git a/builtins/EXT_texture_array/textures b/src/glsl/builtins/EXT_texture_array/textures
index 8a91f901401..8a91f901401 100644
--- a/builtins/EXT_texture_array/textures
+++ b/src/glsl/builtins/EXT_texture_array/textures
diff --git a/builtins/EXT_texture_array_fs/textures b/src/glsl/builtins/EXT_texture_array_fs/textures
index 74e184387ac..74e184387ac 100644
--- a/builtins/EXT_texture_array_fs/textures
+++ b/src/glsl/builtins/EXT_texture_array_fs/textures
diff --git a/builtins/tools/generate_builtins.pl b/src/glsl/builtins/tools/generate_builtins.pl
index 8b640ab8ff9..8b640ab8ff9 100755
--- a/builtins/tools/generate_builtins.pl
+++ b/src/glsl/builtins/tools/generate_builtins.pl
diff --git a/builtins/tools/generate_matrixCompMultGLSL.py b/src/glsl/builtins/tools/generate_matrixCompMultGLSL.py
index 391ad110d37..391ad110d37 100755
--- a/builtins/tools/generate_matrixCompMultGLSL.py
+++ b/src/glsl/builtins/tools/generate_matrixCompMultGLSL.py
diff --git a/builtins/tools/generate_outerProductGLSL.py b/src/glsl/builtins/tools/generate_outerProductGLSL.py
index 48fb72197c3..48fb72197c3 100755
--- a/builtins/tools/generate_outerProductGLSL.py
+++ b/src/glsl/builtins/tools/generate_outerProductGLSL.py
diff --git a/builtins/tools/generate_transposeGLSL.py b/src/glsl/builtins/tools/generate_transposeGLSL.py
index 8f669ce9839..8f669ce9839 100755
--- a/builtins/tools/generate_transposeGLSL.py
+++ b/src/glsl/builtins/tools/generate_transposeGLSL.py
diff --git a/builtins/tools/texture_builtins.py b/src/glsl/builtins/tools/texture_builtins.py
index 23d53149161..23d53149161 100755
--- a/builtins/tools/texture_builtins.py
+++ b/src/glsl/builtins/tools/texture_builtins.py
diff --git a/configure.ac b/src/glsl/configure.ac
index 73ce67de3d1..73ce67de3d1 100644
--- a/configure.ac
+++ b/src/glsl/configure.ac
diff --git a/glcpp/.gitignore b/src/glsl/glcpp/.gitignore
index c158dc8b862..c158dc8b862 100644
--- a/glcpp/.gitignore
+++ b/src/glsl/glcpp/.gitignore
diff --git a/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index a49fd615cda..a49fd615cda 100644
--- a/glcpp/Makefile.am
+++ b/src/glsl/glcpp/Makefile.am
diff --git a/glcpp/README b/src/glsl/glcpp/README
index ab42a3ffe12..ab42a3ffe12 100644
--- a/glcpp/README
+++ b/src/glsl/glcpp/README
diff --git a/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index afddd7ddb32..afddd7ddb32 100644
--- a/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
diff --git a/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 6beac18c65d..6beac18c65d 100644
--- a/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
diff --git a/glcpp/glcpp.c b/src/glsl/glcpp/glcpp.c
index cc87e14950b..cc87e14950b 100644
--- a/glcpp/glcpp.c
+++ b/src/glsl/glcpp/glcpp.c
diff --git a/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h
index 2cfa98d2b1d..2cfa98d2b1d 100644
--- a/glcpp/glcpp.h
+++ b/src/glsl/glcpp/glcpp.h
diff --git a/glcpp/hash_table.c b/src/glsl/glcpp/hash_table.c
index e89a2564d76..e89a2564d76 100644
--- a/glcpp/hash_table.c
+++ b/src/glsl/glcpp/hash_table.c
diff --git a/glcpp/hash_table.h b/src/glsl/glcpp/hash_table.h
index b9dd343dee9..b9dd343dee9 100644
--- a/glcpp/hash_table.h
+++ b/src/glsl/glcpp/hash_table.h
diff --git a/glcpp/main/imports.h b/src/glsl/glcpp/main/imports.h
index d2197342c04..d2197342c04 100644
--- a/glcpp/main/imports.h
+++ b/src/glsl/glcpp/main/imports.h
diff --git a/glcpp/main/simple_list.h b/src/glsl/glcpp/main/simple_list.h
index 5ef39e14cc6..5ef39e14cc6 100644
--- a/glcpp/main/simple_list.h
+++ b/src/glsl/glcpp/main/simple_list.h
diff --git a/glcpp/pp.c b/src/glsl/glcpp/pp.c
index a25b7b72a6b..a25b7b72a6b 100644
--- a/glcpp/pp.c
+++ b/src/glsl/glcpp/pp.c
diff --git a/glcpp/tests/000-content-with-spaces.c b/src/glsl/glcpp/tests/000-content-with-spaces.c
index 696cb3a74fc..696cb3a74fc 100644
--- a/glcpp/tests/000-content-with-spaces.c
+++ b/src/glsl/glcpp/tests/000-content-with-spaces.c
diff --git a/glcpp/tests/000-content-with-spaces.c.expected b/src/glsl/glcpp/tests/000-content-with-spaces.c.expected
index 83f7834d547..83f7834d547 100644
--- a/glcpp/tests/000-content-with-spaces.c.expected
+++ b/src/glsl/glcpp/tests/000-content-with-spaces.c.expected
diff --git a/glcpp/tests/001-define.c b/src/glsl/glcpp/tests/001-define.c
index cbf2fee0e75..cbf2fee0e75 100644
--- a/glcpp/tests/001-define.c
+++ b/src/glsl/glcpp/tests/001-define.c
diff --git a/glcpp/tests/001-define.c.expected b/src/glsl/glcpp/tests/001-define.c.expected
index 878fd15d6f8..878fd15d6f8 100644
--- a/glcpp/tests/001-define.c.expected
+++ b/src/glsl/glcpp/tests/001-define.c.expected
diff --git a/glcpp/tests/002-define-chain.c b/src/glsl/glcpp/tests/002-define-chain.c
index 87d75c68751..87d75c68751 100644
--- a/glcpp/tests/002-define-chain.c
+++ b/src/glsl/glcpp/tests/002-define-chain.c
diff --git a/glcpp/tests/002-define-chain.c.expected b/src/glsl/glcpp/tests/002-define-chain.c.expected
index 43d484d7131..43d484d7131 100644
--- a/glcpp/tests/002-define-chain.c.expected
+++ b/src/glsl/glcpp/tests/002-define-chain.c.expected
diff --git a/glcpp/tests/003-define-chain-reverse.c b/src/glsl/glcpp/tests/003-define-chain-reverse.c
index a18b724eca0..a18b724eca0 100644
--- a/glcpp/tests/003-define-chain-reverse.c
+++ b/src/glsl/glcpp/tests/003-define-chain-reverse.c
diff --git a/glcpp/tests/003-define-chain-reverse.c.expected b/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected
index 43d484d7131..43d484d7131 100644
--- a/glcpp/tests/003-define-chain-reverse.c.expected
+++ b/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected
diff --git a/glcpp/tests/004-define-recursive.c b/src/glsl/glcpp/tests/004-define-recursive.c
index 2ac56ea3dcf..2ac56ea3dcf 100644
--- a/glcpp/tests/004-define-recursive.c
+++ b/src/glsl/glcpp/tests/004-define-recursive.c
diff --git a/glcpp/tests/004-define-recursive.c.expected b/src/glsl/glcpp/tests/004-define-recursive.c.expected
index 4d2698b7a7f..4d2698b7a7f 100644
--- a/glcpp/tests/004-define-recursive.c.expected
+++ b/src/glsl/glcpp/tests/004-define-recursive.c.expected
diff --git a/glcpp/tests/005-define-composite-chain.c b/src/glsl/glcpp/tests/005-define-composite-chain.c
index f5521df968d..f5521df968d 100644
--- a/glcpp/tests/005-define-composite-chain.c
+++ b/src/glsl/glcpp/tests/005-define-composite-chain.c
diff --git a/glcpp/tests/005-define-composite-chain.c.expected b/src/glsl/glcpp/tests/005-define-composite-chain.c.expected
index c67358f4f69..c67358f4f69 100644
--- a/glcpp/tests/005-define-composite-chain.c.expected
+++ b/src/glsl/glcpp/tests/005-define-composite-chain.c.expected
diff --git a/glcpp/tests/006-define-composite-chain-reverse.c b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c
index 4bb91a1221a..4bb91a1221a 100644
--- a/glcpp/tests/006-define-composite-chain-reverse.c
+++ b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c
diff --git a/glcpp/tests/006-define-composite-chain-reverse.c.expected b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
index c67358f4f69..c67358f4f69 100644
--- a/glcpp/tests/006-define-composite-chain-reverse.c.expected
+++ b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
diff --git a/glcpp/tests/007-define-composite-recursive.c b/src/glsl/glcpp/tests/007-define-composite-recursive.c
index 5784565bdf3..5784565bdf3 100644
--- a/glcpp/tests/007-define-composite-recursive.c
+++ b/src/glsl/glcpp/tests/007-define-composite-recursive.c
diff --git a/glcpp/tests/007-define-composite-recursive.c.expected b/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected
index 30fe4dc1f62..30fe4dc1f62 100644
--- a/glcpp/tests/007-define-composite-recursive.c.expected
+++ b/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected
diff --git a/glcpp/tests/008-define-empty.c b/src/glsl/glcpp/tests/008-define-empty.c
index b1bd17ec215..b1bd17ec215 100644
--- a/glcpp/tests/008-define-empty.c
+++ b/src/glsl/glcpp/tests/008-define-empty.c
diff --git a/glcpp/tests/008-define-empty.c.expected b/src/glsl/glcpp/tests/008-define-empty.c.expected
index b28b04f6431..b28b04f6431 100644
--- a/glcpp/tests/008-define-empty.c.expected
+++ b/src/glsl/glcpp/tests/008-define-empty.c.expected
diff --git a/glcpp/tests/009-undef.c b/src/glsl/glcpp/tests/009-undef.c
index 3fc1fb44243..3fc1fb44243 100644
--- a/glcpp/tests/009-undef.c
+++ b/src/glsl/glcpp/tests/009-undef.c
diff --git a/glcpp/tests/009-undef.c.expected b/src/glsl/glcpp/tests/009-undef.c.expected
index 03a7061af03..03a7061af03 100644
--- a/glcpp/tests/009-undef.c.expected
+++ b/src/glsl/glcpp/tests/009-undef.c.expected
diff --git a/glcpp/tests/010-undef-re-define.c b/src/glsl/glcpp/tests/010-undef-re-define.c
index 32ff73798b1..32ff73798b1 100644
--- a/glcpp/tests/010-undef-re-define.c
+++ b/src/glsl/glcpp/tests/010-undef-re-define.c
diff --git a/glcpp/tests/010-undef-re-define.c.expected b/src/glsl/glcpp/tests/010-undef-re-define.c.expected
index f4f7efdc2bf..f4f7efdc2bf 100644
--- a/glcpp/tests/010-undef-re-define.c.expected
+++ b/src/glsl/glcpp/tests/010-undef-re-define.c.expected
diff --git a/glcpp/tests/011-define-func-empty.c b/src/glsl/glcpp/tests/011-define-func-empty.c
index d9ce13c2284..d9ce13c2284 100644
--- a/glcpp/tests/011-define-func-empty.c
+++ b/src/glsl/glcpp/tests/011-define-func-empty.c
diff --git a/glcpp/tests/011-define-func-empty.c.expected b/src/glsl/glcpp/tests/011-define-func-empty.c.expected
index b28b04f6431..b28b04f6431 100644
--- a/glcpp/tests/011-define-func-empty.c.expected
+++ b/src/glsl/glcpp/tests/011-define-func-empty.c.expected
diff --git a/glcpp/tests/012-define-func-no-args.c b/src/glsl/glcpp/tests/012-define-func-no-args.c
index c2bb730b115..c2bb730b115 100644
--- a/glcpp/tests/012-define-func-no-args.c
+++ b/src/glsl/glcpp/tests/012-define-func-no-args.c
diff --git a/glcpp/tests/012-define-func-no-args.c.expected b/src/glsl/glcpp/tests/012-define-func-no-args.c.expected
index 03537672974..03537672974 100644
--- a/glcpp/tests/012-define-func-no-args.c.expected
+++ b/src/glsl/glcpp/tests/012-define-func-no-args.c.expected
diff --git a/glcpp/tests/013-define-func-1-arg-unused.c b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c
index f78fb8b118a..f78fb8b118a 100644
--- a/glcpp/tests/013-define-func-1-arg-unused.c
+++ b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c
diff --git a/glcpp/tests/013-define-func-1-arg-unused.c.expected b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
index 878fd15d6f8..878fd15d6f8 100644
--- a/glcpp/tests/013-define-func-1-arg-unused.c.expected
+++ b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
diff --git a/glcpp/tests/014-define-func-2-arg-unused.c b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c
index 11feb2624b7..11feb2624b7 100644
--- a/glcpp/tests/014-define-func-2-arg-unused.c
+++ b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c
diff --git a/glcpp/tests/014-define-func-2-arg-unused.c.expected b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
index 878fd15d6f8..878fd15d6f8 100644
--- a/glcpp/tests/014-define-func-2-arg-unused.c.expected
+++ b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
diff --git a/glcpp/tests/015-define-object-with-parens.c b/src/glsl/glcpp/tests/015-define-object-with-parens.c
index 558da9c617b..558da9c617b 100644
--- a/glcpp/tests/015-define-object-with-parens.c
+++ b/src/glsl/glcpp/tests/015-define-object-with-parens.c
diff --git a/glcpp/tests/015-define-object-with-parens.c.expected b/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected
index d6f8cb9dc61..d6f8cb9dc61 100644
--- a/glcpp/tests/015-define-object-with-parens.c.expected
+++ b/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected
diff --git a/glcpp/tests/016-define-func-1-arg.c b/src/glsl/glcpp/tests/016-define-func-1-arg.c
index a2e2404c7c1..a2e2404c7c1 100644
--- a/glcpp/tests/016-define-func-1-arg.c
+++ b/src/glsl/glcpp/tests/016-define-func-1-arg.c
diff --git a/glcpp/tests/016-define-func-1-arg.c.expected b/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected
index 7f1828a3c61..7f1828a3c61 100644
--- a/glcpp/tests/016-define-func-1-arg.c.expected
+++ b/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected
diff --git a/glcpp/tests/017-define-func-2-args.c b/src/glsl/glcpp/tests/017-define-func-2-args.c
index c7253835278..c7253835278 100644
--- a/glcpp/tests/017-define-func-2-args.c
+++ b/src/glsl/glcpp/tests/017-define-func-2-args.c
diff --git a/glcpp/tests/017-define-func-2-args.c.expected b/src/glsl/glcpp/tests/017-define-func-2-args.c.expected
index 9f341dac00a..9f341dac00a 100644
--- a/glcpp/tests/017-define-func-2-args.c.expected
+++ b/src/glsl/glcpp/tests/017-define-func-2-args.c.expected
diff --git a/glcpp/tests/018-define-func-macro-as-parameter.c b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c
index 668130b8f9b..668130b8f9b 100644
--- a/glcpp/tests/018-define-func-macro-as-parameter.c
+++ b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c
diff --git a/glcpp/tests/018-define-func-macro-as-parameter.c.expected b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
index 43d484d7131..43d484d7131 100644
--- a/glcpp/tests/018-define-func-macro-as-parameter.c.expected
+++ b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
diff --git a/glcpp/tests/019-define-func-1-arg-multi.c b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c
index c4e62b25508..c4e62b25508 100644
--- a/glcpp/tests/019-define-func-1-arg-multi.c
+++ b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c
diff --git a/glcpp/tests/019-define-func-1-arg-multi.c.expected b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
index 4314fc88d83..4314fc88d83 100644
--- a/glcpp/tests/019-define-func-1-arg-multi.c.expected
+++ b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
diff --git a/glcpp/tests/020-define-func-2-arg-multi.c b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c
index 3049ad15465..3049ad15465 100644
--- a/glcpp/tests/020-define-func-2-arg-multi.c
+++ b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c
diff --git a/glcpp/tests/020-define-func-2-arg-multi.c.expected b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
index 5648e4fb9d4..5648e4fb9d4 100644
--- a/glcpp/tests/020-define-func-2-arg-multi.c.expected
+++ b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
diff --git a/glcpp/tests/021-define-func-compose.c b/src/glsl/glcpp/tests/021-define-func-compose.c
index 21ddd0e65f9..21ddd0e65f9 100644
--- a/glcpp/tests/021-define-func-compose.c
+++ b/src/glsl/glcpp/tests/021-define-func-compose.c
diff --git a/glcpp/tests/021-define-func-compose.c.expected b/src/glsl/glcpp/tests/021-define-func-compose.c.expected
index 1d62105de4c..1d62105de4c 100644
--- a/glcpp/tests/021-define-func-compose.c.expected
+++ b/src/glsl/glcpp/tests/021-define-func-compose.c.expected
diff --git a/glcpp/tests/022-define-func-arg-with-parens.c b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c
index c20d73a4a28..c20d73a4a28 100644
--- a/glcpp/tests/022-define-func-arg-with-parens.c
+++ b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c
diff --git a/glcpp/tests/022-define-func-arg-with-parens.c.expected b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
index 66c16581758..66c16581758 100644
--- a/glcpp/tests/022-define-func-arg-with-parens.c.expected
+++ b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
diff --git a/glcpp/tests/023-define-extra-whitespace.c b/src/glsl/glcpp/tests/023-define-extra-whitespace.c
index 7ebfed6516c..7ebfed6516c 100644
--- a/glcpp/tests/023-define-extra-whitespace.c
+++ b/src/glsl/glcpp/tests/023-define-extra-whitespace.c
diff --git a/glcpp/tests/023-define-extra-whitespace.c.expected b/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
index 573829c2d69..573829c2d69 100644
--- a/glcpp/tests/023-define-extra-whitespace.c.expected
+++ b/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
diff --git a/glcpp/tests/024-define-chain-to-self-recursion.c b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c
index e788adce30c..e788adce30c 100644
--- a/glcpp/tests/024-define-chain-to-self-recursion.c
+++ b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c
diff --git a/glcpp/tests/024-define-chain-to-self-recursion.c.expected b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
index ad955fce6ec..ad955fce6ec 100644
--- a/glcpp/tests/024-define-chain-to-self-recursion.c.expected
+++ b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
diff --git a/glcpp/tests/025-func-macro-as-non-macro.c b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c
index b433671d1bf..b433671d1bf 100644
--- a/glcpp/tests/025-func-macro-as-non-macro.c
+++ b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c
diff --git a/glcpp/tests/025-func-macro-as-non-macro.c.expected b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
index 960f44511a9..960f44511a9 100644
--- a/glcpp/tests/025-func-macro-as-non-macro.c.expected
+++ b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
diff --git a/glcpp/tests/026-define-func-extra-newlines.c b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c
index 0d837405309..0d837405309 100644
--- a/glcpp/tests/026-define-func-extra-newlines.c
+++ b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c
diff --git a/glcpp/tests/026-define-func-extra-newlines.c.expected b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
index f0888f21b94..f0888f21b94 100644
--- a/glcpp/tests/026-define-func-extra-newlines.c.expected
+++ b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
diff --git a/glcpp/tests/027-define-chain-obj-to-func.c b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c
index 5ccb52caba5..5ccb52caba5 100644
--- a/glcpp/tests/027-define-chain-obj-to-func.c
+++ b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c
diff --git a/glcpp/tests/027-define-chain-obj-to-func.c.expected b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
index aef762e1e69..aef762e1e69 100644
--- a/glcpp/tests/027-define-chain-obj-to-func.c.expected
+++ b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
diff --git a/glcpp/tests/028-define-chain-obj-to-non-func.c b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c
index 44962a71876..44962a71876 100644
--- a/glcpp/tests/028-define-chain-obj-to-non-func.c
+++ b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c
diff --git a/glcpp/tests/028-define-chain-obj-to-non-func.c.expected b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
index aef762e1e69..aef762e1e69 100644
--- a/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
+++ b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
diff --git a/glcpp/tests/029-define-chain-obj-to-func-with-args.c b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c
index 261f7d28fc2..261f7d28fc2 100644
--- a/glcpp/tests/029-define-chain-obj-to-func-with-args.c
+++ b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c
diff --git a/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
index aef762e1e69..aef762e1e69 100644
--- a/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
+++ b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
diff --git a/glcpp/tests/030-define-chain-obj-to-func-compose.c b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c
index e56fbefd62d..e56fbefd62d 100644
--- a/glcpp/tests/030-define-chain-obj-to-func-compose.c
+++ b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c
diff --git a/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
index 729bdd15f80..729bdd15f80 100644
--- a/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
+++ b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
diff --git a/glcpp/tests/031-define-chain-func-to-func-compose.c b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c
index 3f4c8744dff..3f4c8744dff 100644
--- a/glcpp/tests/031-define-chain-func-to-func-compose.c
+++ b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c
diff --git a/glcpp/tests/031-define-chain-func-to-func-compose.c.expected b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
index 729bdd15f80..729bdd15f80 100644
--- a/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
+++ b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
diff --git a/glcpp/tests/032-define-func-self-recurse.c b/src/glsl/glcpp/tests/032-define-func-self-recurse.c
index b3ac70f499c..b3ac70f499c 100644
--- a/glcpp/tests/032-define-func-self-recurse.c
+++ b/src/glsl/glcpp/tests/032-define-func-self-recurse.c
diff --git a/glcpp/tests/032-define-func-self-recurse.c.expected b/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
index 541d44db7ab..541d44db7ab 100644
--- a/glcpp/tests/032-define-func-self-recurse.c.expected
+++ b/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
diff --git a/glcpp/tests/033-define-func-self-compose.c b/src/glsl/glcpp/tests/033-define-func-self-compose.c
index f65e48286cf..f65e48286cf 100644
--- a/glcpp/tests/033-define-func-self-compose.c
+++ b/src/glsl/glcpp/tests/033-define-func-self-compose.c
diff --git a/glcpp/tests/033-define-func-self-compose.c.expected b/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected
index 6ea6905d80b..6ea6905d80b 100644
--- a/glcpp/tests/033-define-func-self-compose.c.expected
+++ b/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected
diff --git a/glcpp/tests/034-define-func-self-compose-non-func.c b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c
index 209a5f7e07c..209a5f7e07c 100644
--- a/glcpp/tests/034-define-func-self-compose-non-func.c
+++ b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c
diff --git a/glcpp/tests/034-define-func-self-compose-non-func.c.expected b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
index 24823b1b673..24823b1b673 100644
--- a/glcpp/tests/034-define-func-self-compose-non-func.c.expected
+++ b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
diff --git a/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c
index c307fbe830f..c307fbe830f 100644
--- a/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c
+++ b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c
diff --git a/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
index 137a9ea2db8..137a9ea2db8 100644
--- a/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
+++ b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
diff --git a/glcpp/tests/036-define-func-non-macro-multi-token-argument.c b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c
index b21ff336738..b21ff336738 100644
--- a/glcpp/tests/036-define-func-non-macro-multi-token-argument.c
+++ b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c
diff --git a/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
index ff6360bfe4e..ff6360bfe4e 100644
--- a/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
+++ b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
diff --git a/glcpp/tests/037-finalize-unexpanded-macro.c b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c
index b3a2f37f1b9..b3a2f37f1b9 100644
--- a/glcpp/tests/037-finalize-unexpanded-macro.c
+++ b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c
diff --git a/glcpp/tests/037-finalize-unexpanded-macro.c.expected b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
index cbadee848a5..cbadee848a5 100644
--- a/glcpp/tests/037-finalize-unexpanded-macro.c.expected
+++ b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
diff --git a/glcpp/tests/038-func-arg-with-commas.c b/src/glsl/glcpp/tests/038-func-arg-with-commas.c
index 1407c7d6e3c..1407c7d6e3c 100644
--- a/glcpp/tests/038-func-arg-with-commas.c
+++ b/src/glsl/glcpp/tests/038-func-arg-with-commas.c
diff --git a/glcpp/tests/038-func-arg-with-commas.c.expected b/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
index 5a28fb3b66c..5a28fb3b66c 100644
--- a/glcpp/tests/038-func-arg-with-commas.c.expected
+++ b/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
diff --git a/glcpp/tests/039-func-arg-obj-macro-with-comma.c b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c
index 0f7fe632b56..0f7fe632b56 100644
--- a/glcpp/tests/039-func-arg-obj-macro-with-comma.c
+++ b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c
diff --git a/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
index b73869d0238..b73869d0238 100644
--- a/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
+++ b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
diff --git a/glcpp/tests/040-token-pasting.c b/src/glsl/glcpp/tests/040-token-pasting.c
index caab3ba7368..caab3ba7368 100644
--- a/glcpp/tests/040-token-pasting.c
+++ b/src/glsl/glcpp/tests/040-token-pasting.c
diff --git a/glcpp/tests/040-token-pasting.c.expected b/src/glsl/glcpp/tests/040-token-pasting.c.expected
index 36f66992539..36f66992539 100644
--- a/glcpp/tests/040-token-pasting.c.expected
+++ b/src/glsl/glcpp/tests/040-token-pasting.c.expected
diff --git a/glcpp/tests/041-if-0.c b/src/glsl/glcpp/tests/041-if-0.c
index 2cab677d3e8..2cab677d3e8 100644
--- a/glcpp/tests/041-if-0.c
+++ b/src/glsl/glcpp/tests/041-if-0.c
diff --git a/glcpp/tests/041-if-0.c.expected b/src/glsl/glcpp/tests/041-if-0.c.expected
index 3800024c6ff..3800024c6ff 100644
--- a/glcpp/tests/041-if-0.c.expected
+++ b/src/glsl/glcpp/tests/041-if-0.c.expected
diff --git a/glcpp/tests/042-if-1.c b/src/glsl/glcpp/tests/042-if-1.c
index 874a25cf41b..874a25cf41b 100644
--- a/glcpp/tests/042-if-1.c
+++ b/src/glsl/glcpp/tests/042-if-1.c
diff --git a/glcpp/tests/042-if-1.c.expected b/src/glsl/glcpp/tests/042-if-1.c.expected
index e591044adbb..e591044adbb 100644
--- a/glcpp/tests/042-if-1.c.expected
+++ b/src/glsl/glcpp/tests/042-if-1.c.expected
diff --git a/glcpp/tests/043-if-0-else.c b/src/glsl/glcpp/tests/043-if-0-else.c
index 323351f9dbf..323351f9dbf 100644
--- a/glcpp/tests/043-if-0-else.c
+++ b/src/glsl/glcpp/tests/043-if-0-else.c
diff --git a/glcpp/tests/043-if-0-else.c.expected b/src/glsl/glcpp/tests/043-if-0-else.c.expected
index ee9e677096e..ee9e677096e 100644
--- a/glcpp/tests/043-if-0-else.c.expected
+++ b/src/glsl/glcpp/tests/043-if-0-else.c.expected
diff --git a/glcpp/tests/044-if-1-else.c b/src/glsl/glcpp/tests/044-if-1-else.c
index 28dfc25c6f0..28dfc25c6f0 100644
--- a/glcpp/tests/044-if-1-else.c
+++ b/src/glsl/glcpp/tests/044-if-1-else.c
diff --git a/glcpp/tests/044-if-1-else.c.expected b/src/glsl/glcpp/tests/044-if-1-else.c.expected
index 129f5c8542e..129f5c8542e 100644
--- a/glcpp/tests/044-if-1-else.c.expected
+++ b/src/glsl/glcpp/tests/044-if-1-else.c.expected
diff --git a/glcpp/tests/045-if-0-elif.c b/src/glsl/glcpp/tests/045-if-0-elif.c
index e50f686d461..e50f686d461 100644
--- a/glcpp/tests/045-if-0-elif.c
+++ b/src/glsl/glcpp/tests/045-if-0-elif.c
diff --git a/glcpp/tests/045-if-0-elif.c.expected b/src/glsl/glcpp/tests/045-if-0-elif.c.expected
index 97a11b4472e..97a11b4472e 100644
--- a/glcpp/tests/045-if-0-elif.c.expected
+++ b/src/glsl/glcpp/tests/045-if-0-elif.c.expected
diff --git a/glcpp/tests/046-if-1-elsif.c b/src/glsl/glcpp/tests/046-if-1-elsif.c
index 130515a01ea..130515a01ea 100644
--- a/glcpp/tests/046-if-1-elsif.c
+++ b/src/glsl/glcpp/tests/046-if-1-elsif.c
diff --git a/glcpp/tests/046-if-1-elsif.c.expected b/src/glsl/glcpp/tests/046-if-1-elsif.c.expected
index b928b917e3d..b928b917e3d 100644
--- a/glcpp/tests/046-if-1-elsif.c.expected
+++ b/src/glsl/glcpp/tests/046-if-1-elsif.c.expected
diff --git a/glcpp/tests/047-if-elif-else.c b/src/glsl/glcpp/tests/047-if-elif-else.c
index e8f0838a9ed..e8f0838a9ed 100644
--- a/glcpp/tests/047-if-elif-else.c
+++ b/src/glsl/glcpp/tests/047-if-elif-else.c
diff --git a/glcpp/tests/047-if-elif-else.c.expected b/src/glsl/glcpp/tests/047-if-elif-else.c.expected
index e5b53a3fa59..e5b53a3fa59 100644
--- a/glcpp/tests/047-if-elif-else.c.expected
+++ b/src/glsl/glcpp/tests/047-if-elif-else.c.expected
diff --git a/glcpp/tests/048-if-nested.c b/src/glsl/glcpp/tests/048-if-nested.c
index fc4679c3be4..fc4679c3be4 100644
--- a/glcpp/tests/048-if-nested.c
+++ b/src/glsl/glcpp/tests/048-if-nested.c
diff --git a/glcpp/tests/048-if-nested.c.expected b/src/glsl/glcpp/tests/048-if-nested.c.expected
index c61fd0b3159..c61fd0b3159 100644
--- a/glcpp/tests/048-if-nested.c.expected
+++ b/src/glsl/glcpp/tests/048-if-nested.c.expected
diff --git a/glcpp/tests/049-if-expression-precedence.c b/src/glsl/glcpp/tests/049-if-expression-precedence.c
index 833ea03882a..833ea03882a 100644
--- a/glcpp/tests/049-if-expression-precedence.c
+++ b/src/glsl/glcpp/tests/049-if-expression-precedence.c
diff --git a/glcpp/tests/049-if-expression-precedence.c.expected b/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected
index 569debb0bb6..569debb0bb6 100644
--- a/glcpp/tests/049-if-expression-precedence.c.expected
+++ b/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected
diff --git a/glcpp/tests/050-if-defined.c b/src/glsl/glcpp/tests/050-if-defined.c
index 34f0f95140e..34f0f95140e 100644
--- a/glcpp/tests/050-if-defined.c
+++ b/src/glsl/glcpp/tests/050-if-defined.c
diff --git a/glcpp/tests/050-if-defined.c.expected b/src/glsl/glcpp/tests/050-if-defined.c.expected
index 3f01955ee40..3f01955ee40 100644
--- a/glcpp/tests/050-if-defined.c.expected
+++ b/src/glsl/glcpp/tests/050-if-defined.c.expected
diff --git a/glcpp/tests/051-if-relational.c b/src/glsl/glcpp/tests/051-if-relational.c
index c3db488e0de..c3db488e0de 100644
--- a/glcpp/tests/051-if-relational.c
+++ b/src/glsl/glcpp/tests/051-if-relational.c
diff --git a/glcpp/tests/051-if-relational.c.expected b/src/glsl/glcpp/tests/051-if-relational.c.expected
index d2b76f14576..d2b76f14576 100644
--- a/glcpp/tests/051-if-relational.c.expected
+++ b/src/glsl/glcpp/tests/051-if-relational.c.expected
diff --git a/glcpp/tests/052-if-bitwise.c b/src/glsl/glcpp/tests/052-if-bitwise.c
index 2d8e45eb61e..2d8e45eb61e 100644
--- a/glcpp/tests/052-if-bitwise.c
+++ b/src/glsl/glcpp/tests/052-if-bitwise.c
diff --git a/glcpp/tests/052-if-bitwise.c.expected b/src/glsl/glcpp/tests/052-if-bitwise.c.expected
index bb5d92e8d92..bb5d92e8d92 100644
--- a/glcpp/tests/052-if-bitwise.c.expected
+++ b/src/glsl/glcpp/tests/052-if-bitwise.c.expected
diff --git a/glcpp/tests/053-if-divide-and-shift.c b/src/glsl/glcpp/tests/053-if-divide-and-shift.c
index d24c54a88d1..d24c54a88d1 100644
--- a/glcpp/tests/053-if-divide-and-shift.c
+++ b/src/glsl/glcpp/tests/053-if-divide-and-shift.c
diff --git a/glcpp/tests/053-if-divide-and-shift.c.expected b/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
index f97e93673cc..f97e93673cc 100644
--- a/glcpp/tests/053-if-divide-and-shift.c.expected
+++ b/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
diff --git a/glcpp/tests/054-if-with-macros.c b/src/glsl/glcpp/tests/054-if-with-macros.c
index 3da79a0d96e..3da79a0d96e 100644
--- a/glcpp/tests/054-if-with-macros.c
+++ b/src/glsl/glcpp/tests/054-if-with-macros.c
diff --git a/glcpp/tests/054-if-with-macros.c.expected b/src/glsl/glcpp/tests/054-if-with-macros.c.expected
index 27ea4969628..27ea4969628 100644
--- a/glcpp/tests/054-if-with-macros.c.expected
+++ b/src/glsl/glcpp/tests/054-if-with-macros.c.expected
diff --git a/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c
index 00f2c2346d6..00f2c2346d6 100644
--- a/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c
+++ b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c
diff --git a/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
index aef762e1e69..aef762e1e69 100644
--- a/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
+++ b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
diff --git a/glcpp/tests/056-macro-argument-with-comma.c b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c
index 58701d1f25b..58701d1f25b 100644
--- a/glcpp/tests/056-macro-argument-with-comma.c
+++ b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c
diff --git a/glcpp/tests/056-macro-argument-with-comma.c.expected b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
index 729bdd15f80..729bdd15f80 100644
--- a/glcpp/tests/056-macro-argument-with-comma.c.expected
+++ b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
diff --git a/glcpp/tests/057-empty-arguments.c b/src/glsl/glcpp/tests/057-empty-arguments.c
index 6140232865d..6140232865d 100644
--- a/glcpp/tests/057-empty-arguments.c
+++ b/src/glsl/glcpp/tests/057-empty-arguments.c
diff --git a/glcpp/tests/057-empty-arguments.c.expected b/src/glsl/glcpp/tests/057-empty-arguments.c.expected
index 4e3aad52173..4e3aad52173 100644
--- a/glcpp/tests/057-empty-arguments.c.expected
+++ b/src/glsl/glcpp/tests/057-empty-arguments.c.expected
diff --git a/glcpp/tests/058-token-pasting-empty-arguments.c b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c
index 8ac260c76b6..8ac260c76b6 100644
--- a/glcpp/tests/058-token-pasting-empty-arguments.c
+++ b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c
diff --git a/glcpp/tests/058-token-pasting-empty-arguments.c.expected b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
index a1c34e5c1f8..a1c34e5c1f8 100644
--- a/glcpp/tests/058-token-pasting-empty-arguments.c.expected
+++ b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
diff --git a/glcpp/tests/059-token-pasting-integer.c b/src/glsl/glcpp/tests/059-token-pasting-integer.c
index 37b895a4237..37b895a4237 100644
--- a/glcpp/tests/059-token-pasting-integer.c
+++ b/src/glsl/glcpp/tests/059-token-pasting-integer.c
diff --git a/glcpp/tests/059-token-pasting-integer.c.expected b/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected
index f1a2cd21c13..f1a2cd21c13 100644
--- a/glcpp/tests/059-token-pasting-integer.c.expected
+++ b/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected
diff --git a/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c
index ed80ea879ce..ed80ea879ce 100644
--- a/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c
+++ b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c
diff --git a/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
index c1f0d24a144..c1f0d24a144 100644
--- a/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
+++ b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
diff --git a/glcpp/tests/061-define-chain-obj-to-func-multi.c b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c
index 6dbfd1f62d1..6dbfd1f62d1 100644
--- a/glcpp/tests/061-define-chain-obj-to-func-multi.c
+++ b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c
diff --git a/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
index 111f7d10634..111f7d10634 100644
--- a/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
+++ b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
diff --git a/glcpp/tests/062-if-0-skips-garbage.c b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c
index d9e439bb890..d9e439bb890 100644
--- a/glcpp/tests/062-if-0-skips-garbage.c
+++ b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c
diff --git a/glcpp/tests/062-if-0-skips-garbage.c.expected b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
index 6fb66a5e2f0..6fb66a5e2f0 100644
--- a/glcpp/tests/062-if-0-skips-garbage.c.expected
+++ b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
diff --git a/glcpp/tests/063-comments.c b/src/glsl/glcpp/tests/063-comments.c
index e641d2f0f9e..e641d2f0f9e 100644
--- a/glcpp/tests/063-comments.c
+++ b/src/glsl/glcpp/tests/063-comments.c
diff --git a/glcpp/tests/063-comments.c.expected b/src/glsl/glcpp/tests/063-comments.c.expected
index ed4feedd457..ed4feedd457 100644
--- a/glcpp/tests/063-comments.c.expected
+++ b/src/glsl/glcpp/tests/063-comments.c.expected
diff --git a/glcpp/tests/064-version.c b/src/glsl/glcpp/tests/064-version.c
index 21326481b87..21326481b87 100644
--- a/glcpp/tests/064-version.c
+++ b/src/glsl/glcpp/tests/064-version.c
diff --git a/glcpp/tests/064-version.c.expected b/src/glsl/glcpp/tests/064-version.c.expected
index 3af71113c8c..3af71113c8c 100644
--- a/glcpp/tests/064-version.c.expected
+++ b/src/glsl/glcpp/tests/064-version.c.expected
diff --git a/glcpp/tests/065-if-defined-parens.c b/src/glsl/glcpp/tests/065-if-defined-parens.c
index 48aa0f8c3ef..48aa0f8c3ef 100644
--- a/glcpp/tests/065-if-defined-parens.c
+++ b/src/glsl/glcpp/tests/065-if-defined-parens.c
diff --git a/glcpp/tests/065-if-defined-parens.c.expected b/src/glsl/glcpp/tests/065-if-defined-parens.c.expected
index 3f01955ee40..3f01955ee40 100644
--- a/glcpp/tests/065-if-defined-parens.c.expected
+++ b/src/glsl/glcpp/tests/065-if-defined-parens.c.expected
diff --git a/glcpp/tests/071-punctuator.c b/src/glsl/glcpp/tests/071-punctuator.c
index 959d6825988..959d6825988 100644
--- a/glcpp/tests/071-punctuator.c
+++ b/src/glsl/glcpp/tests/071-punctuator.c
diff --git a/glcpp/tests/071-punctuator.c.expected b/src/glsl/glcpp/tests/071-punctuator.c.expected
index fee253b7452..fee253b7452 100644
--- a/glcpp/tests/071-punctuator.c.expected
+++ b/src/glsl/glcpp/tests/071-punctuator.c.expected
diff --git a/glcpp/tests/072-token-pasting-same-line.c b/src/glsl/glcpp/tests/072-token-pasting-same-line.c
index e421e9d5e29..e421e9d5e29 100644
--- a/glcpp/tests/072-token-pasting-same-line.c
+++ b/src/glsl/glcpp/tests/072-token-pasting-same-line.c
diff --git a/glcpp/tests/072-token-pasting-same-line.c.expected b/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
index c780b43d70f..c780b43d70f 100644
--- a/glcpp/tests/072-token-pasting-same-line.c.expected
+++ b/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
diff --git a/glcpp/tests/099-c99-example.c b/src/glsl/glcpp/tests/099-c99-example.c
index d1976b1f265..d1976b1f265 100644
--- a/glcpp/tests/099-c99-example.c
+++ b/src/glsl/glcpp/tests/099-c99-example.c
diff --git a/glcpp/tests/099-c99-example.c.expected b/src/glsl/glcpp/tests/099-c99-example.c.expected
index 19be7505552..19be7505552 100644
--- a/glcpp/tests/099-c99-example.c.expected
+++ b/src/glsl/glcpp/tests/099-c99-example.c.expected
diff --git a/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test
index 396f6e175e8..396f6e175e8 100755
--- a/glcpp/tests/glcpp-test
+++ b/src/glsl/glcpp/tests/glcpp-test
diff --git a/glcpp/xtalloc.c b/src/glsl/glcpp/xtalloc.c
index 656ac2d6cb5..656ac2d6cb5 100644
--- a/glcpp/xtalloc.c
+++ b/src/glsl/glcpp/xtalloc.c
diff --git a/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp
index fa439f12787..fa439f12787 100644
--- a/glsl_lexer.lpp
+++ b/src/glsl/glsl_lexer.lpp
diff --git a/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index 4132495f403..4132495f403 100644
--- a/glsl_parser.ypp
+++ b/src/glsl/glsl_parser.ypp
diff --git a/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 1d16ef55f57..1d16ef55f57 100644
--- a/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
diff --git a/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index cfe02e3b0c1..cfe02e3b0c1 100644
--- a/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
diff --git a/glsl_symbol_table.h b/src/glsl/glsl_symbol_table.h
index ae2fd3f4f1f..ae2fd3f4f1f 100644
--- a/glsl_symbol_table.h
+++ b/src/glsl/glsl_symbol_table.h
diff --git a/glsl_types.cpp b/src/glsl/glsl_types.cpp
index bef267fa6be..bef267fa6be 100644
--- a/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
diff --git a/glsl_types.h b/src/glsl/glsl_types.h
index 39e6ac970aa..39e6ac970aa 100644
--- a/glsl_types.h
+++ b/src/glsl/glsl_types.h
diff --git a/hash_table.c b/src/glsl/hash_table.c
index e89a2564d76..e89a2564d76 100644
--- a/hash_table.c
+++ b/src/glsl/hash_table.c
diff --git a/hash_table.h b/src/glsl/hash_table.h
index b9dd343dee9..b9dd343dee9 100644
--- a/hash_table.h
+++ b/src/glsl/hash_table.h
diff --git a/hir_field_selection.cpp b/src/glsl/hir_field_selection.cpp
index e2efff60d34..e2efff60d34 100644
--- a/hir_field_selection.cpp
+++ b/src/glsl/hir_field_selection.cpp
diff --git a/ir.cpp b/src/glsl/ir.cpp
index 2756752ba49..2756752ba49 100644
--- a/ir.cpp
+++ b/src/glsl/ir.cpp
diff --git a/ir.h b/src/glsl/ir.h
index 3d2c7ff5cf5..3d2c7ff5cf5 100644
--- a/ir.h
+++ b/src/glsl/ir.h
diff --git a/ir_basic_block.cpp b/src/glsl/ir_basic_block.cpp
index f9953ea42da..f9953ea42da 100644
--- a/ir_basic_block.cpp
+++ b/src/glsl/ir_basic_block.cpp
diff --git a/ir_basic_block.h b/src/glsl/ir_basic_block.h
index dbd678b5c4f..dbd678b5c4f 100644
--- a/ir_basic_block.h
+++ b/src/glsl/ir_basic_block.h
diff --git a/ir_clone.cpp b/src/glsl/ir_clone.cpp
index 84176383fca..84176383fca 100644
--- a/ir_clone.cpp
+++ b/src/glsl/ir_clone.cpp
diff --git a/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 3408f5256a7..3408f5256a7 100644
--- a/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
diff --git a/ir_constant_folding.cpp b/src/glsl/ir_constant_folding.cpp
index 342d027bbe8..342d027bbe8 100644
--- a/ir_constant_folding.cpp
+++ b/src/glsl/ir_constant_folding.cpp
diff --git a/ir_constant_variable.cpp b/src/glsl/ir_constant_variable.cpp
index ef5e1e418e5..ef5e1e418e5 100644
--- a/ir_constant_variable.cpp
+++ b/src/glsl/ir_constant_variable.cpp
diff --git a/ir_copy_propagation.cpp b/src/glsl/ir_copy_propagation.cpp
index 46ef6679d9f..46ef6679d9f 100644
--- a/ir_copy_propagation.cpp
+++ b/src/glsl/ir_copy_propagation.cpp
diff --git a/ir_dead_code.cpp b/src/glsl/ir_dead_code.cpp
index 88213046825..88213046825 100644
--- a/ir_dead_code.cpp
+++ b/src/glsl/ir_dead_code.cpp
diff --git a/ir_dead_code_local.cpp b/src/glsl/ir_dead_code_local.cpp
index e01877077c9..e01877077c9 100644
--- a/ir_dead_code_local.cpp
+++ b/src/glsl/ir_dead_code_local.cpp
diff --git a/ir_expression_flattening.cpp b/src/glsl/ir_expression_flattening.cpp
index 5ba24e390b4..5ba24e390b4 100644
--- a/ir_expression_flattening.cpp
+++ b/src/glsl/ir_expression_flattening.cpp
diff --git a/ir_expression_flattening.h b/src/glsl/ir_expression_flattening.h
index 2eda1590001..2eda1590001 100644
--- a/ir_expression_flattening.h
+++ b/src/glsl/ir_expression_flattening.h
diff --git a/ir_function.cpp b/src/glsl/ir_function.cpp
index 5db93f67fb8..5db93f67fb8 100644
--- a/ir_function.cpp
+++ b/src/glsl/ir_function.cpp
diff --git a/ir_function_can_inline.cpp b/src/glsl/ir_function_can_inline.cpp
index 8bb8e0d9ed7..8bb8e0d9ed7 100644
--- a/ir_function_can_inline.cpp
+++ b/src/glsl/ir_function_can_inline.cpp
diff --git a/ir_function_inlining.cpp b/src/glsl/ir_function_inlining.cpp
index e55780c940e..e55780c940e 100644
--- a/ir_function_inlining.cpp
+++ b/src/glsl/ir_function_inlining.cpp
diff --git a/ir_function_inlining.h b/src/glsl/ir_function_inlining.h
index 6db011bbcae..6db011bbcae 100644
--- a/ir_function_inlining.h
+++ b/src/glsl/ir_function_inlining.h
diff --git a/ir_hierarchical_visitor.cpp b/src/glsl/ir_hierarchical_visitor.cpp
index 0d520b127f2..0d520b127f2 100644
--- a/ir_hierarchical_visitor.cpp
+++ b/src/glsl/ir_hierarchical_visitor.cpp
diff --git a/ir_hierarchical_visitor.h b/src/glsl/ir_hierarchical_visitor.h
index 8b9e49dab13..8b9e49dab13 100644
--- a/ir_hierarchical_visitor.h
+++ b/src/glsl/ir_hierarchical_visitor.h
diff --git a/ir_hv_accept.cpp b/src/glsl/ir_hv_accept.cpp
index f936b3500eb..f936b3500eb 100644
--- a/ir_hv_accept.cpp
+++ b/src/glsl/ir_hv_accept.cpp
diff --git a/ir_if_simplification.cpp b/src/glsl/ir_if_simplification.cpp
index 6882ef72b95..6882ef72b95 100644
--- a/ir_if_simplification.cpp
+++ b/src/glsl/ir_if_simplification.cpp
diff --git a/ir_optimization.h b/src/glsl/ir_optimization.h
index 432a33458c2..432a33458c2 100644
--- a/ir_optimization.h
+++ b/src/glsl/ir_optimization.h
diff --git a/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp
index be5a843f67d..be5a843f67d 100644
--- a/ir_print_visitor.cpp
+++ b/src/glsl/ir_print_visitor.cpp
diff --git a/ir_print_visitor.h b/src/glsl/ir_print_visitor.h
index e97b823522a..e97b823522a 100644
--- a/ir_print_visitor.h
+++ b/src/glsl/ir_print_visitor.h
diff --git a/ir_reader.cpp b/src/glsl/ir_reader.cpp
index 7383c42cbc7..7383c42cbc7 100644
--- a/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
diff --git a/ir_reader.h b/src/glsl/ir_reader.h
index b6afdc81ab1..b6afdc81ab1 100644
--- a/ir_reader.h
+++ b/src/glsl/ir_reader.h
diff --git a/ir_swizzle_swizzle.cpp b/src/glsl/ir_swizzle_swizzle.cpp
index 0ffb4fa3133..0ffb4fa3133 100644
--- a/ir_swizzle_swizzle.cpp
+++ b/src/glsl/ir_swizzle_swizzle.cpp
diff --git a/ir_to_mesa.cpp b/src/glsl/ir_to_mesa.cpp
index 26449c5a5c4..26449c5a5c4 100644
--- a/ir_to_mesa.cpp
+++ b/src/glsl/ir_to_mesa.cpp
diff --git a/ir_validate.cpp b/src/glsl/ir_validate.cpp
index 507e88993f2..507e88993f2 100644
--- a/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
diff --git a/ir_variable.cpp b/src/glsl/ir_variable.cpp
index 15a4a92f628..15a4a92f628 100644
--- a/ir_variable.cpp
+++ b/src/glsl/ir_variable.cpp
diff --git a/ir_vec_index_to_swizzle.cpp b/src/glsl/ir_vec_index_to_swizzle.cpp
index abeb43cd68e..abeb43cd68e 100644
--- a/ir_vec_index_to_swizzle.cpp
+++ b/src/glsl/ir_vec_index_to_swizzle.cpp
diff --git a/ir_visitor.h b/src/glsl/ir_visitor.h
index a6f9d2b7ee3..a6f9d2b7ee3 100644
--- a/ir_visitor.h
+++ b/src/glsl/ir_visitor.h
diff --git a/linker.cpp b/src/glsl/linker.cpp
index ba382fe8816..ba382fe8816 100644
--- a/linker.cpp
+++ b/src/glsl/linker.cpp
diff --git a/list.h b/src/glsl/list.h
index 7732d66d7a6..7732d66d7a6 100644
--- a/list.h
+++ b/src/glsl/list.h
diff --git a/main.cpp b/src/glsl/main.cpp
index dcd9bd69c0c..dcd9bd69c0c 100644
--- a/main.cpp
+++ b/src/glsl/main.cpp
diff --git a/main/imports.h b/src/glsl/main/imports.h
index d2197342c04..d2197342c04 100644
--- a/main/imports.h
+++ b/src/glsl/main/imports.h
diff --git a/main/mtypes.h b/src/glsl/main/mtypes.h
index 06e2dd4b540..06e2dd4b540 100644
--- a/main/mtypes.h
+++ b/src/glsl/main/mtypes.h
diff --git a/main/simple_list.h b/src/glsl/main/simple_list.h
index 5ef39e14cc6..5ef39e14cc6 100644
--- a/main/simple_list.h
+++ b/src/glsl/main/simple_list.h
diff --git a/mesa/shader/prog_instruction.c b/src/glsl/mesa/shader/prog_instruction.c
index fbcf868f509..fbcf868f509 100644
--- a/mesa/shader/prog_instruction.c
+++ b/src/glsl/mesa/shader/prog_instruction.c
diff --git a/mesa/shader/prog_instruction.h b/src/glsl/mesa/shader/prog_instruction.h
index 2c95d274cab..2c95d274cab 100644
--- a/mesa/shader/prog_instruction.h
+++ b/src/glsl/mesa/shader/prog_instruction.h
diff --git a/mesa/shader/prog_print.c b/src/glsl/mesa/shader/prog_print.c
index 3f1cb48e4bf..3f1cb48e4bf 100644
--- a/mesa/shader/prog_print.c
+++ b/src/glsl/mesa/shader/prog_print.c
diff --git a/mesa/shader/prog_print.h b/src/glsl/mesa/shader/prog_print.h
index f0df77b5129..f0df77b5129 100644
--- a/mesa/shader/prog_print.h
+++ b/src/glsl/mesa/shader/prog_print.h
diff --git a/program.h b/src/glsl/program.h
index d21b04344cd..d21b04344cd 100644
--- a/program.h
+++ b/src/glsl/program.h
diff --git a/s_expression.cpp b/src/glsl/s_expression.cpp
index 26be23ea8fa..26be23ea8fa 100644
--- a/s_expression.cpp
+++ b/src/glsl/s_expression.cpp
diff --git a/s_expression.h b/src/glsl/s_expression.h
index 1a0c03c2189..1a0c03c2189 100644
--- a/s_expression.h
+++ b/src/glsl/s_expression.h
diff --git a/symbol_table.c b/src/glsl/symbol_table.c
index 0f0df7a261b..0f0df7a261b 100644
--- a/symbol_table.c
+++ b/src/glsl/symbol_table.c
diff --git a/symbol_table.h b/src/glsl/symbol_table.h
index 3a9994c1ac9..3a9994c1ac9 100644
--- a/symbol_table.h
+++ b/src/glsl/symbol_table.h
diff --git a/tests/array-01.glsl b/src/glsl/tests/array-01.glsl
index d14135fb3a8..d14135fb3a8 100644
--- a/tests/array-01.glsl
+++ b/src/glsl/tests/array-01.glsl
diff --git a/tests/array-02.glsl b/src/glsl/tests/array-02.glsl
index d743617158d..d743617158d 100644
--- a/tests/array-02.glsl
+++ b/src/glsl/tests/array-02.glsl
diff --git a/tests/array-03.glsl b/src/glsl/tests/array-03.glsl
index 0026913f019..0026913f019 100644
--- a/tests/array-03.glsl
+++ b/src/glsl/tests/array-03.glsl
diff --git a/tests/array-04.glsl b/src/glsl/tests/array-04.glsl
index 70f434d8ab6..70f434d8ab6 100644
--- a/tests/array-04.glsl
+++ b/src/glsl/tests/array-04.glsl
diff --git a/tests/array-05.glsl b/src/glsl/tests/array-05.glsl
index 168704096b0..168704096b0 100644
--- a/tests/array-05.glsl
+++ b/src/glsl/tests/array-05.glsl
diff --git a/tests/array-06.glsl b/src/glsl/tests/array-06.glsl
index 46b43795be1..46b43795be1 100644
--- a/tests/array-06.glsl
+++ b/src/glsl/tests/array-06.glsl
diff --git a/tests/array-07.glsl b/src/glsl/tests/array-07.glsl
index 161ffbf2f2e..161ffbf2f2e 100644
--- a/tests/array-07.glsl
+++ b/src/glsl/tests/array-07.glsl
diff --git a/tests/array-08.glsl b/src/glsl/tests/array-08.glsl
index 4bf0c6bd513..4bf0c6bd513 100644
--- a/tests/array-08.glsl
+++ b/src/glsl/tests/array-08.glsl
diff --git a/tests/array-09.glsl b/src/glsl/tests/array-09.glsl
index cad6d0e54ec..cad6d0e54ec 100644
--- a/tests/array-09.glsl
+++ b/src/glsl/tests/array-09.glsl
diff --git a/tests/array-10.glsl b/src/glsl/tests/array-10.glsl
index 019aa21150f..019aa21150f 100644
--- a/tests/array-10.glsl
+++ b/src/glsl/tests/array-10.glsl
diff --git a/tests/array-11.glsl b/src/glsl/tests/array-11.glsl
index 51d94e94773..51d94e94773 100644
--- a/tests/array-11.glsl
+++ b/src/glsl/tests/array-11.glsl
diff --git a/tests/array-12.glsl b/src/glsl/tests/array-12.glsl
index 7fc9579452f..7fc9579452f 100644
--- a/tests/array-12.glsl
+++ b/src/glsl/tests/array-12.glsl
diff --git a/tests/array-13.glsl b/src/glsl/tests/array-13.glsl
index cc7e29a5f76..cc7e29a5f76 100644
--- a/tests/array-13.glsl
+++ b/src/glsl/tests/array-13.glsl
diff --git a/tests/attribute-01.glsl b/src/glsl/tests/attribute-01.glsl
index 18e9e4468aa..18e9e4468aa 100644
--- a/tests/attribute-01.glsl
+++ b/src/glsl/tests/attribute-01.glsl
diff --git a/tests/attribute-02.glsl b/src/glsl/tests/attribute-02.glsl
index 6b6df74d252..6b6df74d252 100644
--- a/tests/attribute-02.glsl
+++ b/src/glsl/tests/attribute-02.glsl
diff --git a/tests/attribute-03.glsl b/src/glsl/tests/attribute-03.glsl
index 870de9e8148..870de9e8148 100644
--- a/tests/attribute-03.glsl
+++ b/src/glsl/tests/attribute-03.glsl
diff --git a/tests/attribute-04.glsl b/src/glsl/tests/attribute-04.glsl
index 14af2fcaadd..14af2fcaadd 100644
--- a/tests/attribute-04.glsl
+++ b/src/glsl/tests/attribute-04.glsl
diff --git a/tests/attribute-05.glsl b/src/glsl/tests/attribute-05.glsl
index 18822c78541..18822c78541 100644
--- a/tests/attribute-05.glsl
+++ b/src/glsl/tests/attribute-05.glsl
diff --git a/tests/attribute-06.glsl b/src/glsl/tests/attribute-06.glsl
index f18027b81af..f18027b81af 100644
--- a/tests/attribute-06.glsl
+++ b/src/glsl/tests/attribute-06.glsl
diff --git a/tests/attribute-07.glsl b/src/glsl/tests/attribute-07.glsl
index 0af13ba84bf..0af13ba84bf 100644
--- a/tests/attribute-07.glsl
+++ b/src/glsl/tests/attribute-07.glsl
diff --git a/tests/attribute-08.glsl b/src/glsl/tests/attribute-08.glsl
index b069c04d1b4..b069c04d1b4 100644
--- a/tests/attribute-08.glsl
+++ b/src/glsl/tests/attribute-08.glsl
diff --git a/tests/attribute-09.glsl b/src/glsl/tests/attribute-09.glsl
index 6a607244b9a..6a607244b9a 100644
--- a/tests/attribute-09.glsl
+++ b/src/glsl/tests/attribute-09.glsl
diff --git a/tests/attribute-10.glsl b/src/glsl/tests/attribute-10.glsl
index 6f5ef63a015..6f5ef63a015 100644
--- a/tests/attribute-10.glsl
+++ b/src/glsl/tests/attribute-10.glsl
diff --git a/tests/attribute-11.glsl b/src/glsl/tests/attribute-11.glsl
index 47cb5a05833..47cb5a05833 100644
--- a/tests/attribute-11.glsl
+++ b/src/glsl/tests/attribute-11.glsl
diff --git a/tests/condition-01.glsl b/src/glsl/tests/condition-01.glsl
index d89c313117e..d89c313117e 100644
--- a/tests/condition-01.glsl
+++ b/src/glsl/tests/condition-01.glsl
diff --git a/tests/condition-02.glsl b/src/glsl/tests/condition-02.glsl
index cbd0e18d9a8..cbd0e18d9a8 100644
--- a/tests/condition-02.glsl
+++ b/src/glsl/tests/condition-02.glsl
diff --git a/tests/condition-03.glsl b/src/glsl/tests/condition-03.glsl
index 9af5d7aa470..9af5d7aa470 100644
--- a/tests/condition-03.glsl
+++ b/src/glsl/tests/condition-03.glsl
diff --git a/tests/condition-04.glsl b/src/glsl/tests/condition-04.glsl
index f440b7e9955..f440b7e9955 100644
--- a/tests/condition-04.glsl
+++ b/src/glsl/tests/condition-04.glsl
diff --git a/tests/condition-05.glsl b/src/glsl/tests/condition-05.glsl
index 3dff18f519d..3dff18f519d 100644
--- a/tests/condition-05.glsl
+++ b/src/glsl/tests/condition-05.glsl
diff --git a/tests/constructor-01.glsl b/src/glsl/tests/constructor-01.glsl
index fdfaf898663..fdfaf898663 100644
--- a/tests/constructor-01.glsl
+++ b/src/glsl/tests/constructor-01.glsl
diff --git a/tests/constructor-02.glsl b/src/glsl/tests/constructor-02.glsl
index 47acbe9db14..47acbe9db14 100644
--- a/tests/constructor-02.glsl
+++ b/src/glsl/tests/constructor-02.glsl
diff --git a/tests/constructor-03.glsl b/src/glsl/tests/constructor-03.glsl
index 07ec225633a..07ec225633a 100644
--- a/tests/constructor-03.glsl
+++ b/src/glsl/tests/constructor-03.glsl
diff --git a/tests/constructor-04.glsl b/src/glsl/tests/constructor-04.glsl
index 19d5e011dea..19d5e011dea 100644
--- a/tests/constructor-04.glsl
+++ b/src/glsl/tests/constructor-04.glsl
diff --git a/tests/constructor-05.glsl b/src/glsl/tests/constructor-05.glsl
index 9c74f75a404..9c74f75a404 100644
--- a/tests/constructor-05.glsl
+++ b/src/glsl/tests/constructor-05.glsl
diff --git a/tests/constructor-06.glsl b/src/glsl/tests/constructor-06.glsl
index d77a5f9e892..d77a5f9e892 100644
--- a/tests/constructor-06.glsl
+++ b/src/glsl/tests/constructor-06.glsl
diff --git a/tests/constructor-07.glsl b/src/glsl/tests/constructor-07.glsl
index 92322506ed1..92322506ed1 100644
--- a/tests/constructor-07.glsl
+++ b/src/glsl/tests/constructor-07.glsl
diff --git a/tests/constructor-08.glsl b/src/glsl/tests/constructor-08.glsl
index 27153f0cda1..27153f0cda1 100644
--- a/tests/constructor-08.glsl
+++ b/src/glsl/tests/constructor-08.glsl
diff --git a/tests/constructor-09.glsl b/src/glsl/tests/constructor-09.glsl
index 1985699b305..1985699b305 100644
--- a/tests/constructor-09.glsl
+++ b/src/glsl/tests/constructor-09.glsl
diff --git a/tests/function-01.glsl b/src/glsl/tests/function-01.glsl
index 0eaa2397ab6..0eaa2397ab6 100644
--- a/tests/function-01.glsl
+++ b/src/glsl/tests/function-01.glsl
diff --git a/tests/function-02.glsl b/src/glsl/tests/function-02.glsl
index 941fcc1ef7b..941fcc1ef7b 100644
--- a/tests/function-02.glsl
+++ b/src/glsl/tests/function-02.glsl
diff --git a/tests/function-03.glsl b/src/glsl/tests/function-03.glsl
index b0da42f8e96..b0da42f8e96 100644
--- a/tests/function-03.glsl
+++ b/src/glsl/tests/function-03.glsl
diff --git a/tests/function-04.glsl b/src/glsl/tests/function-04.glsl
index dfc0d2b7a6c..dfc0d2b7a6c 100644
--- a/tests/function-04.glsl
+++ b/src/glsl/tests/function-04.glsl
diff --git a/tests/function-05.glsl b/src/glsl/tests/function-05.glsl
index 43365bf6062..43365bf6062 100644
--- a/tests/function-05.glsl
+++ b/src/glsl/tests/function-05.glsl
diff --git a/tests/if-01.glsl b/src/glsl/tests/if-01.glsl
index ca9abd54f75..ca9abd54f75 100644
--- a/tests/if-01.glsl
+++ b/src/glsl/tests/if-01.glsl
diff --git a/tests/if-02.glsl b/src/glsl/tests/if-02.glsl
index 7adccea0432..7adccea0432 100644
--- a/tests/if-02.glsl
+++ b/src/glsl/tests/if-02.glsl
diff --git a/tests/if-03.glsl b/src/glsl/tests/if-03.glsl
index 179618c716e..179618c716e 100644
--- a/tests/if-03.glsl
+++ b/src/glsl/tests/if-03.glsl
diff --git a/tests/if-04.glsl b/src/glsl/tests/if-04.glsl
index 7b711fb7edf..7b711fb7edf 100644
--- a/tests/if-04.glsl
+++ b/src/glsl/tests/if-04.glsl
diff --git a/tests/matrix-01.glsl b/src/glsl/tests/matrix-01.glsl
index f46416c8f67..f46416c8f67 100644
--- a/tests/matrix-01.glsl
+++ b/src/glsl/tests/matrix-01.glsl
diff --git a/tests/matrix-02.glsl b/src/glsl/tests/matrix-02.glsl
index 0630722b795..0630722b795 100644
--- a/tests/matrix-02.glsl
+++ b/src/glsl/tests/matrix-02.glsl
diff --git a/tests/matrix-03.glsl b/src/glsl/tests/matrix-03.glsl
index 925dc806258..925dc806258 100644
--- a/tests/matrix-03.glsl
+++ b/src/glsl/tests/matrix-03.glsl
diff --git a/tests/matrix-04.glsl b/src/glsl/tests/matrix-04.glsl
index 5275619b319..5275619b319 100644
--- a/tests/matrix-04.glsl
+++ b/src/glsl/tests/matrix-04.glsl
diff --git a/tests/matrix-05.glsl b/src/glsl/tests/matrix-05.glsl
index 74e1fd25148..74e1fd25148 100644
--- a/tests/matrix-05.glsl
+++ b/src/glsl/tests/matrix-05.glsl
diff --git a/tests/matrix-06.glsl b/src/glsl/tests/matrix-06.glsl
index 0a512b85234..0a512b85234 100644
--- a/tests/matrix-06.glsl
+++ b/src/glsl/tests/matrix-06.glsl
diff --git a/tests/matrix-07.glsl b/src/glsl/tests/matrix-07.glsl
index 0b59aa69d50..0b59aa69d50 100644
--- a/tests/matrix-07.glsl
+++ b/src/glsl/tests/matrix-07.glsl
diff --git a/tests/matrix-08.glsl b/src/glsl/tests/matrix-08.glsl
index 38138d22de4..38138d22de4 100644
--- a/tests/matrix-08.glsl
+++ b/src/glsl/tests/matrix-08.glsl
diff --git a/tests/matrix-09.glsl b/src/glsl/tests/matrix-09.glsl
index 18afbcacea7..18afbcacea7 100644
--- a/tests/matrix-09.glsl
+++ b/src/glsl/tests/matrix-09.glsl
diff --git a/tests/matrix-10.glsl b/src/glsl/tests/matrix-10.glsl
index 20b55180cbb..20b55180cbb 100644
--- a/tests/matrix-10.glsl
+++ b/src/glsl/tests/matrix-10.glsl
diff --git a/tests/parameters-01.glsl b/src/glsl/tests/parameters-01.glsl
index b485106e9d7..b485106e9d7 100644
--- a/tests/parameters-01.glsl
+++ b/src/glsl/tests/parameters-01.glsl
diff --git a/tests/parameters-02.glsl b/src/glsl/tests/parameters-02.glsl
index 7ff5f59ab79..7ff5f59ab79 100644
--- a/tests/parameters-02.glsl
+++ b/src/glsl/tests/parameters-02.glsl
diff --git a/tests/parameters-03.glsl b/src/glsl/tests/parameters-03.glsl
index 7ec30f80cc6..7ec30f80cc6 100644
--- a/tests/parameters-03.glsl
+++ b/src/glsl/tests/parameters-03.glsl
diff --git a/tests/qualifier-01.glsl b/src/glsl/tests/qualifier-01.glsl
index 54ec3572a24..54ec3572a24 100644
--- a/tests/qualifier-01.glsl
+++ b/src/glsl/tests/qualifier-01.glsl
diff --git a/tests/qualifier-02.glsl b/src/glsl/tests/qualifier-02.glsl
index b635d52aa2a..b635d52aa2a 100644
--- a/tests/qualifier-02.glsl
+++ b/src/glsl/tests/qualifier-02.glsl
diff --git a/tests/qualifier-03.glsl b/src/glsl/tests/qualifier-03.glsl
index 7e448034a7c..7e448034a7c 100644
--- a/tests/qualifier-03.glsl
+++ b/src/glsl/tests/qualifier-03.glsl
diff --git a/tests/qualifier-04.glsl b/src/glsl/tests/qualifier-04.glsl
index d03cafc1db2..d03cafc1db2 100644
--- a/tests/qualifier-04.glsl
+++ b/src/glsl/tests/qualifier-04.glsl
diff --git a/tests/qualifier-05.glsl b/src/glsl/tests/qualifier-05.glsl
index 15281f33840..15281f33840 100644
--- a/tests/qualifier-05.glsl
+++ b/src/glsl/tests/qualifier-05.glsl
diff --git a/tests/qualifier-06.glsl b/src/glsl/tests/qualifier-06.glsl
index 1907a087c8e..1907a087c8e 100644
--- a/tests/qualifier-06.glsl
+++ b/src/glsl/tests/qualifier-06.glsl
diff --git a/tests/qualifier-07.glsl b/src/glsl/tests/qualifier-07.glsl
index 12568a57dbc..12568a57dbc 100644
--- a/tests/qualifier-07.glsl
+++ b/src/glsl/tests/qualifier-07.glsl
diff --git a/tests/swiz-01.glsl b/src/glsl/tests/swiz-01.glsl
index 3268fa178c1..3268fa178c1 100644
--- a/tests/swiz-01.glsl
+++ b/src/glsl/tests/swiz-01.glsl
diff --git a/tests/swiz-02.glsl b/src/glsl/tests/swiz-02.glsl
index e3f043c47bd..e3f043c47bd 100644
--- a/tests/swiz-02.glsl
+++ b/src/glsl/tests/swiz-02.glsl
diff --git a/tests/void-01.glsl b/src/glsl/tests/void-01.glsl
index 5719edc0b6c..5719edc0b6c 100644
--- a/tests/void-01.glsl
+++ b/src/glsl/tests/void-01.glsl