[Mesa-dev] [PATCH 9/9] glsl: move to compiler
Emil Velikov
emil.l.velikov at gmail.com
Wed Nov 25 13:32:03 PST 2015
From: Emil Velikov <emil.velikov at collabora.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
Android.mk | 2 +-
configure.ac | 6 +++---
docs/shading.html | 6 +++---
doxygen/glsl.doxy | 8 ++++----
src/Makefile.am | 3 ++-
src/SConscript | 2 +-
src/{ => compiler}/glsl/.gitignore | 0
src/{ => compiler}/glsl/Android.gen.mk | 2 +-
src/{ => compiler}/glsl/Android.mk | 0
src/{ => compiler}/glsl/Makefile.am | 16 ++++++++--------
src/{ => compiler}/glsl/Makefile.sources | 0
src/{ => compiler}/glsl/README | 0
src/{ => compiler}/glsl/SConscript | 2 --
src/{ => compiler}/glsl/TODO | 0
src/{ => compiler}/glsl/ast.h | 0
src/{ => compiler}/glsl/ast_array_index.cpp | 0
src/{ => compiler}/glsl/ast_expr.cpp | 0
src/{ => compiler}/glsl/ast_function.cpp | 0
src/{ => compiler}/glsl/ast_to_hir.cpp | 0
src/{ => compiler}/glsl/ast_type.cpp | 0
src/{ => compiler}/glsl/blob.c | 0
src/{ => compiler}/glsl/blob.h | 0
src/{ => compiler}/glsl/builtin_functions.cpp | 0
src/{ => compiler}/glsl/builtin_types.cpp | 0
src/{ => compiler}/glsl/builtin_variables.cpp | 0
src/{ => compiler}/glsl/glcpp/.gitignore | 0
src/{ => compiler}/glsl/glcpp/README | 0
src/{ => compiler}/glsl/glcpp/glcpp-lex.l | 0
src/{ => compiler}/glsl/glcpp/glcpp-parse.y | 0
src/{ => compiler}/glsl/glcpp/glcpp.c | 0
src/{ => compiler}/glsl/glcpp/glcpp.h | 0
src/{ => compiler}/glsl/glcpp/pp.c | 0
src/{ => compiler}/glsl/glcpp/tests/.gitignore | 0
.../glsl/glcpp/tests/000-content-with-spaces.c | 0
.../glcpp/tests/000-content-with-spaces.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/001-define.c | 0
.../glsl/glcpp/tests/001-define.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/002-define-chain.c | 0
.../glsl/glcpp/tests/002-define-chain.c.expected | 0
.../glsl/glcpp/tests/003-define-chain-reverse.c | 0
.../glcpp/tests/003-define-chain-reverse.c.expected | 0
.../glsl/glcpp/tests/004-define-recursive.c | 0
.../glsl/glcpp/tests/004-define-recursive.c.expected | 0
.../glsl/glcpp/tests/005-define-composite-chain.c | 0
.../glcpp/tests/005-define-composite-chain.c.expected | 0
.../glcpp/tests/006-define-composite-chain-reverse.c | 0
.../006-define-composite-chain-reverse.c.expected | 0
.../glsl/glcpp/tests/007-define-composite-recursive.c | 0
.../tests/007-define-composite-recursive.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/008-define-empty.c | 0
.../glsl/glcpp/tests/008-define-empty.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/009-undef.c | 0
.../glsl/glcpp/tests/009-undef.c.expected | 0
.../glsl/glcpp/tests/010-undef-re-define.c | 0
.../glsl/glcpp/tests/010-undef-re-define.c.expected | 0
.../glsl/glcpp/tests/011-define-func-empty.c | 0
.../glsl/glcpp/tests/011-define-func-empty.c.expected | 0
.../glsl/glcpp/tests/012-define-func-no-args.c | 0
.../glcpp/tests/012-define-func-no-args.c.expected | 0
.../glsl/glcpp/tests/013-define-func-1-arg-unused.c | 0
.../tests/013-define-func-1-arg-unused.c.expected | 0
.../glsl/glcpp/tests/014-define-func-2-arg-unused.c | 0
.../tests/014-define-func-2-arg-unused.c.expected | 0
.../glsl/glcpp/tests/015-define-object-with-parens.c | 0
.../tests/015-define-object-with-parens.c.expected | 0
.../glsl/glcpp/tests/016-define-func-1-arg.c | 0
.../glsl/glcpp/tests/016-define-func-1-arg.c.expected | 0
.../glsl/glcpp/tests/017-define-func-2-args.c | 0
.../glsl/glcpp/tests/017-define-func-2-args.c.expected | 0
.../glcpp/tests/018-define-func-macro-as-parameter.c | 0
.../018-define-func-macro-as-parameter.c.expected | 0
.../glsl/glcpp/tests/019-define-func-1-arg-multi.c | 0
.../glcpp/tests/019-define-func-1-arg-multi.c.expected | 0
.../glsl/glcpp/tests/020-define-func-2-arg-multi.c | 0
.../glcpp/tests/020-define-func-2-arg-multi.c.expected | 0
.../glsl/glcpp/tests/021-define-func-compose.c | 0
.../glcpp/tests/021-define-func-compose.c.expected | 0
.../glsl/glcpp/tests/022-define-func-arg-with-parens.c | 0
.../tests/022-define-func-arg-with-parens.c.expected | 0
.../glsl/glcpp/tests/023-define-extra-whitespace.c | 0
.../glcpp/tests/023-define-extra-whitespace.c.expected | 0
.../glcpp/tests/024-define-chain-to-self-recursion.c | 0
.../024-define-chain-to-self-recursion.c.expected | 0
.../glsl/glcpp/tests/025-func-macro-as-non-macro.c | 0
.../glcpp/tests/025-func-macro-as-non-macro.c.expected | 0
.../glsl/glcpp/tests/026-define-func-extra-newlines.c | 0
.../tests/026-define-func-extra-newlines.c.expected | 0
.../glsl/glcpp/tests/027-define-chain-obj-to-func.c | 0
.../tests/027-define-chain-obj-to-func.c.expected | 0
.../glcpp/tests/028-define-chain-obj-to-non-func.c | 0
.../tests/028-define-chain-obj-to-non-func.c.expected | 0
.../tests/029-define-chain-obj-to-func-with-args.c | 0
.../029-define-chain-obj-to-func-with-args.c.expected | 0
.../glcpp/tests/030-define-chain-obj-to-func-compose.c | 0
.../030-define-chain-obj-to-func-compose.c.expected | 0
.../tests/031-define-chain-func-to-func-compose.c | 0
.../031-define-chain-func-to-func-compose.c.expected | 0
.../glsl/glcpp/tests/032-define-func-self-recurse.c | 0
.../tests/032-define-func-self-recurse.c.expected | 0
.../glsl/glcpp/tests/033-define-func-self-compose.c | 0
.../tests/033-define-func-self-compose.c.expected | 0
.../tests/034-define-func-self-compose-non-func.c | 0
.../034-define-func-self-compose-non-func.c.expected | 0
...e-func-self-compose-non-func-multi-token-argument.c | 0
...lf-compose-non-func-multi-token-argument.c.expected | 0
.../036-define-func-non-macro-multi-token-argument.c | 0
...fine-func-non-macro-multi-token-argument.c.expected | 0
.../glsl/glcpp/tests/037-finalize-unexpanded-macro.c | 0
.../tests/037-finalize-unexpanded-macro.c.expected | 0
.../glsl/glcpp/tests/038-func-arg-with-commas.c | 0
.../glcpp/tests/038-func-arg-with-commas.c.expected | 0
.../glcpp/tests/039-func-arg-obj-macro-with-comma.c | 0
.../tests/039-func-arg-obj-macro-with-comma.c.expected | 0
.../glsl/glcpp/tests/040-token-pasting.c | 0
.../glsl/glcpp/tests/040-token-pasting.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/041-if-0.c | 0
.../glsl/glcpp/tests/041-if-0.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/042-if-1.c | 0
.../glsl/glcpp/tests/042-if-1.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/043-if-0-else.c | 0
.../glsl/glcpp/tests/043-if-0-else.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/044-if-1-else.c | 0
.../glsl/glcpp/tests/044-if-1-else.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/045-if-0-elif.c | 0
.../glsl/glcpp/tests/045-if-0-elif.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/046-if-1-elsif.c | 0
.../glsl/glcpp/tests/046-if-1-elsif.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/047-if-elif-else.c | 0
.../glsl/glcpp/tests/047-if-elif-else.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/048-if-nested.c | 0
.../glsl/glcpp/tests/048-if-nested.c.expected | 0
.../glsl/glcpp/tests/049-if-expression-precedence.c | 0
.../tests/049-if-expression-precedence.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/050-if-defined.c | 0
.../glsl/glcpp/tests/050-if-defined.c.expected | 0
.../glsl/glcpp/tests/051-if-relational.c | 0
.../glsl/glcpp/tests/051-if-relational.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/052-if-bitwise.c | 0
.../glsl/glcpp/tests/052-if-bitwise.c.expected | 0
.../glsl/glcpp/tests/053-if-divide-and-shift.c | 0
.../glcpp/tests/053-if-divide-and-shift.c.expected | 0
.../glsl/glcpp/tests/054-if-with-macros.c | 0
.../glsl/glcpp/tests/054-if-with-macros.c.expected | 0
.../055-define-chain-obj-to-func-parens-in-text.c | 0
...-define-chain-obj-to-func-parens-in-text.c.expected | 0
.../glsl/glcpp/tests/056-macro-argument-with-comma.c | 0
.../tests/056-macro-argument-with-comma.c.expected | 0
.../glsl/glcpp/tests/057-empty-arguments.c | 0
.../glsl/glcpp/tests/057-empty-arguments.c.expected | 0
.../glcpp/tests/058-token-pasting-empty-arguments.c | 0
.../tests/058-token-pasting-empty-arguments.c.expected | 0
.../glsl/glcpp/tests/059-token-pasting-integer.c | 0
.../glcpp/tests/059-token-pasting-integer.c.expected | 0
.../060-left-paren-in-macro-right-paren-in-text.c | 0
...-left-paren-in-macro-right-paren-in-text.c.expected | 0
.../glcpp/tests/061-define-chain-obj-to-func-multi.c | 0
.../061-define-chain-obj-to-func-multi.c.expected | 0
.../glsl/glcpp/tests/062-if-0-skips-garbage.c | 0
.../glsl/glcpp/tests/062-if-0-skips-garbage.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/063-comments.c | 0
.../glsl/glcpp/tests/063-comments.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/064-version.c | 0
.../glsl/glcpp/tests/064-version.c.expected | 0
.../glsl/glcpp/tests/065-if-defined-parens.c | 0
.../glsl/glcpp/tests/065-if-defined-parens.c.expected | 0
.../glsl/glcpp/tests/066-if-nospace-expression.c | 0
.../glcpp/tests/066-if-nospace-expression.c.expected | 0
.../glsl/glcpp/tests/067-nested-ifdef-ifndef.c | 0
.../glcpp/tests/067-nested-ifdef-ifndef.c.expected | 0
.../glsl/glcpp/tests/068-accidental-pasting.c | 0
.../glsl/glcpp/tests/068-accidental-pasting.c.expected | 0
.../glsl/glcpp/tests/069-repeated-argument.c | 0
.../glsl/glcpp/tests/069-repeated-argument.c.expected | 0
.../glcpp/tests/070-undefined-macro-in-expression.c | 0
.../tests/070-undefined-macro-in-expression.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/071-punctuator.c | 0
.../glsl/glcpp/tests/071-punctuator.c.expected | 0
.../glsl/glcpp/tests/072-token-pasting-same-line.c | 0
.../glcpp/tests/072-token-pasting-same-line.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/073-if-in-ifdef.c | 0
.../glsl/glcpp/tests/073-if-in-ifdef.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/074-elif-undef.c | 0
.../glsl/glcpp/tests/074-elif-undef.c.expected | 0
.../glsl/glcpp/tests/075-elif-elif-undef.c | 0
.../glsl/glcpp/tests/075-elif-elif-undef.c.expected | 0
.../glsl/glcpp/tests/076-elif-undef-nested.c | 0
.../glsl/glcpp/tests/076-elif-undef-nested.c.expected | 0
.../glsl/glcpp/tests/077-else-without-if.c | 0
.../glsl/glcpp/tests/077-else-without-if.c.expected | 0
.../glsl/glcpp/tests/078-elif-without-if.c | 0
.../glsl/glcpp/tests/078-elif-without-if.c.expected | 0
.../glsl/glcpp/tests/079-endif-without-if.c | 0
.../glsl/glcpp/tests/079-endif-without-if.c.expected | 0
.../glsl/glcpp/tests/080-if-without-expression.c | 0
.../glcpp/tests/080-if-without-expression.c.expected | 0
.../glsl/glcpp/tests/081-elif-without-expression.c | 0
.../glcpp/tests/081-elif-without-expression.c.expected | 0
.../glsl/glcpp/tests/082-invalid-paste.c | 0
.../glsl/glcpp/tests/082-invalid-paste.c.expected | 0
.../glsl/glcpp/tests/083-unterminated-if.c | 0
.../glsl/glcpp/tests/083-unterminated-if.c.expected | 0
.../glsl/glcpp/tests/084-unbalanced-parentheses.c | 0
.../glcpp/tests/084-unbalanced-parentheses.c.expected | 0
.../glsl/glcpp/tests/085-incorrect-argument-count.c | 0
.../tests/085-incorrect-argument-count.c.expected | 0
.../glsl/glcpp/tests/086-reserved-macro-names.c | 0
.../glcpp/tests/086-reserved-macro-names.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/087-if-comments.c | 0
.../glsl/glcpp/tests/087-if-comments.c.expected | 0
.../glsl/glcpp/tests/088-redefine-macro-legitimate.c | 0
.../tests/088-redefine-macro-legitimate.c.expected | 0
.../glsl/glcpp/tests/089-redefine-macro-error.c | 0
.../glcpp/tests/089-redefine-macro-error.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/090-hash-error.c | 0
.../glsl/glcpp/tests/090-hash-error.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/091-hash-line.c | 0
.../glsl/glcpp/tests/091-hash-line.c.expected | 0
.../glsl/glcpp/tests/092-redefine-macro-error-2.c | 0
.../glcpp/tests/092-redefine-macro-error-2.c.expected | 0
.../glsl/glcpp/tests/093-divide-by-zero.c | 0
.../glsl/glcpp/tests/093-divide-by-zero.c.expected | 0
.../glcpp/tests/094-divide-by-zero-short-circuit.c | 0
.../tests/094-divide-by-zero-short-circuit.c.expected | 0
.../glsl/glcpp/tests/095-recursive-define.c | 0
.../glsl/glcpp/tests/095-recursive-define.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/096-paste-twice.c | 0
.../glsl/glcpp/tests/096-paste-twice.c.expected | 0
.../glcpp/tests/097-paste-with-non-function-macro.c | 0
.../tests/097-paste-with-non-function-macro.c.expected | 0
.../glsl/glcpp/tests/098-elif-undefined.c | 0
.../glsl/glcpp/tests/098-elif-undefined.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/099-c99-example.c | 0
.../glsl/glcpp/tests/099-c99-example.c.expected | 0
.../glsl/glcpp/tests/100-macro-with-colon.c | 0
.../glsl/glcpp/tests/100-macro-with-colon.c.expected | 0
.../glsl/glcpp/tests/101-macros-used-twice.c | 0
.../glsl/glcpp/tests/101-macros-used-twice.c.expected | 0
.../glsl/glcpp/tests/102-garbage-after-endif.c | 0
.../glcpp/tests/102-garbage-after-endif.c.expected | 0
.../glsl/glcpp/tests/103-garbage-after-else-0.c | 0
.../glcpp/tests/103-garbage-after-else-0.c.expected | 0
.../glsl/glcpp/tests/104-hash-line-followed-by-code.c | 0
.../tests/104-hash-line-followed-by-code.c.expected | 0
.../glsl/glcpp/tests/105-multiline-hash-line.c | 0
.../glcpp/tests/105-multiline-hash-line.c.expected | 0
.../glsl/glcpp/tests/106-multiline-hash-if.c | 0
.../glsl/glcpp/tests/106-multiline-hash-if.c.expected | 0
.../glsl/glcpp/tests/107-multiline-hash-elif.c | 0
.../glcpp/tests/107-multiline-hash-elif.c.expected | 0
.../glsl/glcpp/tests/108-no-space-after-hash-version.c | 0
.../tests/108-no-space-after-hash-version.c.expected | 0
.../glsl/glcpp/tests/109-no-space-after-hash-line.c | 0
.../tests/109-no-space-after-hash-line.c.expected | 0
.../glcpp/tests/110-no-space-digits-after-hash-elif.c | 0
.../110-no-space-digits-after-hash-elif.c.expected | 0
.../glcpp/tests/111-no-space-operator-after-hash-if.c | 0
.../111-no-space-operator-after-hash-if.c.expected | 0
.../tests/112-no-space-operator-after-hash-elif.c | 0
.../112-no-space-operator-after-hash-elif.c.expected | 0
.../glsl/glcpp/tests/113-line-and-file-macros.c | 0
.../glcpp/tests/113-line-and-file-macros.c.expected | 0
.../glsl/glcpp/tests/114-paste-integer-tokens.c | 0
.../glcpp/tests/114-paste-integer-tokens.c.expected | 0
.../glsl/glcpp/tests/115-line-continuations.c | 0
.../glsl/glcpp/tests/115-line-continuations.c.expected | 0
.../glsl/glcpp/tests/116-disable-line-continuations.c | 0
.../tests/116-disable-line-continuations.c.expected | 0
...-line-continuation-and-non-continuation-backslash.c | 0
...tinuation-and-non-continuation-backslash.c.expected | 0
.../glsl/glcpp/tests/118-comment-becomes-space.c | 0
.../glcpp/tests/118-comment-becomes-space.c.expected | 0
.../glsl/glcpp/tests/119-elif-after-else.c | 0
.../glsl/glcpp/tests/119-elif-after-else.c.expected | 0
.../glsl/glcpp/tests/120-undef-builtin.c | 0
.../glsl/glcpp/tests/120-undef-builtin.c.expected | 0
.../glsl/glcpp/tests/121-comment-bug-72686.c | 0
.../glsl/glcpp/tests/121-comment-bug-72686.c.expected | 0
.../glsl/glcpp/tests/122-redefine-whitespace.c | 0
.../glcpp/tests/122-redefine-whitespace.c.expected | 0
.../glsl/glcpp/tests/123-garbage-after-else-1.c | 0
.../glcpp/tests/123-garbage-after-else-1.c.expected | 0
.../glsl/glcpp/tests/124-preprocessing-numbers.c | 0
.../glcpp/tests/124-preprocessing-numbers.c.expected | 0
.../glsl/glcpp/tests/125-es-short-circuit-undefined.c | 0
.../tests/125-es-short-circuit-undefined.c.expected | 0
.../glsl/glcpp/tests/126-garbage-after-directive.c | 0
.../glcpp/tests/126-garbage-after-directive.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/127-pragma-empty.c | 0
.../glsl/glcpp/tests/127-pragma-empty.c.expected | 0
.../glsl/glcpp/tests/128-space-before-hash.c | 0
.../glsl/glcpp/tests/128-space-before-hash.c.expected | 0
.../glsl/glcpp/tests/129-define-non-identifier.c | 0
.../glcpp/tests/129-define-non-identifier.c.expected | 0
.../glsl/glcpp/tests/130-define-comment.c | 0
.../glsl/glcpp/tests/130-define-comment.c.expected | 0
.../glsl/glcpp/tests/131-eof-without-newline.c | 0
.../glcpp/tests/131-eof-without-newline.c.expected | 0
.../glsl/glcpp/tests/132-eof-without-newline-define.c | 0
.../tests/132-eof-without-newline-define.c.expected | 0
.../glsl/glcpp/tests/133-eof-without-newline-comment.c | 0
.../tests/133-eof-without-newline-comment.c.expected | 0
.../glsl/glcpp/tests/134-hash-comment-directive.c | 0
.../glcpp/tests/134-hash-comment-directive.c.expected | 0
.../glsl/glcpp/tests/135-duplicate-parameter.c | 0
.../glcpp/tests/135-duplicate-parameter.c.expected | 0
.../glsl/glcpp/tests/136-plus-plus-and-minus-minus.c | 0
.../tests/136-plus-plus-and-minus-minus.c.expected | 0
.../glsl/glcpp/tests/137-expand-macro-after-period.c | 0
.../tests/137-expand-macro-after-period.c.expected | 0
.../glsl/glcpp/tests/138-multi-line-comment-in-if-0.c | 0
.../tests/138-multi-line-comment-in-if-0.c.expected | 0
.../glsl/glcpp/tests/139-define-without-macro-name.c | 0
.../tests/139-define-without-macro-name.c.expected | 0
.../glsl/glcpp/tests/140-null-directive.c | 0
.../glsl/glcpp/tests/140-null-directive.c.expected | 0
.../glsl/glcpp/tests/141-pragma-and-__LINE__.c | 0
.../glcpp/tests/141-pragma-and-__LINE__.c.expected | 0
.../glsl/glcpp/tests/142-defined-within-macro.c | 0
.../glcpp/tests/142-defined-within-macro.c.expected | 0
.../glsl/glcpp/tests/143-multiple-else.c | 0
.../glsl/glcpp/tests/143-multiple-else.c.expected | 0
src/{ => compiler}/glsl/glcpp/tests/glcpp-test | 0
src/{ => compiler}/glsl/glcpp/tests/glcpp-test-cr-lf | 0
src/{ => compiler}/glsl/glsl_lexer.ll | 0
src/{ => compiler}/glsl/glsl_parser.yy | 0
src/{ => compiler}/glsl/glsl_parser_extras.cpp | 0
src/{ => compiler}/glsl/glsl_parser_extras.h | 0
src/{ => compiler}/glsl/glsl_symbol_table.cpp | 0
src/{ => compiler}/glsl/glsl_symbol_table.h | 0
src/{ => compiler}/glsl/hir_field_selection.cpp | 0
src/{ => compiler}/glsl/ir.cpp | 0
src/{ => compiler}/glsl/ir.h | 0
src/{ => compiler}/glsl/ir_basic_block.cpp | 0
src/{ => compiler}/glsl/ir_basic_block.h | 0
src/{ => compiler}/glsl/ir_builder.cpp | 0
src/{ => compiler}/glsl/ir_builder.h | 0
src/{ => compiler}/glsl/ir_clone.cpp | 0
src/{ => compiler}/glsl/ir_constant_expression.cpp | 0
src/{ => compiler}/glsl/ir_equals.cpp | 0
src/{ => compiler}/glsl/ir_expression_flattening.cpp | 0
src/{ => compiler}/glsl/ir_expression_flattening.h | 0
src/{ => compiler}/glsl/ir_function.cpp | 0
src/{ => compiler}/glsl/ir_function_can_inline.cpp | 0
.../glsl/ir_function_detect_recursion.cpp | 0
src/{ => compiler}/glsl/ir_function_inlining.h | 0
src/{ => compiler}/glsl/ir_hierarchical_visitor.cpp | 0
src/{ => compiler}/glsl/ir_hierarchical_visitor.h | 0
src/{ => compiler}/glsl/ir_hv_accept.cpp | 0
src/{ => compiler}/glsl/ir_import_prototypes.cpp | 0
src/{ => compiler}/glsl/ir_optimization.h | 0
src/{ => compiler}/glsl/ir_print_visitor.cpp | 0
src/{ => compiler}/glsl/ir_print_visitor.h | 0
src/{ => compiler}/glsl/ir_reader.cpp | 0
src/{ => compiler}/glsl/ir_reader.h | 0
src/{ => compiler}/glsl/ir_rvalue_visitor.cpp | 0
src/{ => compiler}/glsl/ir_rvalue_visitor.h | 0
src/{ => compiler}/glsl/ir_set_program_inouts.cpp | 0
src/{ => compiler}/glsl/ir_uniform.h | 0
src/{ => compiler}/glsl/ir_validate.cpp | 0
src/{ => compiler}/glsl/ir_variable_refcount.cpp | 0
src/{ => compiler}/glsl/ir_variable_refcount.h | 0
src/{ => compiler}/glsl/ir_visitor.h | 0
src/{ => compiler}/glsl/link_atomics.cpp | 0
src/{ => compiler}/glsl/link_functions.cpp | 0
src/{ => compiler}/glsl/link_interface_blocks.cpp | 0
.../glsl/link_uniform_block_active_visitor.cpp | 0
.../glsl/link_uniform_block_active_visitor.h | 0
src/{ => compiler}/glsl/link_uniform_blocks.cpp | 0
src/{ => compiler}/glsl/link_uniform_initializers.cpp | 0
src/{ => compiler}/glsl/link_uniforms.cpp | 0
src/{ => compiler}/glsl/link_varyings.cpp | 0
src/{ => compiler}/glsl/link_varyings.h | 0
src/{ => compiler}/glsl/linker.cpp | 0
src/{ => compiler}/glsl/linker.h | 0
src/{ => compiler}/glsl/list.h | 0
src/{ => compiler}/glsl/loop_analysis.cpp | 0
src/{ => compiler}/glsl/loop_analysis.h | 0
src/{ => compiler}/glsl/loop_controls.cpp | 0
src/{ => compiler}/glsl/loop_unroll.cpp | 0
src/{ => compiler}/glsl/lower_clip_distance.cpp | 0
.../glsl/lower_const_arrays_to_uniforms.cpp | 0
src/{ => compiler}/glsl/lower_discard.cpp | 0
src/{ => compiler}/glsl/lower_discard_flow.cpp | 0
src/{ => compiler}/glsl/lower_if_to_cond_assign.cpp | 0
src/{ => compiler}/glsl/lower_instructions.cpp | 0
src/{ => compiler}/glsl/lower_jumps.cpp | 0
src/{ => compiler}/glsl/lower_mat_op_to_vec.cpp | 0
.../glsl/lower_named_interface_blocks.cpp | 0
src/{ => compiler}/glsl/lower_noise.cpp | 0
src/{ => compiler}/glsl/lower_offset_array.cpp | 0
src/{ => compiler}/glsl/lower_output_reads.cpp | 0
src/{ => compiler}/glsl/lower_packed_varyings.cpp | 0
src/{ => compiler}/glsl/lower_packing_builtins.cpp | 0
src/{ => compiler}/glsl/lower_subroutine.cpp | 0
src/{ => compiler}/glsl/lower_tess_level.cpp | 0
src/{ => compiler}/glsl/lower_texture_projection.cpp | 0
src/{ => compiler}/glsl/lower_ubo_reference.cpp | 0
.../glsl/lower_variable_index_to_cond_assign.cpp | 0
.../glsl/lower_vec_index_to_cond_assign.cpp | 0
src/{ => compiler}/glsl/lower_vec_index_to_swizzle.cpp | 0
src/{ => compiler}/glsl/lower_vector.cpp | 0
src/{ => compiler}/glsl/lower_vector_derefs.cpp | 0
src/{ => compiler}/glsl/lower_vector_insert.cpp | 0
src/{ => compiler}/glsl/lower_vertex_id.cpp | 0
src/{ => compiler}/glsl/main.cpp | 0
src/{ => compiler}/glsl/opt_algebraic.cpp | 0
src/{ => compiler}/glsl/opt_array_splitting.cpp | 0
src/{ => compiler}/glsl/opt_conditional_discard.cpp | 0
src/{ => compiler}/glsl/opt_constant_folding.cpp | 0
src/{ => compiler}/glsl/opt_constant_propagation.cpp | 0
src/{ => compiler}/glsl/opt_constant_variable.cpp | 0
src/{ => compiler}/glsl/opt_copy_propagation.cpp | 0
.../glsl/opt_copy_propagation_elements.cpp | 0
src/{ => compiler}/glsl/opt_dead_builtin_variables.cpp | 0
src/{ => compiler}/glsl/opt_dead_builtin_varyings.cpp | 0
src/{ => compiler}/glsl/opt_dead_code.cpp | 0
src/{ => compiler}/glsl/opt_dead_code_local.cpp | 0
src/{ => compiler}/glsl/opt_dead_functions.cpp | 0
.../glsl/opt_flatten_nested_if_blocks.cpp | 0
src/{ => compiler}/glsl/opt_flip_matrices.cpp | 0
src/{ => compiler}/glsl/opt_function_inlining.cpp | 0
src/{ => compiler}/glsl/opt_if_simplification.cpp | 0
src/{ => compiler}/glsl/opt_minmax.cpp | 0
src/{ => compiler}/glsl/opt_noop_swizzle.cpp | 0
src/{ => compiler}/glsl/opt_rebalance_tree.cpp | 0
src/{ => compiler}/glsl/opt_redundant_jumps.cpp | 0
src/{ => compiler}/glsl/opt_structure_splitting.cpp | 0
src/{ => compiler}/glsl/opt_swizzle_swizzle.cpp | 0
src/{ => compiler}/glsl/opt_tree_grafting.cpp | 0
src/{ => compiler}/glsl/opt_vectorize.cpp | 0
src/{ => compiler}/glsl/program.h | 0
src/{ => compiler}/glsl/s_expression.cpp | 0
src/{ => compiler}/glsl/s_expression.h | 0
src/{ => compiler}/glsl/standalone_scaffolding.cpp | 0
src/{ => compiler}/glsl/standalone_scaffolding.h | 0
src/{ => compiler}/glsl/test.cpp | 0
src/{ => compiler}/glsl/test_optpass.cpp | 0
src/{ => compiler}/glsl/test_optpass.h | 0
src/{ => compiler}/glsl/tests/.gitignore | 0
src/{ => compiler}/glsl/tests/blob_test.c | 0
.../glsl/tests/builtin_variable_test.cpp | 0
src/{ => compiler}/glsl/tests/compare_ir | 0
.../glsl/tests/copy_constant_to_storage_tests.cpp | 0
src/{ => compiler}/glsl/tests/general_ir_test.cpp | 0
.../glsl/tests/invalidate_locations_test.cpp | 0
src/{ => compiler}/glsl/tests/lower_jumps/.gitignore | 0
.../glsl/tests/lower_jumps/create_test_cases.py | 0
src/{ => compiler}/glsl/tests/optimization-test | 0
src/{ => compiler}/glsl/tests/sampler_types_test.cpp | 0
.../glsl/tests/set_uniform_initializer_tests.cpp | 0
src/{ => compiler}/glsl/tests/sexps.py | 0
.../glsl/tests/uniform_initializer_utils.cpp | 0
.../glsl/tests/uniform_initializer_utils.h | 0
src/{ => compiler}/glsl/tests/varyings_test.cpp | 0
src/compiler/glsl_types.cpp | 2 +-
src/compiler/nir/glsl_to_nir.cpp | 6 +++---
src/compiler/nir/glsl_to_nir.h | 2 +-
src/compiler/nir/nir.h | 2 +-
src/compiler/nir/nir_lower_atomics.c | 2 +-
src/compiler/nir/nir_lower_samplers.c | 2 +-
src/compiler/nir_types.cpp | 2 +-
src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +-
src/gallium/drivers/r300/Android.mk | 1 -
src/gallium/drivers/r300/Makefile.am | 1 -
src/mesa/Android.libmesa_dricore.mk | 1 -
src/mesa/Android.libmesa_glsl_utils.mk | 2 --
src/mesa/Android.libmesa_st_mesa.mk | 1 -
src/mesa/Android.mesa_gen_matypes.mk | 3 +--
src/mesa/Makefile.am | 4 ++--
src/mesa/Makefile.sources | 3 ---
src/mesa/SConscript | 1 -
src/mesa/drivers/dri/i965/brw_cs.c | 2 +-
src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs.h | 2 +-
.../drivers/dri/i965/brw_fs_channel_expressions.cpp | 4 ++--
src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp | 4 ++--
src/mesa/drivers/dri/i965/brw_gs.c | 2 +-
src/mesa/drivers/dri/i965/brw_link.cpp | 4 ++--
.../drivers/dri/i965/brw_lower_texture_gradients.cpp | 4 ++--
.../drivers/dri/i965/brw_lower_unnormalized_offset.cpp | 4 ++--
src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_program.c | 2 +-
src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_vec4.h | 2 +-
.../drivers/dri/i965/brw_vec4_copy_propagation.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 2 +-
src/mesa/drivers/dri/i965/gen6_vs_state.c | 2 +-
src/mesa/drivers/dri/i965/gen7_cs_state.c | 2 +-
src/mesa/drivers/dri/i965/intel_resolve_map.h | 2 +-
src/mesa/main/context.c | 2 +-
src/mesa/main/ff_fragment_shader.cpp | 8 ++++----
src/mesa/main/pipelineobj.c | 4 ++--
src/mesa/main/program_resource.c | 3 ++-
src/mesa/main/shader_query.cpp | 6 +++---
src/mesa/main/shaderapi.c | 8 ++++----
src/mesa/main/uniform_query.cpp | 8 ++++----
src/mesa/main/uniforms.c | 2 +-
src/mesa/main/uniforms.h | 2 +-
src/mesa/program/Android.mk | 1 -
src/mesa/program/ir_to_mesa.cpp | 18 +++++++++---------
src/mesa/program/prog_to_nir.c | 2 +-
src/mesa/program/sampler.cpp | 8 ++++----
src/mesa/state_tracker/st_draw.c | 2 +-
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 ++--
505 files changed, 99 insertions(+), 111 deletions(-)
rename src/{ => compiler}/glsl/.gitignore (100%)
rename src/{ => compiler}/glsl/Android.gen.mk (98%)
rename src/{ => compiler}/glsl/Android.mk (100%)
rename src/{ => compiler}/glsl/Makefile.am (97%)
rename src/{ => compiler}/glsl/Makefile.sources (100%)
rename src/{ => compiler}/glsl/README (100%)
rename src/{ => compiler}/glsl/SConscript (98%)
rename src/{ => compiler}/glsl/TODO (100%)
rename src/{ => compiler}/glsl/ast.h (100%)
rename src/{ => compiler}/glsl/ast_array_index.cpp (100%)
rename src/{ => compiler}/glsl/ast_expr.cpp (100%)
rename src/{ => compiler}/glsl/ast_function.cpp (100%)
rename src/{ => compiler}/glsl/ast_to_hir.cpp (100%)
rename src/{ => compiler}/glsl/ast_type.cpp (100%)
rename src/{ => compiler}/glsl/blob.c (100%)
rename src/{ => compiler}/glsl/blob.h (100%)
rename src/{ => compiler}/glsl/builtin_functions.cpp (100%)
rename src/{ => compiler}/glsl/builtin_types.cpp (100%)
rename src/{ => compiler}/glsl/builtin_variables.cpp (100%)
rename src/{ => compiler}/glsl/glcpp/.gitignore (100%)
rename src/{ => compiler}/glsl/glcpp/README (100%)
rename src/{ => compiler}/glsl/glcpp/glcpp-lex.l (100%)
rename src/{ => compiler}/glsl/glcpp/glcpp-parse.y (100%)
rename src/{ => compiler}/glsl/glcpp/glcpp.c (100%)
rename src/{ => compiler}/glsl/glcpp/glcpp.h (100%)
rename src/{ => compiler}/glsl/glcpp/pp.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/.gitignore (100%)
rename src/{ => compiler}/glsl/glcpp/tests/000-content-with-spaces.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/000-content-with-spaces.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/001-define.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/001-define.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/002-define-chain.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/002-define-chain.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/003-define-chain-reverse.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/003-define-chain-reverse.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/004-define-recursive.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/004-define-recursive.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/005-define-composite-chain.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/005-define-composite-chain.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/006-define-composite-chain-reverse.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/007-define-composite-recursive.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/007-define-composite-recursive.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/008-define-empty.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/008-define-empty.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/009-undef.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/009-undef.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/010-undef-re-define.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/010-undef-re-define.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/011-define-func-empty.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/011-define-func-empty.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/012-define-func-no-args.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/012-define-func-no-args.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/013-define-func-1-arg-unused.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/014-define-func-2-arg-unused.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/015-define-object-with-parens.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/015-define-object-with-parens.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/016-define-func-1-arg.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/016-define-func-1-arg.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/017-define-func-2-args.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/017-define-func-2-args.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/018-define-func-macro-as-parameter.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/019-define-func-1-arg-multi.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/020-define-func-2-arg-multi.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/021-define-func-compose.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/021-define-func-compose.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/022-define-func-arg-with-parens.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/023-define-extra-whitespace.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/023-define-extra-whitespace.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/024-define-chain-to-self-recursion.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/025-func-macro-as-non-macro.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/026-define-func-extra-newlines.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/027-define-chain-obj-to-func.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/032-define-func-self-recurse.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/032-define-func-self-recurse.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/033-define-func-self-compose.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/033-define-func-self-compose.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/034-define-func-self-compose-non-func.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/037-finalize-unexpanded-macro.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/038-func-arg-with-commas.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/038-func-arg-with-commas.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/040-token-pasting.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/040-token-pasting.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/041-if-0.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/041-if-0.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/042-if-1.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/042-if-1.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/043-if-0-else.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/043-if-0-else.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/044-if-1-else.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/044-if-1-else.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/045-if-0-elif.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/045-if-0-elif.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/046-if-1-elsif.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/046-if-1-elsif.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/047-if-elif-else.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/047-if-elif-else.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/048-if-nested.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/048-if-nested.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/049-if-expression-precedence.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/049-if-expression-precedence.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/050-if-defined.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/050-if-defined.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/051-if-relational.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/051-if-relational.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/052-if-bitwise.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/052-if-bitwise.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/053-if-divide-and-shift.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/053-if-divide-and-shift.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/054-if-with-macros.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/054-if-with-macros.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/056-macro-argument-with-comma.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/057-empty-arguments.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/057-empty-arguments.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/058-token-pasting-empty-arguments.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/059-token-pasting-integer.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/059-token-pasting-integer.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/062-if-0-skips-garbage.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/063-comments.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/063-comments.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/064-version.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/064-version.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/065-if-defined-parens.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/065-if-defined-parens.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/066-if-nospace-expression.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/066-if-nospace-expression.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/067-nested-ifdef-ifndef.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/068-accidental-pasting.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/068-accidental-pasting.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/069-repeated-argument.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/069-repeated-argument.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/070-undefined-macro-in-expression.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/071-punctuator.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/071-punctuator.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/072-token-pasting-same-line.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/072-token-pasting-same-line.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/073-if-in-ifdef.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/073-if-in-ifdef.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/074-elif-undef.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/074-elif-undef.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/075-elif-elif-undef.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/075-elif-elif-undef.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/076-elif-undef-nested.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/076-elif-undef-nested.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/077-else-without-if.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/077-else-without-if.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/078-elif-without-if.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/078-elif-without-if.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/079-endif-without-if.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/079-endif-without-if.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/080-if-without-expression.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/080-if-without-expression.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/081-elif-without-expression.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/081-elif-without-expression.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/082-invalid-paste.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/082-invalid-paste.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/083-unterminated-if.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/083-unterminated-if.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/084-unbalanced-parentheses.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/085-incorrect-argument-count.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/085-incorrect-argument-count.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/086-reserved-macro-names.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/086-reserved-macro-names.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/087-if-comments.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/087-if-comments.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/088-redefine-macro-legitimate.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/089-redefine-macro-error.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/089-redefine-macro-error.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/090-hash-error.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/090-hash-error.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/091-hash-line.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/091-hash-line.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/092-redefine-macro-error-2.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/093-divide-by-zero.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/093-divide-by-zero.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/095-recursive-define.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/095-recursive-define.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/096-paste-twice.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/096-paste-twice.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/097-paste-with-non-function-macro.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/098-elif-undefined.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/098-elif-undefined.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/099-c99-example.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/099-c99-example.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/100-macro-with-colon.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/100-macro-with-colon.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/101-macros-used-twice.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/101-macros-used-twice.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/102-garbage-after-endif.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/102-garbage-after-endif.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/103-garbage-after-else-0.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/103-garbage-after-else-0.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/104-hash-line-followed-by-code.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/105-multiline-hash-line.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/105-multiline-hash-line.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/106-multiline-hash-if.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/106-multiline-hash-if.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/107-multiline-hash-elif.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/107-multiline-hash-elif.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/108-no-space-after-hash-version.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/109-no-space-after-hash-line.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/113-line-and-file-macros.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/113-line-and-file-macros.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/114-paste-integer-tokens.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/114-paste-integer-tokens.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/115-line-continuations.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/115-line-continuations.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/116-disable-line-continuations.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/116-disable-line-continuations.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/118-comment-becomes-space.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/118-comment-becomes-space.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/119-elif-after-else.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/119-elif-after-else.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/120-undef-builtin.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/120-undef-builtin.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/121-comment-bug-72686.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/121-comment-bug-72686.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/122-redefine-whitespace.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/122-redefine-whitespace.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/123-garbage-after-else-1.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/123-garbage-after-else-1.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/124-preprocessing-numbers.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/124-preprocessing-numbers.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/125-es-short-circuit-undefined.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/126-garbage-after-directive.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/126-garbage-after-directive.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/127-pragma-empty.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/127-pragma-empty.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/128-space-before-hash.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/128-space-before-hash.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/129-define-non-identifier.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/129-define-non-identifier.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/130-define-comment.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/130-define-comment.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/131-eof-without-newline.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/131-eof-without-newline.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/132-eof-without-newline-define.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/132-eof-without-newline-define.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/133-eof-without-newline-comment.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/134-hash-comment-directive.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/134-hash-comment-directive.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/135-duplicate-parameter.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/135-duplicate-parameter.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/137-expand-macro-after-period.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/137-expand-macro-after-period.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/139-define-without-macro-name.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/139-define-without-macro-name.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/140-null-directive.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/140-null-directive.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/141-pragma-and-__LINE__.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/142-defined-within-macro.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/142-defined-within-macro.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/143-multiple-else.c (100%)
rename src/{ => compiler}/glsl/glcpp/tests/143-multiple-else.c.expected (100%)
rename src/{ => compiler}/glsl/glcpp/tests/glcpp-test (100%)
rename src/{ => compiler}/glsl/glcpp/tests/glcpp-test-cr-lf (100%)
rename src/{ => compiler}/glsl/glsl_lexer.ll (100%)
rename src/{ => compiler}/glsl/glsl_parser.yy (100%)
rename src/{ => compiler}/glsl/glsl_parser_extras.cpp (100%)
rename src/{ => compiler}/glsl/glsl_parser_extras.h (100%)
rename src/{ => compiler}/glsl/glsl_symbol_table.cpp (100%)
rename src/{ => compiler}/glsl/glsl_symbol_table.h (100%)
rename src/{ => compiler}/glsl/hir_field_selection.cpp (100%)
rename src/{ => compiler}/glsl/ir.cpp (100%)
rename src/{ => compiler}/glsl/ir.h (100%)
rename src/{ => compiler}/glsl/ir_basic_block.cpp (100%)
rename src/{ => compiler}/glsl/ir_basic_block.h (100%)
rename src/{ => compiler}/glsl/ir_builder.cpp (100%)
rename src/{ => compiler}/glsl/ir_builder.h (100%)
rename src/{ => compiler}/glsl/ir_clone.cpp (100%)
rename src/{ => compiler}/glsl/ir_constant_expression.cpp (100%)
rename src/{ => compiler}/glsl/ir_equals.cpp (100%)
rename src/{ => compiler}/glsl/ir_expression_flattening.cpp (100%)
rename src/{ => compiler}/glsl/ir_expression_flattening.h (100%)
rename src/{ => compiler}/glsl/ir_function.cpp (100%)
rename src/{ => compiler}/glsl/ir_function_can_inline.cpp (100%)
rename src/{ => compiler}/glsl/ir_function_detect_recursion.cpp (100%)
rename src/{ => compiler}/glsl/ir_function_inlining.h (100%)
rename src/{ => compiler}/glsl/ir_hierarchical_visitor.cpp (100%)
rename src/{ => compiler}/glsl/ir_hierarchical_visitor.h (100%)
rename src/{ => compiler}/glsl/ir_hv_accept.cpp (100%)
rename src/{ => compiler}/glsl/ir_import_prototypes.cpp (100%)
rename src/{ => compiler}/glsl/ir_optimization.h (100%)
rename src/{ => compiler}/glsl/ir_print_visitor.cpp (100%)
rename src/{ => compiler}/glsl/ir_print_visitor.h (100%)
rename src/{ => compiler}/glsl/ir_reader.cpp (100%)
rename src/{ => compiler}/glsl/ir_reader.h (100%)
rename src/{ => compiler}/glsl/ir_rvalue_visitor.cpp (100%)
rename src/{ => compiler}/glsl/ir_rvalue_visitor.h (100%)
rename src/{ => compiler}/glsl/ir_set_program_inouts.cpp (100%)
rename src/{ => compiler}/glsl/ir_uniform.h (100%)
rename src/{ => compiler}/glsl/ir_validate.cpp (100%)
rename src/{ => compiler}/glsl/ir_variable_refcount.cpp (100%)
rename src/{ => compiler}/glsl/ir_variable_refcount.h (100%)
rename src/{ => compiler}/glsl/ir_visitor.h (100%)
rename src/{ => compiler}/glsl/link_atomics.cpp (100%)
rename src/{ => compiler}/glsl/link_functions.cpp (100%)
rename src/{ => compiler}/glsl/link_interface_blocks.cpp (100%)
rename src/{ => compiler}/glsl/link_uniform_block_active_visitor.cpp (100%)
rename src/{ => compiler}/glsl/link_uniform_block_active_visitor.h (100%)
rename src/{ => compiler}/glsl/link_uniform_blocks.cpp (100%)
rename src/{ => compiler}/glsl/link_uniform_initializers.cpp (100%)
rename src/{ => compiler}/glsl/link_uniforms.cpp (100%)
rename src/{ => compiler}/glsl/link_varyings.cpp (100%)
rename src/{ => compiler}/glsl/link_varyings.h (100%)
rename src/{ => compiler}/glsl/linker.cpp (100%)
rename src/{ => compiler}/glsl/linker.h (100%)
rename src/{ => compiler}/glsl/list.h (100%)
rename src/{ => compiler}/glsl/loop_analysis.cpp (100%)
rename src/{ => compiler}/glsl/loop_analysis.h (100%)
rename src/{ => compiler}/glsl/loop_controls.cpp (100%)
rename src/{ => compiler}/glsl/loop_unroll.cpp (100%)
rename src/{ => compiler}/glsl/lower_clip_distance.cpp (100%)
rename src/{ => compiler}/glsl/lower_const_arrays_to_uniforms.cpp (100%)
rename src/{ => compiler}/glsl/lower_discard.cpp (100%)
rename src/{ => compiler}/glsl/lower_discard_flow.cpp (100%)
rename src/{ => compiler}/glsl/lower_if_to_cond_assign.cpp (100%)
rename src/{ => compiler}/glsl/lower_instructions.cpp (100%)
rename src/{ => compiler}/glsl/lower_jumps.cpp (100%)
rename src/{ => compiler}/glsl/lower_mat_op_to_vec.cpp (100%)
rename src/{ => compiler}/glsl/lower_named_interface_blocks.cpp (100%)
rename src/{ => compiler}/glsl/lower_noise.cpp (100%)
rename src/{ => compiler}/glsl/lower_offset_array.cpp (100%)
rename src/{ => compiler}/glsl/lower_output_reads.cpp (100%)
rename src/{ => compiler}/glsl/lower_packed_varyings.cpp (100%)
rename src/{ => compiler}/glsl/lower_packing_builtins.cpp (100%)
rename src/{ => compiler}/glsl/lower_subroutine.cpp (100%)
rename src/{ => compiler}/glsl/lower_tess_level.cpp (100%)
rename src/{ => compiler}/glsl/lower_texture_projection.cpp (100%)
rename src/{ => compiler}/glsl/lower_ubo_reference.cpp (100%)
rename src/{ => compiler}/glsl/lower_variable_index_to_cond_assign.cpp (100%)
rename src/{ => compiler}/glsl/lower_vec_index_to_cond_assign.cpp (100%)
rename src/{ => compiler}/glsl/lower_vec_index_to_swizzle.cpp (100%)
rename src/{ => compiler}/glsl/lower_vector.cpp (100%)
rename src/{ => compiler}/glsl/lower_vector_derefs.cpp (100%)
rename src/{ => compiler}/glsl/lower_vector_insert.cpp (100%)
rename src/{ => compiler}/glsl/lower_vertex_id.cpp (100%)
rename src/{ => compiler}/glsl/main.cpp (100%)
rename src/{ => compiler}/glsl/opt_algebraic.cpp (100%)
rename src/{ => compiler}/glsl/opt_array_splitting.cpp (100%)
rename src/{ => compiler}/glsl/opt_conditional_discard.cpp (100%)
rename src/{ => compiler}/glsl/opt_constant_folding.cpp (100%)
rename src/{ => compiler}/glsl/opt_constant_propagation.cpp (100%)
rename src/{ => compiler}/glsl/opt_constant_variable.cpp (100%)
rename src/{ => compiler}/glsl/opt_copy_propagation.cpp (100%)
rename src/{ => compiler}/glsl/opt_copy_propagation_elements.cpp (100%)
rename src/{ => compiler}/glsl/opt_dead_builtin_variables.cpp (100%)
rename src/{ => compiler}/glsl/opt_dead_builtin_varyings.cpp (100%)
rename src/{ => compiler}/glsl/opt_dead_code.cpp (100%)
rename src/{ => compiler}/glsl/opt_dead_code_local.cpp (100%)
rename src/{ => compiler}/glsl/opt_dead_functions.cpp (100%)
rename src/{ => compiler}/glsl/opt_flatten_nested_if_blocks.cpp (100%)
rename src/{ => compiler}/glsl/opt_flip_matrices.cpp (100%)
rename src/{ => compiler}/glsl/opt_function_inlining.cpp (100%)
rename src/{ => compiler}/glsl/opt_if_simplification.cpp (100%)
rename src/{ => compiler}/glsl/opt_minmax.cpp (100%)
rename src/{ => compiler}/glsl/opt_noop_swizzle.cpp (100%)
rename src/{ => compiler}/glsl/opt_rebalance_tree.cpp (100%)
rename src/{ => compiler}/glsl/opt_redundant_jumps.cpp (100%)
rename src/{ => compiler}/glsl/opt_structure_splitting.cpp (100%)
rename src/{ => compiler}/glsl/opt_swizzle_swizzle.cpp (100%)
rename src/{ => compiler}/glsl/opt_tree_grafting.cpp (100%)
rename src/{ => compiler}/glsl/opt_vectorize.cpp (100%)
rename src/{ => compiler}/glsl/program.h (100%)
rename src/{ => compiler}/glsl/s_expression.cpp (100%)
rename src/{ => compiler}/glsl/s_expression.h (100%)
rename src/{ => compiler}/glsl/standalone_scaffolding.cpp (100%)
rename src/{ => compiler}/glsl/standalone_scaffolding.h (100%)
rename src/{ => compiler}/glsl/test.cpp (100%)
rename src/{ => compiler}/glsl/test_optpass.cpp (100%)
rename src/{ => compiler}/glsl/test_optpass.h (100%)
rename src/{ => compiler}/glsl/tests/.gitignore (100%)
rename src/{ => compiler}/glsl/tests/blob_test.c (100%)
rename src/{ => compiler}/glsl/tests/builtin_variable_test.cpp (100%)
rename src/{ => compiler}/glsl/tests/compare_ir (100%)
rename src/{ => compiler}/glsl/tests/copy_constant_to_storage_tests.cpp (100%)
rename src/{ => compiler}/glsl/tests/general_ir_test.cpp (100%)
rename src/{ => compiler}/glsl/tests/invalidate_locations_test.cpp (100%)
rename src/{ => compiler}/glsl/tests/lower_jumps/.gitignore (100%)
rename src/{ => compiler}/glsl/tests/lower_jumps/create_test_cases.py (100%)
rename src/{ => compiler}/glsl/tests/optimization-test (100%)
rename src/{ => compiler}/glsl/tests/sampler_types_test.cpp (100%)
rename src/{ => compiler}/glsl/tests/set_uniform_initializer_tests.cpp (100%)
rename src/{ => compiler}/glsl/tests/sexps.py (100%)
rename src/{ => compiler}/glsl/tests/uniform_initializer_utils.cpp (100%)
rename src/{ => compiler}/glsl/tests/uniform_initializer_utils.h (100%)
rename src/{ => compiler}/glsl/tests/varyings_test.cpp (100%)
diff --git a/Android.mk b/Android.mk
index 9b0d7bf..edcfe22 100644
--- a/Android.mk
+++ b/Android.mk
@@ -88,7 +88,7 @@ SUBDIRS := \
src/mapi \
src/compiler \
src/compiler/nir \
- src/glsl \
+ src/compiler/glsl \
src/mesa \
src/util \
src/egl \
diff --git a/configure.ac b/configure.ac
index 266d9b6..8e50c58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,10 +110,10 @@ LT_INIT([disable-static])
AC_CHECK_PROG(RM, rm, [rm -f])
AX_PROG_BISON([],
- AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"],
+ AS_IF([test ! -f "$srcdir/src/compiler/glsl/glcpp/glcpp-parse.c"],
[AC_MSG_ERROR([bison not found - unable to compile glcpp-parse.y])]))
AX_PROG_FLEX([],
- AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-lex.c"],
+ AS_IF([test ! -f "$srcdir/src/compiler/glsl/glcpp/glcpp-lex.c"],
[AC_MSG_ERROR([flex not found - unable to compile glcpp-lex.l])]))
AC_CHECK_PROG(INDENT, indent, indent, cat)
@@ -2347,6 +2347,7 @@ dnl Substitute the config
AC_CONFIG_FILES([Makefile
src/Makefile
src/compiler/Makefile
+ src/compiler/glsl/Makefile
src/compiler/nir/Makefile
src/egl/Makefile
src/egl/main/egl.pc
@@ -2417,7 +2418,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/docs/shading.html b/docs/shading.html
index e9fe3dd..6575ba9 100644
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -172,7 +172,7 @@ This tool is useful for:
</ul>
<p>
-After building Mesa, the compiler can be found at src/glsl/glsl_compiler
+After building Mesa, the compiler can be found at src/compiler/glsl/glsl_compiler
</p>
<p>
@@ -180,7 +180,7 @@ Here's an example of using the compiler to compile a vertex shader and
emit GL_ARB_vertex_program-style instructions:
</p>
<pre>
- src/glsl/glsl_compiler --dump-ast myshader.vert
+ src/compiler/glsl/glsl_compiler --dump-ast myshader.vert
</pre>
Options include
@@ -196,7 +196,7 @@ Options include
<p>
The source code for Mesa's shading language compiler is in the
-<code>src/glsl/</code> directory.
+<code>src/compiler/glsl/</code> directory.
</p>
<p>
diff --git a/doxygen/glsl.doxy b/doxygen/glsl.doxy
index 9915ba2..cc9c3c2 100644
--- a/doxygen/glsl.doxy
+++ b/doxygen/glsl.doxy
@@ -9,11 +9,11 @@ PROJECT_NAME = "Mesa GLSL module"
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = ../src/glsl/
+INPUT = ../src/compiler/glsl/
RECURSIVE = NO
-EXCLUDE = ../src/glsl/glsl_lexer.cpp \
- ../src/glsl/glsl_parser.cpp \
- ../src/glsl/glsl_parser.h
+EXCLUDE = ../src/compiler/glsl/glsl_lexer.cpp \
+ ../src/compiler/glsl/glsl_parser.cpp \
+ ../src/compiler/glsl/glsl_parser.h
EXCLUDE_PATTERNS =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
diff --git a/src/Makefile.am b/src/Makefile.am
index c7f274a..b3075f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,9 +24,10 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi
# XXX: conditionally include
SUBDIRS += compiler
SUBDIRS += compiler/nir
+SUBDIRS += compiler/glsl
if NEED_OPENGL_COMMON
-SUBDIRS += glsl mesa
+SUBDIRS += mesa
endif
SUBDIRS += loader
diff --git a/src/SConscript b/src/SConscript
index 8acf9b0..5d43bde 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -6,7 +6,7 @@ if env['platform'] == 'windows':
SConscript('util/SConscript')
SConscript('compiler/SConscript')
-SConscript('glsl/SConscript')
+SConscript('compiler/glsl/SConscript')
if env['hostonly']:
# We are just compiling the things necessary on the host for cross
diff --git a/src/glsl/.gitignore b/src/compiler/glsl/.gitignore
similarity index 100%
rename from src/glsl/.gitignore
rename to src/compiler/glsl/.gitignore
diff --git a/src/glsl/Android.gen.mk b/src/compiler/glsl/Android.gen.mk
similarity index 98%
rename from src/glsl/Android.gen.mk
rename to src/compiler/glsl/Android.gen.mk
index 384939f..e68fdef 100644
--- a/src/glsl/Android.gen.mk
+++ b/src/compiler/glsl/Android.gen.mk
@@ -33,7 +33,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES)
LOCAL_C_INCLUDES += \
$(intermediates)/glcpp \
- $(MESA_TOP)/src/glsl/glcpp
+ $(LOCAL_PATH)/glcpp
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
$(LIBGLCPP_GENERATED_FILES) \
diff --git a/src/glsl/Android.mk b/src/compiler/glsl/Android.mk
similarity index 100%
rename from src/glsl/Android.mk
rename to src/compiler/glsl/Android.mk
diff --git a/src/glsl/Makefile.am b/src/compiler/glsl/Makefile.am
similarity index 97%
rename from src/glsl/Makefile.am
rename to src/compiler/glsl/Makefile.am
index 9954b81..3c39600 100644
--- a/src/glsl/Makefile.am
+++ b/src/compiler/glsl/Makefile.am
@@ -26,7 +26,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
- -I$(top_srcdir)/src/glsl/glcpp \
+ -I$(top_builddir)/src/compiler/glsl/glcpp \
-I$(top_srcdir)/src/gtest/include \
$(DEFINES)
AM_CFLAGS = \
@@ -71,7 +71,7 @@ noinst_PROGRAMS = glsl_compiler
tests_blob_test_SOURCES = \
tests/blob_test.c
tests_blob_test_LDADD = \
- $(top_builddir)/src/glsl/libglsl.la
+ libglsl.la
tests_general_ir_test_SOURCES = \
standalone_scaffolding.cpp \
@@ -82,9 +82,9 @@ tests_general_ir_test_SOURCES = \
tests_general_ir_test_CFLAGS = \
$(PTHREAD_CFLAGS)
tests_general_ir_test_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(top_builddir)/src/glsl/libglsl.la \
+ libglsl.la \
$(top_builddir)/src/libglsl_util.la \
+ $(top_builddir)/src/gtest/libgtest.la \
$(PTHREAD_LIBS)
tests_uniform_initializer_test_SOURCES = \
@@ -95,9 +95,9 @@ tests_uniform_initializer_test_SOURCES = \
tests_uniform_initializer_test_CFLAGS = \
$(PTHREAD_CFLAGS)
tests_uniform_initializer_test_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(top_builddir)/src/glsl/libglsl.la \
+ libglsl.la \
$(top_builddir)/src/libglsl_util.la \
+ $(top_builddir)/src/gtest/libgtest.la \
$(PTHREAD_LIBS)
tests_sampler_types_test_SOURCES = \
@@ -105,9 +105,9 @@ tests_sampler_types_test_SOURCES = \
tests_sampler_types_test_CFLAGS = \
$(PTHREAD_CFLAGS)
tests_sampler_types_test_LDADD = \
- $(top_builddir)/src/gtest/libgtest.la \
- $(top_builddir)/src/glsl/libglsl.la \
+ libglsl.la \
$(top_builddir)/src/libglsl_util.la \
+ $(top_builddir)/src/gtest/libgtest.la \
$(PTHREAD_LIBS)
libglcpp_la_LIBADD = \
diff --git a/src/glsl/Makefile.sources b/src/compiler/glsl/Makefile.sources
similarity index 100%
rename from src/glsl/Makefile.sources
rename to src/compiler/glsl/Makefile.sources
diff --git a/src/glsl/README b/src/compiler/glsl/README
similarity index 100%
rename from src/glsl/README
rename to src/compiler/glsl/README
diff --git a/src/glsl/SConscript b/src/compiler/glsl/SConscript
similarity index 98%
rename from src/glsl/SConscript
rename to src/compiler/glsl/SConscript
index de329ad..15951c1 100644
--- a/src/glsl/SConscript
+++ b/src/compiler/glsl/SConscript
@@ -15,8 +15,6 @@ env.Prepend(CPPPATH = [
'#src/mesa',
'#src/gallium/include',
'#src/gallium/auxiliary',
- '#src/glsl',
- '#src/glsl/glcpp',
])
env.Prepend(LIBS = [mesautil])
diff --git a/src/glsl/TODO b/src/compiler/glsl/TODO
similarity index 100%
rename from src/glsl/TODO
rename to src/compiler/glsl/TODO
diff --git a/src/glsl/ast.h b/src/compiler/glsl/ast.h
similarity index 100%
rename from src/glsl/ast.h
rename to src/compiler/glsl/ast.h
diff --git a/src/glsl/ast_array_index.cpp b/src/compiler/glsl/ast_array_index.cpp
similarity index 100%
rename from src/glsl/ast_array_index.cpp
rename to src/compiler/glsl/ast_array_index.cpp
diff --git a/src/glsl/ast_expr.cpp b/src/compiler/glsl/ast_expr.cpp
similarity index 100%
rename from src/glsl/ast_expr.cpp
rename to src/compiler/glsl/ast_expr.cpp
diff --git a/src/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp
similarity index 100%
rename from src/glsl/ast_function.cpp
rename to src/compiler/glsl/ast_function.cpp
diff --git a/src/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
similarity index 100%
rename from src/glsl/ast_to_hir.cpp
rename to src/compiler/glsl/ast_to_hir.cpp
diff --git a/src/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
similarity index 100%
rename from src/glsl/ast_type.cpp
rename to src/compiler/glsl/ast_type.cpp
diff --git a/src/glsl/blob.c b/src/compiler/glsl/blob.c
similarity index 100%
rename from src/glsl/blob.c
rename to src/compiler/glsl/blob.c
diff --git a/src/glsl/blob.h b/src/compiler/glsl/blob.h
similarity index 100%
rename from src/glsl/blob.h
rename to src/compiler/glsl/blob.h
diff --git a/src/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp
similarity index 100%
rename from src/glsl/builtin_functions.cpp
rename to src/compiler/glsl/builtin_functions.cpp
diff --git a/src/glsl/builtin_types.cpp b/src/compiler/glsl/builtin_types.cpp
similarity index 100%
rename from src/glsl/builtin_types.cpp
rename to src/compiler/glsl/builtin_types.cpp
diff --git a/src/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp
similarity index 100%
rename from src/glsl/builtin_variables.cpp
rename to src/compiler/glsl/builtin_variables.cpp
diff --git a/src/glsl/glcpp/.gitignore b/src/compiler/glsl/glcpp/.gitignore
similarity index 100%
rename from src/glsl/glcpp/.gitignore
rename to src/compiler/glsl/glcpp/.gitignore
diff --git a/src/glsl/glcpp/README b/src/compiler/glsl/glcpp/README
similarity index 100%
rename from src/glsl/glcpp/README
rename to src/compiler/glsl/glcpp/README
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/compiler/glsl/glcpp/glcpp-lex.l
similarity index 100%
rename from src/glsl/glcpp/glcpp-lex.l
rename to src/compiler/glsl/glcpp/glcpp-lex.l
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y
similarity index 100%
rename from src/glsl/glcpp/glcpp-parse.y
rename to src/compiler/glsl/glcpp/glcpp-parse.y
diff --git a/src/glsl/glcpp/glcpp.c b/src/compiler/glsl/glcpp/glcpp.c
similarity index 100%
rename from src/glsl/glcpp/glcpp.c
rename to src/compiler/glsl/glcpp/glcpp.c
diff --git a/src/glsl/glcpp/glcpp.h b/src/compiler/glsl/glcpp/glcpp.h
similarity index 100%
rename from src/glsl/glcpp/glcpp.h
rename to src/compiler/glsl/glcpp/glcpp.h
diff --git a/src/glsl/glcpp/pp.c b/src/compiler/glsl/glcpp/pp.c
similarity index 100%
rename from src/glsl/glcpp/pp.c
rename to src/compiler/glsl/glcpp/pp.c
diff --git a/src/glsl/glcpp/tests/.gitignore b/src/compiler/glsl/glcpp/tests/.gitignore
similarity index 100%
rename from src/glsl/glcpp/tests/.gitignore
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/000-content-with-spaces.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/000-content-with-spaces.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/001-define.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/001-define.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/002-define-chain.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/002-define-chain.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/003-define-chain-reverse.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/003-define-chain-reverse.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/004-define-recursive.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/004-define-recursive.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/005-define-composite-chain.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/005-define-composite-chain.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/006-define-composite-chain-reverse.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/007-define-composite-recursive.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/007-define-composite-recursive.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/008-define-empty.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/008-define-empty.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/009-undef.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/009-undef.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/010-undef-re-define.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/010-undef-re-define.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/011-define-func-empty.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/011-define-func-empty.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/012-define-func-no-args.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/012-define-func-no-args.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/013-define-func-1-arg-unused.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/014-define-func-2-arg-unused.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/015-define-object-with-parens.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/015-define-object-with-parens.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/016-define-func-1-arg.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/016-define-func-1-arg.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/017-define-func-2-args.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/017-define-func-2-args.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/019-define-func-1-arg-multi.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/020-define-func-2-arg-multi.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/021-define-func-compose.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/021-define-func-compose.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/022-define-func-arg-with-parens.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/023-define-extra-whitespace.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/025-func-macro-as-non-macro.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/026-define-func-extra-newlines.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/027-define-chain-obj-to-func.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/032-define-func-self-recurse.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/033-define-func-self-compose.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/033-define-func-self-compose.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/038-func-arg-with-commas.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/040-token-pasting.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/040-token-pasting.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/041-if-0.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/041-if-0.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/042-if-1.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/042-if-1.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/043-if-0-else.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/043-if-0-else.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/044-if-1-else.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/044-if-1-else.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/045-if-0-elif.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/045-if-0-elif.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/046-if-1-elsif.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/046-if-1-elsif.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/047-if-elif-else.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/047-if-elif-else.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/048-if-nested.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/048-if-nested.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/049-if-expression-precedence.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/049-if-expression-precedence.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/050-if-defined.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/050-if-defined.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/051-if-relational.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/051-if-relational.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/052-if-bitwise.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/052-if-bitwise.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/053-if-divide-and-shift.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/054-if-with-macros.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/054-if-with-macros.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/056-macro-argument-with-comma.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/057-empty-arguments.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/057-empty-arguments.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/059-token-pasting-integer.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/059-token-pasting-integer.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/062-if-0-skips-garbage.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/063-comments.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/063-comments.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/064-version.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/064-version.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/065-if-defined-parens.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/065-if-defined-parens.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/066-if-nospace-expression.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/066-if-nospace-expression.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/068-accidental-pasting.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/068-accidental-pasting.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/069-repeated-argument.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/069-repeated-argument.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/070-undefined-macro-in-expression.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/071-punctuator.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/071-punctuator.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/072-token-pasting-same-line.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/073-if-in-ifdef.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/073-if-in-ifdef.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/074-elif-undef.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/074-elif-undef.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/075-elif-elif-undef.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/075-elif-elif-undef.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/076-elif-undef-nested.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/076-elif-undef-nested.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/077-else-without-if.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/077-else-without-if.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/078-elif-without-if.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/078-elif-without-if.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/079-endif-without-if.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/079-endif-without-if.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/080-if-without-expression.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/080-if-without-expression.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/081-elif-without-expression.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/081-elif-without-expression.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/082-invalid-paste.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/082-invalid-paste.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/083-unterminated-if.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/083-unterminated-if.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/084-unbalanced-parentheses.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/085-incorrect-argument-count.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/086-reserved-macro-names.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/086-reserved-macro-names.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/087-if-comments.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/087-if-comments.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/088-redefine-macro-legitimate.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/089-redefine-macro-error.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/089-redefine-macro-error.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/090-hash-error.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/090-hash-error.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/091-hash-line.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/091-hash-line.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/092-redefine-macro-error-2.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/093-divide-by-zero.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/093-divide-by-zero.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/095-recursive-define.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/095-recursive-define.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/096-paste-twice.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/096-paste-twice.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/097-paste-with-non-function-macro.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/098-elif-undefined.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/098-elif-undefined.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/099-c99-example.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/099-c99-example.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/100-macro-with-colon.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/100-macro-with-colon.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/101-macros-used-twice.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/101-macros-used-twice.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/102-garbage-after-endif.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/102-garbage-after-endif.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/103-garbage-after-else-0.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/104-hash-line-followed-by-code.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/105-multiline-hash-line.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/105-multiline-hash-line.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/106-multiline-hash-if.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/106-multiline-hash-if.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/107-multiline-hash-elif.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/108-no-space-after-hash-version.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/109-no-space-after-hash-line.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/113-line-and-file-macros.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/113-line-and-file-macros.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/114-paste-integer-tokens.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/115-line-continuations.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/115-line-continuations.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/116-disable-line-continuations.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/116-disable-line-continuations.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/118-comment-becomes-space.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/118-comment-becomes-space.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/119-elif-after-else.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/119-elif-after-else.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/120-undef-builtin.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/120-undef-builtin.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/121-comment-bug-72686.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/121-comment-bug-72686.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/122-redefine-whitespace.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/122-redefine-whitespace.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/123-garbage-after-else-1.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/124-preprocessing-numbers.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/125-es-short-circuit-undefined.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/126-garbage-after-directive.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/126-garbage-after-directive.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/127-pragma-empty.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/127-pragma-empty.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/128-space-before-hash.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/128-space-before-hash.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/129-define-non-identifier.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/129-define-non-identifier.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/130-define-comment.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/130-define-comment.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/131-eof-without-newline.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/131-eof-without-newline.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/132-eof-without-newline-define.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/133-eof-without-newline-comment.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/134-hash-comment-directive.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/134-hash-comment-directive.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/135-duplicate-parameter.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/135-duplicate-parameter.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/137-expand-macro-after-period.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/139-define-without-macro-name.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/139-define-without-macro-name.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/140-null-directive.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/140-null-directive.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/141-pragma-and-__LINE__.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/142-defined-within-macro.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/142-defined-within-macro.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/143-multiple-else.c
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/143-multiple-else.c.expected
rename to 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
similarity index 100%
rename from src/glsl/glcpp/tests/glcpp-test
rename to src/compiler/glsl/glcpp/tests/glcpp-test
diff --git a/src/glsl/glcpp/tests/glcpp-test-cr-lf b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf
similarity index 100%
rename from src/glsl/glcpp/tests/glcpp-test-cr-lf
rename to src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf
diff --git a/src/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
similarity index 100%
rename from src/glsl/glsl_lexer.ll
rename to src/compiler/glsl/glsl_lexer.ll
diff --git a/src/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
similarity index 100%
rename from src/glsl/glsl_parser.yy
rename to src/compiler/glsl/glsl_parser.yy
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
similarity index 100%
rename from src/glsl/glsl_parser_extras.cpp
rename to src/compiler/glsl/glsl_parser_extras.cpp
diff --git a/src/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h
similarity index 100%
rename from src/glsl/glsl_parser_extras.h
rename to src/compiler/glsl/glsl_parser_extras.h
diff --git a/src/glsl/glsl_symbol_table.cpp b/src/compiler/glsl/glsl_symbol_table.cpp
similarity index 100%
rename from src/glsl/glsl_symbol_table.cpp
rename to src/compiler/glsl/glsl_symbol_table.cpp
diff --git a/src/glsl/glsl_symbol_table.h b/src/compiler/glsl/glsl_symbol_table.h
similarity index 100%
rename from src/glsl/glsl_symbol_table.h
rename to src/compiler/glsl/glsl_symbol_table.h
diff --git a/src/glsl/hir_field_selection.cpp b/src/compiler/glsl/hir_field_selection.cpp
similarity index 100%
rename from src/glsl/hir_field_selection.cpp
rename to src/compiler/glsl/hir_field_selection.cpp
diff --git a/src/glsl/ir.cpp b/src/compiler/glsl/ir.cpp
similarity index 100%
rename from src/glsl/ir.cpp
rename to src/compiler/glsl/ir.cpp
diff --git a/src/glsl/ir.h b/src/compiler/glsl/ir.h
similarity index 100%
rename from src/glsl/ir.h
rename to src/compiler/glsl/ir.h
diff --git a/src/glsl/ir_basic_block.cpp b/src/compiler/glsl/ir_basic_block.cpp
similarity index 100%
rename from src/glsl/ir_basic_block.cpp
rename to src/compiler/glsl/ir_basic_block.cpp
diff --git a/src/glsl/ir_basic_block.h b/src/compiler/glsl/ir_basic_block.h
similarity index 100%
rename from src/glsl/ir_basic_block.h
rename to src/compiler/glsl/ir_basic_block.h
diff --git a/src/glsl/ir_builder.cpp b/src/compiler/glsl/ir_builder.cpp
similarity index 100%
rename from src/glsl/ir_builder.cpp
rename to src/compiler/glsl/ir_builder.cpp
diff --git a/src/glsl/ir_builder.h b/src/compiler/glsl/ir_builder.h
similarity index 100%
rename from src/glsl/ir_builder.h
rename to src/compiler/glsl/ir_builder.h
diff --git a/src/glsl/ir_clone.cpp b/src/compiler/glsl/ir_clone.cpp
similarity index 100%
rename from src/glsl/ir_clone.cpp
rename to src/compiler/glsl/ir_clone.cpp
diff --git a/src/glsl/ir_constant_expression.cpp b/src/compiler/glsl/ir_constant_expression.cpp
similarity index 100%
rename from src/glsl/ir_constant_expression.cpp
rename to src/compiler/glsl/ir_constant_expression.cpp
diff --git a/src/glsl/ir_equals.cpp b/src/compiler/glsl/ir_equals.cpp
similarity index 100%
rename from src/glsl/ir_equals.cpp
rename to src/compiler/glsl/ir_equals.cpp
diff --git a/src/glsl/ir_expression_flattening.cpp b/src/compiler/glsl/ir_expression_flattening.cpp
similarity index 100%
rename from src/glsl/ir_expression_flattening.cpp
rename to src/compiler/glsl/ir_expression_flattening.cpp
diff --git a/src/glsl/ir_expression_flattening.h b/src/compiler/glsl/ir_expression_flattening.h
similarity index 100%
rename from src/glsl/ir_expression_flattening.h
rename to src/compiler/glsl/ir_expression_flattening.h
diff --git a/src/glsl/ir_function.cpp b/src/compiler/glsl/ir_function.cpp
similarity index 100%
rename from src/glsl/ir_function.cpp
rename to 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
similarity index 100%
rename from src/glsl/ir_function_can_inline.cpp
rename to 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
similarity index 100%
rename from src/glsl/ir_function_detect_recursion.cpp
rename to 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
similarity index 100%
rename from src/glsl/ir_function_inlining.h
rename to src/compiler/glsl/ir_function_inlining.h
diff --git a/src/glsl/ir_hierarchical_visitor.cpp b/src/compiler/glsl/ir_hierarchical_visitor.cpp
similarity index 100%
rename from src/glsl/ir_hierarchical_visitor.cpp
rename to src/compiler/glsl/ir_hierarchical_visitor.cpp
diff --git a/src/glsl/ir_hierarchical_visitor.h b/src/compiler/glsl/ir_hierarchical_visitor.h
similarity index 100%
rename from src/glsl/ir_hierarchical_visitor.h
rename to src/compiler/glsl/ir_hierarchical_visitor.h
diff --git a/src/glsl/ir_hv_accept.cpp b/src/compiler/glsl/ir_hv_accept.cpp
similarity index 100%
rename from src/glsl/ir_hv_accept.cpp
rename to src/compiler/glsl/ir_hv_accept.cpp
diff --git a/src/glsl/ir_import_prototypes.cpp b/src/compiler/glsl/ir_import_prototypes.cpp
similarity index 100%
rename from src/glsl/ir_import_prototypes.cpp
rename to src/compiler/glsl/ir_import_prototypes.cpp
diff --git a/src/glsl/ir_optimization.h b/src/compiler/glsl/ir_optimization.h
similarity index 100%
rename from src/glsl/ir_optimization.h
rename to src/compiler/glsl/ir_optimization.h
diff --git a/src/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp
similarity index 100%
rename from src/glsl/ir_print_visitor.cpp
rename to src/compiler/glsl/ir_print_visitor.cpp
diff --git a/src/glsl/ir_print_visitor.h b/src/compiler/glsl/ir_print_visitor.h
similarity index 100%
rename from src/glsl/ir_print_visitor.h
rename to src/compiler/glsl/ir_print_visitor.h
diff --git a/src/glsl/ir_reader.cpp b/src/compiler/glsl/ir_reader.cpp
similarity index 100%
rename from src/glsl/ir_reader.cpp
rename to src/compiler/glsl/ir_reader.cpp
diff --git a/src/glsl/ir_reader.h b/src/compiler/glsl/ir_reader.h
similarity index 100%
rename from src/glsl/ir_reader.h
rename to src/compiler/glsl/ir_reader.h
diff --git a/src/glsl/ir_rvalue_visitor.cpp b/src/compiler/glsl/ir_rvalue_visitor.cpp
similarity index 100%
rename from src/glsl/ir_rvalue_visitor.cpp
rename to src/compiler/glsl/ir_rvalue_visitor.cpp
diff --git a/src/glsl/ir_rvalue_visitor.h b/src/compiler/glsl/ir_rvalue_visitor.h
similarity index 100%
rename from src/glsl/ir_rvalue_visitor.h
rename to 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
similarity index 100%
rename from src/glsl/ir_set_program_inouts.cpp
rename to src/compiler/glsl/ir_set_program_inouts.cpp
diff --git a/src/glsl/ir_uniform.h b/src/compiler/glsl/ir_uniform.h
similarity index 100%
rename from src/glsl/ir_uniform.h
rename to src/compiler/glsl/ir_uniform.h
diff --git a/src/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp
similarity index 100%
rename from src/glsl/ir_validate.cpp
rename to src/compiler/glsl/ir_validate.cpp
diff --git a/src/glsl/ir_variable_refcount.cpp b/src/compiler/glsl/ir_variable_refcount.cpp
similarity index 100%
rename from src/glsl/ir_variable_refcount.cpp
rename to src/compiler/glsl/ir_variable_refcount.cpp
diff --git a/src/glsl/ir_variable_refcount.h b/src/compiler/glsl/ir_variable_refcount.h
similarity index 100%
rename from src/glsl/ir_variable_refcount.h
rename to src/compiler/glsl/ir_variable_refcount.h
diff --git a/src/glsl/ir_visitor.h b/src/compiler/glsl/ir_visitor.h
similarity index 100%
rename from src/glsl/ir_visitor.h
rename to src/compiler/glsl/ir_visitor.h
diff --git a/src/glsl/link_atomics.cpp b/src/compiler/glsl/link_atomics.cpp
similarity index 100%
rename from src/glsl/link_atomics.cpp
rename to src/compiler/glsl/link_atomics.cpp
diff --git a/src/glsl/link_functions.cpp b/src/compiler/glsl/link_functions.cpp
similarity index 100%
rename from src/glsl/link_functions.cpp
rename to src/compiler/glsl/link_functions.cpp
diff --git a/src/glsl/link_interface_blocks.cpp b/src/compiler/glsl/link_interface_blocks.cpp
similarity index 100%
rename from src/glsl/link_interface_blocks.cpp
rename to 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
similarity index 100%
rename from src/glsl/link_uniform_block_active_visitor.cpp
rename to 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
similarity index 100%
rename from src/glsl/link_uniform_block_active_visitor.h
rename to 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
similarity index 100%
rename from src/glsl/link_uniform_blocks.cpp
rename to src/compiler/glsl/link_uniform_blocks.cpp
diff --git a/src/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp
similarity index 100%
rename from src/glsl/link_uniform_initializers.cpp
rename to src/compiler/glsl/link_uniform_initializers.cpp
diff --git a/src/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp
similarity index 100%
rename from src/glsl/link_uniforms.cpp
rename to src/compiler/glsl/link_uniforms.cpp
diff --git a/src/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp
similarity index 100%
rename from src/glsl/link_varyings.cpp
rename to src/compiler/glsl/link_varyings.cpp
diff --git a/src/glsl/link_varyings.h b/src/compiler/glsl/link_varyings.h
similarity index 100%
rename from src/glsl/link_varyings.h
rename to src/compiler/glsl/link_varyings.h
diff --git a/src/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
similarity index 100%
rename from src/glsl/linker.cpp
rename to src/compiler/glsl/linker.cpp
diff --git a/src/glsl/linker.h b/src/compiler/glsl/linker.h
similarity index 100%
rename from src/glsl/linker.h
rename to src/compiler/glsl/linker.h
diff --git a/src/glsl/list.h b/src/compiler/glsl/list.h
similarity index 100%
rename from src/glsl/list.h
rename to src/compiler/glsl/list.h
diff --git a/src/glsl/loop_analysis.cpp b/src/compiler/glsl/loop_analysis.cpp
similarity index 100%
rename from src/glsl/loop_analysis.cpp
rename to src/compiler/glsl/loop_analysis.cpp
diff --git a/src/glsl/loop_analysis.h b/src/compiler/glsl/loop_analysis.h
similarity index 100%
rename from src/glsl/loop_analysis.h
rename to src/compiler/glsl/loop_analysis.h
diff --git a/src/glsl/loop_controls.cpp b/src/compiler/glsl/loop_controls.cpp
similarity index 100%
rename from src/glsl/loop_controls.cpp
rename to src/compiler/glsl/loop_controls.cpp
diff --git a/src/glsl/loop_unroll.cpp b/src/compiler/glsl/loop_unroll.cpp
similarity index 100%
rename from src/glsl/loop_unroll.cpp
rename to src/compiler/glsl/loop_unroll.cpp
diff --git a/src/glsl/lower_clip_distance.cpp b/src/compiler/glsl/lower_clip_distance.cpp
similarity index 100%
rename from src/glsl/lower_clip_distance.cpp
rename to 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
similarity index 100%
rename from src/glsl/lower_const_arrays_to_uniforms.cpp
rename to src/compiler/glsl/lower_const_arrays_to_uniforms.cpp
diff --git a/src/glsl/lower_discard.cpp b/src/compiler/glsl/lower_discard.cpp
similarity index 100%
rename from src/glsl/lower_discard.cpp
rename to src/compiler/glsl/lower_discard.cpp
diff --git a/src/glsl/lower_discard_flow.cpp b/src/compiler/glsl/lower_discard_flow.cpp
similarity index 100%
rename from src/glsl/lower_discard_flow.cpp
rename to 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
similarity index 100%
rename from src/glsl/lower_if_to_cond_assign.cpp
rename to src/compiler/glsl/lower_if_to_cond_assign.cpp
diff --git a/src/glsl/lower_instructions.cpp b/src/compiler/glsl/lower_instructions.cpp
similarity index 100%
rename from src/glsl/lower_instructions.cpp
rename to src/compiler/glsl/lower_instructions.cpp
diff --git a/src/glsl/lower_jumps.cpp b/src/compiler/glsl/lower_jumps.cpp
similarity index 100%
rename from src/glsl/lower_jumps.cpp
rename to 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
similarity index 100%
rename from src/glsl/lower_mat_op_to_vec.cpp
rename to 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
similarity index 100%
rename from src/glsl/lower_named_interface_blocks.cpp
rename to src/compiler/glsl/lower_named_interface_blocks.cpp
diff --git a/src/glsl/lower_noise.cpp b/src/compiler/glsl/lower_noise.cpp
similarity index 100%
rename from src/glsl/lower_noise.cpp
rename to src/compiler/glsl/lower_noise.cpp
diff --git a/src/glsl/lower_offset_array.cpp b/src/compiler/glsl/lower_offset_array.cpp
similarity index 100%
rename from src/glsl/lower_offset_array.cpp
rename to src/compiler/glsl/lower_offset_array.cpp
diff --git a/src/glsl/lower_output_reads.cpp b/src/compiler/glsl/lower_output_reads.cpp
similarity index 100%
rename from src/glsl/lower_output_reads.cpp
rename to src/compiler/glsl/lower_output_reads.cpp
diff --git a/src/glsl/lower_packed_varyings.cpp b/src/compiler/glsl/lower_packed_varyings.cpp
similarity index 100%
rename from src/glsl/lower_packed_varyings.cpp
rename to src/compiler/glsl/lower_packed_varyings.cpp
diff --git a/src/glsl/lower_packing_builtins.cpp b/src/compiler/glsl/lower_packing_builtins.cpp
similarity index 100%
rename from src/glsl/lower_packing_builtins.cpp
rename to src/compiler/glsl/lower_packing_builtins.cpp
diff --git a/src/glsl/lower_subroutine.cpp b/src/compiler/glsl/lower_subroutine.cpp
similarity index 100%
rename from src/glsl/lower_subroutine.cpp
rename to src/compiler/glsl/lower_subroutine.cpp
diff --git a/src/glsl/lower_tess_level.cpp b/src/compiler/glsl/lower_tess_level.cpp
similarity index 100%
rename from src/glsl/lower_tess_level.cpp
rename to src/compiler/glsl/lower_tess_level.cpp
diff --git a/src/glsl/lower_texture_projection.cpp b/src/compiler/glsl/lower_texture_projection.cpp
similarity index 100%
rename from src/glsl/lower_texture_projection.cpp
rename to src/compiler/glsl/lower_texture_projection.cpp
diff --git a/src/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp
similarity index 100%
rename from src/glsl/lower_ubo_reference.cpp
rename to 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
similarity index 100%
rename from src/glsl/lower_variable_index_to_cond_assign.cpp
rename to 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
similarity index 100%
rename from src/glsl/lower_vec_index_to_cond_assign.cpp
rename to 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
similarity index 100%
rename from src/glsl/lower_vec_index_to_swizzle.cpp
rename to src/compiler/glsl/lower_vec_index_to_swizzle.cpp
diff --git a/src/glsl/lower_vector.cpp b/src/compiler/glsl/lower_vector.cpp
similarity index 100%
rename from src/glsl/lower_vector.cpp
rename to src/compiler/glsl/lower_vector.cpp
diff --git a/src/glsl/lower_vector_derefs.cpp b/src/compiler/glsl/lower_vector_derefs.cpp
similarity index 100%
rename from src/glsl/lower_vector_derefs.cpp
rename to src/compiler/glsl/lower_vector_derefs.cpp
diff --git a/src/glsl/lower_vector_insert.cpp b/src/compiler/glsl/lower_vector_insert.cpp
similarity index 100%
rename from src/glsl/lower_vector_insert.cpp
rename to src/compiler/glsl/lower_vector_insert.cpp
diff --git a/src/glsl/lower_vertex_id.cpp b/src/compiler/glsl/lower_vertex_id.cpp
similarity index 100%
rename from src/glsl/lower_vertex_id.cpp
rename to src/compiler/glsl/lower_vertex_id.cpp
diff --git a/src/glsl/main.cpp b/src/compiler/glsl/main.cpp
similarity index 100%
rename from src/glsl/main.cpp
rename to src/compiler/glsl/main.cpp
diff --git a/src/glsl/opt_algebraic.cpp b/src/compiler/glsl/opt_algebraic.cpp
similarity index 100%
rename from src/glsl/opt_algebraic.cpp
rename to src/compiler/glsl/opt_algebraic.cpp
diff --git a/src/glsl/opt_array_splitting.cpp b/src/compiler/glsl/opt_array_splitting.cpp
similarity index 100%
rename from src/glsl/opt_array_splitting.cpp
rename to src/compiler/glsl/opt_array_splitting.cpp
diff --git a/src/glsl/opt_conditional_discard.cpp b/src/compiler/glsl/opt_conditional_discard.cpp
similarity index 100%
rename from src/glsl/opt_conditional_discard.cpp
rename to src/compiler/glsl/opt_conditional_discard.cpp
diff --git a/src/glsl/opt_constant_folding.cpp b/src/compiler/glsl/opt_constant_folding.cpp
similarity index 100%
rename from src/glsl/opt_constant_folding.cpp
rename to src/compiler/glsl/opt_constant_folding.cpp
diff --git a/src/glsl/opt_constant_propagation.cpp b/src/compiler/glsl/opt_constant_propagation.cpp
similarity index 100%
rename from src/glsl/opt_constant_propagation.cpp
rename to src/compiler/glsl/opt_constant_propagation.cpp
diff --git a/src/glsl/opt_constant_variable.cpp b/src/compiler/glsl/opt_constant_variable.cpp
similarity index 100%
rename from src/glsl/opt_constant_variable.cpp
rename to src/compiler/glsl/opt_constant_variable.cpp
diff --git a/src/glsl/opt_copy_propagation.cpp b/src/compiler/glsl/opt_copy_propagation.cpp
similarity index 100%
rename from src/glsl/opt_copy_propagation.cpp
rename to 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
similarity index 100%
rename from src/glsl/opt_copy_propagation_elements.cpp
rename to 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
similarity index 100%
rename from src/glsl/opt_dead_builtin_variables.cpp
rename to 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
similarity index 100%
rename from src/glsl/opt_dead_builtin_varyings.cpp
rename to 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
similarity index 100%
rename from src/glsl/opt_dead_code.cpp
rename to 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
similarity index 100%
rename from src/glsl/opt_dead_code_local.cpp
rename to 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
similarity index 100%
rename from src/glsl/opt_dead_functions.cpp
rename to 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
similarity index 100%
rename from src/glsl/opt_flatten_nested_if_blocks.cpp
rename to 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
similarity index 100%
rename from src/glsl/opt_flip_matrices.cpp
rename to src/compiler/glsl/opt_flip_matrices.cpp
diff --git a/src/glsl/opt_function_inlining.cpp b/src/compiler/glsl/opt_function_inlining.cpp
similarity index 100%
rename from src/glsl/opt_function_inlining.cpp
rename to src/compiler/glsl/opt_function_inlining.cpp
diff --git a/src/glsl/opt_if_simplification.cpp b/src/compiler/glsl/opt_if_simplification.cpp
similarity index 100%
rename from src/glsl/opt_if_simplification.cpp
rename to src/compiler/glsl/opt_if_simplification.cpp
diff --git a/src/glsl/opt_minmax.cpp b/src/compiler/glsl/opt_minmax.cpp
similarity index 100%
rename from src/glsl/opt_minmax.cpp
rename to src/compiler/glsl/opt_minmax.cpp
diff --git a/src/glsl/opt_noop_swizzle.cpp b/src/compiler/glsl/opt_noop_swizzle.cpp
similarity index 100%
rename from src/glsl/opt_noop_swizzle.cpp
rename to src/compiler/glsl/opt_noop_swizzle.cpp
diff --git a/src/glsl/opt_rebalance_tree.cpp b/src/compiler/glsl/opt_rebalance_tree.cpp
similarity index 100%
rename from src/glsl/opt_rebalance_tree.cpp
rename to src/compiler/glsl/opt_rebalance_tree.cpp
diff --git a/src/glsl/opt_redundant_jumps.cpp b/src/compiler/glsl/opt_redundant_jumps.cpp
similarity index 100%
rename from src/glsl/opt_redundant_jumps.cpp
rename to src/compiler/glsl/opt_redundant_jumps.cpp
diff --git a/src/glsl/opt_structure_splitting.cpp b/src/compiler/glsl/opt_structure_splitting.cpp
similarity index 100%
rename from src/glsl/opt_structure_splitting.cpp
rename to src/compiler/glsl/opt_structure_splitting.cpp
diff --git a/src/glsl/opt_swizzle_swizzle.cpp b/src/compiler/glsl/opt_swizzle_swizzle.cpp
similarity index 100%
rename from src/glsl/opt_swizzle_swizzle.cpp
rename to src/compiler/glsl/opt_swizzle_swizzle.cpp
diff --git a/src/glsl/opt_tree_grafting.cpp b/src/compiler/glsl/opt_tree_grafting.cpp
similarity index 100%
rename from src/glsl/opt_tree_grafting.cpp
rename to src/compiler/glsl/opt_tree_grafting.cpp
diff --git a/src/glsl/opt_vectorize.cpp b/src/compiler/glsl/opt_vectorize.cpp
similarity index 100%
rename from src/glsl/opt_vectorize.cpp
rename to src/compiler/glsl/opt_vectorize.cpp
diff --git a/src/glsl/program.h b/src/compiler/glsl/program.h
similarity index 100%
rename from src/glsl/program.h
rename to src/compiler/glsl/program.h
diff --git a/src/glsl/s_expression.cpp b/src/compiler/glsl/s_expression.cpp
similarity index 100%
rename from src/glsl/s_expression.cpp
rename to src/compiler/glsl/s_expression.cpp
diff --git a/src/glsl/s_expression.h b/src/compiler/glsl/s_expression.h
similarity index 100%
rename from src/glsl/s_expression.h
rename to src/compiler/glsl/s_expression.h
diff --git a/src/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp
similarity index 100%
rename from src/glsl/standalone_scaffolding.cpp
rename to src/compiler/glsl/standalone_scaffolding.cpp
diff --git a/src/glsl/standalone_scaffolding.h b/src/compiler/glsl/standalone_scaffolding.h
similarity index 100%
rename from src/glsl/standalone_scaffolding.h
rename to src/compiler/glsl/standalone_scaffolding.h
diff --git a/src/glsl/test.cpp b/src/compiler/glsl/test.cpp
similarity index 100%
rename from src/glsl/test.cpp
rename to src/compiler/glsl/test.cpp
diff --git a/src/glsl/test_optpass.cpp b/src/compiler/glsl/test_optpass.cpp
similarity index 100%
rename from src/glsl/test_optpass.cpp
rename to src/compiler/glsl/test_optpass.cpp
diff --git a/src/glsl/test_optpass.h b/src/compiler/glsl/test_optpass.h
similarity index 100%
rename from src/glsl/test_optpass.h
rename to src/compiler/glsl/test_optpass.h
diff --git a/src/glsl/tests/.gitignore b/src/compiler/glsl/tests/.gitignore
similarity index 100%
rename from src/glsl/tests/.gitignore
rename to src/compiler/glsl/tests/.gitignore
diff --git a/src/glsl/tests/blob_test.c b/src/compiler/glsl/tests/blob_test.c
similarity index 100%
rename from src/glsl/tests/blob_test.c
rename to 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
similarity index 100%
rename from src/glsl/tests/builtin_variable_test.cpp
rename to src/compiler/glsl/tests/builtin_variable_test.cpp
diff --git a/src/glsl/tests/compare_ir b/src/compiler/glsl/tests/compare_ir
similarity index 100%
rename from src/glsl/tests/compare_ir
rename to 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
similarity index 100%
rename from src/glsl/tests/copy_constant_to_storage_tests.cpp
rename to 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
similarity index 100%
rename from src/glsl/tests/general_ir_test.cpp
rename to 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
similarity index 100%
rename from src/glsl/tests/invalidate_locations_test.cpp
rename to 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
similarity index 100%
rename from src/glsl/tests/lower_jumps/.gitignore
rename to 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
similarity index 100%
rename from src/glsl/tests/lower_jumps/create_test_cases.py
rename to 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
similarity index 100%
rename from src/glsl/tests/optimization-test
rename to 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
similarity index 100%
rename from src/glsl/tests/sampler_types_test.cpp
rename to 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
similarity index 100%
rename from src/glsl/tests/set_uniform_initializer_tests.cpp
rename to src/compiler/glsl/tests/set_uniform_initializer_tests.cpp
diff --git a/src/glsl/tests/sexps.py b/src/compiler/glsl/tests/sexps.py
similarity index 100%
rename from src/glsl/tests/sexps.py
rename to 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
similarity index 100%
rename from src/glsl/tests/uniform_initializer_utils.cpp
rename to 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
similarity index 100%
rename from src/glsl/tests/uniform_initializer_utils.h
rename to 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
similarity index 100%
rename from src/glsl/tests/varyings_test.cpp
rename to src/compiler/glsl/tests/varyings_test.cpp
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index 6151c8f..a69007b 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/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp
index f5c5d50..0ddc87e 100644
--- a/src/compiler/nir/glsl_to_nir.cpp
+++ b/src/compiler/nir/glsl_to_nir.cpp
@@ -25,9 +25,9 @@
*
*/
-#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 "glsl_to_nir.h"
#include "main/imports.h"
#include "nir_control_flow.h"
diff --git a/src/compiler/nir/glsl_to_nir.h b/src/compiler/nir/glsl_to_nir.h
index c900d11..bad0939 100644
--- a/src/compiler/nir/glsl_to_nir.h
+++ b/src/compiler/nir/glsl_to_nir.h
@@ -25,7 +25,7 @@
*
*/
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
#include "nir.h"
#ifdef __cplusplus
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 2122144..a829f4b 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 581498e..6d193c1 100644
--- a/src/compiler/nir/nir_lower_atomics.c
+++ b/src/compiler/nir/nir_lower_atomics.c
@@ -26,7 +26,7 @@
*/
#include <assert.h>
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
#include "main/config.h"
#include "nir.h"
diff --git a/src/compiler/nir/nir_lower_samplers.c b/src/compiler/nir/nir_lower_samplers.c
index 43ed635..3b0b2d2 100644
--- a/src/compiler/nir/nir_lower_samplers.c
+++ b/src/compiler/nir/nir_lower_samplers.c
@@ -23,7 +23,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
#include "main/compiler.h"
#include "main/mtypes.h"
#include "program/prog_parameter.h"
diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp
index 4f89d20..7ceb7e3 100644
--- a/src/compiler/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -25,7 +25,7 @@
*
*/
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
#include "nir_types.h"
void
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 4dd16b1..a946e59 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -28,7 +28,7 @@
#include "compiler/nir/nir_builder.h"
#include "util/ralloc.h"
-#include "glsl/list.h"
+#include "compiler/glsl/list.h"
#include "nir/tgsi_to_nir.h"
#include "tgsi/tgsi_parse.h"
diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk
index 7ff4f86..bb31519 100644
--- a/src/gallium/drivers/r300/Android.mk
+++ b/src/gallium/drivers/r300/Android.mk
@@ -32,7 +32,6 @@ LOCAL_SRC_FILES := $(C_SOURCES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
- $(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/mesa
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 081f332..fba7a1f 100644
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -5,7 +5,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/mesa/program \
-I$(top_srcdir)/src/mesa \
- -I$(top_srcdir)/src/glsl \
-I$(top_srcdir)/src/mapi \
$(GALLIUM_DRIVER_CFLAGS) \
$(LLVM_CFLAGS) \
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index fef76c8..0a8cda7 100644
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -59,7 +59,6 @@ endif
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa/main \
- $(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/gallium/include \
$(MESA_TOP)/src/gallium/auxiliary
diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk
index ed620ac..b800372 100644
--- a/src/mesa/Android.libmesa_glsl_utils.mk
+++ b/src/mesa/Android.libmesa_glsl_utils.mk
@@ -36,7 +36,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_glsl_utils
LOCAL_C_INCLUDES := \
- $(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/gallium/include \
$(MESA_TOP)/src/gallium/auxiliary
@@ -61,7 +60,6 @@ LOCAL_IS_HOST_MODULE := true
LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L
LOCAL_C_INCLUDES := \
- $(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/gallium/include \
$(MESA_TOP)/src/gallium/auxiliary
diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk
index b4b7fd9..5a475894 100644
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -54,7 +54,6 @@ endif
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa/main \
- $(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/gallium/auxiliary \
$(MESA_TOP)/src/gallium/include
diff --git a/src/mesa/Android.mesa_gen_matypes.mk b/src/mesa/Android.mesa_gen_matypes.mk
index 6e301f9..4fcf73a 100644
--- a/src/mesa/Android.mesa_gen_matypes.mk
+++ b/src/mesa/Android.mesa_gen_matypes.mk
@@ -35,8 +35,7 @@ LOCAL_MODULE := mesa_gen_matypes
LOCAL_IS_HOST_MODULE := true
LOCAL_C_INCLUDES := \
- $(MESA_TOP)/src/mapi \
- $(MESA_TOP)/src/glsl
+ $(MESA_TOP)/src/mapi
LOCAL_SRC_FILES := \
x86/gen_matypes.c
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 69506f2..8dc44fd 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 2c79169..105b9db 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -621,9 +621,6 @@ MESA_GALLIUM_FILES = \
INCLUDE_DIRS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/src/glsl \
- -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/SConscript b/src/mesa/SConscript
index 5b80a21..8671afc 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -15,7 +15,6 @@ env.MSVC2013Compat()
env.Append(CPPPATH = [
'#/src',
'#/src/mapi',
- '#/src/glsl',
'#/src/mesa',
'#/src/gallium/include',
'#/src/gallium/auxiliary',
diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c
index 9ef9bd4..094dfd3 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"
void
brw_cs_fill_local_id_payload(const struct brw_cs_prog_data *prog_data,
diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
index 3d6aa74..2ff9ec1 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 c14ec3a..1abeb42 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -31,7 +31,7 @@
#include "brw_shader.h"
#include "brw_ir_fs.h"
#include "brw_fs_builder.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
struct bblock_t;
namespace {
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 9be1498..9d639ec 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
@@ -41,9 +41,9 @@
* we do retain the vector types in that case.
*/
-#include "glsl/ir.h"
-#include "glsl/ir_expression_flattening.h"
#include "compiler/glsl_types.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_expression_flattening.h"
class ir_channel_expressions_visitor : public ir_hierarchical_visitor {
public:
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index 9b50e4e..a9807f4 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 fb434d5..3640753 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 02e6a8f..1e68dc8 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
assign_gs_binding_table_offsets(const struct brw_device_info *devinfo,
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index 31d29ec..24b9d0b 100644
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -26,8 +26,8 @@
#include "brw_fs.h"
#include "brw_nir.h"
#include "brw_program.h"
-#include "glsl/ir_optimization.h"
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/ir_optimization.h"
+#include "compiler/glsl/glsl_parser_extras.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 d571ecd..9fb7bcf 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 eafbdf6..f5d7bae 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 21caca5..19d2cdf 100644
--- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
+++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
@@ -21,9 +21,9 @@
* IN THE SOFTWARE.
*/
+#include "compiler/glsl/ir_uniform.h"
#include "brw_shader.h"
#include "brw_nir.h"
-#include "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 e7f4f80..fd0b8f5 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_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index 5a6752b..edadcbd 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -25,7 +25,7 @@
#include "brw_cfg.h"
#include "brw_eu.h"
#include "brw_nir.h"
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
#include "util/debug.h"
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
index a006cbf..18fc343 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@ -33,7 +33,7 @@
#include "brw_ir_vec4.h"
#endif
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
#ifdef __cplusplus
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
index c6f0b0d..bc6b1c1 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
@@ -406,7 +406,7 @@ vec4_visitor::opt_copy_propagation(bool do_constant_prop)
* scratch.
*
* This should really be fixed by using a structure like in
- * src/glsl/opt_copy_propagation.cpp to track available copies.
+ * src/compiler/glsl/opt_copy_propagation.cpp to track available copies.
*/
if (!is_dominated_by_previous_instruction(inst)) {
memset(&entries, 0, sizeof(entries));
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
index acf9286..13a8737 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
#include "brw_vec4.h"
#include "brw_cfg.h"
#include "brw_eu.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c
index 6653a6d..d9182e1 100644
--- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
@@ -32,7 +32,7 @@
#include "program/prog_parameter.h"
#include "program/prog_statevars.h"
#include "intel_batchbuffer.h"
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
/**
* Creates a streamed BO containing the push constants for the VS or GS on
diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c
index 38b0258..3896088 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 9bb9fca..726b287 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 be542dd..a5e68a0 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 b2b1ee9..b0ce8c4 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 0439129..770884b 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 b7e25fe..cb638a0 100644
--- a/src/mesa/main/program_resource.c
+++ b/src/mesa/main/program_resource.c
@@ -30,7 +30,8 @@
#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 79a91b5..83c6578 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 ac40891..8caef57 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 083087d..250f16a 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 8457b27..a784267 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -43,8 +43,8 @@
#include "main/shaderobj.h"
#include "main/uniforms.h"
#include "main/enums.h"
-#include "ir_uniform.h"
#include "compiler/glsl_types.h"
+#include "compiler/glsl/ir_uniform.h"
#include "program/program.h"
/**
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
index baf49a7..88fe958 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/Android.mk b/src/mesa/program/Android.mk
index ccb0fa5..f8904d9 100644
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -74,7 +74,6 @@ $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa \
- $(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/gallium/auxiliary \
$(MESA_TOP)/src/gallium/include
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index d662d61..79b666e 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 6393277..19b125b 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 9137d18..f118552 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 f4b273b..d081918 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 40c7725..43f04b5 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"
--
2.6.2
More information about the mesa-dev
mailing list