diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/SConscript | 1 | ||||
| -rw-r--r-- | src/compiler/Makefile.am | 201 | ||||
| -rw-r--r-- | src/compiler/Makefile.sources | 147 | ||||
| -rw-r--r-- | src/compiler/SConscript | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/.gitignore (renamed from src/glsl/.gitignore) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/Android.gen.mk (renamed from src/glsl/Android.gen.mk) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/Android.mk (renamed from src/glsl/Android.mk) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/Makefile.am (renamed from src/glsl/Makefile.am) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/Makefile.sources (renamed from src/glsl/Makefile.sources) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/README (renamed from src/glsl/README) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/SConscript (renamed from src/glsl/SConscript) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/TODO (renamed from src/glsl/TODO) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ast.h (renamed from src/glsl/ast.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ast_array_index.cpp (renamed from src/glsl/ast_array_index.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ast_expr.cpp (renamed from src/glsl/ast_expr.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ast_function.cpp (renamed from src/glsl/ast_function.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp (renamed from src/glsl/ast_to_hir.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ast_type.cpp (renamed from src/glsl/ast_type.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/blob.c (renamed from src/glsl/blob.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/blob.h (renamed from src/glsl/blob.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/builtin_functions.cpp (renamed from src/glsl/builtin_functions.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/builtin_types.cpp (renamed from src/glsl/builtin_types.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/builtin_variables.cpp (renamed from src/glsl/builtin_variables.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/.gitignore (renamed from src/glsl/glcpp/.gitignore) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/README (renamed from src/glsl/glcpp/README) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/glcpp-lex.l (renamed from src/glsl/glcpp/glcpp-lex.l) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/glcpp-parse.y (renamed from src/glsl/glcpp/glcpp-parse.y) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/glcpp.c (renamed from src/glsl/glcpp/glcpp.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/glcpp.h (renamed from src/glsl/glcpp/glcpp.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/pp.c (renamed from src/glsl/glcpp/pp.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/.gitignore (renamed from src/glsl/glcpp/tests/.gitignore) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/000-content-with-spaces.c (renamed from src/glsl/glcpp/tests/000-content-with-spaces.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected (renamed from src/glsl/glcpp/tests/000-content-with-spaces.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/001-define.c (renamed from src/glsl/glcpp/tests/001-define.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/001-define.c.expected (renamed from src/glsl/glcpp/tests/001-define.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/002-define-chain.c (renamed from src/glsl/glcpp/tests/002-define-chain.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/002-define-chain.c.expected (renamed from src/glsl/glcpp/tests/002-define-chain.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c (renamed from src/glsl/glcpp/tests/003-define-chain-reverse.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected (renamed from src/glsl/glcpp/tests/003-define-chain-reverse.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/004-define-recursive.c (renamed from src/glsl/glcpp/tests/004-define-recursive.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected (renamed from src/glsl/glcpp/tests/004-define-recursive.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/005-define-composite-chain.c (renamed from src/glsl/glcpp/tests/005-define-composite-chain.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected (renamed from src/glsl/glcpp/tests/005-define-composite-chain.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c (renamed from src/glsl/glcpp/tests/006-define-composite-chain-reverse.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected (renamed from src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c (renamed from src/glsl/glcpp/tests/007-define-composite-recursive.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected (renamed from src/glsl/glcpp/tests/007-define-composite-recursive.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/008-define-empty.c (renamed from src/glsl/glcpp/tests/008-define-empty.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/008-define-empty.c.expected (renamed from src/glsl/glcpp/tests/008-define-empty.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/009-undef.c (renamed from src/glsl/glcpp/tests/009-undef.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/009-undef.c.expected (renamed from src/glsl/glcpp/tests/009-undef.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/010-undef-re-define.c (renamed from src/glsl/glcpp/tests/010-undef-re-define.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected (renamed from src/glsl/glcpp/tests/010-undef-re-define.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/011-define-func-empty.c (renamed from src/glsl/glcpp/tests/011-define-func-empty.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected (renamed from src/glsl/glcpp/tests/011-define-func-empty.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/012-define-func-no-args.c (renamed from src/glsl/glcpp/tests/012-define-func-no-args.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected (renamed from src/glsl/glcpp/tests/012-define-func-no-args.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c (renamed from src/glsl/glcpp/tests/013-define-func-1-arg-unused.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected (renamed from src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c (renamed from src/glsl/glcpp/tests/014-define-func-2-arg-unused.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected (renamed from src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c (renamed from src/glsl/glcpp/tests/015-define-object-with-parens.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected (renamed from src/glsl/glcpp/tests/015-define-object-with-parens.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c (renamed from src/glsl/glcpp/tests/016-define-func-1-arg.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected (renamed from src/glsl/glcpp/tests/016-define-func-1-arg.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/017-define-func-2-args.c (renamed from src/glsl/glcpp/tests/017-define-func-2-args.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected (renamed from src/glsl/glcpp/tests/017-define-func-2-args.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c (renamed from src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected (renamed from src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c (renamed from src/glsl/glcpp/tests/019-define-func-1-arg-multi.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected (renamed from src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c (renamed from src/glsl/glcpp/tests/020-define-func-2-arg-multi.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected (renamed from src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/021-define-func-compose.c (renamed from src/glsl/glcpp/tests/021-define-func-compose.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected (renamed from src/glsl/glcpp/tests/021-define-func-compose.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c (renamed from src/glsl/glcpp/tests/022-define-func-arg-with-parens.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected (renamed from src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c (renamed from src/glsl/glcpp/tests/023-define-extra-whitespace.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected (renamed from src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c (renamed from src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected (renamed from src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c (renamed from src/glsl/glcpp/tests/025-func-macro-as-non-macro.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected (renamed from src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c (renamed from src/glsl/glcpp/tests/026-define-func-extra-newlines.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected (renamed from src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c (renamed from src/glsl/glcpp/tests/027-define-chain-obj-to-func.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected (renamed from src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c (renamed from src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected (renamed from src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c (renamed from src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected (renamed from src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c (renamed from src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected (renamed from src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c (renamed from src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected (renamed from src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c (renamed from src/glsl/glcpp/tests/032-define-func-self-recurse.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected (renamed from src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c (renamed from src/glsl/glcpp/tests/033-define-func-self-compose.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected (renamed from src/glsl/glcpp/tests/033-define-func-self-compose.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c (renamed from src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected (renamed from src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c (renamed from src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected (renamed from src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c (renamed from src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected (renamed from src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c (renamed from src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected (renamed from src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c (renamed from src/glsl/glcpp/tests/038-func-arg-with-commas.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected (renamed from src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c (renamed from src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected (renamed from src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/040-token-pasting.c (renamed from src/glsl/glcpp/tests/040-token-pasting.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected (renamed from src/glsl/glcpp/tests/040-token-pasting.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/041-if-0.c (renamed from src/glsl/glcpp/tests/041-if-0.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/041-if-0.c.expected (renamed from src/glsl/glcpp/tests/041-if-0.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/042-if-1.c (renamed from src/glsl/glcpp/tests/042-if-1.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/042-if-1.c.expected (renamed from src/glsl/glcpp/tests/042-if-1.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/043-if-0-else.c (renamed from src/glsl/glcpp/tests/043-if-0-else.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected (renamed from src/glsl/glcpp/tests/043-if-0-else.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/044-if-1-else.c (renamed from src/glsl/glcpp/tests/044-if-1-else.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected (renamed from src/glsl/glcpp/tests/044-if-1-else.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/045-if-0-elif.c (renamed from src/glsl/glcpp/tests/045-if-0-elif.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected (renamed from src/glsl/glcpp/tests/045-if-0-elif.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/046-if-1-elsif.c (renamed from src/glsl/glcpp/tests/046-if-1-elsif.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected (renamed from src/glsl/glcpp/tests/046-if-1-elsif.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/047-if-elif-else.c (renamed from src/glsl/glcpp/tests/047-if-elif-else.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected (renamed from src/glsl/glcpp/tests/047-if-elif-else.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/048-if-nested.c (renamed from src/glsl/glcpp/tests/048-if-nested.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/048-if-nested.c.expected (renamed from src/glsl/glcpp/tests/048-if-nested.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c (renamed from src/glsl/glcpp/tests/049-if-expression-precedence.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected (renamed from src/glsl/glcpp/tests/049-if-expression-precedence.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/050-if-defined.c (renamed from src/glsl/glcpp/tests/050-if-defined.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/050-if-defined.c.expected (renamed from src/glsl/glcpp/tests/050-if-defined.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/051-if-relational.c (renamed from src/glsl/glcpp/tests/051-if-relational.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/051-if-relational.c.expected (renamed from src/glsl/glcpp/tests/051-if-relational.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/052-if-bitwise.c (renamed from src/glsl/glcpp/tests/052-if-bitwise.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected (renamed from src/glsl/glcpp/tests/052-if-bitwise.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c (renamed from src/glsl/glcpp/tests/053-if-divide-and-shift.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected (renamed from src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/054-if-with-macros.c (renamed from src/glsl/glcpp/tests/054-if-with-macros.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected (renamed from src/glsl/glcpp/tests/054-if-with-macros.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c (renamed from src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected (renamed from src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c (renamed from src/glsl/glcpp/tests/056-macro-argument-with-comma.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected (renamed from src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/057-empty-arguments.c (renamed from src/glsl/glcpp/tests/057-empty-arguments.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected (renamed from src/glsl/glcpp/tests/057-empty-arguments.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c (renamed from src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected (renamed from src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c (renamed from src/glsl/glcpp/tests/059-token-pasting-integer.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected (renamed from src/glsl/glcpp/tests/059-token-pasting-integer.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c (renamed from src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected (renamed from src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c (renamed from src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected (renamed from src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c (renamed from src/glsl/glcpp/tests/062-if-0-skips-garbage.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected (renamed from src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/063-comments.c (renamed from src/glsl/glcpp/tests/063-comments.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/063-comments.c.expected (renamed from src/glsl/glcpp/tests/063-comments.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/064-version.c (renamed from src/glsl/glcpp/tests/064-version.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/064-version.c.expected (renamed from src/glsl/glcpp/tests/064-version.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/065-if-defined-parens.c (renamed from src/glsl/glcpp/tests/065-if-defined-parens.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected (renamed from src/glsl/glcpp/tests/065-if-defined-parens.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c (renamed from src/glsl/glcpp/tests/066-if-nospace-expression.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected (renamed from src/glsl/glcpp/tests/066-if-nospace-expression.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c (renamed from src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected (renamed from src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/068-accidental-pasting.c (renamed from src/glsl/glcpp/tests/068-accidental-pasting.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected (renamed from src/glsl/glcpp/tests/068-accidental-pasting.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/069-repeated-argument.c (renamed from src/glsl/glcpp/tests/069-repeated-argument.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected (renamed from src/glsl/glcpp/tests/069-repeated-argument.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c (renamed from src/glsl/glcpp/tests/070-undefined-macro-in-expression.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected (renamed from src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/071-punctuator.c (renamed from src/glsl/glcpp/tests/071-punctuator.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/071-punctuator.c.expected (renamed from src/glsl/glcpp/tests/071-punctuator.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c (renamed from src/glsl/glcpp/tests/072-token-pasting-same-line.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected (renamed from src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c (renamed from src/glsl/glcpp/tests/073-if-in-ifdef.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected (renamed from src/glsl/glcpp/tests/073-if-in-ifdef.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/074-elif-undef.c (renamed from src/glsl/glcpp/tests/074-elif-undef.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected (renamed from src/glsl/glcpp/tests/074-elif-undef.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c (renamed from src/glsl/glcpp/tests/075-elif-elif-undef.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected (renamed from src/glsl/glcpp/tests/075-elif-elif-undef.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c (renamed from src/glsl/glcpp/tests/076-elif-undef-nested.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected (renamed from src/glsl/glcpp/tests/076-elif-undef-nested.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/077-else-without-if.c (renamed from src/glsl/glcpp/tests/077-else-without-if.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected (renamed from src/glsl/glcpp/tests/077-else-without-if.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/078-elif-without-if.c (renamed from src/glsl/glcpp/tests/078-elif-without-if.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected (renamed from src/glsl/glcpp/tests/078-elif-without-if.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/079-endif-without-if.c (renamed from src/glsl/glcpp/tests/079-endif-without-if.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected (renamed from src/glsl/glcpp/tests/079-endif-without-if.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/080-if-without-expression.c (renamed from src/glsl/glcpp/tests/080-if-without-expression.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected (renamed from src/glsl/glcpp/tests/080-if-without-expression.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/081-elif-without-expression.c (renamed from src/glsl/glcpp/tests/081-elif-without-expression.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected (renamed from src/glsl/glcpp/tests/081-elif-without-expression.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/082-invalid-paste.c (renamed from src/glsl/glcpp/tests/082-invalid-paste.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected (renamed from src/glsl/glcpp/tests/082-invalid-paste.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/083-unterminated-if.c (renamed from src/glsl/glcpp/tests/083-unterminated-if.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected (renamed from src/glsl/glcpp/tests/083-unterminated-if.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c (renamed from src/glsl/glcpp/tests/084-unbalanced-parentheses.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected (renamed from src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c (renamed from src/glsl/glcpp/tests/085-incorrect-argument-count.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected (renamed from src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c (renamed from src/glsl/glcpp/tests/086-reserved-macro-names.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected (renamed from src/glsl/glcpp/tests/086-reserved-macro-names.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/087-if-comments.c (renamed from src/glsl/glcpp/tests/087-if-comments.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/087-if-comments.c.expected (renamed from src/glsl/glcpp/tests/087-if-comments.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c (renamed from src/glsl/glcpp/tests/088-redefine-macro-legitimate.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected (renamed from src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c (renamed from src/glsl/glcpp/tests/089-redefine-macro-error.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected (renamed from src/glsl/glcpp/tests/089-redefine-macro-error.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/090-hash-error.c (renamed from src/glsl/glcpp/tests/090-hash-error.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/090-hash-error.c.expected (renamed from src/glsl/glcpp/tests/090-hash-error.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/091-hash-line.c (renamed from src/glsl/glcpp/tests/091-hash-line.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/091-hash-line.c.expected (renamed from src/glsl/glcpp/tests/091-hash-line.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c (renamed from src/glsl/glcpp/tests/092-redefine-macro-error-2.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected (renamed from src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/093-divide-by-zero.c (renamed from src/glsl/glcpp/tests/093-divide-by-zero.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected (renamed from src/glsl/glcpp/tests/093-divide-by-zero.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c (renamed from src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected (renamed from src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/095-recursive-define.c (renamed from src/glsl/glcpp/tests/095-recursive-define.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected (renamed from src/glsl/glcpp/tests/095-recursive-define.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/096-paste-twice.c (renamed from src/glsl/glcpp/tests/096-paste-twice.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected (renamed from src/glsl/glcpp/tests/096-paste-twice.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c (renamed from src/glsl/glcpp/tests/097-paste-with-non-function-macro.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected (renamed from src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/098-elif-undefined.c (renamed from src/glsl/glcpp/tests/098-elif-undefined.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected (renamed from src/glsl/glcpp/tests/098-elif-undefined.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/099-c99-example.c (renamed from src/glsl/glcpp/tests/099-c99-example.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/099-c99-example.c.expected (renamed from src/glsl/glcpp/tests/099-c99-example.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/100-macro-with-colon.c (renamed from src/glsl/glcpp/tests/100-macro-with-colon.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected (renamed from src/glsl/glcpp/tests/100-macro-with-colon.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/101-macros-used-twice.c (renamed from src/glsl/glcpp/tests/101-macros-used-twice.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected (renamed from src/glsl/glcpp/tests/101-macros-used-twice.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c (renamed from src/glsl/glcpp/tests/102-garbage-after-endif.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected (renamed from src/glsl/glcpp/tests/102-garbage-after-endif.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c (renamed from src/glsl/glcpp/tests/103-garbage-after-else-0.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected (renamed from src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c (renamed from src/glsl/glcpp/tests/104-hash-line-followed-by-code.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected (renamed from src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c (renamed from src/glsl/glcpp/tests/105-multiline-hash-line.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected (renamed from src/glsl/glcpp/tests/105-multiline-hash-line.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c (renamed from src/glsl/glcpp/tests/106-multiline-hash-if.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected (renamed from src/glsl/glcpp/tests/106-multiline-hash-if.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c (renamed from src/glsl/glcpp/tests/107-multiline-hash-elif.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected (renamed from src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c (renamed from src/glsl/glcpp/tests/108-no-space-after-hash-version.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected (renamed from src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c (renamed from src/glsl/glcpp/tests/109-no-space-after-hash-line.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected (renamed from src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c (renamed from src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected (renamed from src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c (renamed from src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected (renamed from src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c (renamed from src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected (renamed from src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c (renamed from src/glsl/glcpp/tests/113-line-and-file-macros.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected (renamed from src/glsl/glcpp/tests/113-line-and-file-macros.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c (renamed from src/glsl/glcpp/tests/114-paste-integer-tokens.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected (renamed from src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/115-line-continuations.c (renamed from src/glsl/glcpp/tests/115-line-continuations.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected (renamed from src/glsl/glcpp/tests/115-line-continuations.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c (renamed from src/glsl/glcpp/tests/116-disable-line-continuations.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected (renamed from src/glsl/glcpp/tests/116-disable-line-continuations.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c (renamed from src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected (renamed from src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c (renamed from src/glsl/glcpp/tests/118-comment-becomes-space.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected (renamed from src/glsl/glcpp/tests/118-comment-becomes-space.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/119-elif-after-else.c (renamed from src/glsl/glcpp/tests/119-elif-after-else.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected (renamed from src/glsl/glcpp/tests/119-elif-after-else.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/120-undef-builtin.c (renamed from src/glsl/glcpp/tests/120-undef-builtin.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected (renamed from src/glsl/glcpp/tests/120-undef-builtin.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c (renamed from src/glsl/glcpp/tests/121-comment-bug-72686.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected (renamed from src/glsl/glcpp/tests/121-comment-bug-72686.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c (renamed from src/glsl/glcpp/tests/122-redefine-whitespace.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected (renamed from src/glsl/glcpp/tests/122-redefine-whitespace.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c (renamed from src/glsl/glcpp/tests/123-garbage-after-else-1.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected (renamed from src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c (renamed from src/glsl/glcpp/tests/124-preprocessing-numbers.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected (renamed from src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c (renamed from src/glsl/glcpp/tests/125-es-short-circuit-undefined.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected (renamed from src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c (renamed from src/glsl/glcpp/tests/126-garbage-after-directive.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected (renamed from src/glsl/glcpp/tests/126-garbage-after-directive.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/127-pragma-empty.c (renamed from src/glsl/glcpp/tests/127-pragma-empty.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected (renamed from src/glsl/glcpp/tests/127-pragma-empty.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/128-space-before-hash.c (renamed from src/glsl/glcpp/tests/128-space-before-hash.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected (renamed from src/glsl/glcpp/tests/128-space-before-hash.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/129-define-non-identifier.c (renamed from src/glsl/glcpp/tests/129-define-non-identifier.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected (renamed from src/glsl/glcpp/tests/129-define-non-identifier.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/130-define-comment.c (renamed from src/glsl/glcpp/tests/130-define-comment.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/130-define-comment.c.expected (renamed from src/glsl/glcpp/tests/130-define-comment.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/131-eof-without-newline.c (renamed from src/glsl/glcpp/tests/131-eof-without-newline.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected (renamed from src/glsl/glcpp/tests/131-eof-without-newline.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c (renamed from src/glsl/glcpp/tests/132-eof-without-newline-define.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected (renamed from src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c (renamed from src/glsl/glcpp/tests/133-eof-without-newline-comment.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected (renamed from src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c (renamed from src/glsl/glcpp/tests/134-hash-comment-directive.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected (renamed from src/glsl/glcpp/tests/134-hash-comment-directive.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c (renamed from src/glsl/glcpp/tests/135-duplicate-parameter.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected (renamed from src/glsl/glcpp/tests/135-duplicate-parameter.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c (renamed from src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected (renamed from src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c (renamed from src/glsl/glcpp/tests/137-expand-macro-after-period.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected (renamed from src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c (renamed from src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected (renamed from src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c (renamed from src/glsl/glcpp/tests/139-define-without-macro-name.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected (renamed from src/glsl/glcpp/tests/139-define-without-macro-name.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/140-null-directive.c (renamed from src/glsl/glcpp/tests/140-null-directive.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/140-null-directive.c.expected (renamed from src/glsl/glcpp/tests/140-null-directive.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c (renamed from src/glsl/glcpp/tests/141-pragma-and-__LINE__.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected (renamed from src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/142-defined-within-macro.c (renamed from src/glsl/glcpp/tests/142-defined-within-macro.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected (renamed from src/glsl/glcpp/tests/142-defined-within-macro.c.expected) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/143-multiple-else.c (renamed from src/glsl/glcpp/tests/143-multiple-else.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected (renamed from src/glsl/glcpp/tests/143-multiple-else.c.expected) | 0 | ||||
| -rwxr-xr-x | src/compiler/glsl/glcpp/tests/glcpp-test (renamed from src/glsl/glcpp/tests/glcpp-test) | 6 | ||||
| -rwxr-xr-x | src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf (renamed from src/glsl/glcpp/tests/glcpp-test-cr-lf) | 10 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_lexer.ll (renamed from src/glsl/glsl_lexer.ll) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser.yy (renamed from src/glsl/glsl_parser.yy) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp (renamed from src/glsl/glsl_parser_extras.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.h (renamed from src/glsl/glsl_parser_extras.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_symbol_table.cpp (renamed from src/glsl/glsl_symbol_table.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_symbol_table.h (renamed from src/glsl/glsl_symbol_table.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/hir_field_selection.cpp (renamed from src/glsl/hir_field_selection.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir.cpp (renamed from src/glsl/ir.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir.h (renamed from src/glsl/ir.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_basic_block.cpp (renamed from src/glsl/ir_basic_block.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_basic_block.h (renamed from src/glsl/ir_basic_block.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_builder.cpp (renamed from src/glsl/ir_builder.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_builder.h (renamed from src/glsl/ir_builder.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_clone.cpp (renamed from src/glsl/ir_clone.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_constant_expression.cpp (renamed from src/glsl/ir_constant_expression.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_equals.cpp (renamed from src/glsl/ir_equals.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_expression_flattening.cpp (renamed from src/glsl/ir_expression_flattening.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_expression_flattening.h (renamed from src/glsl/ir_expression_flattening.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_function.cpp (renamed from src/glsl/ir_function.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_function_can_inline.cpp (renamed from src/glsl/ir_function_can_inline.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_function_detect_recursion.cpp (renamed from src/glsl/ir_function_detect_recursion.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_function_inlining.h (renamed from src/glsl/ir_function_inlining.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_hierarchical_visitor.cpp (renamed from src/glsl/ir_hierarchical_visitor.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_hierarchical_visitor.h (renamed from src/glsl/ir_hierarchical_visitor.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_hv_accept.cpp (renamed from src/glsl/ir_hv_accept.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_import_prototypes.cpp (renamed from src/glsl/ir_import_prototypes.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_optimization.h (renamed from src/glsl/ir_optimization.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_print_visitor.cpp (renamed from src/glsl/ir_print_visitor.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_print_visitor.h (renamed from src/glsl/ir_print_visitor.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_reader.cpp (renamed from src/glsl/ir_reader.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_reader.h (renamed from src/glsl/ir_reader.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_rvalue_visitor.cpp (renamed from src/glsl/ir_rvalue_visitor.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_rvalue_visitor.h (renamed from src/glsl/ir_rvalue_visitor.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_set_program_inouts.cpp (renamed from src/glsl/ir_set_program_inouts.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_uniform.h (renamed from src/glsl/ir_uniform.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_validate.cpp (renamed from src/glsl/ir_validate.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_variable_refcount.cpp (renamed from src/glsl/ir_variable_refcount.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_variable_refcount.h (renamed from src/glsl/ir_variable_refcount.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_visitor.h (renamed from src/glsl/ir_visitor.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_atomics.cpp (renamed from src/glsl/link_atomics.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_functions.cpp (renamed from src/glsl/link_functions.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_interface_blocks.cpp (renamed from src/glsl/link_interface_blocks.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_uniform_block_active_visitor.cpp (renamed from src/glsl/link_uniform_block_active_visitor.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_uniform_block_active_visitor.h (renamed from src/glsl/link_uniform_block_active_visitor.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_uniform_blocks.cpp (renamed from src/glsl/link_uniform_blocks.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_uniform_initializers.cpp (renamed from src/glsl/link_uniform_initializers.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_uniforms.cpp (renamed from src/glsl/link_uniforms.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_varyings.cpp (renamed from src/glsl/link_varyings.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/link_varyings.h (renamed from src/glsl/link_varyings.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp (renamed from src/glsl/linker.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.h (renamed from src/glsl/linker.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/list.h (renamed from src/glsl/list.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/loop_analysis.cpp (renamed from src/glsl/loop_analysis.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/loop_analysis.h (renamed from src/glsl/loop_analysis.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/loop_controls.cpp (renamed from src/glsl/loop_controls.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/loop_unroll.cpp (renamed from src/glsl/loop_unroll.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_buffer_access.cpp (renamed from src/glsl/lower_buffer_access.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_buffer_access.h (renamed from src/glsl/lower_buffer_access.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_clip_distance.cpp (renamed from src/glsl/lower_clip_distance.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_const_arrays_to_uniforms.cpp (renamed from src/glsl/lower_const_arrays_to_uniforms.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_discard.cpp (renamed from src/glsl/lower_discard.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_discard_flow.cpp (renamed from src/glsl/lower_discard_flow.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_if_to_cond_assign.cpp (renamed from src/glsl/lower_if_to_cond_assign.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_instructions.cpp (renamed from src/glsl/lower_instructions.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_jumps.cpp (renamed from src/glsl/lower_jumps.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_mat_op_to_vec.cpp (renamed from src/glsl/lower_mat_op_to_vec.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_named_interface_blocks.cpp (renamed from src/glsl/lower_named_interface_blocks.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_noise.cpp (renamed from src/glsl/lower_noise.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_offset_array.cpp (renamed from src/glsl/lower_offset_array.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_output_reads.cpp (renamed from src/glsl/lower_output_reads.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_packed_varyings.cpp (renamed from src/glsl/lower_packed_varyings.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_packing_builtins.cpp (renamed from src/glsl/lower_packing_builtins.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_shared_reference.cpp (renamed from src/glsl/lower_shared_reference.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_subroutine.cpp (renamed from src/glsl/lower_subroutine.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_tess_level.cpp (renamed from src/glsl/lower_tess_level.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_texture_projection.cpp (renamed from src/glsl/lower_texture_projection.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_ubo_reference.cpp (renamed from src/glsl/lower_ubo_reference.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_variable_index_to_cond_assign.cpp (renamed from src/glsl/lower_variable_index_to_cond_assign.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_vec_index_to_cond_assign.cpp (renamed from src/glsl/lower_vec_index_to_cond_assign.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_vec_index_to_swizzle.cpp (renamed from src/glsl/lower_vec_index_to_swizzle.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_vector.cpp (renamed from src/glsl/lower_vector.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_vector_derefs.cpp (renamed from src/glsl/lower_vector_derefs.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_vector_insert.cpp (renamed from src/glsl/lower_vector_insert.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_vertex_id.cpp (renamed from src/glsl/lower_vertex_id.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/main.cpp (renamed from src/glsl/main.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_algebraic.cpp (renamed from src/glsl/opt_algebraic.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_array_splitting.cpp (renamed from src/glsl/opt_array_splitting.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_conditional_discard.cpp (renamed from src/glsl/opt_conditional_discard.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_constant_folding.cpp (renamed from src/glsl/opt_constant_folding.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_constant_propagation.cpp (renamed from src/glsl/opt_constant_propagation.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_constant_variable.cpp (renamed from src/glsl/opt_constant_variable.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_copy_propagation.cpp (renamed from src/glsl/opt_copy_propagation.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_copy_propagation_elements.cpp (renamed from src/glsl/opt_copy_propagation_elements.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_dead_builtin_variables.cpp (renamed from src/glsl/opt_dead_builtin_variables.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_dead_builtin_varyings.cpp (renamed from src/glsl/opt_dead_builtin_varyings.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_dead_code.cpp (renamed from src/glsl/opt_dead_code.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_dead_code_local.cpp (renamed from src/glsl/opt_dead_code_local.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_dead_functions.cpp (renamed from src/glsl/opt_dead_functions.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_flatten_nested_if_blocks.cpp (renamed from src/glsl/opt_flatten_nested_if_blocks.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_flip_matrices.cpp (renamed from src/glsl/opt_flip_matrices.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_function_inlining.cpp (renamed from src/glsl/opt_function_inlining.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_if_simplification.cpp (renamed from src/glsl/opt_if_simplification.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_minmax.cpp (renamed from src/glsl/opt_minmax.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_noop_swizzle.cpp (renamed from src/glsl/opt_noop_swizzle.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_rebalance_tree.cpp (renamed from src/glsl/opt_rebalance_tree.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_redundant_jumps.cpp (renamed from src/glsl/opt_redundant_jumps.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_structure_splitting.cpp (renamed from src/glsl/opt_structure_splitting.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_swizzle_swizzle.cpp (renamed from src/glsl/opt_swizzle_swizzle.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_tree_grafting.cpp (renamed from src/glsl/opt_tree_grafting.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/opt_vectorize.cpp (renamed from src/glsl/opt_vectorize.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/program.h (renamed from src/glsl/program.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/s_expression.cpp (renamed from src/glsl/s_expression.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/s_expression.h (renamed from src/glsl/s_expression.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/standalone_scaffolding.cpp (renamed from src/glsl/standalone_scaffolding.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/standalone_scaffolding.h (renamed from src/glsl/standalone_scaffolding.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/test.cpp (renamed from src/glsl/test.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/test_optpass.cpp (renamed from src/glsl/test_optpass.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/test_optpass.h (renamed from src/glsl/test_optpass.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/.gitignore (renamed from src/glsl/tests/.gitignore) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/blob_test.c (renamed from src/glsl/tests/blob_test.c) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/builtin_variable_test.cpp (renamed from src/glsl/tests/builtin_variable_test.cpp) | 0 | ||||
| -rwxr-xr-x | src/compiler/glsl/tests/compare_ir (renamed from src/glsl/tests/compare_ir) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp (renamed from src/glsl/tests/copy_constant_to_storage_tests.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/general_ir_test.cpp (renamed from src/glsl/tests/general_ir_test.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/invalidate_locations_test.cpp (renamed from src/glsl/tests/invalidate_locations_test.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/lower_jumps/.gitignore (renamed from src/glsl/tests/lower_jumps/.gitignore) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/lower_jumps/create_test_cases.py (renamed from src/glsl/tests/lower_jumps/create_test_cases.py) | 0 | ||||
| -rwxr-xr-x | src/compiler/glsl/tests/optimization-test (renamed from src/glsl/tests/optimization-test) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/sampler_types_test.cpp (renamed from src/glsl/tests/sampler_types_test.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/set_uniform_initializer_tests.cpp (renamed from src/glsl/tests/set_uniform_initializer_tests.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/sexps.py (renamed from src/glsl/tests/sexps.py) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/uniform_initializer_utils.cpp (renamed from src/glsl/tests/uniform_initializer_utils.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/uniform_initializer_utils.h (renamed from src/glsl/tests/uniform_initializer_utils.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/varyings_test.cpp (renamed from src/glsl/tests/varyings_test.cpp) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl_types.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/nir/Makefile.sources | 71 | ||||
| -rw-r--r-- | src/compiler/nir/glsl_to_nir.cpp | 6 | ||||
| -rw-r--r-- | src/compiler/nir/glsl_to_nir.h | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir.h | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_atomics.c | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_samplers.c | 2 | ||||
| -rw-r--r-- | src/compiler/nir_types.cpp | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 4 | ||||
| -rw-r--r-- | src/mesa/Makefile.sources | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_cs.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_gs.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_link.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_cs_state.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_resolve_map.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 8 | ||||
| -rw-r--r-- | src/mesa/main/pipelineobj.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/program_resource.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/shader_query.cpp | 6 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 8 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.h | 2 | ||||
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 18 | ||||
| -rw-r--r-- | src/mesa/program/prog_to_nir.c | 2 | ||||
| -rw-r--r-- | src/mesa/program/sampler.cpp | 8 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_draw.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 |
497 files changed, 498 insertions, 84 deletions
diff --git a/configure.ac b/configure.ac index dc1e995b8d5..4172eaeefd9 100644 --- a/configure.ac +++ b/configure.ac @@ -2506,7 +2506,6 @@ AC_CONFIG_FILES([Makefile src/gallium/winsys/virgl/vtest/Makefile src/gbm/Makefile src/gbm/main/gbm.pc - src/glsl/Makefile src/glx/Makefile src/glx/apple/Makefile src/glx/tests/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a0ec40146b0..9b23cf58f4f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi SUBDIRS += compiler if NEED_OPENGL_COMMON -SUBDIRS += glsl mesa +SUBDIRS += mesa endif SUBDIRS += loader diff --git a/src/SConscript b/src/SConscript index 8acf9b04ab6..4ba0a32d669 100644 --- a/src/SConscript +++ b/src/SConscript @@ -6,7 +6,6 @@ if env['platform'] == 'windows': SConscript('util/SConscript') SConscript('compiler/SConscript') -SConscript('glsl/SConscript') if env['hostonly']: # We are just compiling the things necessary on the host for cross diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am index 1e3778df8d5..0bc8e48efa6 100644 --- a/src/compiler/Makefile.am +++ b/src/compiler/Makefile.am @@ -1,4 +1,5 @@ # +# Copyright © 2012 Jon TURNEY # Copyright (C) 2015 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a @@ -27,6 +28,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_builddir)/src/compiler/glsl\ + -I$(top_srcdir)/src/compiler/glsl\ + -I$(top_srcdir)/src/compiler/glsl/glcpp\ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gtest/include \ @@ -51,6 +55,201 @@ CLEANFILES = EXTRA_DIST = SConscript +EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README \ + glsl/TODO glsl/glcpp/README \ + glsl/glsl_lexer.ll \ + glsl/glsl_parser.yy \ + glsl/glcpp/glcpp-lex.l \ + glsl/glcpp/glcpp-parse.y \ + glsl/Makefile.sources \ + glsl/SConscript + +TESTS += glsl/glcpp/tests/glcpp-test \ + glsl/glcpp/tests/glcpp-test-cr-lf \ + glsl/tests/blob-test \ + glsl/tests/general-ir-test \ + glsl/tests/optimization-test \ + glsl/tests/sampler-types-test \ + glsl/tests/uniform-initializer-test + +TESTS_ENVIRONMENT= \ + export PYTHON2=$(PYTHON2); \ + export PYTHON_FLAGS=$(PYTHON_FLAGS); + +check_PROGRAMS += \ + glsl/glcpp/glcpp \ + glsl/glsl_test \ + glsl/tests/blob-test \ + glsl/tests/general-ir-test \ + glsl/tests/sampler-types-test \ + glsl/tests/uniform-initializer-test + +noinst_PROGRAMS = glsl_compiler + +glsl_tests_blob_test_SOURCES = \ + glsl/tests/blob_test.c +glsl_tests_blob_test_LDADD = \ + glsl/libglsl.la + +glsl_tests_general_ir_test_SOURCES = \ + glsl/standalone_scaffolding.cpp \ + glsl/tests/builtin_variable_test.cpp \ + glsl/tests/invalidate_locations_test.cpp \ + glsl/tests/general_ir_test.cpp \ + glsl/tests/varyings_test.cpp +glsl_tests_general_ir_test_CFLAGS = \ + $(PTHREAD_CFLAGS) +glsl_tests_general_ir_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(PTHREAD_LIBS) + +glsl_tests_uniform_initializer_test_SOURCES = \ + glsl/tests/copy_constant_to_storage_tests.cpp \ + glsl/tests/set_uniform_initializer_tests.cpp \ + glsl/tests/uniform_initializer_utils.cpp \ + glsl/tests/uniform_initializer_utils.h +glsl_tests_uniform_initializer_test_CFLAGS = \ + $(PTHREAD_CFLAGS) +glsl_tests_uniform_initializer_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(PTHREAD_LIBS) + +glsl_tests_sampler_types_test_SOURCES = \ + glsl/tests/sampler_types_test.cpp +glsl_tests_sampler_types_test_CFLAGS = \ + $(PTHREAD_CFLAGS) +glsl_tests_sampler_types_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(PTHREAD_LIBS) + +noinst_LTLIBRARIES += glsl/libglsl.la glsl/libglcpp.la + +glsl_libglcpp_la_LIBADD = \ + $(top_builddir)/src/util/libmesautil.la +glsl_libglcpp_la_SOURCES = \ + glsl/glcpp/glcpp-lex.c \ + glsl/glcpp/glcpp-parse.c \ + glsl/glcpp/glcpp-parse.h \ + $(LIBGLCPP_FILES) + +glsl_glcpp_glcpp_SOURCES = \ + glsl/glcpp/glcpp.c +glsl_glcpp_glcpp_LDADD = \ + glsl/libglcpp.la \ + $(top_builddir)/src/libglsl_util.la \ + -lm + +glsl_libglsl_la_LIBADD = \ + nir/libnir.la \ + glsl/libglcpp.la + +glsl_libglsl_la_SOURCES = \ + glsl/glsl_lexer.cpp \ + glsl/glsl_parser.cpp \ + glsl/glsl_parser.h \ + $(LIBGLSL_FILES) + + +glsl_compiler_SOURCES = \ + $(GLSL_COMPILER_CXX_FILES) + +glsl_compiler_LDADD = \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(PTHREAD_LIBS) + +glsl_glsl_test_SOURCES = \ + glsl/standalone_scaffolding.cpp \ + glsl/test.cpp \ + glsl/test_optpass.cpp \ + glsl/test_optpass.h + +glsl_glsl_test_LDADD = \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(PTHREAD_LIBS) + +# We write our own rules for yacc and lex below. We'd rather use automake, +# but automake makes it especially difficult for a number of reasons: +# +# * < automake-1.12 generates .h files from .yy and .ypp files, but +# >=automake-1.12 generates .hh and .hpp files respectively. There's no +# good way of making a project that uses C++ yacc files compatible with +# both versions of automake. Strong work automake developers. +# +# * Since we're generating code from .l/.y files in a subdirectory (glcpp/) +# we'd like the resulting generated code to also go in glcpp/ for purposes +# of distribution. Automake gives no way to do this. +# +# * Since we're building multiple yacc parsers into one library (and via one +# Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes +# automake to name the resulting generated code as <library-name>_filename.c. +# Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file. + +# In order to make build output print "LEX" and "YACC", we reproduce the +# automake variables below. + +AM_V_LEX = $(am__v_LEX_$(V)) +am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY)) +am__v_LEX_0 = @echo " LEX " $@; +am__v_LEX_1 = + +AM_V_YACC = $(am__v_YACC_$(V)) +am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY)) +am__v_YACC_0 = @echo " YACC " $@; +am__v_YACC_1 = + +MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) +YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS) +LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS) + +glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy + $(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl/glsl_parser.h $(srcdir)/glsl/glsl_parser.yy + +glsl/glsl_lexer.cpp: glsl/glsl_lexer.ll + $(LEX_GEN) -o $@ $(srcdir)/glsl/glsl_lexer.ll + +glsl/glcpp/glcpp-parse.c glsl/glcpp/glcpp-parse.h: glsl/glcpp/glcpp-parse.y + $(MKDIR_GEN) + $(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glsl/glcpp/glcpp-parse.h $(srcdir)/glsl/glcpp/glcpp-parse.y + +glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l + $(MKDIR_GEN) + $(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l + +# Only the parsers (specifically the header files generated at the same time) +# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is +# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files +# YACC is only executed once for each parser. The rest of the generated code +# will be created at the appropriate times according to standard automake +# dependency rules. +BUILT_SOURCES += \ + glsl/glsl_parser.cpp \ + glsl/glsl_lexer.cpp \ + glsl/glcpp/glcpp-parse.c \ + glsl/glcpp/glcpp-lex.c +CLEANFILES += \ + glsl/glcpp/glcpp-parse.h \ + glsl/glsl_parser.h \ + glsl/glsl_parser.cpp \ + glsl/glsl_lexer.cpp \ + glsl/glcpp/glcpp-parse.c \ + glsl/glcpp/glcpp-lex.c + +clean-local: + $(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr + +dist-hook: + $(RM) glsl/glcpp/tests/*.out + $(RM) glsl/glcpp/tests/subtest*/*.out + noinst_LTLIBRARIES += nir/libnir.la nir_libnir_la_CPPFLAGS = \ @@ -101,7 +300,7 @@ nir_tests_control_flow_tests_CFLAGS = \ $(PTHREAD_CFLAGS) nir_tests_control_flow_tests_LDADD = \ $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ + nir/libnir.la \ $(top_builddir)/src/util/libmesautil.la \ $(PTHREAD_LIBS) diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index fe12e419afb..c9780d6d6f7 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -7,6 +7,153 @@ LIBCOMPILER_FILES = \ shader_enums.c \ shader_enums.h +# libglsl + +LIBGLSL_FILES = \ + glsl/ast.h \ + glsl/ast_array_index.cpp \ + glsl/ast_expr.cpp \ + glsl/ast_function.cpp \ + glsl/ast_to_hir.cpp \ + glsl/ast_type.cpp \ + glsl/blob.c \ + glsl/blob.h \ + glsl/builtin_functions.cpp \ + glsl/builtin_types.cpp \ + glsl/builtin_variables.cpp \ + glsl/glsl_parser_extras.cpp \ + glsl/glsl_parser_extras.h \ + glsl/glsl_symbol_table.cpp \ + glsl/glsl_symbol_table.h \ + glsl/hir_field_selection.cpp \ + glsl/ir_basic_block.cpp \ + glsl/ir_basic_block.h \ + glsl/ir_builder.cpp \ + glsl/ir_builder.h \ + glsl/ir_clone.cpp \ + glsl/ir_constant_expression.cpp \ + glsl/ir.cpp \ + glsl/ir.h \ + glsl/ir_equals.cpp \ + glsl/ir_expression_flattening.cpp \ + glsl/ir_expression_flattening.h \ + glsl/ir_function_can_inline.cpp \ + glsl/ir_function_detect_recursion.cpp \ + glsl/ir_function_inlining.h \ + glsl/ir_function.cpp \ + glsl/ir_hierarchical_visitor.cpp \ + glsl/ir_hierarchical_visitor.h \ + glsl/ir_hv_accept.cpp \ + glsl/ir_import_prototypes.cpp \ + glsl/ir_optimization.h \ + glsl/ir_print_visitor.cpp \ + glsl/ir_print_visitor.h \ + glsl/ir_reader.cpp \ + glsl/ir_reader.h \ + glsl/ir_rvalue_visitor.cpp \ + glsl/ir_rvalue_visitor.h \ + glsl/ir_set_program_inouts.cpp \ + glsl/ir_uniform.h \ + glsl/ir_validate.cpp \ + glsl/ir_variable_refcount.cpp \ + glsl/ir_variable_refcount.h \ + glsl/ir_visitor.h \ + glsl/linker.cpp \ + glsl/linker.h \ + glsl/link_atomics.cpp \ + glsl/link_functions.cpp \ + glsl/link_interface_blocks.cpp \ + glsl/link_uniforms.cpp \ + glsl/link_uniform_initializers.cpp \ + glsl/link_uniform_block_active_visitor.cpp \ + glsl/link_uniform_block_active_visitor.h \ + glsl/link_uniform_blocks.cpp \ + glsl/link_varyings.cpp \ + glsl/link_varyings.h \ + glsl/list.h \ + glsl/loop_analysis.cpp \ + glsl/loop_analysis.h \ + glsl/loop_controls.cpp \ + glsl/loop_unroll.cpp \ + glsl/lower_buffer_access.cpp \ + glsl/lower_buffer_access.h \ + glsl/lower_clip_distance.cpp \ + glsl/lower_const_arrays_to_uniforms.cpp \ + glsl/lower_discard.cpp \ + glsl/lower_discard_flow.cpp \ + glsl/lower_if_to_cond_assign.cpp \ + glsl/lower_instructions.cpp \ + glsl/lower_jumps.cpp \ + glsl/lower_mat_op_to_vec.cpp \ + glsl/lower_noise.cpp \ + glsl/lower_offset_array.cpp \ + glsl/lower_packed_varyings.cpp \ + glsl/lower_named_interface_blocks.cpp \ + glsl/lower_packing_builtins.cpp \ + glsl/lower_subroutine.cpp \ + glsl/lower_tess_level.cpp \ + glsl/lower_texture_projection.cpp \ + glsl/lower_variable_index_to_cond_assign.cpp \ + glsl/lower_vec_index_to_cond_assign.cpp \ + glsl/lower_vec_index_to_swizzle.cpp \ + glsl/lower_vector.cpp \ + glsl/lower_vector_derefs.cpp \ + glsl/lower_vector_insert.cpp \ + glsl/lower_vertex_id.cpp \ + glsl/lower_output_reads.cpp \ + glsl/lower_shared_reference.cpp \ + glsl/lower_ubo_reference.cpp \ + glsl/opt_algebraic.cpp \ + glsl/opt_array_splitting.cpp \ + glsl/opt_conditional_discard.cpp \ + glsl/opt_constant_folding.cpp \ + glsl/opt_constant_propagation.cpp \ + glsl/opt_constant_variable.cpp \ + glsl/opt_copy_propagation.cpp \ + glsl/opt_copy_propagation_elements.cpp \ + glsl/opt_dead_builtin_variables.cpp \ + glsl/opt_dead_builtin_varyings.cpp \ + glsl/opt_dead_code.cpp \ + glsl/opt_dead_code_local.cpp \ + glsl/opt_dead_functions.cpp \ + glsl/opt_flatten_nested_if_blocks.cpp \ + glsl/opt_flip_matrices.cpp \ + glsl/opt_function_inlining.cpp \ + glsl/opt_if_simplification.cpp \ + glsl/opt_minmax.cpp \ + glsl/opt_noop_swizzle.cpp \ + glsl/opt_rebalance_tree.cpp \ + glsl/opt_redundant_jumps.cpp \ + glsl/opt_structure_splitting.cpp \ + glsl/opt_swizzle_swizzle.cpp \ + glsl/opt_tree_grafting.cpp \ + glsl/opt_vectorize.cpp \ + glsl/program.h \ + glsl/s_expression.cpp \ + glsl/s_expression.h + +# glsl_compiler + +GLSL_COMPILER_CXX_FILES = \ + glsl/standalone_scaffolding.cpp \ + glsl/standalone_scaffolding.h \ + glsl/main.cpp + +# libglsl generated sources +LIBGLSL_GENERATED_CXX_FILES = \ + glsl/glsl_lexer.cpp \ + glsl/glsl_parser.cpp + +# libglcpp + +LIBGLCPP_FILES = \ + glsl/glcpp/glcpp.h \ + glsl/glcpp/pp.c + +LIBGLCPP_GENERATED_FILES = \ + glsl/glcpp/glcpp-lex.c \ + glsl/glcpp/glcpp-parse.c + NIR_GENERATED_FILES = \ nir/nir_builder_opcodes.h \ nir/nir_constant_expressions.c \ diff --git a/src/compiler/SConscript b/src/compiler/SConscript index 412da0e62bd..8d71b82bee0 100644 --- a/src/compiler/SConscript +++ b/src/compiler/SConscript @@ -20,3 +20,5 @@ compiler = env.ConvenienceLibrary( source = sources ) Export('compiler') + +SConscript('glsl/SConscript') diff --git a/src/glsl/.gitignore b/src/compiler/glsl/.gitignore index dda423f83db..dda423f83db 100644 --- a/src/glsl/.gitignore +++ b/src/compiler/glsl/.gitignore diff --git a/src/glsl/Android.gen.mk b/src/compiler/glsl/Android.gen.mk index c5741b40bc5..c5741b40bc5 100644 --- a/src/glsl/Android.gen.mk +++ b/src/compiler/glsl/Android.gen.mk diff --git a/src/glsl/Android.mk b/src/compiler/glsl/Android.mk index 9cbb9a339a1..9cbb9a339a1 100644 --- a/src/glsl/Android.mk +++ b/src/compiler/glsl/Android.mk diff --git a/src/glsl/Makefile.am b/src/compiler/glsl/Makefile.am index 9954b812403..9954b812403 100644 --- a/src/glsl/Makefile.am +++ b/src/compiler/glsl/Makefile.am diff --git a/src/glsl/Makefile.sources b/src/compiler/glsl/Makefile.sources index 08b40c5cc8f..08b40c5cc8f 100644 --- a/src/glsl/Makefile.sources +++ b/src/compiler/glsl/Makefile.sources diff --git a/src/glsl/README b/src/compiler/glsl/README index bfcf69f903a..bfcf69f903a 100644 --- a/src/glsl/README +++ b/src/compiler/glsl/README diff --git a/src/glsl/SConscript b/src/compiler/glsl/SConscript index ef82a9d317a..ef82a9d317a 100644 --- a/src/glsl/SConscript +++ b/src/compiler/glsl/SConscript diff --git a/src/glsl/TODO b/src/compiler/glsl/TODO index bd077a85678..bd077a85678 100644 --- a/src/glsl/TODO +++ b/src/compiler/glsl/TODO diff --git a/src/glsl/ast.h b/src/compiler/glsl/ast.h index 03df6c08b2b..03df6c08b2b 100644 --- a/src/glsl/ast.h +++ b/src/compiler/glsl/ast.h diff --git a/src/glsl/ast_array_index.cpp b/src/compiler/glsl/ast_array_index.cpp index f5baeb9ea32..f5baeb9ea32 100644 --- a/src/glsl/ast_array_index.cpp +++ b/src/compiler/glsl/ast_array_index.cpp diff --git a/src/glsl/ast_expr.cpp b/src/compiler/glsl/ast_expr.cpp index e624d11cf3b..e624d11cf3b 100644 --- a/src/glsl/ast_expr.cpp +++ b/src/compiler/glsl/ast_expr.cpp diff --git a/src/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp index 0eb456a2b1f..0eb456a2b1f 100644 --- a/src/glsl/ast_function.cpp +++ b/src/compiler/glsl/ast_function.cpp diff --git a/src/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index dfd31966eb0..dfd31966eb0 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp diff --git a/src/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp index e0e331152dd..e0e331152dd 100644 --- a/src/glsl/ast_type.cpp +++ b/src/compiler/glsl/ast_type.cpp diff --git a/src/glsl/blob.c b/src/compiler/glsl/blob.c index dd4341be961..dd4341be961 100644 --- a/src/glsl/blob.c +++ b/src/compiler/glsl/blob.c diff --git a/src/glsl/blob.h b/src/compiler/glsl/blob.h index ec903ec140f..ec903ec140f 100644 --- a/src/glsl/blob.h +++ b/src/compiler/glsl/blob.h diff --git a/src/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index 95e86df1cdd..95e86df1cdd 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp diff --git a/src/glsl/builtin_types.cpp b/src/compiler/glsl/builtin_types.cpp index ee24bd5e411..ee24bd5e411 100644 --- a/src/glsl/builtin_types.cpp +++ b/src/compiler/glsl/builtin_types.cpp diff --git a/src/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index ccc04c00cea..ccc04c00cea 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp diff --git a/src/glsl/glcpp/.gitignore b/src/compiler/glsl/glcpp/.gitignore index 24a7119caa4..24a7119caa4 100644 --- a/src/glsl/glcpp/.gitignore +++ b/src/compiler/glsl/glcpp/.gitignore diff --git a/src/glsl/glcpp/README b/src/compiler/glsl/glcpp/README index 0637935e28b..0637935e28b 100644 --- a/src/glsl/glcpp/README +++ b/src/compiler/glsl/glcpp/README diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/compiler/glsl/glcpp/glcpp-lex.l index fa9aa506912..fa9aa506912 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/compiler/glsl/glcpp/glcpp-lex.l diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index ef1a6575aaa..ef1a6575aaa 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y diff --git a/src/glsl/glcpp/glcpp.c b/src/compiler/glsl/glcpp/glcpp.c index c62f4efec9d..c62f4efec9d 100644 --- a/src/glsl/glcpp/glcpp.c +++ b/src/compiler/glsl/glcpp/glcpp.c diff --git a/src/glsl/glcpp/glcpp.h b/src/compiler/glsl/glcpp/glcpp.h index 70aa14b6ec0..70aa14b6ec0 100644 --- a/src/glsl/glcpp/glcpp.h +++ b/src/compiler/glsl/glcpp/glcpp.h diff --git a/src/glsl/glcpp/pp.c b/src/compiler/glsl/glcpp/pp.c index 160c6662ff6..160c6662ff6 100644 --- a/src/glsl/glcpp/pp.c +++ b/src/compiler/glsl/glcpp/pp.c diff --git a/src/glsl/glcpp/tests/.gitignore b/src/compiler/glsl/glcpp/tests/.gitignore index 3802c850a3e..3802c850a3e 100644 --- a/src/glsl/glcpp/tests/.gitignore +++ b/src/compiler/glsl/glcpp/tests/.gitignore diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c index 1f2320e6fc1..1f2320e6fc1 100644 --- a/src/glsl/glcpp/tests/000-content-with-spaces.c +++ b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected index 00791910ed5..00791910ed5 100644 --- a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected +++ b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected diff --git a/src/glsl/glcpp/tests/001-define.c b/src/compiler/glsl/glcpp/tests/001-define.c index cbf2fee0e75..cbf2fee0e75 100644 --- a/src/glsl/glcpp/tests/001-define.c +++ b/src/compiler/glsl/glcpp/tests/001-define.c diff --git a/src/glsl/glcpp/tests/001-define.c.expected b/src/compiler/glsl/glcpp/tests/001-define.c.expected index a464d9da742..a464d9da742 100644 --- a/src/glsl/glcpp/tests/001-define.c.expected +++ b/src/compiler/glsl/glcpp/tests/001-define.c.expected diff --git a/src/glsl/glcpp/tests/002-define-chain.c b/src/compiler/glsl/glcpp/tests/002-define-chain.c index 87d75c68751..87d75c68751 100644 --- a/src/glsl/glcpp/tests/002-define-chain.c +++ b/src/compiler/glsl/glcpp/tests/002-define-chain.c diff --git a/src/glsl/glcpp/tests/002-define-chain.c.expected b/src/compiler/glsl/glcpp/tests/002-define-chain.c.expected index c6c9ee38a9e..c6c9ee38a9e 100644 --- a/src/glsl/glcpp/tests/002-define-chain.c.expected +++ b/src/compiler/glsl/glcpp/tests/002-define-chain.c.expected diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c index a18b724eca0..a18b724eca0 100644 --- a/src/glsl/glcpp/tests/003-define-chain-reverse.c +++ b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected index c6c9ee38a9e..c6c9ee38a9e 100644 --- a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected +++ b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected diff --git a/src/glsl/glcpp/tests/004-define-recursive.c b/src/compiler/glsl/glcpp/tests/004-define-recursive.c index 2ac56ea3dcf..2ac56ea3dcf 100644 --- a/src/glsl/glcpp/tests/004-define-recursive.c +++ b/src/compiler/glsl/glcpp/tests/004-define-recursive.c diff --git a/src/glsl/glcpp/tests/004-define-recursive.c.expected b/src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected index 2d07687f8ca..2d07687f8ca 100644 --- a/src/glsl/glcpp/tests/004-define-recursive.c.expected +++ b/src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c index f5521df968d..f5521df968d 100644 --- a/src/glsl/glcpp/tests/005-define-composite-chain.c +++ b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected index 892975c268c..892975c268c 100644 --- a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected +++ b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c index 4bb91a1221a..4bb91a1221a 100644 --- a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c +++ b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected index 892975c268c..892975c268c 100644 --- a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected +++ b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c index 5784565bdf3..5784565bdf3 100644 --- a/src/glsl/glcpp/tests/007-define-composite-recursive.c +++ b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected index 0b0b477d9df..0b0b477d9df 100644 --- a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected +++ b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected diff --git a/src/glsl/glcpp/tests/008-define-empty.c b/src/compiler/glsl/glcpp/tests/008-define-empty.c index b1bd17ec215..b1bd17ec215 100644 --- a/src/glsl/glcpp/tests/008-define-empty.c +++ b/src/compiler/glsl/glcpp/tests/008-define-empty.c diff --git a/src/glsl/glcpp/tests/008-define-empty.c.expected b/src/compiler/glsl/glcpp/tests/008-define-empty.c.expected index d148bc8e800..d148bc8e800 100644 --- a/src/glsl/glcpp/tests/008-define-empty.c.expected +++ b/src/compiler/glsl/glcpp/tests/008-define-empty.c.expected diff --git a/src/glsl/glcpp/tests/009-undef.c b/src/compiler/glsl/glcpp/tests/009-undef.c index 3fc1fb44243..3fc1fb44243 100644 --- a/src/glsl/glcpp/tests/009-undef.c +++ b/src/compiler/glsl/glcpp/tests/009-undef.c diff --git a/src/glsl/glcpp/tests/009-undef.c.expected b/src/compiler/glsl/glcpp/tests/009-undef.c.expected index 9c0b35a4518..9c0b35a4518 100644 --- a/src/glsl/glcpp/tests/009-undef.c.expected +++ b/src/compiler/glsl/glcpp/tests/009-undef.c.expected diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c index 32ff73798b1..32ff73798b1 100644 --- a/src/glsl/glcpp/tests/010-undef-re-define.c +++ b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c.expected b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected index 5970f49028e..5970f49028e 100644 --- a/src/glsl/glcpp/tests/010-undef-re-define.c.expected +++ b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c index d9ce13c2284..d9ce13c2284 100644 --- a/src/glsl/glcpp/tests/011-define-func-empty.c +++ b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c.expected b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected index d148bc8e800..d148bc8e800 100644 --- a/src/glsl/glcpp/tests/011-define-func-empty.c.expected +++ b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c index c2bb730b115..c2bb730b115 100644 --- a/src/glsl/glcpp/tests/012-define-func-no-args.c +++ b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected index 9f075f26004..9f075f26004 100644 --- a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected +++ b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c index f78fb8b118a..f78fb8b118a 100644 --- a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c +++ b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected index a464d9da742..a464d9da742 100644 --- a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected +++ b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c index 11feb2624b7..11feb2624b7 100644 --- a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c +++ b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected index a464d9da742..a464d9da742 100644 --- a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected +++ b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c index 558da9c617b..558da9c617b 100644 --- a/src/glsl/glcpp/tests/015-define-object-with-parens.c +++ b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected index a70321a4c51..a70321a4c51 100644 --- a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected +++ b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c index a2e2404c7c1..a2e2404c7c1 100644 --- a/src/glsl/glcpp/tests/016-define-func-1-arg.c +++ b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected index 6bfe04f7381..6bfe04f7381 100644 --- a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected +++ b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c index c7253835278..c7253835278 100644 --- a/src/glsl/glcpp/tests/017-define-func-2-args.c +++ b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected index f7a2b8c26cb..f7a2b8c26cb 100644 --- a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected +++ b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c index 668130b8f9b..668130b8f9b 100644 --- a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c +++ b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected index c6c9ee38a9e..c6c9ee38a9e 100644 --- a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected +++ b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c index c4e62b25508..c4e62b25508 100644 --- a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c +++ b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected index 1e89b8cfd0c..1e89b8cfd0c 100644 --- a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected +++ b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c index 3049ad15465..3049ad15465 100644 --- a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c +++ b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected index 19f59f5ecb7..19f59f5ecb7 100644 --- a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected +++ b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c index 21ddd0e65f9..21ddd0e65f9 100644 --- a/src/glsl/glcpp/tests/021-define-func-compose.c +++ b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected index 87f51f0baca..87f51f0baca 100644 --- a/src/glsl/glcpp/tests/021-define-func-compose.c.expected +++ b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c index c20d73a4a28..c20d73a4a28 100644 --- a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c +++ b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected index 1dfc6698bb7..1dfc6698bb7 100644 --- a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected +++ b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c index 7ebfed6516c..7ebfed6516c 100644 --- a/src/glsl/glcpp/tests/023-define-extra-whitespace.c +++ b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected index 9c58275d0f9..9c58275d0f9 100644 --- a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected +++ b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c index e788adce30c..e788adce30c 100644 --- a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c +++ b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected index 15600af546b..15600af546b 100644 --- a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected +++ b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c index b433671d1bf..b433671d1bf 100644 --- a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c +++ b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected index 4a59f0520e3..4a59f0520e3 100644 --- a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected +++ b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c index 0d837405309..0d837405309 100644 --- a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c +++ b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected index 5e3c70f2cc5..5e3c70f2cc5 100644 --- a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected +++ b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c index 5ccb52caba5..5ccb52caba5 100644 --- a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c +++ b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected index 94c15f95059..94c15f95059 100644 --- a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected +++ b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c index 44962a71876..44962a71876 100644 --- a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c +++ b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected index 94c15f95059..94c15f95059 100644 --- a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected +++ b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c index 261f7d28fc2..261f7d28fc2 100644 --- a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c +++ b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected index 94c15f95059..94c15f95059 100644 --- a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected +++ b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c index e56fbefd62d..e56fbefd62d 100644 --- a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c +++ b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected index bed826e7831..bed826e7831 100644 --- a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected +++ b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c index 3f4c8744dff..3f4c8744dff 100644 --- a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c +++ b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected index bed826e7831..bed826e7831 100644 --- a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected +++ b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c index b3ac70f499c..b3ac70f499c 100644 --- a/src/glsl/glcpp/tests/032-define-func-self-recurse.c +++ b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected index 983f9417401..983f9417401 100644 --- a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected +++ b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c index f65e48286cf..f65e48286cf 100644 --- a/src/glsl/glcpp/tests/033-define-func-self-compose.c +++ b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected index 08183623643..08183623643 100644 --- a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected +++ b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c index 209a5f7e07c..209a5f7e07c 100644 --- a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c +++ b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected index 3f808fe665d..3f808fe665d 100644 --- a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected +++ b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c index c307fbe830f..c307fbe830f 100644 --- a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c +++ b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected index 09dfdd64e9b..09dfdd64e9b 100644 --- a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected +++ b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c index b21ff336738..b21ff336738 100644 --- a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c +++ b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected index 580ed9599c5..580ed9599c5 100644 --- a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected +++ b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c index b3a2f37f1b9..b3a2f37f1b9 100644 --- a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c +++ b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected index e804d7e4f9f..e804d7e4f9f 100644 --- a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected +++ b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c index 1407c7d6e3c..1407c7d6e3c 100644 --- a/src/glsl/glcpp/tests/038-func-arg-with-commas.c +++ b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected index 6544adb3a25..6544adb3a25 100644 --- a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected +++ b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c index a7c053bb402..a7c053bb402 100644 --- a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c +++ b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected index 4cc795338b2..4cc795338b2 100644 --- a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected +++ b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected diff --git a/src/glsl/glcpp/tests/040-token-pasting.c b/src/compiler/glsl/glcpp/tests/040-token-pasting.c index caab3ba7368..caab3ba7368 100644 --- a/src/glsl/glcpp/tests/040-token-pasting.c +++ b/src/compiler/glsl/glcpp/tests/040-token-pasting.c diff --git a/src/glsl/glcpp/tests/040-token-pasting.c.expected b/src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected index 48e836ec3fa..48e836ec3fa 100644 --- a/src/glsl/glcpp/tests/040-token-pasting.c.expected +++ b/src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected diff --git a/src/glsl/glcpp/tests/041-if-0.c b/src/compiler/glsl/glcpp/tests/041-if-0.c index 2cab677d3e8..2cab677d3e8 100644 --- a/src/glsl/glcpp/tests/041-if-0.c +++ b/src/compiler/glsl/glcpp/tests/041-if-0.c diff --git a/src/glsl/glcpp/tests/041-if-0.c.expected b/src/compiler/glsl/glcpp/tests/041-if-0.c.expected index 8b506b32d55..8b506b32d55 100644 --- a/src/glsl/glcpp/tests/041-if-0.c.expected +++ b/src/compiler/glsl/glcpp/tests/041-if-0.c.expected diff --git a/src/glsl/glcpp/tests/042-if-1.c b/src/compiler/glsl/glcpp/tests/042-if-1.c index 874a25cf41b..874a25cf41b 100644 --- a/src/glsl/glcpp/tests/042-if-1.c +++ b/src/compiler/glsl/glcpp/tests/042-if-1.c diff --git a/src/glsl/glcpp/tests/042-if-1.c.expected b/src/compiler/glsl/glcpp/tests/042-if-1.c.expected index a6ae9465a97..a6ae9465a97 100644 --- a/src/glsl/glcpp/tests/042-if-1.c.expected +++ b/src/compiler/glsl/glcpp/tests/042-if-1.c.expected diff --git a/src/glsl/glcpp/tests/043-if-0-else.c b/src/compiler/glsl/glcpp/tests/043-if-0-else.c index 323351f9dbf..323351f9dbf 100644 --- a/src/glsl/glcpp/tests/043-if-0-else.c +++ b/src/compiler/glsl/glcpp/tests/043-if-0-else.c diff --git a/src/glsl/glcpp/tests/043-if-0-else.c.expected b/src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected index 3d7e6be96c8..3d7e6be96c8 100644 --- a/src/glsl/glcpp/tests/043-if-0-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected diff --git a/src/glsl/glcpp/tests/044-if-1-else.c b/src/compiler/glsl/glcpp/tests/044-if-1-else.c index 28dfc25c6f0..28dfc25c6f0 100644 --- a/src/glsl/glcpp/tests/044-if-1-else.c +++ b/src/compiler/glsl/glcpp/tests/044-if-1-else.c diff --git a/src/glsl/glcpp/tests/044-if-1-else.c.expected b/src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected index 4a31e1cfa9e..4a31e1cfa9e 100644 --- a/src/glsl/glcpp/tests/044-if-1-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c index e50f686d461..e50f686d461 100644 --- a/src/glsl/glcpp/tests/045-if-0-elif.c +++ b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c.expected b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected index a9bb1588e4f..a9bb1588e4f 100644 --- a/src/glsl/glcpp/tests/045-if-0-elif.c.expected +++ b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c index 130515a01ea..130515a01ea 100644 --- a/src/glsl/glcpp/tests/046-if-1-elsif.c +++ b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected index a4995713ca5..a4995713ca5 100644 --- a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected +++ b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c index e8f0838a9ed..e8f0838a9ed 100644 --- a/src/glsl/glcpp/tests/047-if-elif-else.c +++ b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c.expected b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected index 54d30861197..54d30861197 100644 --- a/src/glsl/glcpp/tests/047-if-elif-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected diff --git a/src/glsl/glcpp/tests/048-if-nested.c b/src/compiler/glsl/glcpp/tests/048-if-nested.c index fc4679c3be4..fc4679c3be4 100644 --- a/src/glsl/glcpp/tests/048-if-nested.c +++ b/src/compiler/glsl/glcpp/tests/048-if-nested.c diff --git a/src/glsl/glcpp/tests/048-if-nested.c.expected b/src/compiler/glsl/glcpp/tests/048-if-nested.c.expected index 8beb9c32c37..8beb9c32c37 100644 --- a/src/glsl/glcpp/tests/048-if-nested.c.expected +++ b/src/compiler/glsl/glcpp/tests/048-if-nested.c.expected diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c index 833ea03882a..833ea03882a 100644 --- a/src/glsl/glcpp/tests/049-if-expression-precedence.c +++ b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected index 729bdd15f80..729bdd15f80 100644 --- a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected +++ b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected diff --git a/src/glsl/glcpp/tests/050-if-defined.c b/src/compiler/glsl/glcpp/tests/050-if-defined.c index 34f0f95140e..34f0f95140e 100644 --- a/src/glsl/glcpp/tests/050-if-defined.c +++ b/src/compiler/glsl/glcpp/tests/050-if-defined.c diff --git a/src/glsl/glcpp/tests/050-if-defined.c.expected b/src/compiler/glsl/glcpp/tests/050-if-defined.c.expected index 737eb8d9403..737eb8d9403 100644 --- a/src/glsl/glcpp/tests/050-if-defined.c.expected +++ b/src/compiler/glsl/glcpp/tests/050-if-defined.c.expected diff --git a/src/glsl/glcpp/tests/051-if-relational.c b/src/compiler/glsl/glcpp/tests/051-if-relational.c index c3db488e0de..c3db488e0de 100644 --- a/src/glsl/glcpp/tests/051-if-relational.c +++ b/src/compiler/glsl/glcpp/tests/051-if-relational.c diff --git a/src/glsl/glcpp/tests/051-if-relational.c.expected b/src/compiler/glsl/glcpp/tests/051-if-relational.c.expected index 652fefdd43b..652fefdd43b 100644 --- a/src/glsl/glcpp/tests/051-if-relational.c.expected +++ b/src/compiler/glsl/glcpp/tests/051-if-relational.c.expected diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c index 2d8e45eb61e..2d8e45eb61e 100644 --- a/src/glsl/glcpp/tests/052-if-bitwise.c +++ b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c.expected b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected index 44e52b206e5..44e52b206e5 100644 --- a/src/glsl/glcpp/tests/052-if-bitwise.c.expected +++ b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c index d24c54a88d1..d24c54a88d1 100644 --- a/src/glsl/glcpp/tests/053-if-divide-and-shift.c +++ b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected index 7e78e0454e0..7e78e0454e0 100644 --- a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected +++ b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c index 3da79a0d96e..3da79a0d96e 100644 --- a/src/glsl/glcpp/tests/054-if-with-macros.c +++ b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c.expected b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected index 70f737c90a9..70f737c90a9 100644 --- a/src/glsl/glcpp/tests/054-if-with-macros.c.expected +++ b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c index 00f2c2346d6..00f2c2346d6 100644 --- a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c +++ b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected index 94c15f95059..94c15f95059 100644 --- a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected +++ b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c index 58701d1f25b..58701d1f25b 100644 --- a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c +++ b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected index bed826e7831..bed826e7831 100644 --- a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected +++ b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c index 6140232865d..6140232865d 100644 --- a/src/glsl/glcpp/tests/057-empty-arguments.c +++ b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c.expected b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected index 7d97e15e29d..7d97e15e29d 100644 --- a/src/glsl/glcpp/tests/057-empty-arguments.c.expected +++ b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c index 8ac260c76b6..8ac260c76b6 100644 --- a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c +++ b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected index e0967a1b951..e0967a1b951 100644 --- a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected +++ b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c index 37b895a4237..37b895a4237 100644 --- a/src/glsl/glcpp/tests/059-token-pasting-integer.c +++ b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected index f1288aa7cb7..f1288aa7cb7 100644 --- a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected +++ b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c index ed80ea879ce..ed80ea879ce 100644 --- a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c +++ b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected index 3e5501aa6e8..3e5501aa6e8 100644 --- a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected +++ b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c index 6dbfd1f62d1..6dbfd1f62d1 100644 --- a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c +++ b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected index 15eb64b97f1..15eb64b97f1 100644 --- a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected +++ b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c index d9e439bb890..d9e439bb890 100644 --- a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c +++ b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected index 3f2ff2d6cc8..3f2ff2d6cc8 100644 --- a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected +++ b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected diff --git a/src/glsl/glcpp/tests/063-comments.c b/src/compiler/glsl/glcpp/tests/063-comments.c index e641d2f0f9e..e641d2f0f9e 100644 --- a/src/glsl/glcpp/tests/063-comments.c +++ b/src/compiler/glsl/glcpp/tests/063-comments.c diff --git a/src/glsl/glcpp/tests/063-comments.c.expected b/src/compiler/glsl/glcpp/tests/063-comments.c.expected index f6e10ce0377..f6e10ce0377 100644 --- a/src/glsl/glcpp/tests/063-comments.c.expected +++ b/src/compiler/glsl/glcpp/tests/063-comments.c.expected diff --git a/src/glsl/glcpp/tests/064-version.c b/src/compiler/glsl/glcpp/tests/064-version.c index 21326481b87..21326481b87 100644 --- a/src/glsl/glcpp/tests/064-version.c +++ b/src/compiler/glsl/glcpp/tests/064-version.c diff --git a/src/glsl/glcpp/tests/064-version.c.expected b/src/compiler/glsl/glcpp/tests/064-version.c.expected index 4036b1ee374..4036b1ee374 100644 --- a/src/glsl/glcpp/tests/064-version.c.expected +++ b/src/compiler/glsl/glcpp/tests/064-version.c.expected diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c index 48aa0f8c3ef..48aa0f8c3ef 100644 --- a/src/glsl/glcpp/tests/065-if-defined-parens.c +++ b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected index 737eb8d9403..737eb8d9403 100644 --- a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected +++ b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c index 3b0b47349d0..3b0b47349d0 100644 --- a/src/glsl/glcpp/tests/066-if-nospace-expression.c +++ b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected index 5a28fb3b66c..5a28fb3b66c 100644 --- a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected +++ b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c index f46cce4e60a..f46cce4e60a 100644 --- a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c +++ b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected index 9a5ed2eb2d3..9a5ed2eb2d3 100644 --- a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected +++ b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c index 699ac5144e5..699ac5144e5 100644 --- a/src/glsl/glcpp/tests/068-accidental-pasting.c +++ b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected index 27582cda5e8..27582cda5e8 100644 --- a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected +++ b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c index 2b46ead294c..2b46ead294c 100644 --- a/src/glsl/glcpp/tests/069-repeated-argument.c +++ b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c.expected b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected index 8b4b095e488..8b4b095e488 100644 --- a/src/glsl/glcpp/tests/069-repeated-argument.c.expected +++ b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c index d15a4840b01..d15a4840b01 100644 --- a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c +++ b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected index 44b93a434fa..44b93a434fa 100644 --- a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected +++ b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected diff --git a/src/glsl/glcpp/tests/071-punctuator.c b/src/compiler/glsl/glcpp/tests/071-punctuator.c index 959d6825988..959d6825988 100644 --- a/src/glsl/glcpp/tests/071-punctuator.c +++ b/src/compiler/glsl/glcpp/tests/071-punctuator.c diff --git a/src/glsl/glcpp/tests/071-punctuator.c.expected b/src/compiler/glsl/glcpp/tests/071-punctuator.c.expected index 959d6825988..959d6825988 100644 --- a/src/glsl/glcpp/tests/071-punctuator.c.expected +++ b/src/compiler/glsl/glcpp/tests/071-punctuator.c.expected diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c index e421e9d5e29..e421e9d5e29 100644 --- a/src/glsl/glcpp/tests/072-token-pasting-same-line.c +++ b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected index 7b80af7e465..7b80af7e465 100644 --- a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected +++ b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c index 61a48097ca3..61a48097ca3 100644 --- a/src/glsl/glcpp/tests/073-if-in-ifdef.c +++ b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected index fd40910d9e7..fd40910d9e7 100644 --- a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected +++ b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected diff --git a/src/glsl/glcpp/tests/074-elif-undef.c b/src/compiler/glsl/glcpp/tests/074-elif-undef.c index 67aac8977e0..67aac8977e0 100644 --- a/src/glsl/glcpp/tests/074-elif-undef.c +++ b/src/compiler/glsl/glcpp/tests/074-elif-undef.c diff --git a/src/glsl/glcpp/tests/074-elif-undef.c.expected b/src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected index b28b04f6431..b28b04f6431 100644 --- a/src/glsl/glcpp/tests/074-elif-undef.c.expected +++ b/src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c index 264bc4f10ee..264bc4f10ee 100644 --- a/src/glsl/glcpp/tests/075-elif-elif-undef.c +++ b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected index fd40910d9e7..fd40910d9e7 100644 --- a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected +++ b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c index ebd550ed005..ebd550ed005 100644 --- a/src/glsl/glcpp/tests/076-elif-undef-nested.c +++ b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected index 3f2ff2d6cc8..3f2ff2d6cc8 100644 --- a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected +++ b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected diff --git a/src/glsl/glcpp/tests/077-else-without-if.c b/src/compiler/glsl/glcpp/tests/077-else-without-if.c index 81f00bfe278..81f00bfe278 100644 --- a/src/glsl/glcpp/tests/077-else-without-if.c +++ b/src/compiler/glsl/glcpp/tests/077-else-without-if.c diff --git a/src/glsl/glcpp/tests/077-else-without-if.c.expected b/src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected index 69f34047033..69f34047033 100644 --- a/src/glsl/glcpp/tests/077-else-without-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c index 60466b3890a..60466b3890a 100644 --- a/src/glsl/glcpp/tests/078-elif-without-if.c +++ b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c.expected b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected index b8e40ecc09b..b8e40ecc09b 100644 --- a/src/glsl/glcpp/tests/078-elif-without-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c index 69331c3ca9d..69331c3ca9d 100644 --- a/src/glsl/glcpp/tests/079-endif-without-if.c +++ b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c.expected b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected index 7ae579dd25e..7ae579dd25e 100644 --- a/src/glsl/glcpp/tests/079-endif-without-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c index a27ba36a366..a27ba36a366 100644 --- a/src/glsl/glcpp/tests/080-if-without-expression.c +++ b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c.expected b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected index 2e4cd7323c5..2e4cd7323c5 100644 --- a/src/glsl/glcpp/tests/080-if-without-expression.c.expected +++ b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c index 79c78663dd3..79c78663dd3 100644 --- a/src/glsl/glcpp/tests/081-elif-without-expression.c +++ b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected index b607b849068..b607b849068 100644 --- a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected +++ b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c index 8b84d50c3a0..8b84d50c3a0 100644 --- a/src/glsl/glcpp/tests/082-invalid-paste.c +++ b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c.expected b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected index b48a2d6d296..b48a2d6d296 100644 --- a/src/glsl/glcpp/tests/082-invalid-paste.c.expected +++ b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c index 91806350927..91806350927 100644 --- a/src/glsl/glcpp/tests/083-unterminated-if.c +++ b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c.expected b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected index 4659ab6fe67..4659ab6fe67 100644 --- a/src/glsl/glcpp/tests/083-unterminated-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c index 0789ba5e525..0789ba5e525 100644 --- a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c +++ b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected index af49a37369d..af49a37369d 100644 --- a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected +++ b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c index 91bea600612..91bea600612 100644 --- a/src/glsl/glcpp/tests/085-incorrect-argument-count.c +++ b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected index d23845bfd49..d23845bfd49 100644 --- a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected +++ b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c index a6b7201f95d..a6b7201f95d 100644 --- a/src/glsl/glcpp/tests/086-reserved-macro-names.c +++ b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected index 38b089daec3..38b089daec3 100644 --- a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected +++ b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected diff --git a/src/glsl/glcpp/tests/087-if-comments.c b/src/compiler/glsl/glcpp/tests/087-if-comments.c index ce8dc43057f..ce8dc43057f 100644 --- a/src/glsl/glcpp/tests/087-if-comments.c +++ b/src/compiler/glsl/glcpp/tests/087-if-comments.c diff --git a/src/glsl/glcpp/tests/087-if-comments.c.expected b/src/compiler/glsl/glcpp/tests/087-if-comments.c.expected index 2783a9c14d5..2783a9c14d5 100644 --- a/src/glsl/glcpp/tests/087-if-comments.c.expected +++ b/src/compiler/glsl/glcpp/tests/087-if-comments.c.expected diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c index 422c6546414..422c6546414 100644 --- a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c +++ b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected index 3f2ff2d6cc8..3f2ff2d6cc8 100644 --- a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected +++ b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c index b3d1391e160..b3d1391e160 100644 --- a/src/glsl/glcpp/tests/089-redefine-macro-error.c +++ b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected index a945161497f..a945161497f 100644 --- a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected +++ b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected diff --git a/src/glsl/glcpp/tests/090-hash-error.c b/src/compiler/glsl/glcpp/tests/090-hash-error.c index d19bb7faed8..d19bb7faed8 100644 --- a/src/glsl/glcpp/tests/090-hash-error.c +++ b/src/compiler/glsl/glcpp/tests/090-hash-error.c diff --git a/src/glsl/glcpp/tests/090-hash-error.c.expected b/src/compiler/glsl/glcpp/tests/090-hash-error.c.expected index 876a6ea9cc5..876a6ea9cc5 100644 --- a/src/glsl/glcpp/tests/090-hash-error.c.expected +++ b/src/compiler/glsl/glcpp/tests/090-hash-error.c.expected diff --git a/src/glsl/glcpp/tests/091-hash-line.c b/src/compiler/glsl/glcpp/tests/091-hash-line.c index 26d70382a89..26d70382a89 100644 --- a/src/glsl/glcpp/tests/091-hash-line.c +++ b/src/compiler/glsl/glcpp/tests/091-hash-line.c diff --git a/src/glsl/glcpp/tests/091-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/091-hash-line.c.expected index ac9ab252f1e..ac9ab252f1e 100644 --- a/src/glsl/glcpp/tests/091-hash-line.c.expected +++ b/src/compiler/glsl/glcpp/tests/091-hash-line.c.expected diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c index 3c161a5c501..3c161a5c501 100644 --- a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c +++ b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected index 698294d91f2..698294d91f2 100644 --- a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected +++ b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c index bf65d4f5271..bf65d4f5271 100644 --- a/src/glsl/glcpp/tests/093-divide-by-zero.c +++ b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected index a858870b794..a858870b794 100644 --- a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected +++ b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c index 04497b17913..04497b17913 100644 --- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c +++ b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected index 570952b2454..570952b2454 100644 --- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected +++ b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected diff --git a/src/glsl/glcpp/tests/095-recursive-define.c b/src/compiler/glsl/glcpp/tests/095-recursive-define.c index 801d90ce2e3..801d90ce2e3 100644 --- a/src/glsl/glcpp/tests/095-recursive-define.c +++ b/src/compiler/glsl/glcpp/tests/095-recursive-define.c diff --git a/src/glsl/glcpp/tests/095-recursive-define.c.expected b/src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected index 493ab091be7..493ab091be7 100644 --- a/src/glsl/glcpp/tests/095-recursive-define.c.expected +++ b/src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected diff --git a/src/glsl/glcpp/tests/096-paste-twice.c b/src/compiler/glsl/glcpp/tests/096-paste-twice.c index 8da756fcba4..8da756fcba4 100644 --- a/src/glsl/glcpp/tests/096-paste-twice.c +++ b/src/compiler/glsl/glcpp/tests/096-paste-twice.c diff --git a/src/glsl/glcpp/tests/096-paste-twice.c.expected b/src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected index 96c57d2a6ec..96c57d2a6ec 100644 --- a/src/glsl/glcpp/tests/096-paste-twice.c.expected +++ b/src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c index 0f46835c29e..0f46835c29e 100644 --- a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c +++ b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected index 36f66992539..36f66992539 100644 --- a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected +++ b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c index 1f520d4d432..1f520d4d432 100644 --- a/src/glsl/glcpp/tests/098-elif-undefined.c +++ b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c.expected b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected index c6ef689ce4b..c6ef689ce4b 100644 --- a/src/glsl/glcpp/tests/098-elif-undefined.c.expected +++ b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected diff --git a/src/glsl/glcpp/tests/099-c99-example.c b/src/compiler/glsl/glcpp/tests/099-c99-example.c index d1976b1f265..d1976b1f265 100644 --- a/src/glsl/glcpp/tests/099-c99-example.c +++ b/src/compiler/glsl/glcpp/tests/099-c99-example.c diff --git a/src/glsl/glcpp/tests/099-c99-example.c.expected b/src/compiler/glsl/glcpp/tests/099-c99-example.c.expected index 352bbff48f5..352bbff48f5 100644 --- a/src/glsl/glcpp/tests/099-c99-example.c.expected +++ b/src/compiler/glsl/glcpp/tests/099-c99-example.c.expected diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c index 31dbb9a9edc..31dbb9a9edc 100644 --- a/src/glsl/glcpp/tests/100-macro-with-colon.c +++ b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected index 09f1f417bdd..09f1f417bdd 100644 --- a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected +++ b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c index e1693805b6a..e1693805b6a 100644 --- a/src/glsl/glcpp/tests/101-macros-used-twice.c +++ b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected index 1e0b30696cb..1e0b30696cb 100644 --- a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected +++ b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c index 301779eb948..301779eb948 100644 --- a/src/glsl/glcpp/tests/102-garbage-after-endif.c +++ b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected index d9f3bdc9465..d9f3bdc9465 100644 --- a/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected +++ b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c index c460feadf57..c460feadf57 100644 --- a/src/glsl/glcpp/tests/103-garbage-after-else-0.c +++ b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected index b053b399775..b053b399775 100644 --- a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected +++ b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c index 3fbeec48e4c..3fbeec48e4c 100644 --- a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c +++ b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected index 3fbeec48e4c..3fbeec48e4c 100644 --- a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected +++ b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c index da156c6a596..da156c6a596 100644 --- a/src/glsl/glcpp/tests/105-multiline-hash-line.c +++ b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected index 814cef1b8c5..814cef1b8c5 100644 --- a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected +++ b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c index 929e93e782f..929e93e782f 100644 --- a/src/glsl/glcpp/tests/106-multiline-hash-if.c +++ b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected index 1c0cbc970f5..1c0cbc970f5 100644 --- a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c index 8c1c67a4d6b..8c1c67a4d6b 100644 --- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c +++ b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected index b0601d7ee42..b0601d7ee42 100644 --- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected +++ b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c index 0ce36f2eb1b..0ce36f2eb1b 100644 --- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c +++ b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected index 4f4243f947f..4f4243f947f 100644 --- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected +++ b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c index f52966a8e80..f52966a8e80 100644 --- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c +++ b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected index 4f4243f947f..4f4243f947f 100644 --- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected +++ b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c index 6d7d0f38d9a..6d7d0f38d9a 100644 --- a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c +++ b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected index 4d93de41dd3..4d93de41dd3 100644 --- a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected +++ b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c index b3413371ec2..b3413371ec2 100644 --- a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c +++ b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected index 5c005c393a9..5c005c393a9 100644 --- a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c index e8221bc49c3..e8221bc49c3 100644 --- a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c +++ b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected index 86b37036b65..86b37036b65 100644 --- a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected +++ b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c index 369c4879260..369c4879260 100644 --- a/src/glsl/glcpp/tests/113-line-and-file-macros.c +++ b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected index 55bc788ffd7..55bc788ffd7 100644 --- a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected +++ b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c index d80d9c7ef4b..d80d9c7ef4b 100644 --- a/src/glsl/glcpp/tests/114-paste-integer-tokens.c +++ b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected index aa9711034a6..aa9711034a6 100644 --- a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected +++ b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected diff --git a/src/glsl/glcpp/tests/115-line-continuations.c b/src/compiler/glsl/glcpp/tests/115-line-continuations.c index 105590d85ed..105590d85ed 100644 --- a/src/glsl/glcpp/tests/115-line-continuations.c +++ b/src/compiler/glsl/glcpp/tests/115-line-continuations.c diff --git a/src/glsl/glcpp/tests/115-line-continuations.c.expected b/src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected index 428b5e822c5..428b5e822c5 100644 --- a/src/glsl/glcpp/tests/115-line-continuations.c.expected +++ b/src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c index 83d5ddf681b..83d5ddf681b 100644 --- a/src/glsl/glcpp/tests/116-disable-line-continuations.c +++ b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected index 5ca78928a61..5ca78928a61 100644 --- a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected +++ b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c index 6a6f2829883..6a6f2829883 100644 --- a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c +++ b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected index 8aaa04d28e4..8aaa04d28e4 100644 --- a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected +++ b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c index 53e80394ab6..53e80394ab6 100644 --- a/src/glsl/glcpp/tests/118-comment-becomes-space.c +++ b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected index 1fa8135cb13..1fa8135cb13 100644 --- a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected +++ b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c index 9b9e9233bcb..9b9e9233bcb 100644 --- a/src/glsl/glcpp/tests/119-elif-after-else.c +++ b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c.expected b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected index 636956799cd..636956799cd 100644 --- a/src/glsl/glcpp/tests/119-elif-after-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c index 49e7696613e..49e7696613e 100644 --- a/src/glsl/glcpp/tests/120-undef-builtin.c +++ b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c.expected b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected index 3b736df378e..3b736df378e 100644 --- a/src/glsl/glcpp/tests/120-undef-builtin.c.expected +++ b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c index 67ebe73e5cf..67ebe73e5cf 100644 --- a/src/glsl/glcpp/tests/121-comment-bug-72686.c +++ b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected index 8cb7cb9891f..8cb7cb9891f 100644 --- a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected +++ b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c index ae7ea09f67e..ae7ea09f67e 100644 --- a/src/glsl/glcpp/tests/122-redefine-whitespace.c +++ b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected index 602bdef94c2..602bdef94c2 100644 --- a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected +++ b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c index 0b341a381f8..0b341a381f8 100644 --- a/src/glsl/glcpp/tests/123-garbage-after-else-1.c +++ b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected index b053b399775..b053b399775 100644 --- a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected +++ b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c index 947ba1885ec..947ba1885ec 100644 --- a/src/glsl/glcpp/tests/124-preprocessing-numbers.c +++ b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected index 6ec588862d6..6ec588862d6 100644 --- a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected +++ b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c index 4ee29f6d93f..4ee29f6d93f 100644 --- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c +++ b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected index 616aa912e2f..616aa912e2f 100644 --- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected +++ b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c index 4c0d29000a3..4c0d29000a3 100644 --- a/src/glsl/glcpp/tests/126-garbage-after-directive.c +++ b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected index 82a06f8a3b3..82a06f8a3b3 100644 --- a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected +++ b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c index 0f9b0b3d38f..0f9b0b3d38f 100644 --- a/src/glsl/glcpp/tests/127-pragma-empty.c +++ b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c.expected b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected index 92371a07c32..92371a07c32 100644 --- a/src/glsl/glcpp/tests/127-pragma-empty.c.expected +++ b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c index fba9596baf8..fba9596baf8 100644 --- a/src/glsl/glcpp/tests/128-space-before-hash.c +++ b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c.expected b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected index 9babb6fb078..9babb6fb078 100644 --- a/src/glsl/glcpp/tests/128-space-before-hash.c.expected +++ b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c index a229179f18c..a229179f18c 100644 --- a/src/glsl/glcpp/tests/129-define-non-identifier.c +++ b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected index fd0b41347fa..fd0b41347fa 100644 --- a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected +++ b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected diff --git a/src/glsl/glcpp/tests/130-define-comment.c b/src/compiler/glsl/glcpp/tests/130-define-comment.c index 33312362cc7..33312362cc7 100644 --- a/src/glsl/glcpp/tests/130-define-comment.c +++ b/src/compiler/glsl/glcpp/tests/130-define-comment.c diff --git a/src/glsl/glcpp/tests/130-define-comment.c.expected b/src/compiler/glsl/glcpp/tests/130-define-comment.c.expected index d789e29d5a8..d789e29d5a8 100644 --- a/src/glsl/glcpp/tests/130-define-comment.c.expected +++ b/src/compiler/glsl/glcpp/tests/130-define-comment.c.expected diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c index 240292dad01..240292dad01 100644 --- a/src/glsl/glcpp/tests/131-eof-without-newline.c +++ b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c.expected b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected index 57800306322..57800306322 100644 --- a/src/glsl/glcpp/tests/131-eof-without-newline.c.expected +++ b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c index 6795e35ea00..6795e35ea00 100644 --- a/src/glsl/glcpp/tests/132-eof-without-newline-define.c +++ b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected index 341e5e2aa67..341e5e2aa67 100644 --- a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected +++ b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c index 56ec5f722c0..56ec5f722c0 100644 --- a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c +++ b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected index d186f48761f..d186f48761f 100644 --- a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected +++ b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c index 3015f0e886e..3015f0e886e 100644 --- a/src/glsl/glcpp/tests/134-hash-comment-directive.c +++ b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected index 760c960cb62..760c960cb62 100644 --- a/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected +++ b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c index fd96bd64c74..fd96bd64c74 100644 --- a/src/glsl/glcpp/tests/135-duplicate-parameter.c +++ b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected index bc1a334ed29..bc1a334ed29 100644 --- a/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected +++ b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c index 167d3c8a3cf..167d3c8a3cf 100644 --- a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c +++ b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected index 137921b1695..137921b1695 100644 --- a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected +++ b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c index c8cd47fb57e..c8cd47fb57e 100644 --- a/src/glsl/glcpp/tests/137-expand-macro-after-period.c +++ b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected index f9f5be13e01..f9f5be13e01 100644 --- a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected +++ b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c index 38967dc57d1..38967dc57d1 100644 --- a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c +++ b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected index 0d6ef4d9ad4..0d6ef4d9ad4 100644 --- a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected +++ b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c index 30e128db4c5..30e128db4c5 100644 --- a/src/glsl/glcpp/tests/139-define-without-macro-name.c +++ b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected index 42b02d1a8a1..42b02d1a8a1 100644 --- a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected +++ b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected diff --git a/src/glsl/glcpp/tests/140-null-directive.c b/src/compiler/glsl/glcpp/tests/140-null-directive.c index 1dcb26ef8b9..1dcb26ef8b9 100644 --- a/src/glsl/glcpp/tests/140-null-directive.c +++ b/src/compiler/glsl/glcpp/tests/140-null-directive.c diff --git a/src/glsl/glcpp/tests/140-null-directive.c.expected b/src/compiler/glsl/glcpp/tests/140-null-directive.c.expected index fa103f60e82..fa103f60e82 100644 --- a/src/glsl/glcpp/tests/140-null-directive.c.expected +++ b/src/compiler/glsl/glcpp/tests/140-null-directive.c.expected diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c index a93f3ce35fd..a93f3ce35fd 100644 --- a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c +++ b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected index 330731dc800..330731dc800 100644 --- a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected +++ b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c index b60c04232a6..b60c04232a6 100644 --- a/src/glsl/glcpp/tests/142-defined-within-macro.c +++ b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c.expected b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected index 4eca90bc3db..4eca90bc3db 100644 --- a/src/glsl/glcpp/tests/142-defined-within-macro.c.expected +++ b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected diff --git a/src/glsl/glcpp/tests/143-multiple-else.c b/src/compiler/glsl/glcpp/tests/143-multiple-else.c index 62ad49cf7bb..62ad49cf7bb 100644 --- a/src/glsl/glcpp/tests/143-multiple-else.c +++ b/src/compiler/glsl/glcpp/tests/143-multiple-else.c diff --git a/src/glsl/glcpp/tests/143-multiple-else.c.expected b/src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected index 00b3328c835..00b3328c835 100644 --- a/src/glsl/glcpp/tests/143-multiple-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/compiler/glsl/glcpp/tests/glcpp-test index 825c22e71fb..3945ee4f6ce 100755 --- a/src/glsl/glcpp/tests/glcpp-test +++ b/src/compiler/glsl/glcpp/tests/glcpp-test @@ -1,9 +1,9 @@ #!/bin/sh if [ ! -z "$srcdir" ]; then - testdir=$srcdir/glcpp/tests - outdir=`pwd`/glcpp/tests - glcpp=`pwd`/glcpp/glcpp + testdir=$srcdir/glsl/glcpp/tests + outdir=`pwd`/glsl/glcpp/tests + glcpp=`pwd`/glsl/glcpp/glcpp else testdir=. outdir=. diff --git a/src/glsl/glcpp/tests/glcpp-test-cr-lf b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf index c4ed0b86d74..c75370f48c3 100755 --- a/src/glsl/glcpp/tests/glcpp-test-cr-lf +++ b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf @@ -6,8 +6,8 @@ # glcpp-test script. if [ ! -z "$srcdir" ]; then - testdir="$srcdir/glcpp/tests" - glcpp_test="$srcdir/glcpp/tests/glcpp-test" + testdir="$srcdir/glsl/glcpp/tests" + glcpp_test="$srcdir/glsl/glcpp/tests/glcpp-test" else testdir=. glcpp_test=./glcpp-test @@ -99,7 +99,7 @@ mkdir subtest-cr for file in "$testdir"/*.c; do base=$(basename "$file") tr "\n" "\r" < "$file" > subtest-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected done run_test "${glcpp_test} --testdir=subtest-cr" @@ -112,7 +112,7 @@ mkdir subtest-cr-lf for file in "$testdir"/*.c; do base=$(basename "$file") sed -e 's/$/
/' < "$file" > subtest-cr-lf/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected done run_test "${glcpp_test} --testdir=subtest-cr-lf" @@ -125,7 +125,7 @@ mkdir subtest-lf-cr for file in "$testdir"/*.c; do base=$(basename "$file") sed -e 's/$/
/' < "$file" | tr "\n\r" "\r\n" > subtest-lf-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected done run_test "${glcpp_test} --testdir=subtest-lf-cr" diff --git a/src/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll index e59f93e10ef..e59f93e10ef 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/compiler/glsl/glsl_lexer.ll diff --git a/src/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index 99bd0e61d0e..99bd0e61d0e 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy diff --git a/src/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 603895497d1..603895497d1 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp diff --git a/src/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index 3f88e01d599..3f88e01d599 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h diff --git a/src/glsl/glsl_symbol_table.cpp b/src/compiler/glsl/glsl_symbol_table.cpp index 6c682acf560..6c682acf560 100644 --- a/src/glsl/glsl_symbol_table.cpp +++ b/src/compiler/glsl/glsl_symbol_table.cpp diff --git a/src/glsl/glsl_symbol_table.h b/src/compiler/glsl/glsl_symbol_table.h index 5d654e5e6a7..5d654e5e6a7 100644 --- a/src/glsl/glsl_symbol_table.h +++ b/src/compiler/glsl/glsl_symbol_table.h diff --git a/src/glsl/hir_field_selection.cpp b/src/compiler/glsl/hir_field_selection.cpp index eab08ad8235..eab08ad8235 100644 --- a/src/glsl/hir_field_selection.cpp +++ b/src/compiler/glsl/hir_field_selection.cpp diff --git a/src/glsl/ir.cpp b/src/compiler/glsl/ir.cpp index de9d314bae4..de9d314bae4 100644 --- a/src/glsl/ir.cpp +++ b/src/compiler/glsl/ir.cpp diff --git a/src/glsl/ir.h b/src/compiler/glsl/ir.h index bd7b5506343..bd7b5506343 100644 --- a/src/glsl/ir.h +++ b/src/compiler/glsl/ir.h diff --git a/src/glsl/ir_basic_block.cpp b/src/compiler/glsl/ir_basic_block.cpp index 15481aa47f6..15481aa47f6 100644 --- a/src/glsl/ir_basic_block.cpp +++ b/src/compiler/glsl/ir_basic_block.cpp diff --git a/src/glsl/ir_basic_block.h b/src/compiler/glsl/ir_basic_block.h index dbd678b5c4f..dbd678b5c4f 100644 --- a/src/glsl/ir_basic_block.h +++ b/src/compiler/glsl/ir_basic_block.h diff --git a/src/glsl/ir_builder.cpp b/src/compiler/glsl/ir_builder.cpp index c9cf1240dfe..c9cf1240dfe 100644 --- a/src/glsl/ir_builder.cpp +++ b/src/compiler/glsl/ir_builder.cpp diff --git a/src/glsl/ir_builder.h b/src/compiler/glsl/ir_builder.h index b483ebf6269..b483ebf6269 100644 --- a/src/glsl/ir_builder.h +++ b/src/compiler/glsl/ir_builder.h diff --git a/src/glsl/ir_clone.cpp b/src/compiler/glsl/ir_clone.cpp index 0965b0d3719..0965b0d3719 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/compiler/glsl/ir_clone.cpp diff --git a/src/glsl/ir_constant_expression.cpp b/src/compiler/glsl/ir_constant_expression.cpp index fbbf7794da6..fbbf7794da6 100644 --- a/src/glsl/ir_constant_expression.cpp +++ b/src/compiler/glsl/ir_constant_expression.cpp diff --git a/src/glsl/ir_equals.cpp b/src/compiler/glsl/ir_equals.cpp index b86f4ea16bb..b86f4ea16bb 100644 --- a/src/glsl/ir_equals.cpp +++ b/src/compiler/glsl/ir_equals.cpp diff --git a/src/glsl/ir_expression_flattening.cpp b/src/compiler/glsl/ir_expression_flattening.cpp index c13ae811d78..c13ae811d78 100644 --- a/src/glsl/ir_expression_flattening.cpp +++ b/src/compiler/glsl/ir_expression_flattening.cpp diff --git a/src/glsl/ir_expression_flattening.h b/src/compiler/glsl/ir_expression_flattening.h index 2eda1590001..2eda1590001 100644 --- a/src/glsl/ir_expression_flattening.h +++ b/src/compiler/glsl/ir_expression_flattening.h diff --git a/src/glsl/ir_function.cpp b/src/compiler/glsl/ir_function.cpp index 0b4cb4bd30d..0b4cb4bd30d 100644 --- a/src/glsl/ir_function.cpp +++ b/src/compiler/glsl/ir_function.cpp diff --git a/src/glsl/ir_function_can_inline.cpp b/src/compiler/glsl/ir_function_can_inline.cpp index 3b1d15f80fc..3b1d15f80fc 100644 --- a/src/glsl/ir_function_can_inline.cpp +++ b/src/compiler/glsl/ir_function_can_inline.cpp diff --git a/src/glsl/ir_function_detect_recursion.cpp b/src/compiler/glsl/ir_function_detect_recursion.cpp index b2334d2e403..b2334d2e403 100644 --- a/src/glsl/ir_function_detect_recursion.cpp +++ b/src/compiler/glsl/ir_function_detect_recursion.cpp diff --git a/src/glsl/ir_function_inlining.h b/src/compiler/glsl/ir_function_inlining.h index 6db011bbcae..6db011bbcae 100644 --- a/src/glsl/ir_function_inlining.h +++ b/src/compiler/glsl/ir_function_inlining.h diff --git a/src/glsl/ir_hierarchical_visitor.cpp b/src/compiler/glsl/ir_hierarchical_visitor.cpp index 1d23a776643..1d23a776643 100644 --- a/src/glsl/ir_hierarchical_visitor.cpp +++ b/src/compiler/glsl/ir_hierarchical_visitor.cpp diff --git a/src/glsl/ir_hierarchical_visitor.h b/src/compiler/glsl/ir_hierarchical_visitor.h index 28517b6e4f4..28517b6e4f4 100644 --- a/src/glsl/ir_hierarchical_visitor.h +++ b/src/compiler/glsl/ir_hierarchical_visitor.h diff --git a/src/glsl/ir_hv_accept.cpp b/src/compiler/glsl/ir_hv_accept.cpp index 213992af28c..213992af28c 100644 --- a/src/glsl/ir_hv_accept.cpp +++ b/src/compiler/glsl/ir_hv_accept.cpp diff --git a/src/glsl/ir_import_prototypes.cpp b/src/compiler/glsl/ir_import_prototypes.cpp index b0429fbc3af..b0429fbc3af 100644 --- a/src/glsl/ir_import_prototypes.cpp +++ b/src/compiler/glsl/ir_import_prototypes.cpp diff --git a/src/glsl/ir_optimization.h b/src/compiler/glsl/ir_optimization.h index be86f547f77..be86f547f77 100644 --- a/src/glsl/ir_optimization.h +++ b/src/compiler/glsl/ir_optimization.h diff --git a/src/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp index 960b23fe0ed..960b23fe0ed 100644 --- a/src/glsl/ir_print_visitor.cpp +++ b/src/compiler/glsl/ir_print_visitor.cpp diff --git a/src/glsl/ir_print_visitor.h b/src/compiler/glsl/ir_print_visitor.h index 965e63ade8b..965e63ade8b 100644 --- a/src/glsl/ir_print_visitor.h +++ b/src/compiler/glsl/ir_print_visitor.h diff --git a/src/glsl/ir_reader.cpp b/src/compiler/glsl/ir_reader.cpp index 15315aac522..15315aac522 100644 --- a/src/glsl/ir_reader.cpp +++ b/src/compiler/glsl/ir_reader.cpp diff --git a/src/glsl/ir_reader.h b/src/compiler/glsl/ir_reader.h index aef2ca23bd2..aef2ca23bd2 100644 --- a/src/glsl/ir_reader.h +++ b/src/compiler/glsl/ir_reader.h diff --git a/src/glsl/ir_rvalue_visitor.cpp b/src/compiler/glsl/ir_rvalue_visitor.cpp index 6ab6cf02176..6ab6cf02176 100644 --- a/src/glsl/ir_rvalue_visitor.cpp +++ b/src/compiler/glsl/ir_rvalue_visitor.cpp diff --git a/src/glsl/ir_rvalue_visitor.h b/src/compiler/glsl/ir_rvalue_visitor.h index 185c72a5ba1..185c72a5ba1 100644 --- a/src/glsl/ir_rvalue_visitor.h +++ b/src/compiler/glsl/ir_rvalue_visitor.h diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp index df06923b870..df06923b870 100644 --- a/src/glsl/ir_set_program_inouts.cpp +++ b/src/compiler/glsl/ir_set_program_inouts.cpp diff --git a/src/glsl/ir_uniform.h b/src/compiler/glsl/ir_uniform.h index 1854279925b..1854279925b 100644 --- a/src/glsl/ir_uniform.h +++ b/src/compiler/glsl/ir_uniform.h diff --git a/src/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp index cad7069bf98..cad7069bf98 100644 --- a/src/glsl/ir_validate.cpp +++ b/src/compiler/glsl/ir_validate.cpp diff --git a/src/glsl/ir_variable_refcount.cpp b/src/compiler/glsl/ir_variable_refcount.cpp index 8306be10b9c..8306be10b9c 100644 --- a/src/glsl/ir_variable_refcount.cpp +++ b/src/compiler/glsl/ir_variable_refcount.cpp diff --git a/src/glsl/ir_variable_refcount.h b/src/compiler/glsl/ir_variable_refcount.h index 08a11c01495..08a11c01495 100644 --- a/src/glsl/ir_variable_refcount.h +++ b/src/compiler/glsl/ir_variable_refcount.h diff --git a/src/glsl/ir_visitor.h b/src/compiler/glsl/ir_visitor.h index 7c38481cd53..7c38481cd53 100644 --- a/src/glsl/ir_visitor.h +++ b/src/compiler/glsl/ir_visitor.h diff --git a/src/glsl/link_atomics.cpp b/src/compiler/glsl/link_atomics.cpp index 277d4737ab7..277d4737ab7 100644 --- a/src/glsl/link_atomics.cpp +++ b/src/compiler/glsl/link_atomics.cpp diff --git a/src/glsl/link_functions.cpp b/src/compiler/glsl/link_functions.cpp index 537f4dc77ac..537f4dc77ac 100644 --- a/src/glsl/link_functions.cpp +++ b/src/compiler/glsl/link_functions.cpp diff --git a/src/glsl/link_interface_blocks.cpp b/src/compiler/glsl/link_interface_blocks.cpp index 64c30fea9a3..64c30fea9a3 100644 --- a/src/glsl/link_interface_blocks.cpp +++ b/src/compiler/glsl/link_interface_blocks.cpp diff --git a/src/glsl/link_uniform_block_active_visitor.cpp b/src/compiler/glsl/link_uniform_block_active_visitor.cpp index 54fea700b53..54fea700b53 100644 --- a/src/glsl/link_uniform_block_active_visitor.cpp +++ b/src/compiler/glsl/link_uniform_block_active_visitor.cpp diff --git a/src/glsl/link_uniform_block_active_visitor.h b/src/compiler/glsl/link_uniform_block_active_visitor.h index afb52c14a37..afb52c14a37 100644 --- a/src/glsl/link_uniform_block_active_visitor.h +++ b/src/compiler/glsl/link_uniform_block_active_visitor.h diff --git a/src/glsl/link_uniform_blocks.cpp b/src/compiler/glsl/link_uniform_blocks.cpp index 7d755765852..7d755765852 100644 --- a/src/glsl/link_uniform_blocks.cpp +++ b/src/compiler/glsl/link_uniform_blocks.cpp diff --git a/src/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp index 58d21e5125e..58d21e5125e 100644 --- a/src/glsl/link_uniform_initializers.cpp +++ b/src/compiler/glsl/link_uniform_initializers.cpp diff --git a/src/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index 33b2d4c8646..33b2d4c8646 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp diff --git a/src/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp index 264b69ca619..264b69ca619 100644 --- a/src/glsl/link_varyings.cpp +++ b/src/compiler/glsl/link_varyings.cpp diff --git a/src/glsl/link_varyings.h b/src/compiler/glsl/link_varyings.h index b2812614ecc..b2812614ecc 100644 --- a/src/glsl/link_varyings.h +++ b/src/compiler/glsl/link_varyings.h diff --git a/src/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 6657777d74c..6657777d74c 100644 --- a/src/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp diff --git a/src/glsl/linker.h b/src/compiler/glsl/linker.h index c80be1c7e22..c80be1c7e22 100644 --- a/src/glsl/linker.h +++ b/src/compiler/glsl/linker.h diff --git a/src/glsl/list.h b/src/compiler/glsl/list.h index a1c4d82b017..a1c4d82b017 100644 --- a/src/glsl/list.h +++ b/src/compiler/glsl/list.h diff --git a/src/glsl/loop_analysis.cpp b/src/compiler/glsl/loop_analysis.cpp index 096a80abb34..096a80abb34 100644 --- a/src/glsl/loop_analysis.cpp +++ b/src/compiler/glsl/loop_analysis.cpp diff --git a/src/glsl/loop_analysis.h b/src/compiler/glsl/loop_analysis.h index 3b1971d7edc..3b1971d7edc 100644 --- a/src/glsl/loop_analysis.h +++ b/src/compiler/glsl/loop_analysis.h diff --git a/src/glsl/loop_controls.cpp b/src/compiler/glsl/loop_controls.cpp index c717605ec74..c717605ec74 100644 --- a/src/glsl/loop_controls.cpp +++ b/src/compiler/glsl/loop_controls.cpp diff --git a/src/glsl/loop_unroll.cpp b/src/compiler/glsl/loop_unroll.cpp index aea2743cdb1..aea2743cdb1 100644 --- a/src/glsl/loop_unroll.cpp +++ b/src/compiler/glsl/loop_unroll.cpp diff --git a/src/glsl/lower_buffer_access.cpp b/src/compiler/glsl/lower_buffer_access.cpp index f8c8d140ea8..f8c8d140ea8 100644 --- a/src/glsl/lower_buffer_access.cpp +++ b/src/compiler/glsl/lower_buffer_access.cpp diff --git a/src/glsl/lower_buffer_access.h b/src/compiler/glsl/lower_buffer_access.h index cc4614e9792..cc4614e9792 100644 --- a/src/glsl/lower_buffer_access.h +++ b/src/compiler/glsl/lower_buffer_access.h diff --git a/src/glsl/lower_clip_distance.cpp b/src/compiler/glsl/lower_clip_distance.cpp index 1ada215796c..1ada215796c 100644 --- a/src/glsl/lower_clip_distance.cpp +++ b/src/compiler/glsl/lower_clip_distance.cpp diff --git a/src/glsl/lower_const_arrays_to_uniforms.cpp b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp index 2d024d4b78c..2d024d4b78c 100644 --- a/src/glsl/lower_const_arrays_to_uniforms.cpp +++ b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp diff --git a/src/glsl/lower_discard.cpp b/src/compiler/glsl/lower_discard.cpp index b62eb20dcb4..b62eb20dcb4 100644 --- a/src/glsl/lower_discard.cpp +++ b/src/compiler/glsl/lower_discard.cpp diff --git a/src/glsl/lower_discard_flow.cpp b/src/compiler/glsl/lower_discard_flow.cpp index 9d0a56b230d..9d0a56b230d 100644 --- a/src/glsl/lower_discard_flow.cpp +++ b/src/compiler/glsl/lower_discard_flow.cpp diff --git a/src/glsl/lower_if_to_cond_assign.cpp b/src/compiler/glsl/lower_if_to_cond_assign.cpp index 6a7034794b2..6a7034794b2 100644 --- a/src/glsl/lower_if_to_cond_assign.cpp +++ b/src/compiler/glsl/lower_if_to_cond_assign.cpp diff --git a/src/glsl/lower_instructions.cpp b/src/compiler/glsl/lower_instructions.cpp index 1875149b7a6..1875149b7a6 100644 --- a/src/glsl/lower_instructions.cpp +++ b/src/compiler/glsl/lower_instructions.cpp diff --git a/src/glsl/lower_jumps.cpp b/src/compiler/glsl/lower_jumps.cpp index 3cfa2e00ae8..3cfa2e00ae8 100644 --- a/src/glsl/lower_jumps.cpp +++ b/src/compiler/glsl/lower_jumps.cpp diff --git a/src/glsl/lower_mat_op_to_vec.cpp b/src/compiler/glsl/lower_mat_op_to_vec.cpp index 266fdc6a250..266fdc6a250 100644 --- a/src/glsl/lower_mat_op_to_vec.cpp +++ b/src/compiler/glsl/lower_mat_op_to_vec.cpp diff --git a/src/glsl/lower_named_interface_blocks.cpp b/src/compiler/glsl/lower_named_interface_blocks.cpp index f29eba4f75f..f29eba4f75f 100644 --- a/src/glsl/lower_named_interface_blocks.cpp +++ b/src/compiler/glsl/lower_named_interface_blocks.cpp diff --git a/src/glsl/lower_noise.cpp b/src/compiler/glsl/lower_noise.cpp index 85f59b675e0..85f59b675e0 100644 --- a/src/glsl/lower_noise.cpp +++ b/src/compiler/glsl/lower_noise.cpp diff --git a/src/glsl/lower_offset_array.cpp b/src/compiler/glsl/lower_offset_array.cpp index 96486c3a711..96486c3a711 100644 --- a/src/glsl/lower_offset_array.cpp +++ b/src/compiler/glsl/lower_offset_array.cpp diff --git a/src/glsl/lower_output_reads.cpp b/src/compiler/glsl/lower_output_reads.cpp index 79488df2932..79488df2932 100644 --- a/src/glsl/lower_output_reads.cpp +++ b/src/compiler/glsl/lower_output_reads.cpp diff --git a/src/glsl/lower_packed_varyings.cpp b/src/compiler/glsl/lower_packed_varyings.cpp index 8d1eb1725d5..8d1eb1725d5 100644 --- a/src/glsl/lower_packed_varyings.cpp +++ b/src/compiler/glsl/lower_packed_varyings.cpp diff --git a/src/glsl/lower_packing_builtins.cpp b/src/compiler/glsl/lower_packing_builtins.cpp index 7f18238bc6e..7f18238bc6e 100644 --- a/src/glsl/lower_packing_builtins.cpp +++ b/src/compiler/glsl/lower_packing_builtins.cpp diff --git a/src/glsl/lower_shared_reference.cpp b/src/compiler/glsl/lower_shared_reference.cpp index 533cd9202f4..533cd9202f4 100644 --- a/src/glsl/lower_shared_reference.cpp +++ b/src/compiler/glsl/lower_shared_reference.cpp diff --git a/src/glsl/lower_subroutine.cpp b/src/compiler/glsl/lower_subroutine.cpp index e80c1be768a..e80c1be768a 100644 --- a/src/glsl/lower_subroutine.cpp +++ b/src/compiler/glsl/lower_subroutine.cpp diff --git a/src/glsl/lower_tess_level.cpp b/src/compiler/glsl/lower_tess_level.cpp index bed2553222f..bed2553222f 100644 --- a/src/glsl/lower_tess_level.cpp +++ b/src/compiler/glsl/lower_tess_level.cpp diff --git a/src/glsl/lower_texture_projection.cpp b/src/compiler/glsl/lower_texture_projection.cpp index 95df106d93f..95df106d93f 100644 --- a/src/glsl/lower_texture_projection.cpp +++ b/src/compiler/glsl/lower_texture_projection.cpp diff --git a/src/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp index a172054bac8..a172054bac8 100644 --- a/src/glsl/lower_ubo_reference.cpp +++ b/src/compiler/glsl/lower_ubo_reference.cpp diff --git a/src/glsl/lower_variable_index_to_cond_assign.cpp b/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp index 278d5450bfb..278d5450bfb 100644 --- a/src/glsl/lower_variable_index_to_cond_assign.cpp +++ b/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp diff --git a/src/glsl/lower_vec_index_to_cond_assign.cpp b/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp index 784db085924..784db085924 100644 --- a/src/glsl/lower_vec_index_to_cond_assign.cpp +++ b/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp diff --git a/src/glsl/lower_vec_index_to_swizzle.cpp b/src/compiler/glsl/lower_vec_index_to_swizzle.cpp index 8b18e95509c..8b18e95509c 100644 --- a/src/glsl/lower_vec_index_to_swizzle.cpp +++ b/src/compiler/glsl/lower_vec_index_to_swizzle.cpp diff --git a/src/glsl/lower_vector.cpp b/src/compiler/glsl/lower_vector.cpp index a658410ae6f..a658410ae6f 100644 --- a/src/glsl/lower_vector.cpp +++ b/src/compiler/glsl/lower_vector.cpp diff --git a/src/glsl/lower_vector_derefs.cpp b/src/compiler/glsl/lower_vector_derefs.cpp index 4a5d6f0da4c..4a5d6f0da4c 100644 --- a/src/glsl/lower_vector_derefs.cpp +++ b/src/compiler/glsl/lower_vector_derefs.cpp diff --git a/src/glsl/lower_vector_insert.cpp b/src/compiler/glsl/lower_vector_insert.cpp index 26d31b03c12..26d31b03c12 100644 --- a/src/glsl/lower_vector_insert.cpp +++ b/src/compiler/glsl/lower_vector_insert.cpp diff --git a/src/glsl/lower_vertex_id.cpp b/src/compiler/glsl/lower_vertex_id.cpp index 3da7a2f1b3b..3da7a2f1b3b 100644 --- a/src/glsl/lower_vertex_id.cpp +++ b/src/compiler/glsl/lower_vertex_id.cpp diff --git a/src/glsl/main.cpp b/src/compiler/glsl/main.cpp index df93a013ede..df93a013ede 100644 --- a/src/glsl/main.cpp +++ b/src/compiler/glsl/main.cpp diff --git a/src/glsl/opt_algebraic.cpp b/src/compiler/glsl/opt_algebraic.cpp index 1e58062cb0d..1e58062cb0d 100644 --- a/src/glsl/opt_algebraic.cpp +++ b/src/compiler/glsl/opt_algebraic.cpp diff --git a/src/glsl/opt_array_splitting.cpp b/src/compiler/glsl/opt_array_splitting.cpp index cceec6b6431..cceec6b6431 100644 --- a/src/glsl/opt_array_splitting.cpp +++ b/src/compiler/glsl/opt_array_splitting.cpp diff --git a/src/glsl/opt_conditional_discard.cpp b/src/compiler/glsl/opt_conditional_discard.cpp index 1ca8803f643..1ca8803f643 100644 --- a/src/glsl/opt_conditional_discard.cpp +++ b/src/compiler/glsl/opt_conditional_discard.cpp diff --git a/src/glsl/opt_constant_folding.cpp b/src/compiler/glsl/opt_constant_folding.cpp index 150a17b2af6..150a17b2af6 100644 --- a/src/glsl/opt_constant_folding.cpp +++ b/src/compiler/glsl/opt_constant_folding.cpp diff --git a/src/glsl/opt_constant_propagation.cpp b/src/compiler/glsl/opt_constant_propagation.cpp index 416ba16a3c5..416ba16a3c5 100644 --- a/src/glsl/opt_constant_propagation.cpp +++ b/src/compiler/glsl/opt_constant_propagation.cpp diff --git a/src/glsl/opt_constant_variable.cpp b/src/compiler/glsl/opt_constant_variable.cpp index 3ddb12904c7..3ddb12904c7 100644 --- a/src/glsl/opt_constant_variable.cpp +++ b/src/compiler/glsl/opt_constant_variable.cpp diff --git a/src/glsl/opt_copy_propagation.cpp b/src/compiler/glsl/opt_copy_propagation.cpp index 310708db868..310708db868 100644 --- a/src/glsl/opt_copy_propagation.cpp +++ b/src/compiler/glsl/opt_copy_propagation.cpp diff --git a/src/glsl/opt_copy_propagation_elements.cpp b/src/compiler/glsl/opt_copy_propagation_elements.cpp index a6791801943..a6791801943 100644 --- a/src/glsl/opt_copy_propagation_elements.cpp +++ b/src/compiler/glsl/opt_copy_propagation_elements.cpp diff --git a/src/glsl/opt_dead_builtin_variables.cpp b/src/compiler/glsl/opt_dead_builtin_variables.cpp index 03e578982b9..03e578982b9 100644 --- a/src/glsl/opt_dead_builtin_variables.cpp +++ b/src/compiler/glsl/opt_dead_builtin_variables.cpp diff --git a/src/glsl/opt_dead_builtin_varyings.cpp b/src/compiler/glsl/opt_dead_builtin_varyings.cpp index 37bcbccf0c5..37bcbccf0c5 100644 --- a/src/glsl/opt_dead_builtin_varyings.cpp +++ b/src/compiler/glsl/opt_dead_builtin_varyings.cpp diff --git a/src/glsl/opt_dead_code.cpp b/src/compiler/glsl/opt_dead_code.cpp index dbdb7de8bb8..dbdb7de8bb8 100644 --- a/src/glsl/opt_dead_code.cpp +++ b/src/compiler/glsl/opt_dead_code.cpp diff --git a/src/glsl/opt_dead_code_local.cpp b/src/compiler/glsl/opt_dead_code_local.cpp index d38fd2bf638..d38fd2bf638 100644 --- a/src/glsl/opt_dead_code_local.cpp +++ b/src/compiler/glsl/opt_dead_code_local.cpp diff --git a/src/glsl/opt_dead_functions.cpp b/src/compiler/glsl/opt_dead_functions.cpp index 2e90b650fa8..2e90b650fa8 100644 --- a/src/glsl/opt_dead_functions.cpp +++ b/src/compiler/glsl/opt_dead_functions.cpp diff --git a/src/glsl/opt_flatten_nested_if_blocks.cpp b/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp index c702102045f..c702102045f 100644 --- a/src/glsl/opt_flatten_nested_if_blocks.cpp +++ b/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp diff --git a/src/glsl/opt_flip_matrices.cpp b/src/compiler/glsl/opt_flip_matrices.cpp index 04c6170b845..04c6170b845 100644 --- a/src/glsl/opt_flip_matrices.cpp +++ b/src/compiler/glsl/opt_flip_matrices.cpp diff --git a/src/glsl/opt_function_inlining.cpp b/src/compiler/glsl/opt_function_inlining.cpp index 19f5fae0a17..19f5fae0a17 100644 --- a/src/glsl/opt_function_inlining.cpp +++ b/src/compiler/glsl/opt_function_inlining.cpp diff --git a/src/glsl/opt_if_simplification.cpp b/src/compiler/glsl/opt_if_simplification.cpp index e05f03190aa..e05f03190aa 100644 --- a/src/glsl/opt_if_simplification.cpp +++ b/src/compiler/glsl/opt_if_simplification.cpp diff --git a/src/glsl/opt_minmax.cpp b/src/compiler/glsl/opt_minmax.cpp index 29482ee69de..29482ee69de 100644 --- a/src/glsl/opt_minmax.cpp +++ b/src/compiler/glsl/opt_minmax.cpp diff --git a/src/glsl/opt_noop_swizzle.cpp b/src/compiler/glsl/opt_noop_swizzle.cpp index 41890ab2b15..41890ab2b15 100644 --- a/src/glsl/opt_noop_swizzle.cpp +++ b/src/compiler/glsl/opt_noop_swizzle.cpp diff --git a/src/glsl/opt_rebalance_tree.cpp b/src/compiler/glsl/opt_rebalance_tree.cpp index 095f2d7d2f0..095f2d7d2f0 100644 --- a/src/glsl/opt_rebalance_tree.cpp +++ b/src/compiler/glsl/opt_rebalance_tree.cpp diff --git a/src/glsl/opt_redundant_jumps.cpp b/src/compiler/glsl/opt_redundant_jumps.cpp index ee384d0f23c..ee384d0f23c 100644 --- a/src/glsl/opt_redundant_jumps.cpp +++ b/src/compiler/glsl/opt_redundant_jumps.cpp diff --git a/src/glsl/opt_structure_splitting.cpp b/src/compiler/glsl/opt_structure_splitting.cpp index 0d18a2f7584..0d18a2f7584 100644 --- a/src/glsl/opt_structure_splitting.cpp +++ b/src/compiler/glsl/opt_structure_splitting.cpp diff --git a/src/glsl/opt_swizzle_swizzle.cpp b/src/compiler/glsl/opt_swizzle_swizzle.cpp index 7285474b089..7285474b089 100644 --- a/src/glsl/opt_swizzle_swizzle.cpp +++ b/src/compiler/glsl/opt_swizzle_swizzle.cpp diff --git a/src/glsl/opt_tree_grafting.cpp b/src/compiler/glsl/opt_tree_grafting.cpp index 83effb7424c..83effb7424c 100644 --- a/src/glsl/opt_tree_grafting.cpp +++ b/src/compiler/glsl/opt_tree_grafting.cpp diff --git a/src/glsl/opt_vectorize.cpp b/src/compiler/glsl/opt_vectorize.cpp index 88318cd8a6e..88318cd8a6e 100644 --- a/src/glsl/opt_vectorize.cpp +++ b/src/compiler/glsl/opt_vectorize.cpp diff --git a/src/glsl/program.h b/src/compiler/glsl/program.h index 64f54635f62..64f54635f62 100644 --- a/src/glsl/program.h +++ b/src/compiler/glsl/program.h diff --git a/src/glsl/s_expression.cpp b/src/compiler/glsl/s_expression.cpp index f82e155a6b6..f82e155a6b6 100644 --- a/src/glsl/s_expression.cpp +++ b/src/compiler/glsl/s_expression.cpp diff --git a/src/glsl/s_expression.h b/src/compiler/glsl/s_expression.h index f0dffb1b2f8..f0dffb1b2f8 100644 --- a/src/glsl/s_expression.h +++ b/src/compiler/glsl/s_expression.h diff --git a/src/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp index d5d214b57cc..d5d214b57cc 100644 --- a/src/glsl/standalone_scaffolding.cpp +++ b/src/compiler/glsl/standalone_scaffolding.cpp diff --git a/src/glsl/standalone_scaffolding.h b/src/compiler/glsl/standalone_scaffolding.h index f853a187bf4..f853a187bf4 100644 --- a/src/glsl/standalone_scaffolding.h +++ b/src/compiler/glsl/standalone_scaffolding.h diff --git a/src/glsl/test.cpp b/src/compiler/glsl/test.cpp index b1ff92ed1d4..b1ff92ed1d4 100644 --- a/src/glsl/test.cpp +++ b/src/compiler/glsl/test.cpp diff --git a/src/glsl/test_optpass.cpp b/src/compiler/glsl/test_optpass.cpp index fed1fabf301..fed1fabf301 100644 --- a/src/glsl/test_optpass.cpp +++ b/src/compiler/glsl/test_optpass.cpp diff --git a/src/glsl/test_optpass.h b/src/compiler/glsl/test_optpass.h index 923ccf3dece..923ccf3dece 100644 --- a/src/glsl/test_optpass.h +++ b/src/compiler/glsl/test_optpass.h diff --git a/src/glsl/tests/.gitignore b/src/compiler/glsl/tests/.gitignore index 13dcdc4ab73..13dcdc4ab73 100644 --- a/src/glsl/tests/.gitignore +++ b/src/compiler/glsl/tests/.gitignore diff --git a/src/glsl/tests/blob_test.c b/src/compiler/glsl/tests/blob_test.c index 4806029bca6..4806029bca6 100644 --- a/src/glsl/tests/blob_test.c +++ b/src/compiler/glsl/tests/blob_test.c diff --git a/src/glsl/tests/builtin_variable_test.cpp b/src/compiler/glsl/tests/builtin_variable_test.cpp index 11e384a0722..11e384a0722 100644 --- a/src/glsl/tests/builtin_variable_test.cpp +++ b/src/compiler/glsl/tests/builtin_variable_test.cpp diff --git a/src/glsl/tests/compare_ir b/src/compiler/glsl/tests/compare_ir index a40fc810cf3..a40fc810cf3 100755 --- a/src/glsl/tests/compare_ir +++ b/src/compiler/glsl/tests/compare_ir diff --git a/src/glsl/tests/copy_constant_to_storage_tests.cpp b/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp index cd48bc523c1..cd48bc523c1 100644 --- a/src/glsl/tests/copy_constant_to_storage_tests.cpp +++ b/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp diff --git a/src/glsl/tests/general_ir_test.cpp b/src/compiler/glsl/tests/general_ir_test.cpp index 217305bf847..217305bf847 100644 --- a/src/glsl/tests/general_ir_test.cpp +++ b/src/compiler/glsl/tests/general_ir_test.cpp diff --git a/src/glsl/tests/invalidate_locations_test.cpp b/src/compiler/glsl/tests/invalidate_locations_test.cpp index ba94d7e3a21..ba94d7e3a21 100644 --- a/src/glsl/tests/invalidate_locations_test.cpp +++ b/src/compiler/glsl/tests/invalidate_locations_test.cpp diff --git a/src/glsl/tests/lower_jumps/.gitignore b/src/compiler/glsl/tests/lower_jumps/.gitignore index e98df627fd8..e98df627fd8 100644 --- a/src/glsl/tests/lower_jumps/.gitignore +++ b/src/compiler/glsl/tests/lower_jumps/.gitignore diff --git a/src/glsl/tests/lower_jumps/create_test_cases.py b/src/compiler/glsl/tests/lower_jumps/create_test_cases.py index 3be1079bc14..3be1079bc14 100644 --- a/src/glsl/tests/lower_jumps/create_test_cases.py +++ b/src/compiler/glsl/tests/lower_jumps/create_test_cases.py diff --git a/src/glsl/tests/optimization-test b/src/compiler/glsl/tests/optimization-test index 26a51be6980..26a51be6980 100755 --- a/src/glsl/tests/optimization-test +++ b/src/compiler/glsl/tests/optimization-test diff --git a/src/glsl/tests/sampler_types_test.cpp b/src/compiler/glsl/tests/sampler_types_test.cpp index 04dd65e6e8d..04dd65e6e8d 100644 --- a/src/glsl/tests/sampler_types_test.cpp +++ b/src/compiler/glsl/tests/sampler_types_test.cpp diff --git a/src/glsl/tests/set_uniform_initializer_tests.cpp b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp index 0b1f66cb342..0b1f66cb342 100644 --- a/src/glsl/tests/set_uniform_initializer_tests.cpp +++ b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp diff --git a/src/glsl/tests/sexps.py b/src/compiler/glsl/tests/sexps.py index a714af8d236..a714af8d236 100644 --- a/src/glsl/tests/sexps.py +++ b/src/compiler/glsl/tests/sexps.py diff --git a/src/glsl/tests/uniform_initializer_utils.cpp b/src/compiler/glsl/tests/uniform_initializer_utils.cpp index 5006387036f..5006387036f 100644 --- a/src/glsl/tests/uniform_initializer_utils.cpp +++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp diff --git a/src/glsl/tests/uniform_initializer_utils.h b/src/compiler/glsl/tests/uniform_initializer_utils.h index b4d0c10220f..b4d0c10220f 100644 --- a/src/glsl/tests/uniform_initializer_utils.h +++ b/src/compiler/glsl/tests/uniform_initializer_utils.h diff --git a/src/glsl/tests/varyings_test.cpp b/src/compiler/glsl/tests/varyings_test.cpp index 0c4e0a471b8..0c4e0a471b8 100644 --- a/src/glsl/tests/varyings_test.cpp +++ b/src/compiler/glsl/tests/varyings_test.cpp diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 7e60e7c1098..17ebf07acbc 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -23,7 +23,7 @@ #include <stdio.h> #include "main/macros.h" -#include "glsl/glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #include "glsl_types.h" #include "util/hash_table.h" diff --git a/src/compiler/nir/Makefile.sources b/src/compiler/nir/Makefile.sources new file mode 100644 index 00000000000..0755a100e65 --- /dev/null +++ b/src/compiler/nir/Makefile.sources @@ -0,0 +1,71 @@ +NIR_GENERATED_FILES = \ + nir_builder_opcodes.h \ + nir_constant_expressions.c \ + nir_opcodes.c \ + nir_opcodes.h \ + nir_opt_algebraic.c + +NIR_FILES = \ + glsl_to_nir.cpp \ + glsl_to_nir.h \ + nir.c \ + nir.h \ + nir_array.h \ + nir_builder.h \ + nir_clone.c \ + nir_constant_expressions.h \ + nir_control_flow.c \ + nir_control_flow.h \ + nir_control_flow_private.h \ + nir_dominance.c \ + nir_from_ssa.c \ + nir_gs_count_vertices.c \ + nir_intrinsics.c \ + nir_intrinsics.h \ + nir_instr_set.c \ + nir_instr_set.h \ + nir_liveness.c \ + nir_lower_alu_to_scalar.c \ + nir_lower_atomics.c \ + nir_lower_clip.c \ + nir_lower_global_vars_to_local.c \ + nir_lower_gs_intrinsics.c \ + nir_lower_load_const_to_scalar.c \ + nir_lower_locals_to_regs.c \ + nir_lower_idiv.c \ + nir_lower_io.c \ + nir_lower_outputs_to_temporaries.c \ + nir_lower_phis_to_scalar.c \ + nir_lower_samplers.c \ + nir_lower_system_values.c \ + nir_lower_tex.c \ + nir_lower_to_source_mods.c \ + nir_lower_two_sided_color.c \ + nir_lower_vars_to_ssa.c \ + nir_lower_var_copies.c \ + nir_lower_vec_to_movs.c \ + nir_metadata.c \ + nir_move_vec_src_uses_to_dest.c \ + nir_normalize_cubemap_coords.c \ + nir_opt_constant_folding.c \ + nir_opt_copy_propagate.c \ + nir_opt_cse.c \ + nir_opt_dce.c \ + nir_opt_dead_cf.c \ + nir_opt_gcm.c \ + nir_opt_global_to_local.c \ + nir_opt_peephole_select.c \ + nir_opt_remove_phis.c \ + nir_opt_undef.c \ + nir_print.c \ + nir_remove_dead_variables.c \ + nir_search.c \ + nir_search.h \ + nir_split_var_copies.c \ + nir_sweep.c \ + nir_to_ssa.c \ + nir_validate.c \ + nir_vla.h \ + nir_worklist.c \ + nir_worklist.h + diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp index 33b1f5c7b9e..4b76d234420 100644 --- a/src/compiler/nir/glsl_to_nir.cpp +++ b/src/compiler/nir/glsl_to_nir.cpp @@ -28,9 +28,9 @@ #include "glsl_to_nir.h" #include "nir_control_flow.h" #include "nir_builder.h" -#include "glsl/ir_visitor.h" -#include "glsl/ir_hierarchical_visitor.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir_visitor.h" +#include "compiler/glsl/ir_hierarchical_visitor.h" +#include "compiler/glsl/ir.h" #include "main/imports.h" /* diff --git a/src/compiler/nir/glsl_to_nir.h b/src/compiler/nir/glsl_to_nir.h index 20d2a380a26..e3fe9b0246a 100644 --- a/src/compiler/nir/glsl_to_nir.h +++ b/src/compiler/nir/glsl_to_nir.h @@ -26,7 +26,7 @@ */ #include "nir.h" -#include "glsl/glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #ifdef __cplusplus extern "C" { diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 54e23eb4754..aec75fb930c 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -28,7 +28,7 @@ #pragma once #include "util/hash_table.h" -#include "glsl/list.h" +#include "compiler/glsl/list.h" #include "GL/gl.h" /* GLenum */ #include "util/list.h" #include "util/ralloc.h" diff --git a/src/compiler/nir/nir_lower_atomics.c b/src/compiler/nir/nir_lower_atomics.c index 2cbc1b75348..1a4458d4f84 100644 --- a/src/compiler/nir/nir_lower_atomics.c +++ b/src/compiler/nir/nir_lower_atomics.c @@ -25,7 +25,7 @@ * */ -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "nir.h" #include "main/config.h" #include <assert.h> diff --git a/src/compiler/nir/nir_lower_samplers.c b/src/compiler/nir/nir_lower_samplers.c index 9c912129f09..96e82914014 100644 --- a/src/compiler/nir/nir_lower_samplers.c +++ b/src/compiler/nir/nir_lower_samplers.c @@ -26,7 +26,7 @@ #include "nir.h" #include "nir_builder.h" #include "program/hash_table.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "main/compiler.h" #include "main/mtypes.h" diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp index ddc43becf9a..a87dcd8dc6a 100644 --- a/src/compiler/nir_types.cpp +++ b/src/compiler/nir_types.cpp @@ -26,7 +26,7 @@ */ #include "nir_types.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" void glsl_print_type(const glsl_type *type, FILE *fp) diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index 6649e403d08..3e7d69f73ed 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -26,7 +26,7 @@ #include "compiler/nir/nir.h" #include "compiler/nir/nir_control_flow.h" #include "compiler/nir/nir_builder.h" -#include "glsl/list.h" +#include "compiler/glsl/list.h" #include "compiler/shader_enums.h" #include "tgsi_to_nir.h" diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 69506f2a3fd..8dc44fda0f2 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -165,7 +165,7 @@ libmesa_la_SOURCES = \ $(MESA_ASM_FILES_FOR_ARCH) libmesa_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/compiler/glsl/libglsl.la \ $(ARCH_LIBS) libmesagallium_la_SOURCES = \ @@ -175,7 +175,7 @@ libmesagallium_la_SOURCES = \ $(MESA_ASM_FILES_FOR_ARCH) libmesagallium_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/compiler/glsl/libglsl.la \ $(ARCH_LIBS) libmesa_sse41_la_SOURCES = \ diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 386d6aa3815..7af8becd607 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -623,10 +623,7 @@ MESA_GALLIUM_FILES = \ INCLUDE_DIRS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/glsl \ -I$(top_builddir)/src/compiler/nir \ - -I$(top_builddir)/src/glsl \ - -I$(top_srcdir)/src/glsl/glcpp \ -I$(top_srcdir)/src/mesa \ -I$(top_builddir)/src/mesa \ -I$(top_srcdir)/src/mesa/main \ diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c index 9eadb7e00fa..0ab9ebdab3c 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.c +++ b/src/mesa/drivers/dri/i965/brw_cs.c @@ -32,7 +32,7 @@ #include "intel_batchbuffer.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void assign_cs_binding_table_offsets(const struct brw_device_info *devinfo, diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp index 3d6aa74d830..2ff9ec16fdb 100644 --- a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp +++ b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp @@ -31,7 +31,7 @@ */ #include "compiler/glsl_types.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "program/prog_instruction.h" /* For WRITEMASK_* */ class brw_cubemap_normalize_visitor : public ir_hierarchical_visitor { diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index b75ebfedb3d..4612a287bb7 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -30,7 +30,7 @@ #include "brw_shader.h" #include "brw_ir_fs.h" #include "brw_fs_builder.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "compiler/nir/nir.h" struct bblock_t; diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp index 22877797522..689e0911b17 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -41,8 +41,8 @@ * we do retain the vector types in that case. */ -#include "glsl/ir.h" -#include "glsl/ir_expression_flattening.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_expression_flattening.h" #include "compiler/glsl_types.h" class ir_channel_expressions_visitor : public ir_hierarchical_visitor { diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index f9df2a4e3b6..68a86a9a85e 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "main/shaderimage.h" #include "brw_fs.h" #include "brw_fs_surface_builder.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp index 0970959bbd6..5fe24debeec 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp @@ -38,8 +38,8 @@ */ #include "main/imports.h" -#include "glsl/ir.h" -#include "glsl/ir_rvalue_visitor.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_rvalue_visitor.h" #include "compiler/glsl_types.h" #include "util/hash_table.h" diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index edb52ac44b7..c888ef2bd67 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -34,7 +34,7 @@ #include "brw_ff_gs.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void brw_gs_debug_recompile(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 234afd554df..db4ba88cb1c 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -26,7 +26,7 @@ #include "brw_fs.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_optimization.h" +#include "compiler/glsl/ir_optimization.h" #include "program/program.h" #include "main/shaderapi.h" #include "main/uniforms.h" diff --git a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp index c83b2728b98..0848e1ec536 100644 --- a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp +++ b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp @@ -25,8 +25,8 @@ * \file brw_lower_texture_gradients.cpp */ -#include "glsl/ir.h" -#include "glsl/ir_builder.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_builder.h" #include "program/prog_instruction.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp index eafbdf68ea0..f5d7baee6db 100644 --- a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp +++ b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp @@ -32,8 +32,8 @@ */ #include "compiler/glsl_types.h" -#include "glsl/ir.h" -#include "glsl/ir_builder.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_builder.h" using namespace ir_builder; diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 0849ca40046..f3361d69786 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -23,7 +23,7 @@ #include "brw_shader.h" #include "brw_nir.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void brw_nir_setup_glsl_builtin_uniform(nir_variable *var, diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 20d4e0d6c4a..368efeecb2d 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -37,7 +37,7 @@ #include "program/programopt.h" #include "tnl/tnl.h" #include "util/ralloc.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "brw_program.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 4e00fd0ec0d..1460f4599bf 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -31,7 +31,7 @@ #include "brw_ir_vec4.h" #endif -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "compiler/nir/nir.h" diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index 6d6988c6a41..e07c05a92c1 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -31,7 +31,7 @@ #include "intel_batchbuffer.h" #include "brw_state.h" #include "program/prog_statevars.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static unsigned get_cs_thread_count(const struct brw_cs_prog_data *cs_prog_data) diff --git a/src/mesa/drivers/dri/i965/intel_resolve_map.h b/src/mesa/drivers/dri/i965/intel_resolve_map.h index 9bb9fca0455..726b287722a 100644 --- a/src/mesa/drivers/dri/i965/intel_resolve_map.h +++ b/src/mesa/drivers/dri/i965/intel_resolve_map.h @@ -24,7 +24,7 @@ #pragma once #include <stdint.h> -#include "glsl/list.h" +#include "compiler/glsl/list.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index f3fd01f395e..8b415ed6019 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -142,7 +142,7 @@ #include "sparc/sparc.h" #endif -#include "glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #include <stdbool.h> diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index b2b1ee9ba44..b0ce8c472ef 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -36,10 +36,10 @@ #include "main/texenvprogram.h" #include "main/texobj.h" #include "main/uniforms.h" -#include "glsl/ir_builder.h" -#include "glsl/ir_optimization.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/glsl_symbol_table.h" +#include "compiler/glsl/ir_builder.h" +#include "compiler/glsl/ir_optimization.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/glsl_symbol_table.h" #include "compiler/glsl_types.h" #include "program/ir_to_mesa.h" #include "program/program.h" diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index f2a872dc83a..0e4a0af0b0f 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -43,8 +43,8 @@ #include "main/shaderobj.h" #include "main/transformfeedback.h" #include "main/uniforms.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/ir_uniform.h" #include "program/program.h" #include "program/prog_parameter.h" #include "util/ralloc.h" diff --git a/src/mesa/main/program_resource.c b/src/mesa/main/program_resource.c index 9a15cfe70b8..50659b0cd21 100644 --- a/src/mesa/main/program_resource.c +++ b/src/mesa/main/program_resource.c @@ -30,7 +30,7 @@ #include "main/shaderobj.h" #include "main/context.h" #include "program_resource.h" -#include "ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static bool supported_interface_enum(struct gl_context *ctx, GLenum iface) { diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index e902585924a..4967e4b1df1 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -34,9 +34,9 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "glsl/glsl_symbol_table.h" -#include "glsl/ir.h" -#include "glsl/program.h" +#include "compiler/glsl/glsl_symbol_table.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" #include "util/strndup.h" diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index a988f41697b..df92c0912af 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -49,10 +49,10 @@ #include "main/shaderobj.h" #include "main/transformfeedback.h" #include "main/uniforms.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/program.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/program.h" #include "program/program.h" #include "program/prog_print.h" #include "program/prog_parameter.h" diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 766a465cb11..2ced201ebca 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -31,10 +31,10 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/program.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 47010badbc6..b1968b3f795 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -43,7 +43,7 @@ #include "main/shaderobj.h" #include "main/uniforms.h" #include "main/enums.h" -#include "ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "compiler/glsl_types.h" #include "program/program.h" diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index baf49a752b1..88fe9580167 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -28,7 +28,7 @@ #include "main/glheader.h" #include "compiler/glsl_types.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "program/prog_parameter.h" #ifdef __cplusplus diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 70c477ec4fd..c9c30449734 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -35,16 +35,16 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "glsl/ast.h" -#include "glsl/ir.h" -#include "glsl/ir_expression_flattening.h" -#include "glsl/ir_visitor.h" -#include "glsl/ir_optimization.h" -#include "glsl/ir_uniform.h" -#include "glsl/glsl_parser_extras.h" +#include "compiler/glsl/ast.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_expression_flattening.h" +#include "compiler/glsl/ir_visitor.h" +#include "compiler/glsl/ir_optimization.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/glsl_parser_extras.h" #include "compiler/glsl_types.h" -#include "glsl/linker.h" -#include "glsl/program.h" +#include "compiler/glsl/linker.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" #include "program/prog_instruction.h" #include "program/prog_optimize.h" diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index a2ebb1ba77c..ebcc5288c2e 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -25,7 +25,7 @@ #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" -#include "glsl/list.h" +#include "compiler/glsl/list.h" #include "main/imports.h" #include "util/ralloc.h" diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp index 9137d1858e9..f118552d64e 100644 --- a/src/mesa/program/sampler.cpp +++ b/src/mesa/program/sampler.cpp @@ -25,10 +25,10 @@ #include "main/mtypes.h" #include "compiler/glsl_types.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/ir_visitor.h" -#include "glsl/program.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/ir_visitor.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" #include "program/prog_parameter.h" #include "program/program.h" diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 03788f33468..10e294cd147 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -42,7 +42,7 @@ #include "main/macros.h" #include "main/varray.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "vbo/vbo.h" diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index d424e3b335f..f5b8c33622e 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -32,8 +32,8 @@ #include "st_glsl_to_tgsi.h" -#include "glsl_parser_extras.h" -#include "ir_optimization.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/ir_optimization.h" #include "main/errors.h" #include "main/shaderobj.h" |