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 be19e29a5a..be19e29a5a 100644
--- a/.dir-locals.el
+++ b/src/glsl/.dir-locals.el
diff --git a/.gitignore b/src/glsl/.gitignore
index 376aaeda13..376aaeda13 100644
--- a/.gitignore
+++ b/src/glsl/.gitignore
diff --git a/Makefile.am b/src/glsl/Makefile.am
index c34f7d8abf..c34f7d8abf 100644
--- a/Makefile.am
+++ b/src/glsl/Makefile.am
diff --git a/TODO b/src/glsl/TODO
index 193cfc767d..193cfc767d 100644
--- a/TODO
+++ b/src/glsl/TODO
diff --git a/ast.h b/src/glsl/ast.h
index de300e719c..de300e719c 100644
--- a/ast.h
+++ b/src/glsl/ast.h
diff --git a/ast_expr.cpp b/src/glsl/ast_expr.cpp
index 4e83decb92..4e83decb92 100644
--- a/ast_expr.cpp
+++ b/src/glsl/ast_expr.cpp
diff --git a/ast_function.cpp b/src/glsl/ast_function.cpp
index 761af00b95..761af00b95 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 33eb27533f..33eb27533f 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 cb0852bb77..cb0852bb77 100644
--- a/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
diff --git a/autogen.sh b/src/glsl/autogen.sh
index 904cd6746c..904cd6746c 100755
--- a/autogen.sh
+++ b/src/glsl/autogen.sh
diff --git a/builtin_function.cpp b/src/glsl/builtin_function.cpp
index d248388a1a..d248388a1a 100644
--- a/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
diff --git a/builtin_types.h b/src/glsl/builtin_types.h
index 48202f5645..48202f5645 100644
--- a/builtin_types.h
+++ b/src/glsl/builtin_types.h
diff --git a/builtin_variables.h b/src/glsl/builtin_variables.h
index 77f2fe5502..77f2fe5502 100644
--- a/builtin_variables.h
+++ b/src/glsl/builtin_variables.h
diff --git a/builtins/110/abs b/src/glsl/builtins/110/abs
index 904845307c..904845307c 100644
--- a/builtins/110/abs
+++ b/src/glsl/builtins/110/abs
diff --git a/builtins/110/all b/src/glsl/builtins/110/all
index 2cac0dfb68..2cac0dfb68 100644
--- a/builtins/110/all
+++ b/src/glsl/builtins/110/all
diff --git a/builtins/110/any b/src/glsl/builtins/110/any
index f10e8a7b47..f10e8a7b47 100644
--- a/builtins/110/any
+++ b/src/glsl/builtins/110/any
diff --git a/builtins/110/asin b/src/glsl/builtins/110/asin
index fe93337bff..fe93337bff 100644
--- a/builtins/110/asin
+++ b/src/glsl/builtins/110/asin
diff --git a/builtins/110/atan b/src/glsl/builtins/110/atan
index e5542350b5..e5542350b5 100644
--- a/builtins/110/atan
+++ b/src/glsl/builtins/110/atan
diff --git a/builtins/110/ceil b/src/glsl/builtins/110/ceil
index a26a775049..a26a775049 100644
--- a/builtins/110/ceil
+++ b/src/glsl/builtins/110/ceil
diff --git a/builtins/110/clamp b/src/glsl/builtins/110/clamp
index 94c8e5ed16..94c8e5ed16 100644
--- a/builtins/110/clamp
+++ b/src/glsl/builtins/110/clamp
diff --git a/builtins/110/cos b/src/glsl/builtins/110/cos
index 88f266eccb..88f266eccb 100644
--- a/builtins/110/cos
+++ b/src/glsl/builtins/110/cos
diff --git a/builtins/110/cross b/src/glsl/builtins/110/cross
index deb2f952bf..deb2f952bf 100644
--- a/builtins/110/cross
+++ b/src/glsl/builtins/110/cross
diff --git a/builtins/110/degrees b/src/glsl/builtins/110/degrees
index dc0d7b9e20..dc0d7b9e20 100644
--- a/builtins/110/degrees
+++ b/src/glsl/builtins/110/degrees
diff --git a/builtins/110/distance b/src/glsl/builtins/110/distance
index a2309c484f..a2309c484f 100644
--- a/builtins/110/distance
+++ b/src/glsl/builtins/110/distance
diff --git a/builtins/110/dot b/src/glsl/builtins/110/dot
index a91a6d2c56..a91a6d2c56 100644
--- a/builtins/110/dot
+++ b/src/glsl/builtins/110/dot
diff --git a/builtins/110/equal b/src/glsl/builtins/110/equal
index ae7ddc53bd..ae7ddc53bd 100644
--- a/builtins/110/equal
+++ b/src/glsl/builtins/110/equal
diff --git a/builtins/110/exp b/src/glsl/builtins/110/exp
index a73bd6a7f8..a73bd6a7f8 100644
--- a/builtins/110/exp
+++ b/src/glsl/builtins/110/exp
diff --git a/builtins/110/exp2 b/src/glsl/builtins/110/exp2
index a842d3fe65..a842d3fe65 100644
--- a/builtins/110/exp2
+++ b/src/glsl/builtins/110/exp2
diff --git a/builtins/110/faceforward b/src/glsl/builtins/110/faceforward
index d170397238..d170397238 100644
--- a/builtins/110/faceforward
+++ b/src/glsl/builtins/110/faceforward
diff --git a/builtins/110/floor b/src/glsl/builtins/110/floor
index 8dd8052799..8dd8052799 100644
--- a/builtins/110/floor
+++ b/src/glsl/builtins/110/floor
diff --git a/builtins/110/fract b/src/glsl/builtins/110/fract
index 3995bfaf3f..3995bfaf3f 100644
--- a/builtins/110/fract
+++ b/src/glsl/builtins/110/fract
diff --git a/builtins/110/greaterThan b/src/glsl/builtins/110/greaterThan
index ae03030e49..ae03030e49 100644
--- a/builtins/110/greaterThan
+++ b/src/glsl/builtins/110/greaterThan
diff --git a/builtins/110/greaterThanEqual b/src/glsl/builtins/110/greaterThanEqual
index 204d5fd143..204d5fd143 100644
--- a/builtins/110/greaterThanEqual
+++ b/src/glsl/builtins/110/greaterThanEqual
diff --git a/builtins/110/inversesqrt b/src/glsl/builtins/110/inversesqrt
index 5b66d2b369..5b66d2b369 100644
--- a/builtins/110/inversesqrt
+++ b/src/glsl/builtins/110/inversesqrt
diff --git a/builtins/110/length b/src/glsl/builtins/110/length
index 89ff7f3ef1..89ff7f3ef1 100644
--- a/builtins/110/length
+++ b/src/glsl/builtins/110/length
diff --git a/builtins/110/lessThan b/src/glsl/builtins/110/lessThan
index 5c4254165c..5c4254165c 100644
--- a/builtins/110/lessThan
+++ b/src/glsl/builtins/110/lessThan
diff --git a/builtins/110/lessThanEqual b/src/glsl/builtins/110/lessThanEqual
index ccb955b8a7..ccb955b8a7 100644
--- a/builtins/110/lessThanEqual
+++ b/src/glsl/builtins/110/lessThanEqual
diff --git a/builtins/110/log b/src/glsl/builtins/110/log
index d168abb5a7..d168abb5a7 100644
--- a/builtins/110/log
+++ b/src/glsl/builtins/110/log
diff --git a/builtins/110/log2 b/src/glsl/builtins/110/log2
index b96c6276f0..b96c6276f0 100644
--- a/builtins/110/log2
+++ b/src/glsl/builtins/110/log2
diff --git a/builtins/110/matrixCompMult b/src/glsl/builtins/110/matrixCompMult
index cb5a2cb1f7..cb5a2cb1f7 100644
--- a/builtins/110/matrixCompMult
+++ b/src/glsl/builtins/110/matrixCompMult
diff --git a/builtins/110/max b/src/glsl/builtins/110/max
index c05545f3d9..c05545f3d9 100644
--- a/builtins/110/max
+++ b/src/glsl/builtins/110/max
diff --git a/builtins/110/min b/src/glsl/builtins/110/min
index 31e7948940..31e7948940 100644
--- a/builtins/110/min
+++ b/src/glsl/builtins/110/min
diff --git a/builtins/110/mix b/src/glsl/builtins/110/mix
index 032f29e5fa..032f29e5fa 100644
--- a/builtins/110/mix
+++ b/src/glsl/builtins/110/mix
diff --git a/builtins/110/mod b/src/glsl/builtins/110/mod
index 9e08bbc7ef..9e08bbc7ef 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 bcfb17b04b..bcfb17b04b 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 be88a9830d..be88a9830d 100644
--- a/builtins/110/normalize
+++ b/src/glsl/builtins/110/normalize
diff --git a/builtins/110/not b/src/glsl/builtins/110/not
index b696b06557..b696b06557 100644
--- a/builtins/110/not
+++ b/src/glsl/builtins/110/not
diff --git a/builtins/110/notEqual b/src/glsl/builtins/110/notEqual
index c87efa317f..c87efa317f 100644
--- a/builtins/110/notEqual
+++ b/src/glsl/builtins/110/notEqual
diff --git a/builtins/110/pow b/src/glsl/builtins/110/pow
index a61bc4418e..a61bc4418e 100644
--- a/builtins/110/pow
+++ b/src/glsl/builtins/110/pow
diff --git a/builtins/110/radians b/src/glsl/builtins/110/radians
index 6a0f5d2e21..6a0f5d2e21 100644
--- a/builtins/110/radians
+++ b/src/glsl/builtins/110/radians
diff --git a/builtins/110/reflect b/src/glsl/builtins/110/reflect
index 8238fdc93f..8238fdc93f 100644
--- a/builtins/110/reflect
+++ b/src/glsl/builtins/110/reflect
diff --git a/builtins/110/refract b/src/glsl/builtins/110/refract
index e9b1475294..e9b1475294 100644
--- a/builtins/110/refract
+++ b/src/glsl/builtins/110/refract
diff --git a/builtins/110/sign b/src/glsl/builtins/110/sign
index 7d540de405..7d540de405 100644
--- a/builtins/110/sign
+++ b/src/glsl/builtins/110/sign
diff --git a/builtins/110/sin b/src/glsl/builtins/110/sin
index e6009d8ef1..e6009d8ef1 100644
--- a/builtins/110/sin
+++ b/src/glsl/builtins/110/sin
diff --git a/builtins/110/smoothstep b/src/glsl/builtins/110/smoothstep
index b4255ba78f..b4255ba78f 100644
--- a/builtins/110/smoothstep
+++ b/src/glsl/builtins/110/smoothstep
diff --git a/builtins/110/sqrt b/src/glsl/builtins/110/sqrt
index 0302d164ae..0302d164ae 100644
--- a/builtins/110/sqrt
+++ b/src/glsl/builtins/110/sqrt
diff --git a/builtins/110/step b/src/glsl/builtins/110/step
index 1cc2b51f8f..1cc2b51f8f 100644
--- a/builtins/110/step
+++ b/src/glsl/builtins/110/step
diff --git a/builtins/110/tan b/src/glsl/builtins/110/tan
index 3e04892a76..3e04892a76 100644
--- a/builtins/110/tan
+++ b/src/glsl/builtins/110/tan
diff --git a/builtins/110/textures b/src/glsl/builtins/110/textures
index c81b7e8ad4..c81b7e8ad4 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 b79852ee1f..b79852ee1f 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 38f3787e9e..38f3787e9e 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 3a5e8ccecf..3a5e8ccecf 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 69331e2652..69331e2652 100644
--- a/builtins/120/matrixCompMult
+++ b/src/glsl/builtins/120/matrixCompMult
diff --git a/builtins/120/outerProduct b/src/glsl/builtins/120/outerProduct
index b401ba0233..b401ba0233 100644
--- a/builtins/120/outerProduct
+++ b/src/glsl/builtins/120/outerProduct
diff --git a/builtins/120/transpose b/src/glsl/builtins/120/transpose
index 416a0ee467..416a0ee467 100644
--- a/builtins/120/transpose
+++ b/src/glsl/builtins/120/transpose
diff --git a/builtins/130/clamp b/src/glsl/builtins/130/clamp
index 3aed22c20d..3aed22c20d 100644
--- a/builtins/130/clamp
+++ b/src/glsl/builtins/130/clamp
diff --git a/builtins/130/cosh b/src/glsl/builtins/130/cosh
index 45e0ae427d..45e0ae427d 100644
--- a/builtins/130/cosh
+++ b/src/glsl/builtins/130/cosh
diff --git a/builtins/130/equal b/src/glsl/builtins/130/equal
index 079c3e97fb..079c3e97fb 100644
--- a/builtins/130/equal
+++ b/src/glsl/builtins/130/equal
diff --git a/builtins/130/greaterThan b/src/glsl/builtins/130/greaterThan
index a9fb7b3a43..a9fb7b3a43 100644
--- a/builtins/130/greaterThan
+++ b/src/glsl/builtins/130/greaterThan
diff --git a/builtins/130/greaterThanEqual b/src/glsl/builtins/130/greaterThanEqual
index 293c93c7cc..293c93c7cc 100644
--- a/builtins/130/greaterThanEqual
+++ b/src/glsl/builtins/130/greaterThanEqual
diff --git a/builtins/130/lessThan b/src/glsl/builtins/130/lessThan
index d9f693fd63..d9f693fd63 100644
--- a/builtins/130/lessThan
+++ b/src/glsl/builtins/130/lessThan
diff --git a/builtins/130/lessThanEqual b/src/glsl/builtins/130/lessThanEqual
index 494411b869..494411b869 100644
--- a/builtins/130/lessThanEqual
+++ b/src/glsl/builtins/130/lessThanEqual
diff --git a/builtins/130/max b/src/glsl/builtins/130/max
index 45a6089c9f..45a6089c9f 100644
--- a/builtins/130/max
+++ b/src/glsl/builtins/130/max
diff --git a/builtins/130/min b/src/glsl/builtins/130/min
index d98ec1e79d..d98ec1e79d 100644
--- a/builtins/130/min
+++ b/src/glsl/builtins/130/min
diff --git a/builtins/130/notEqual b/src/glsl/builtins/130/notEqual
index 81e6376bd9..81e6376bd9 100644
--- a/builtins/130/notEqual
+++ b/src/glsl/builtins/130/notEqual
diff --git a/builtins/130/sign b/src/glsl/builtins/130/sign
index 0bdc0e09d2..0bdc0e09d2 100644
--- a/builtins/130/sign
+++ b/src/glsl/builtins/130/sign
diff --git a/builtins/130/sinh b/src/glsl/builtins/130/sinh
index 7ad4f58e20..7ad4f58e20 100644
--- a/builtins/130/sinh
+++ b/src/glsl/builtins/130/sinh
diff --git a/builtins/130/tanh b/src/glsl/builtins/130/tanh
index 3b7271bf77..3b7271bf77 100644
--- a/builtins/130/tanh
+++ b/src/glsl/builtins/130/tanh
diff --git a/builtins/130/texelFetch b/src/glsl/builtins/130/texelFetch
index d51ce65a89..d51ce65a89 100644
--- a/builtins/130/texelFetch
+++ b/src/glsl/builtins/130/texelFetch
diff --git a/builtins/130/texture b/src/glsl/builtins/130/texture
index b170b58309..b170b58309 100644
--- a/builtins/130/texture
+++ b/src/glsl/builtins/130/texture
diff --git a/builtins/130/textureGrad b/src/glsl/builtins/130/textureGrad
index 0ef428c224..0ef428c224 100644
--- a/builtins/130/textureGrad
+++ b/src/glsl/builtins/130/textureGrad
diff --git a/builtins/130/textureLod b/src/glsl/builtins/130/textureLod
index 7d7059d848..7d7059d848 100644
--- a/builtins/130/textureLod
+++ b/src/glsl/builtins/130/textureLod
diff --git a/builtins/130/textureProj b/src/glsl/builtins/130/textureProj
index 40ea1c2af6..40ea1c2af6 100644
--- a/builtins/130/textureProj
+++ b/src/glsl/builtins/130/textureProj
diff --git a/builtins/130/textureProjGrad b/src/glsl/builtins/130/textureProjGrad
index a0142c5e68..a0142c5e68 100644
--- a/builtins/130/textureProjGrad
+++ b/src/glsl/builtins/130/textureProjGrad
diff --git a/builtins/130/textureProjLod b/src/glsl/builtins/130/textureProjLod
index 9f4ce1b493..9f4ce1b493 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 0de981397f..0de981397f 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 b1d8f0a2f3..b1d8f0a2f3 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 161d8c4a54..161d8c4a54 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 8a91f90140..8a91f90140 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 74e184387a..74e184387a 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 8b640ab8ff..8b640ab8ff 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 391ad110d3..391ad110d3 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 48fb72197c..48fb72197c 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 8f669ce983..8f669ce983 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 23d5314916..23d5314916 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 73ce67de3d..73ce67de3d 100644
--- a/configure.ac
+++ b/src/glsl/configure.ac
diff --git a/glcpp/.gitignore b/src/glsl/glcpp/.gitignore
index c158dc8b86..c158dc8b86 100644
--- a/glcpp/.gitignore
+++ b/src/glsl/glcpp/.gitignore
diff --git a/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index a49fd615cd..a49fd615cd 100644
--- a/glcpp/Makefile.am
+++ b/src/glsl/glcpp/Makefile.am
diff --git a/glcpp/README b/src/glsl/glcpp/README
index ab42a3ffe1..ab42a3ffe1 100644
--- a/glcpp/README
+++ b/src/glsl/glcpp/README
diff --git a/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index afddd7ddb3..afddd7ddb3 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 6beac18c65..6beac18c65 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 cc87e14950..cc87e14950 100644
--- a/glcpp/glcpp.c
+++ b/src/glsl/glcpp/glcpp.c
diff --git a/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h
index 2cfa98d2b1..2cfa98d2b1 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 e89a2564d7..e89a2564d7 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 b9dd343dee..b9dd343dee 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 d2197342c0..d2197342c0 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 5ef39e14cc..5ef39e14cc 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 a25b7b72a6..a25b7b72a6 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 696cb3a74f..696cb3a74f 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 83f7834d54..83f7834d54 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 cbf2fee0e7..cbf2fee0e7 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 878fd15d6f..878fd15d6f 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 87d75c6875..87d75c6875 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 43d484d713..43d484d713 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 a18b724eca..a18b724eca 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 43d484d713..43d484d713 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 2ac56ea3dc..2ac56ea3dc 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 4d2698b7a7..4d2698b7a7 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 f5521df968..f5521df968 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 c67358f4f6..c67358f4f6 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 4bb91a1221..4bb91a1221 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 c67358f4f6..c67358f4f6 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 5784565bdf..5784565bdf 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 30fe4dc1f6..30fe4dc1f6 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 b1bd17ec21..b1bd17ec21 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 b28b04f643..b28b04f643 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 3fc1fb4424..3fc1fb4424 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 03a7061af0..03a7061af0 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 32ff73798b..32ff73798b 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 f4f7efdc2b..f4f7efdc2b 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 d9ce13c228..d9ce13c228 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 b28b04f643..b28b04f643 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 c2bb730b11..c2bb730b11 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 0353767297..0353767297 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 f78fb8b118..f78fb8b118 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 878fd15d6f..878fd15d6f 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 11feb2624b..11feb2624b 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 878fd15d6f..878fd15d6f 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 558da9c617..558da9c617 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 d6f8cb9dc6..d6f8cb9dc6 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 a2e2404c7c..a2e2404c7c 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 7f1828a3c6..7f1828a3c6 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 c725383527..c725383527 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 9f341dac00..9f341dac00 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 668130b8f9..668130b8f9 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 43d484d713..43d484d713 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 c4e62b2550..c4e62b2550 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 4314fc88d8..4314fc88d8 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 3049ad1546..3049ad1546 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 5648e4fb9d..5648e4fb9d 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 21ddd0e65f..21ddd0e65f 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 1d62105de4..1d62105de4 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 c20d73a4a2..c20d73a4a2 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 66c1658175..66c1658175 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 7ebfed6516..7ebfed6516 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 573829c2d6..573829c2d6 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 e788adce30..e788adce30 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 ad955fce6e..ad955fce6e 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 b433671d1b..b433671d1b 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 960f44511a..960f44511a 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 0d83740530..0d83740530 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 f0888f21b9..f0888f21b9 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 5ccb52caba..5ccb52caba 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 aef762e1e6..aef762e1e6 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 44962a7187..44962a7187 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 aef762e1e6..aef762e1e6 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 261f7d28fc..261f7d28fc 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 aef762e1e6..aef762e1e6 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 e56fbefd62..e56fbefd62 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 729bdd15f8..729bdd15f8 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 3f4c8744df..3f4c8744df 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 729bdd15f8..729bdd15f8 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 b3ac70f499..b3ac70f499 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 541d44db7a..541d44db7a 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 f65e48286c..f65e48286c 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 6ea6905d80..6ea6905d80 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 209a5f7e07..209a5f7e07 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 24823b1b67..24823b1b67 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 c307fbe830..c307fbe830 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 137a9ea2db..137a9ea2db 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 b21ff33673..b21ff33673 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 ff6360bfe4..ff6360bfe4 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 b3a2f37f1b..b3a2f37f1b 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 cbadee848a..cbadee848a 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 1407c7d6e3..1407c7d6e3 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 5a28fb3b66..5a28fb3b66 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 0f7fe632b5..0f7fe632b5 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 b73869d023..b73869d023 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 caab3ba736..caab3ba736 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 36f6699253..36f6699253 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 2cab677d3e..2cab677d3e 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 3800024c6f..3800024c6f 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 874a25cf41..874a25cf41 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 e591044adb..e591044adb 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 323351f9db..323351f9db 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 ee9e677096..ee9e677096 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 28dfc25c6f..28dfc25c6f 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 129f5c8542..129f5c8542 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 e50f686d46..e50f686d46 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 97a11b4472..97a11b4472 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 130515a01e..130515a01e 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 b928b917e3..b928b917e3 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 e8f0838a9e..e8f0838a9e 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 e5b53a3fa5..e5b53a3fa5 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 fc4679c3be..fc4679c3be 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 c61fd0b315..c61fd0b315 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 833ea03882..833ea03882 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 569debb0bb..569debb0bb 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 34f0f95140..34f0f95140 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 3f01955ee4..3f01955ee4 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 c3db488e0d..c3db488e0d 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 d2b76f1457..d2b76f1457 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 2d8e45eb61..2d8e45eb61 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 bb5d92e8d9..bb5d92e8d9 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 d24c54a88d..d24c54a88d 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 f97e93673c..f97e93673c 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 3da79a0d96..3da79a0d96 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 27ea496962..27ea496962 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 00f2c2346d..00f2c2346d 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 aef762e1e6..aef762e1e6 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 58701d1f25..58701d1f25 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 729bdd15f8..729bdd15f8 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 6140232865..6140232865 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 4e3aad5217..4e3aad5217 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 8ac260c76b..8ac260c76b 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 a1c34e5c1f..a1c34e5c1f 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 37b895a423..37b895a423 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 f1a2cd21c1..f1a2cd21c1 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 ed80ea879c..ed80ea879c 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 c1f0d24a14..c1f0d24a14 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 6dbfd1f62d..6dbfd1f62d 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 111f7d1063..111f7d1063 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 d9e439bb89..d9e439bb89 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 6fb66a5e2f..6fb66a5e2f 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 e641d2f0f9..e641d2f0f9 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 ed4feedd45..ed4feedd45 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 21326481b8..21326481b8 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 3af71113c8..3af71113c8 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 48aa0f8c3e..48aa0f8c3e 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 3f01955ee4..3f01955ee4 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 959d682598..959d682598 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 fee253b745..fee253b745 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 e421e9d5e2..e421e9d5e2 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 c780b43d70..c780b43d70 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 d1976b1f26..d1976b1f26 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 19be750555..19be750555 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 396f6e175e..396f6e175e 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 656ac2d6cb..656ac2d6cb 100644
--- a/glcpp/xtalloc.c
+++ b/src/glsl/glcpp/xtalloc.c
diff --git a/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp
index fa439f1278..fa439f1278 100644
--- a/glsl_lexer.lpp
+++ b/src/glsl/glsl_lexer.lpp
diff --git a/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index 4132495f40..4132495f40 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 1d16ef55f5..1d16ef55f5 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 cfe02e3b0c..cfe02e3b0c 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 ae2fd3f4f1..ae2fd3f4f1 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 bef267fa6b..bef267fa6b 100644
--- a/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
diff --git a/glsl_types.h b/src/glsl/glsl_types.h
index 39e6ac970a..39e6ac970a 100644
--- a/glsl_types.h
+++ b/src/glsl/glsl_types.h
diff --git a/hash_table.c b/src/glsl/hash_table.c
index e89a2564d7..e89a2564d7 100644
--- a/hash_table.c
+++ b/src/glsl/hash_table.c
diff --git a/hash_table.h b/src/glsl/hash_table.h
index b9dd343dee..b9dd343dee 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 e2efff60d3..e2efff60d3 100644
--- a/hir_field_selection.cpp
+++ b/src/glsl/hir_field_selection.cpp
diff --git a/ir.cpp b/src/glsl/ir.cpp
index 2756752ba4..2756752ba4 100644
--- a/ir.cpp
+++ b/src/glsl/ir.cpp
diff --git a/ir.h b/src/glsl/ir.h
index 3d2c7ff5cf..3d2c7ff5cf 100644
--- a/ir.h
+++ b/src/glsl/ir.h
diff --git a/ir_basic_block.cpp b/src/glsl/ir_basic_block.cpp
index f9953ea42d..f9953ea42d 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 dbd678b5c4..dbd678b5c4 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 84176383fc..84176383fc 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 3408f5256a..3408f5256a 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 342d027bbe..342d027bbe 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 ef5e1e418e..ef5e1e418e 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 46ef6679d9..46ef6679d9 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 8821304682..8821304682 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 e01877077c..e01877077c 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 5ba24e390b..5ba24e390b 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 2eda159000..2eda159000 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 5db93f67fb..5db93f67fb 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 8bb8e0d9ed..8bb8e0d9ed 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 e55780c940..e55780c940 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 6db011bbca..6db011bbca 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 0d520b127f..0d520b127f 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 8b9e49dab1..8b9e49dab1 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 f936b3500e..f936b3500e 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 6882ef72b9..6882ef72b9 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 432a33458c..432a33458c 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 be5a843f67..be5a843f67 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 e97b823522..e97b823522 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 7383c42cbc..7383c42cbc 100644
--- a/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
diff --git a/ir_reader.h b/src/glsl/ir_reader.h
index b6afdc81ab..b6afdc81ab 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 0ffb4fa313..0ffb4fa313 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 26449c5a5c..26449c5a5c 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 507e88993f..507e88993f 100644
--- a/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
diff --git a/ir_variable.cpp b/src/glsl/ir_variable.cpp
index 15a4a92f62..15a4a92f62 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 abeb43cd68..abeb43cd68 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 a6f9d2b7ee..a6f9d2b7ee 100644
--- a/ir_visitor.h
+++ b/src/glsl/ir_visitor.h
diff --git a/linker.cpp b/src/glsl/linker.cpp
index ba382fe881..ba382fe881 100644
--- a/linker.cpp
+++ b/src/glsl/linker.cpp
diff --git a/list.h b/src/glsl/list.h
index 7732d66d7a..7732d66d7a 100644
--- a/list.h
+++ b/src/glsl/list.h
diff --git a/main.cpp b/src/glsl/main.cpp
index dcd9bd69c0..dcd9bd69c0 100644
--- a/main.cpp
+++ b/src/glsl/main.cpp
diff --git a/main/imports.h b/src/glsl/main/imports.h
index d2197342c0..d2197342c0 100644
--- a/main/imports.h
+++ b/src/glsl/main/imports.h
diff --git a/main/mtypes.h b/src/glsl/main/mtypes.h
index 06e2dd4b54..06e2dd4b54 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 5ef39e14cc..5ef39e14cc 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 fbcf868f50..fbcf868f50 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 2c95d274ca..2c95d274ca 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 3f1cb48e4b..3f1cb48e4b 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 f0df77b512..f0df77b512 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 d21b04344c..d21b04344c 100644
--- a/program.h
+++ b/src/glsl/program.h
diff --git a/s_expression.cpp b/src/glsl/s_expression.cpp
index 26be23ea8f..26be23ea8f 100644
--- a/s_expression.cpp
+++ b/src/glsl/s_expression.cpp
diff --git a/s_expression.h b/src/glsl/s_expression.h
index 1a0c03c218..1a0c03c218 100644
--- a/s_expression.h
+++ b/src/glsl/s_expression.h
diff --git a/symbol_table.c b/src/glsl/symbol_table.c
index 0f0df7a261..0f0df7a261 100644
--- a/symbol_table.c
+++ b/src/glsl/symbol_table.c
diff --git a/symbol_table.h b/src/glsl/symbol_table.h
index 3a9994c1ac..3a9994c1ac 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 d14135fb3a..d14135fb3a 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 d743617158..d743617158 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 0026913f01..0026913f01 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 70f434d8ab..70f434d8ab 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 168704096b..168704096b 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 46b43795be..46b43795be 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 161ffbf2f2..161ffbf2f2 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 4bf0c6bd51..4bf0c6bd51 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 cad6d0e54e..cad6d0e54e 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 019aa21150..019aa21150 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 51d94e9477..51d94e9477 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 7fc9579452..7fc9579452 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 cc7e29a5f7..cc7e29a5f7 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 18e9e4468a..18e9e4468a 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 6b6df74d25..6b6df74d25 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 870de9e814..870de9e814 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 14af2fcaad..14af2fcaad 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 18822c7854..18822c7854 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 f18027b81a..f18027b81a 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 0af13ba84b..0af13ba84b 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 b069c04d1b..b069c04d1b 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 6a607244b9..6a607244b9 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 6f5ef63a01..6f5ef63a01 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 47cb5a0583..47cb5a0583 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 d89c313117..d89c313117 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 cbd0e18d9a..cbd0e18d9a 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 9af5d7aa47..9af5d7aa47 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 f440b7e995..f440b7e995 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 3dff18f519..3dff18f519 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 fdfaf89866..fdfaf89866 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 47acbe9db1..47acbe9db1 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 07ec225633..07ec225633 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 19d5e011de..19d5e011de 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 9c74f75a40..9c74f75a40 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 d77a5f9e89..d77a5f9e89 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 92322506ed..92322506ed 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 27153f0cda..27153f0cda 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 1985699b30..1985699b30 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 0eaa2397ab..0eaa2397ab 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 941fcc1ef7..941fcc1ef7 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 b0da42f8e9..b0da42f8e9 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 dfc0d2b7a6..dfc0d2b7a6 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 43365bf606..43365bf606 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 ca9abd54f7..ca9abd54f7 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 7adccea043..7adccea043 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 179618c716..179618c716 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 7b711fb7ed..7b711fb7ed 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 f46416c8f6..f46416c8f6 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 0630722b79..0630722b79 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 925dc80625..925dc80625 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 5275619b31..5275619b31 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 74e1fd2514..74e1fd2514 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 0a512b8523..0a512b8523 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 0b59aa69d5..0b59aa69d5 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 38138d22de..38138d22de 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 18afbcacea..18afbcacea 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 20b55180cb..20b55180cb 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 b485106e9d..b485106e9d 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 7ff5f59ab7..7ff5f59ab7 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 7ec30f80cc..7ec30f80cc 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 54ec3572a2..54ec3572a2 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 b635d52aa2..b635d52aa2 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 7e448034a7..7e448034a7 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 d03cafc1db..d03cafc1db 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 15281f3384..15281f3384 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 1907a087c8..1907a087c8 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 12568a57db..12568a57db 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 3268fa178c..3268fa178c 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 e3f043c47b..e3f043c47b 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 5719edc0b6..5719edc0b6 100644
--- a/tests/void-01.glsl
+++ b/src/glsl/tests/void-01.glsl