From eb63640c1d38a200a7b1540405051d3ff79d0d8a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 18 Jan 2016 12:16:48 +0200 Subject: [PATCH] glsl: move to compiler/ Signed-off-by: Emil Velikov Acked-by: Matt Turner Acked-by: Jose Fonseca --- configure.ac | 1 - src/Makefile.am | 2 +- src/SConscript | 1 - src/compiler/Makefile.am | 201 +++++++++++++++++- src/compiler/Makefile.sources | 147 +++++++++++++ src/compiler/SConscript | 2 + src/{ => compiler}/glsl/.gitignore | 0 src/{ => compiler}/glsl/Android.gen.mk | 0 src/{ => compiler}/glsl/Android.mk | 0 src/{ => compiler}/glsl/Makefile.am | 0 src/{ => compiler}/glsl/Makefile.sources | 0 src/{ => compiler}/glsl/README | 0 src/{ => compiler}/glsl/SConscript | 0 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 .../glsl/glcpp/tests/.gitignore | 0 .../glcpp/tests/000-content-with-spaces.c | 0 .../tests/000-content-with-spaces.c.expected | 0 .../glsl/glcpp/tests/001-define.c | 0 .../glsl/glcpp/tests/001-define.c.expected | 0 .../glsl/glcpp/tests/002-define-chain.c | 0 .../glcpp/tests/002-define-chain.c.expected | 0 .../glcpp/tests/003-define-chain-reverse.c | 0 .../tests/003-define-chain-reverse.c.expected | 0 .../glsl/glcpp/tests/004-define-recursive.c | 0 .../tests/004-define-recursive.c.expected | 0 .../glcpp/tests/005-define-composite-chain.c | 0 .../005-define-composite-chain.c.expected | 0 .../006-define-composite-chain-reverse.c | 0 ...-define-composite-chain-reverse.c.expected | 0 .../tests/007-define-composite-recursive.c | 0 .../007-define-composite-recursive.c.expected | 0 .../glsl/glcpp/tests/008-define-empty.c | 0 .../glcpp/tests/008-define-empty.c.expected | 0 .../glsl/glcpp/tests/009-undef.c | 0 .../glsl/glcpp/tests/009-undef.c.expected | 0 .../glsl/glcpp/tests/010-undef-re-define.c | 0 .../tests/010-undef-re-define.c.expected | 0 .../glsl/glcpp/tests/011-define-func-empty.c | 0 .../tests/011-define-func-empty.c.expected | 0 .../glcpp/tests/012-define-func-no-args.c | 0 .../tests/012-define-func-no-args.c.expected | 0 .../tests/013-define-func-1-arg-unused.c | 0 .../013-define-func-1-arg-unused.c.expected | 0 .../tests/014-define-func-2-arg-unused.c | 0 .../014-define-func-2-arg-unused.c.expected | 0 .../tests/015-define-object-with-parens.c | 0 .../015-define-object-with-parens.c.expected | 0 .../glsl/glcpp/tests/016-define-func-1-arg.c | 0 .../tests/016-define-func-1-arg.c.expected | 0 .../glsl/glcpp/tests/017-define-func-2-args.c | 0 .../tests/017-define-func-2-args.c.expected | 0 .../018-define-func-macro-as-parameter.c | 0 ...-define-func-macro-as-parameter.c.expected | 0 .../glcpp/tests/019-define-func-1-arg-multi.c | 0 .../019-define-func-1-arg-multi.c.expected | 0 .../glcpp/tests/020-define-func-2-arg-multi.c | 0 .../020-define-func-2-arg-multi.c.expected | 0 .../glcpp/tests/021-define-func-compose.c | 0 .../tests/021-define-func-compose.c.expected | 0 .../tests/022-define-func-arg-with-parens.c | 0 ...022-define-func-arg-with-parens.c.expected | 0 .../glcpp/tests/023-define-extra-whitespace.c | 0 .../023-define-extra-whitespace.c.expected | 0 .../024-define-chain-to-self-recursion.c | 0 ...-define-chain-to-self-recursion.c.expected | 0 .../glcpp/tests/025-func-macro-as-non-macro.c | 0 .../025-func-macro-as-non-macro.c.expected | 0 .../tests/026-define-func-extra-newlines.c | 0 .../026-define-func-extra-newlines.c.expected | 0 .../tests/027-define-chain-obj-to-func.c | 0 .../027-define-chain-obj-to-func.c.expected | 0 .../tests/028-define-chain-obj-to-non-func.c | 0 ...28-define-chain-obj-to-non-func.c.expected | 0 .../029-define-chain-obj-to-func-with-args.c | 0 ...ine-chain-obj-to-func-with-args.c.expected | 0 .../030-define-chain-obj-to-func-compose.c | 0 ...efine-chain-obj-to-func-compose.c.expected | 0 .../031-define-chain-func-to-func-compose.c | 0 ...fine-chain-func-to-func-compose.c.expected | 0 .../tests/032-define-func-self-recurse.c | 0 .../032-define-func-self-recurse.c.expected | 0 .../tests/033-define-func-self-compose.c | 0 .../033-define-func-self-compose.c.expected | 0 .../034-define-func-self-compose-non-func.c | 0 ...fine-func-self-compose-non-func.c.expected | 0 ...lf-compose-non-func-multi-token-argument.c | 0 ...e-non-func-multi-token-argument.c.expected | 0 ...fine-func-non-macro-multi-token-argument.c | 0 ...-non-macro-multi-token-argument.c.expected | 0 .../tests/037-finalize-unexpanded-macro.c | 0 .../037-finalize-unexpanded-macro.c.expected | 0 .../glcpp/tests/038-func-arg-with-commas.c | 0 .../tests/038-func-arg-with-commas.c.expected | 0 .../tests/039-func-arg-obj-macro-with-comma.c | 0 ...9-func-arg-obj-macro-with-comma.c.expected | 0 .../glsl/glcpp/tests/040-token-pasting.c | 0 .../glcpp/tests/040-token-pasting.c.expected | 0 .../glsl/glcpp/tests/041-if-0.c | 0 .../glsl/glcpp/tests/041-if-0.c.expected | 0 .../glsl/glcpp/tests/042-if-1.c | 0 .../glsl/glcpp/tests/042-if-1.c.expected | 0 .../glsl/glcpp/tests/043-if-0-else.c | 0 .../glsl/glcpp/tests/043-if-0-else.c.expected | 0 .../glsl/glcpp/tests/044-if-1-else.c | 0 .../glsl/glcpp/tests/044-if-1-else.c.expected | 0 .../glsl/glcpp/tests/045-if-0-elif.c | 0 .../glsl/glcpp/tests/045-if-0-elif.c.expected | 0 .../glsl/glcpp/tests/046-if-1-elsif.c | 0 .../glcpp/tests/046-if-1-elsif.c.expected | 0 .../glsl/glcpp/tests/047-if-elif-else.c | 0 .../glcpp/tests/047-if-elif-else.c.expected | 0 .../glsl/glcpp/tests/048-if-nested.c | 0 .../glsl/glcpp/tests/048-if-nested.c.expected | 0 .../tests/049-if-expression-precedence.c | 0 .../049-if-expression-precedence.c.expected | 0 .../glsl/glcpp/tests/050-if-defined.c | 0 .../glcpp/tests/050-if-defined.c.expected | 0 .../glsl/glcpp/tests/051-if-relational.c | 0 .../glcpp/tests/051-if-relational.c.expected | 0 .../glsl/glcpp/tests/052-if-bitwise.c | 0 .../glcpp/tests/052-if-bitwise.c.expected | 0 .../glcpp/tests/053-if-divide-and-shift.c | 0 .../tests/053-if-divide-and-shift.c.expected | 0 .../glsl/glcpp/tests/054-if-with-macros.c | 0 .../glcpp/tests/054-if-with-macros.c.expected | 0 ...-define-chain-obj-to-func-parens-in-text.c | 0 ...hain-obj-to-func-parens-in-text.c.expected | 0 .../tests/056-macro-argument-with-comma.c | 0 .../056-macro-argument-with-comma.c.expected | 0 .../glsl/glcpp/tests/057-empty-arguments.c | 0 .../tests/057-empty-arguments.c.expected | 0 .../tests/058-token-pasting-empty-arguments.c | 0 ...8-token-pasting-empty-arguments.c.expected | 0 .../glcpp/tests/059-token-pasting-integer.c | 0 .../059-token-pasting-integer.c.expected | 0 ...-left-paren-in-macro-right-paren-in-text.c | 0 ...en-in-macro-right-paren-in-text.c.expected | 0 .../061-define-chain-obj-to-func-multi.c | 0 ...-define-chain-obj-to-func-multi.c.expected | 0 .../glsl/glcpp/tests/062-if-0-skips-garbage.c | 0 .../tests/062-if-0-skips-garbage.c.expected | 0 .../glsl/glcpp/tests/063-comments.c | 0 .../glsl/glcpp/tests/063-comments.c.expected | 0 .../glsl/glcpp/tests/064-version.c | 0 .../glsl/glcpp/tests/064-version.c.expected | 0 .../glsl/glcpp/tests/065-if-defined-parens.c | 0 .../tests/065-if-defined-parens.c.expected | 0 .../glcpp/tests/066-if-nospace-expression.c | 0 .../066-if-nospace-expression.c.expected | 0 .../glcpp/tests/067-nested-ifdef-ifndef.c | 0 .../tests/067-nested-ifdef-ifndef.c.expected | 0 .../glsl/glcpp/tests/068-accidental-pasting.c | 0 .../tests/068-accidental-pasting.c.expected | 0 .../glsl/glcpp/tests/069-repeated-argument.c | 0 .../tests/069-repeated-argument.c.expected | 0 .../tests/070-undefined-macro-in-expression.c | 0 ...0-undefined-macro-in-expression.c.expected | 0 .../glsl/glcpp/tests/071-punctuator.c | 0 .../glcpp/tests/071-punctuator.c.expected | 0 .../glcpp/tests/072-token-pasting-same-line.c | 0 .../072-token-pasting-same-line.c.expected | 0 .../glsl/glcpp/tests/073-if-in-ifdef.c | 0 .../glcpp/tests/073-if-in-ifdef.c.expected | 0 .../glsl/glcpp/tests/074-elif-undef.c | 0 .../glcpp/tests/074-elif-undef.c.expected | 0 .../glsl/glcpp/tests/075-elif-elif-undef.c | 0 .../tests/075-elif-elif-undef.c.expected | 0 .../glsl/glcpp/tests/076-elif-undef-nested.c | 0 .../tests/076-elif-undef-nested.c.expected | 0 .../glsl/glcpp/tests/077-else-without-if.c | 0 .../tests/077-else-without-if.c.expected | 0 .../glsl/glcpp/tests/078-elif-without-if.c | 0 .../tests/078-elif-without-if.c.expected | 0 .../glsl/glcpp/tests/079-endif-without-if.c | 0 .../tests/079-endif-without-if.c.expected | 0 .../glcpp/tests/080-if-without-expression.c | 0 .../080-if-without-expression.c.expected | 0 .../glcpp/tests/081-elif-without-expression.c | 0 .../081-elif-without-expression.c.expected | 0 .../glsl/glcpp/tests/082-invalid-paste.c | 0 .../glcpp/tests/082-invalid-paste.c.expected | 0 .../glsl/glcpp/tests/083-unterminated-if.c | 0 .../tests/083-unterminated-if.c.expected | 0 .../glcpp/tests/084-unbalanced-parentheses.c | 0 .../084-unbalanced-parentheses.c.expected | 0 .../tests/085-incorrect-argument-count.c | 0 .../085-incorrect-argument-count.c.expected | 0 .../glcpp/tests/086-reserved-macro-names.c | 0 .../tests/086-reserved-macro-names.c.expected | 0 .../glsl/glcpp/tests/087-if-comments.c | 0 .../glcpp/tests/087-if-comments.c.expected | 0 .../tests/088-redefine-macro-legitimate.c | 0 .../088-redefine-macro-legitimate.c.expected | 0 .../glcpp/tests/089-redefine-macro-error.c | 0 .../tests/089-redefine-macro-error.c.expected | 0 .../glsl/glcpp/tests/090-hash-error.c | 0 .../glcpp/tests/090-hash-error.c.expected | 0 .../glsl/glcpp/tests/091-hash-line.c | 0 .../glsl/glcpp/tests/091-hash-line.c.expected | 0 .../glcpp/tests/092-redefine-macro-error-2.c | 0 .../092-redefine-macro-error-2.c.expected | 0 .../glsl/glcpp/tests/093-divide-by-zero.c | 0 .../glcpp/tests/093-divide-by-zero.c.expected | 0 .../tests/094-divide-by-zero-short-circuit.c | 0 ...94-divide-by-zero-short-circuit.c.expected | 0 .../glsl/glcpp/tests/095-recursive-define.c | 0 .../tests/095-recursive-define.c.expected | 0 .../glsl/glcpp/tests/096-paste-twice.c | 0 .../glcpp/tests/096-paste-twice.c.expected | 0 .../tests/097-paste-with-non-function-macro.c | 0 ...7-paste-with-non-function-macro.c.expected | 0 .../glsl/glcpp/tests/098-elif-undefined.c | 0 .../glcpp/tests/098-elif-undefined.c.expected | 0 .../glsl/glcpp/tests/099-c99-example.c | 0 .../glcpp/tests/099-c99-example.c.expected | 0 .../glsl/glcpp/tests/100-macro-with-colon.c | 0 .../tests/100-macro-with-colon.c.expected | 0 .../glsl/glcpp/tests/101-macros-used-twice.c | 0 .../tests/101-macros-used-twice.c.expected | 0 .../glcpp/tests/102-garbage-after-endif.c | 0 .../tests/102-garbage-after-endif.c.expected | 0 .../glcpp/tests/103-garbage-after-else-0.c | 0 .../tests/103-garbage-after-else-0.c.expected | 0 .../tests/104-hash-line-followed-by-code.c | 0 .../104-hash-line-followed-by-code.c.expected | 0 .../glcpp/tests/105-multiline-hash-line.c | 0 .../tests/105-multiline-hash-line.c.expected | 0 .../glsl/glcpp/tests/106-multiline-hash-if.c | 0 .../tests/106-multiline-hash-if.c.expected | 0 .../glcpp/tests/107-multiline-hash-elif.c | 0 .../tests/107-multiline-hash-elif.c.expected | 0 .../tests/108-no-space-after-hash-version.c | 0 ...108-no-space-after-hash-version.c.expected | 0 .../tests/109-no-space-after-hash-line.c | 0 .../109-no-space-after-hash-line.c.expected | 0 .../110-no-space-digits-after-hash-elif.c | 0 ...no-space-digits-after-hash-elif.c.expected | 0 .../111-no-space-operator-after-hash-if.c | 0 ...no-space-operator-after-hash-if.c.expected | 0 .../112-no-space-operator-after-hash-elif.c | 0 ...-space-operator-after-hash-elif.c.expected | 0 .../glcpp/tests/113-line-and-file-macros.c | 0 .../tests/113-line-and-file-macros.c.expected | 0 .../glcpp/tests/114-paste-integer-tokens.c | 0 .../tests/114-paste-integer-tokens.c.expected | 0 .../glsl/glcpp/tests/115-line-continuations.c | 0 .../tests/115-line-continuations.c.expected | 0 .../tests/116-disable-line-continuations.c | 0 .../116-disable-line-continuations.c.expected | 0 ...tinuation-and-non-continuation-backslash.c | 0 ...-and-non-continuation-backslash.c.expected | 0 .../glcpp/tests/118-comment-becomes-space.c | 0 .../118-comment-becomes-space.c.expected | 0 .../glsl/glcpp/tests/119-elif-after-else.c | 0 .../tests/119-elif-after-else.c.expected | 0 .../glsl/glcpp/tests/120-undef-builtin.c | 0 .../glcpp/tests/120-undef-builtin.c.expected | 0 .../glsl/glcpp/tests/121-comment-bug-72686.c | 0 .../tests/121-comment-bug-72686.c.expected | 0 .../glcpp/tests/122-redefine-whitespace.c | 0 .../tests/122-redefine-whitespace.c.expected | 0 .../glcpp/tests/123-garbage-after-else-1.c | 0 .../tests/123-garbage-after-else-1.c.expected | 0 .../glcpp/tests/124-preprocessing-numbers.c | 0 .../124-preprocessing-numbers.c.expected | 0 .../tests/125-es-short-circuit-undefined.c | 0 .../125-es-short-circuit-undefined.c.expected | 0 .../glcpp/tests/126-garbage-after-directive.c | 0 .../126-garbage-after-directive.c.expected | 0 .../glsl/glcpp/tests/127-pragma-empty.c | 0 .../glcpp/tests/127-pragma-empty.c.expected | 0 .../glsl/glcpp/tests/128-space-before-hash.c | 0 .../tests/128-space-before-hash.c.expected | 0 .../glcpp/tests/129-define-non-identifier.c | 0 .../129-define-non-identifier.c.expected | 0 .../glsl/glcpp/tests/130-define-comment.c | 0 .../glcpp/tests/130-define-comment.c.expected | 0 .../glcpp/tests/131-eof-without-newline.c | 0 .../tests/131-eof-without-newline.c.expected | 0 .../tests/132-eof-without-newline-define.c | 0 .../132-eof-without-newline-define.c.expected | 0 .../tests/133-eof-without-newline-comment.c | 0 ...133-eof-without-newline-comment.c.expected | 0 .../glcpp/tests/134-hash-comment-directive.c | 0 .../134-hash-comment-directive.c.expected | 0 .../glcpp/tests/135-duplicate-parameter.c | 0 .../tests/135-duplicate-parameter.c.expected | 0 .../tests/136-plus-plus-and-minus-minus.c | 0 .../136-plus-plus-and-minus-minus.c.expected | 0 .../tests/137-expand-macro-after-period.c | 0 .../137-expand-macro-after-period.c.expected | 0 .../tests/138-multi-line-comment-in-if-0.c | 0 .../138-multi-line-comment-in-if-0.c.expected | 0 .../tests/139-define-without-macro-name.c | 0 .../139-define-without-macro-name.c.expected | 0 .../glsl/glcpp/tests/140-null-directive.c | 0 .../glcpp/tests/140-null-directive.c.expected | 0 .../glcpp/tests/141-pragma-and-__LINE__.c | 0 .../tests/141-pragma-and-__LINE__.c.expected | 0 .../glcpp/tests/142-defined-within-macro.c | 0 .../tests/142-defined-within-macro.c.expected | 0 .../glsl/glcpp/tests/143-multiple-else.c | 0 .../glcpp/tests/143-multiple-else.c.expected | 0 .../glsl/glcpp/tests/glcpp-test | 6 +- .../glsl/glcpp/tests/glcpp-test-cr-lf | 10 +- src/{ => compiler}/glsl/glsl_lexer.ll | 0 src/{ => compiler}/glsl/glsl_parser.yy | 0 .../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 .../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 .../glsl/ir_constant_expression.cpp | 0 src/{ => compiler}/glsl/ir_equals.cpp | 0 .../glsl/ir_expression_flattening.cpp | 0 .../glsl/ir_expression_flattening.h | 0 src/{ => compiler}/glsl/ir_function.cpp | 0 .../glsl/ir_function_can_inline.cpp | 0 .../glsl/ir_function_detect_recursion.cpp | 0 .../glsl/ir_function_inlining.h | 0 .../glsl/ir_hierarchical_visitor.cpp | 0 .../glsl/ir_hierarchical_visitor.h | 0 src/{ => compiler}/glsl/ir_hv_accept.cpp | 0 .../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 .../glsl/ir_set_program_inouts.cpp | 0 src/{ => compiler}/glsl/ir_uniform.h | 0 src/{ => compiler}/glsl/ir_validate.cpp | 0 .../glsl/ir_variable_refcount.cpp | 0 .../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 .../glsl/link_interface_blocks.cpp | 0 .../link_uniform_block_active_visitor.cpp | 0 .../glsl/link_uniform_block_active_visitor.h | 0 .../glsl/link_uniform_blocks.cpp | 0 .../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 .../glsl/lower_buffer_access.cpp | 0 src/{ => compiler}/glsl/lower_buffer_access.h | 0 .../glsl/lower_clip_distance.cpp | 0 .../glsl/lower_const_arrays_to_uniforms.cpp | 0 src/{ => compiler}/glsl/lower_discard.cpp | 0 .../glsl/lower_discard_flow.cpp | 0 .../glsl/lower_if_to_cond_assign.cpp | 0 .../glsl/lower_instructions.cpp | 0 src/{ => compiler}/glsl/lower_jumps.cpp | 0 .../glsl/lower_mat_op_to_vec.cpp | 0 .../glsl/lower_named_interface_blocks.cpp | 0 src/{ => compiler}/glsl/lower_noise.cpp | 0 .../glsl/lower_offset_array.cpp | 0 .../glsl/lower_output_reads.cpp | 0 .../glsl/lower_packed_varyings.cpp | 0 .../glsl/lower_packing_builtins.cpp | 0 .../glsl/lower_shared_reference.cpp | 0 src/{ => compiler}/glsl/lower_subroutine.cpp | 0 src/{ => compiler}/glsl/lower_tess_level.cpp | 0 .../glsl/lower_texture_projection.cpp | 0 .../glsl/lower_ubo_reference.cpp | 0 .../lower_variable_index_to_cond_assign.cpp | 0 .../glsl/lower_vec_index_to_cond_assign.cpp | 0 .../glsl/lower_vec_index_to_swizzle.cpp | 0 src/{ => compiler}/glsl/lower_vector.cpp | 0 .../glsl/lower_vector_derefs.cpp | 0 .../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 .../glsl/opt_array_splitting.cpp | 0 .../glsl/opt_conditional_discard.cpp | 0 .../glsl/opt_constant_folding.cpp | 0 .../glsl/opt_constant_propagation.cpp | 0 .../glsl/opt_constant_variable.cpp | 0 .../glsl/opt_copy_propagation.cpp | 0 .../glsl/opt_copy_propagation_elements.cpp | 0 .../glsl/opt_dead_builtin_variables.cpp | 0 .../glsl/opt_dead_builtin_varyings.cpp | 0 src/{ => compiler}/glsl/opt_dead_code.cpp | 0 .../glsl/opt_dead_code_local.cpp | 0 .../glsl/opt_dead_functions.cpp | 0 .../glsl/opt_flatten_nested_if_blocks.cpp | 0 src/{ => compiler}/glsl/opt_flip_matrices.cpp | 0 .../glsl/opt_function_inlining.cpp | 0 .../glsl/opt_if_simplification.cpp | 0 src/{ => compiler}/glsl/opt_minmax.cpp | 0 src/{ => compiler}/glsl/opt_noop_swizzle.cpp | 0 .../glsl/opt_rebalance_tree.cpp | 0 .../glsl/opt_redundant_jumps.cpp | 0 .../glsl/opt_structure_splitting.cpp | 0 .../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 .../glsl/standalone_scaffolding.cpp | 0 .../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 .../tests/copy_constant_to_storage_tests.cpp | 0 .../glsl/tests/general_ir_test.cpp | 0 .../glsl/tests/invalidate_locations_test.cpp | 0 .../glsl/tests/lower_jumps/.gitignore | 0 .../tests/lower_jumps/create_test_cases.py | 0 .../glsl/tests/optimization-test | 0 .../glsl/tests/sampler_types_test.cpp | 0 .../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 .../glsl/tests/varyings_test.cpp | 0 src/compiler/glsl_types.cpp | 2 +- src/compiler/nir/Makefile.sources | 71 +++++++ 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/mesa/Makefile.am | 4 +- src/mesa/Makefile.sources | 3 - src/mesa/drivers/dri/i965/brw_cs.c | 2 +- .../dri/i965/brw_cubemap_normalize.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs.h | 2 +- .../dri/i965/brw_fs_channel_expressions.cpp | 4 +- src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 2 +- .../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 | 2 +- .../dri/i965/brw_lower_texture_gradients.cpp | 4 +- .../i965/brw_lower_unnormalized_offset.cpp | 4 +- .../drivers/dri/i965/brw_nir_uniforms.cpp | 2 +- src/mesa/drivers/dri/i965/brw_program.c | 2 +- src/mesa/drivers/dri/i965/brw_vec4.h | 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 | 2 +- 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/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 +- 497 files changed, 498 insertions(+), 84 deletions(-) rename src/{ => compiler}/glsl/.gitignore (100%) rename src/{ => compiler}/glsl/Android.gen.mk (100%) rename src/{ => compiler}/glsl/Android.mk (100%) rename src/{ => compiler}/glsl/Makefile.am (100%) rename src/{ => compiler}/glsl/Makefile.sources (100%) rename src/{ => compiler}/glsl/README (100%) rename src/{ => compiler}/glsl/SConscript (100%) 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 (95%) rename src/{ => compiler}/glsl/glcpp/tests/glcpp-test-cr-lf (90%) 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_buffer_access.cpp (100%) rename src/{ => compiler}/glsl/lower_buffer_access.h (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_shared_reference.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%) create mode 100644 src/compiler/nir/Makefile.sources diff --git a/configure.ac b/configure.ac index dc1e995b8d5..4172eaeefd9 100644 --- a/configure.ac +++ b/configure.ac @@ -2506,7 +2506,6 @@ AC_CONFIG_FILES([Makefile src/gallium/winsys/virgl/vtest/Makefile src/gbm/Makefile src/gbm/main/gbm.pc - src/glsl/Makefile src/glx/Makefile src/glx/apple/Makefile src/glx/tests/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a0ec40146b0..9b23cf58f4f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi SUBDIRS += compiler if NEED_OPENGL_COMMON -SUBDIRS += glsl mesa +SUBDIRS += mesa endif SUBDIRS += loader diff --git a/src/SConscript b/src/SConscript index 8acf9b04ab6..4ba0a32d669 100644 --- a/src/SConscript +++ b/src/SConscript @@ -6,7 +6,6 @@ if env['platform'] == 'windows': SConscript('util/SConscript') SConscript('compiler/SConscript') -SConscript('glsl/SConscript') if env['hostonly']: # We are just compiling the things necessary on the host for cross diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am index 1e3778df8d5..0bc8e48efa6 100644 --- a/src/compiler/Makefile.am +++ b/src/compiler/Makefile.am @@ -1,4 +1,5 @@ # +# Copyright © 2012 Jon TURNEY # Copyright (C) 2015 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a @@ -27,6 +28,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ + -I$(top_builddir)/src/compiler/glsl\ + -I$(top_srcdir)/src/compiler/glsl\ + -I$(top_srcdir)/src/compiler/glsl/glcpp\ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gtest/include \ @@ -51,6 +55,201 @@ CLEANFILES = EXTRA_DIST = SConscript +EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README \ + glsl/TODO glsl/glcpp/README \ + glsl/glsl_lexer.ll \ + glsl/glsl_parser.yy \ + glsl/glcpp/glcpp-lex.l \ + glsl/glcpp/glcpp-parse.y \ + glsl/Makefile.sources \ + glsl/SConscript + +TESTS += glsl/glcpp/tests/glcpp-test \ + glsl/glcpp/tests/glcpp-test-cr-lf \ + glsl/tests/blob-test \ + glsl/tests/general-ir-test \ + glsl/tests/optimization-test \ + glsl/tests/sampler-types-test \ + glsl/tests/uniform-initializer-test + +TESTS_ENVIRONMENT= \ + export PYTHON2=$(PYTHON2); \ + export PYTHON_FLAGS=$(PYTHON_FLAGS); + +check_PROGRAMS += \ + glsl/glcpp/glcpp \ + glsl/glsl_test \ + glsl/tests/blob-test \ + glsl/tests/general-ir-test \ + glsl/tests/sampler-types-test \ + glsl/tests/uniform-initializer-test + +noinst_PROGRAMS = glsl_compiler + +glsl_tests_blob_test_SOURCES = \ + glsl/tests/blob_test.c +glsl_tests_blob_test_LDADD = \ + glsl/libglsl.la + +glsl_tests_general_ir_test_SOURCES = \ + glsl/standalone_scaffolding.cpp \ + glsl/tests/builtin_variable_test.cpp \ + glsl/tests/invalidate_locations_test.cpp \ + glsl/tests/general_ir_test.cpp \ + glsl/tests/varyings_test.cpp +glsl_tests_general_ir_test_CFLAGS = \ + $(PTHREAD_CFLAGS) +glsl_tests_general_ir_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(PTHREAD_LIBS) + +glsl_tests_uniform_initializer_test_SOURCES = \ + glsl/tests/copy_constant_to_storage_tests.cpp \ + glsl/tests/set_uniform_initializer_tests.cpp \ + glsl/tests/uniform_initializer_utils.cpp \ + glsl/tests/uniform_initializer_utils.h +glsl_tests_uniform_initializer_test_CFLAGS = \ + $(PTHREAD_CFLAGS) +glsl_tests_uniform_initializer_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(PTHREAD_LIBS) + +glsl_tests_sampler_types_test_SOURCES = \ + glsl/tests/sampler_types_test.cpp +glsl_tests_sampler_types_test_CFLAGS = \ + $(PTHREAD_CFLAGS) +glsl_tests_sampler_types_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(PTHREAD_LIBS) + +noinst_LTLIBRARIES += glsl/libglsl.la glsl/libglcpp.la + +glsl_libglcpp_la_LIBADD = \ + $(top_builddir)/src/util/libmesautil.la +glsl_libglcpp_la_SOURCES = \ + glsl/glcpp/glcpp-lex.c \ + glsl/glcpp/glcpp-parse.c \ + glsl/glcpp/glcpp-parse.h \ + $(LIBGLCPP_FILES) + +glsl_glcpp_glcpp_SOURCES = \ + glsl/glcpp/glcpp.c +glsl_glcpp_glcpp_LDADD = \ + glsl/libglcpp.la \ + $(top_builddir)/src/libglsl_util.la \ + -lm + +glsl_libglsl_la_LIBADD = \ + nir/libnir.la \ + glsl/libglcpp.la + +glsl_libglsl_la_SOURCES = \ + glsl/glsl_lexer.cpp \ + glsl/glsl_parser.cpp \ + glsl/glsl_parser.h \ + $(LIBGLSL_FILES) + + +glsl_compiler_SOURCES = \ + $(GLSL_COMPILER_CXX_FILES) + +glsl_compiler_LDADD = \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(PTHREAD_LIBS) + +glsl_glsl_test_SOURCES = \ + glsl/standalone_scaffolding.cpp \ + glsl/test.cpp \ + glsl/test_optpass.cpp \ + glsl/test_optpass.h + +glsl_glsl_test_LDADD = \ + glsl/libglsl.la \ + $(top_builddir)/src/libglsl_util.la \ + $(PTHREAD_LIBS) + +# We write our own rules for yacc and lex below. We'd rather use automake, +# but automake makes it especially difficult for a number of reasons: +# +# * < automake-1.12 generates .h files from .yy and .ypp files, but +# >=automake-1.12 generates .hh and .hpp files respectively. There's no +# good way of making a project that uses C++ yacc files compatible with +# both versions of automake. Strong work automake developers. +# +# * Since we're generating code from .l/.y files in a subdirectory (glcpp/) +# we'd like the resulting generated code to also go in glcpp/ for purposes +# of distribution. Automake gives no way to do this. +# +# * Since we're building multiple yacc parsers into one library (and via one +# Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes +# automake to name the resulting generated code as _filename.c. +# Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file. + +# In order to make build output print "LEX" and "YACC", we reproduce the +# automake variables below. + +AM_V_LEX = $(am__v_LEX_$(V)) +am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY)) +am__v_LEX_0 = @echo " LEX " $@; +am__v_LEX_1 = + +AM_V_YACC = $(am__v_YACC_$(V)) +am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY)) +am__v_YACC_0 = @echo " YACC " $@; +am__v_YACC_1 = + +MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) +YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS) +LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS) + +glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy + $(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl/glsl_parser.h $(srcdir)/glsl/glsl_parser.yy + +glsl/glsl_lexer.cpp: glsl/glsl_lexer.ll + $(LEX_GEN) -o $@ $(srcdir)/glsl/glsl_lexer.ll + +glsl/glcpp/glcpp-parse.c glsl/glcpp/glcpp-parse.h: glsl/glcpp/glcpp-parse.y + $(MKDIR_GEN) + $(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glsl/glcpp/glcpp-parse.h $(srcdir)/glsl/glcpp/glcpp-parse.y + +glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l + $(MKDIR_GEN) + $(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l + +# Only the parsers (specifically the header files generated at the same time) +# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is +# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files +# YACC is only executed once for each parser. The rest of the generated code +# will be created at the appropriate times according to standard automake +# dependency rules. +BUILT_SOURCES += \ + glsl/glsl_parser.cpp \ + glsl/glsl_lexer.cpp \ + glsl/glcpp/glcpp-parse.c \ + glsl/glcpp/glcpp-lex.c +CLEANFILES += \ + glsl/glcpp/glcpp-parse.h \ + glsl/glsl_parser.h \ + glsl/glsl_parser.cpp \ + glsl/glsl_lexer.cpp \ + glsl/glcpp/glcpp-parse.c \ + glsl/glcpp/glcpp-lex.c + +clean-local: + $(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr + +dist-hook: + $(RM) glsl/glcpp/tests/*.out + $(RM) glsl/glcpp/tests/subtest*/*.out + noinst_LTLIBRARIES += nir/libnir.la nir_libnir_la_CPPFLAGS = \ @@ -101,7 +300,7 @@ nir_tests_control_flow_tests_CFLAGS = \ $(PTHREAD_CFLAGS) nir_tests_control_flow_tests_LDADD = \ $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ + nir/libnir.la \ $(top_builddir)/src/util/libmesautil.la \ $(PTHREAD_LIBS) diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index fe12e419afb..c9780d6d6f7 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -7,6 +7,153 @@ LIBCOMPILER_FILES = \ shader_enums.c \ shader_enums.h +# libglsl + +LIBGLSL_FILES = \ + glsl/ast.h \ + glsl/ast_array_index.cpp \ + glsl/ast_expr.cpp \ + glsl/ast_function.cpp \ + glsl/ast_to_hir.cpp \ + glsl/ast_type.cpp \ + glsl/blob.c \ + glsl/blob.h \ + glsl/builtin_functions.cpp \ + glsl/builtin_types.cpp \ + glsl/builtin_variables.cpp \ + glsl/glsl_parser_extras.cpp \ + glsl/glsl_parser_extras.h \ + glsl/glsl_symbol_table.cpp \ + glsl/glsl_symbol_table.h \ + glsl/hir_field_selection.cpp \ + glsl/ir_basic_block.cpp \ + glsl/ir_basic_block.h \ + glsl/ir_builder.cpp \ + glsl/ir_builder.h \ + glsl/ir_clone.cpp \ + glsl/ir_constant_expression.cpp \ + glsl/ir.cpp \ + glsl/ir.h \ + glsl/ir_equals.cpp \ + glsl/ir_expression_flattening.cpp \ + glsl/ir_expression_flattening.h \ + glsl/ir_function_can_inline.cpp \ + glsl/ir_function_detect_recursion.cpp \ + glsl/ir_function_inlining.h \ + glsl/ir_function.cpp \ + glsl/ir_hierarchical_visitor.cpp \ + glsl/ir_hierarchical_visitor.h \ + glsl/ir_hv_accept.cpp \ + glsl/ir_import_prototypes.cpp \ + glsl/ir_optimization.h \ + glsl/ir_print_visitor.cpp \ + glsl/ir_print_visitor.h \ + glsl/ir_reader.cpp \ + glsl/ir_reader.h \ + glsl/ir_rvalue_visitor.cpp \ + glsl/ir_rvalue_visitor.h \ + glsl/ir_set_program_inouts.cpp \ + glsl/ir_uniform.h \ + glsl/ir_validate.cpp \ + glsl/ir_variable_refcount.cpp \ + glsl/ir_variable_refcount.h \ + glsl/ir_visitor.h \ + glsl/linker.cpp \ + glsl/linker.h \ + glsl/link_atomics.cpp \ + glsl/link_functions.cpp \ + glsl/link_interface_blocks.cpp \ + glsl/link_uniforms.cpp \ + glsl/link_uniform_initializers.cpp \ + glsl/link_uniform_block_active_visitor.cpp \ + glsl/link_uniform_block_active_visitor.h \ + glsl/link_uniform_blocks.cpp \ + glsl/link_varyings.cpp \ + glsl/link_varyings.h \ + glsl/list.h \ + glsl/loop_analysis.cpp \ + glsl/loop_analysis.h \ + glsl/loop_controls.cpp \ + glsl/loop_unroll.cpp \ + glsl/lower_buffer_access.cpp \ + glsl/lower_buffer_access.h \ + glsl/lower_clip_distance.cpp \ + glsl/lower_const_arrays_to_uniforms.cpp \ + glsl/lower_discard.cpp \ + glsl/lower_discard_flow.cpp \ + glsl/lower_if_to_cond_assign.cpp \ + glsl/lower_instructions.cpp \ + glsl/lower_jumps.cpp \ + glsl/lower_mat_op_to_vec.cpp \ + glsl/lower_noise.cpp \ + glsl/lower_offset_array.cpp \ + glsl/lower_packed_varyings.cpp \ + glsl/lower_named_interface_blocks.cpp \ + glsl/lower_packing_builtins.cpp \ + glsl/lower_subroutine.cpp \ + glsl/lower_tess_level.cpp \ + glsl/lower_texture_projection.cpp \ + glsl/lower_variable_index_to_cond_assign.cpp \ + glsl/lower_vec_index_to_cond_assign.cpp \ + glsl/lower_vec_index_to_swizzle.cpp \ + glsl/lower_vector.cpp \ + glsl/lower_vector_derefs.cpp \ + glsl/lower_vector_insert.cpp \ + glsl/lower_vertex_id.cpp \ + glsl/lower_output_reads.cpp \ + glsl/lower_shared_reference.cpp \ + glsl/lower_ubo_reference.cpp \ + glsl/opt_algebraic.cpp \ + glsl/opt_array_splitting.cpp \ + glsl/opt_conditional_discard.cpp \ + glsl/opt_constant_folding.cpp \ + glsl/opt_constant_propagation.cpp \ + glsl/opt_constant_variable.cpp \ + glsl/opt_copy_propagation.cpp \ + glsl/opt_copy_propagation_elements.cpp \ + glsl/opt_dead_builtin_variables.cpp \ + glsl/opt_dead_builtin_varyings.cpp \ + glsl/opt_dead_code.cpp \ + glsl/opt_dead_code_local.cpp \ + glsl/opt_dead_functions.cpp \ + glsl/opt_flatten_nested_if_blocks.cpp \ + glsl/opt_flip_matrices.cpp \ + glsl/opt_function_inlining.cpp \ + glsl/opt_if_simplification.cpp \ + glsl/opt_minmax.cpp \ + glsl/opt_noop_swizzle.cpp \ + glsl/opt_rebalance_tree.cpp \ + glsl/opt_redundant_jumps.cpp \ + glsl/opt_structure_splitting.cpp \ + glsl/opt_swizzle_swizzle.cpp \ + glsl/opt_tree_grafting.cpp \ + glsl/opt_vectorize.cpp \ + glsl/program.h \ + glsl/s_expression.cpp \ + glsl/s_expression.h + +# glsl_compiler + +GLSL_COMPILER_CXX_FILES = \ + glsl/standalone_scaffolding.cpp \ + glsl/standalone_scaffolding.h \ + glsl/main.cpp + +# libglsl generated sources +LIBGLSL_GENERATED_CXX_FILES = \ + glsl/glsl_lexer.cpp \ + glsl/glsl_parser.cpp + +# libglcpp + +LIBGLCPP_FILES = \ + glsl/glcpp/glcpp.h \ + glsl/glcpp/pp.c + +LIBGLCPP_GENERATED_FILES = \ + glsl/glcpp/glcpp-lex.c \ + glsl/glcpp/glcpp-parse.c + NIR_GENERATED_FILES = \ nir/nir_builder_opcodes.h \ nir/nir_constant_expressions.c \ diff --git a/src/compiler/SConscript b/src/compiler/SConscript index 412da0e62bd..8d71b82bee0 100644 --- a/src/compiler/SConscript +++ b/src/compiler/SConscript @@ -20,3 +20,5 @@ compiler = env.ConvenienceLibrary( source = sources ) Export('compiler') + +SConscript('glsl/SConscript') diff --git a/src/glsl/.gitignore b/src/compiler/glsl/.gitignore 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 100% rename from src/glsl/Android.gen.mk rename to src/compiler/glsl/Android.gen.mk 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 100% rename from src/glsl/Makefile.am rename to src/compiler/glsl/Makefile.am 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 100% rename from src/glsl/SConscript rename to src/compiler/glsl/SConscript 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 95% rename from src/glsl/glcpp/tests/glcpp-test rename to src/compiler/glsl/glcpp/tests/glcpp-test index 825c22e71fb..3945ee4f6ce 100755 --- a/src/glsl/glcpp/tests/glcpp-test +++ b/src/compiler/glsl/glcpp/tests/glcpp-test @@ -1,9 +1,9 @@ #!/bin/sh if [ ! -z "$srcdir" ]; then - testdir=$srcdir/glcpp/tests - outdir=`pwd`/glcpp/tests - glcpp=`pwd`/glcpp/glcpp + testdir=$srcdir/glsl/glcpp/tests + outdir=`pwd`/glsl/glcpp/tests + glcpp=`pwd`/glsl/glcpp/glcpp else testdir=. outdir=. diff --git a/src/glsl/glcpp/tests/glcpp-test-cr-lf b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf similarity index 90% rename from src/glsl/glcpp/tests/glcpp-test-cr-lf rename to src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf index c4ed0b86d74..c75370f48c3 100755 --- a/src/glsl/glcpp/tests/glcpp-test-cr-lf +++ b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf @@ -6,8 +6,8 @@ # glcpp-test script. if [ ! -z "$srcdir" ]; then - testdir="$srcdir/glcpp/tests" - glcpp_test="$srcdir/glcpp/tests/glcpp-test" + testdir="$srcdir/glsl/glcpp/tests" + glcpp_test="$srcdir/glsl/glcpp/tests/glcpp-test" else testdir=. glcpp_test=./glcpp-test @@ -99,7 +99,7 @@ mkdir subtest-cr for file in "$testdir"/*.c; do base=$(basename "$file") tr "\n" "\r" < "$file" > subtest-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected done run_test "${glcpp_test} --testdir=subtest-cr" @@ -112,7 +112,7 @@ mkdir subtest-cr-lf for file in "$testdir"/*.c; do base=$(basename "$file") sed -e 's/$/ /' < "$file" > subtest-cr-lf/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected done run_test "${glcpp_test} --testdir=subtest-cr-lf" @@ -125,7 +125,7 @@ mkdir subtest-lf-cr for file in "$testdir"/*.c; do base=$(basename "$file") sed -e 's/$/ /' < "$file" | tr "\n\r" "\r\n" > subtest-lf-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected done run_test "${glcpp_test} --testdir=subtest-lf-cr" diff --git a/src/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll 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_buffer_access.cpp b/src/compiler/glsl/lower_buffer_access.cpp similarity index 100% rename from src/glsl/lower_buffer_access.cpp rename to src/compiler/glsl/lower_buffer_access.cpp diff --git a/src/glsl/lower_buffer_access.h b/src/compiler/glsl/lower_buffer_access.h similarity index 100% rename from src/glsl/lower_buffer_access.h rename to src/compiler/glsl/lower_buffer_access.h 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_shared_reference.cpp b/src/compiler/glsl/lower_shared_reference.cpp similarity index 100% rename from src/glsl/lower_shared_reference.cpp rename to src/compiler/glsl/lower_shared_reference.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 7e60e7c1098..17ebf07acbc 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -23,7 +23,7 @@ #include #include "main/macros.h" -#include "glsl/glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #include "glsl_types.h" #include "util/hash_table.h" diff --git a/src/compiler/nir/Makefile.sources b/src/compiler/nir/Makefile.sources new file mode 100644 index 00000000000..0755a100e65 --- /dev/null +++ b/src/compiler/nir/Makefile.sources @@ -0,0 +1,71 @@ +NIR_GENERATED_FILES = \ + nir_builder_opcodes.h \ + nir_constant_expressions.c \ + nir_opcodes.c \ + nir_opcodes.h \ + nir_opt_algebraic.c + +NIR_FILES = \ + glsl_to_nir.cpp \ + glsl_to_nir.h \ + nir.c \ + nir.h \ + nir_array.h \ + nir_builder.h \ + nir_clone.c \ + nir_constant_expressions.h \ + nir_control_flow.c \ + nir_control_flow.h \ + nir_control_flow_private.h \ + nir_dominance.c \ + nir_from_ssa.c \ + nir_gs_count_vertices.c \ + nir_intrinsics.c \ + nir_intrinsics.h \ + nir_instr_set.c \ + nir_instr_set.h \ + nir_liveness.c \ + nir_lower_alu_to_scalar.c \ + nir_lower_atomics.c \ + nir_lower_clip.c \ + nir_lower_global_vars_to_local.c \ + nir_lower_gs_intrinsics.c \ + nir_lower_load_const_to_scalar.c \ + nir_lower_locals_to_regs.c \ + nir_lower_idiv.c \ + nir_lower_io.c \ + nir_lower_outputs_to_temporaries.c \ + nir_lower_phis_to_scalar.c \ + nir_lower_samplers.c \ + nir_lower_system_values.c \ + nir_lower_tex.c \ + nir_lower_to_source_mods.c \ + nir_lower_two_sided_color.c \ + nir_lower_vars_to_ssa.c \ + nir_lower_var_copies.c \ + nir_lower_vec_to_movs.c \ + nir_metadata.c \ + nir_move_vec_src_uses_to_dest.c \ + nir_normalize_cubemap_coords.c \ + nir_opt_constant_folding.c \ + nir_opt_copy_propagate.c \ + nir_opt_cse.c \ + nir_opt_dce.c \ + nir_opt_dead_cf.c \ + nir_opt_gcm.c \ + nir_opt_global_to_local.c \ + nir_opt_peephole_select.c \ + nir_opt_remove_phis.c \ + nir_opt_undef.c \ + nir_print.c \ + nir_remove_dead_variables.c \ + nir_search.c \ + nir_search.h \ + nir_split_var_copies.c \ + nir_sweep.c \ + nir_to_ssa.c \ + nir_validate.c \ + nir_vla.h \ + nir_worklist.c \ + nir_worklist.h + diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp index 33b1f5c7b9e..4b76d234420 100644 --- a/src/compiler/nir/glsl_to_nir.cpp +++ b/src/compiler/nir/glsl_to_nir.cpp @@ -28,9 +28,9 @@ #include "glsl_to_nir.h" #include "nir_control_flow.h" #include "nir_builder.h" -#include "glsl/ir_visitor.h" -#include "glsl/ir_hierarchical_visitor.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir_visitor.h" +#include "compiler/glsl/ir_hierarchical_visitor.h" +#include "compiler/glsl/ir.h" #include "main/imports.h" /* diff --git a/src/compiler/nir/glsl_to_nir.h b/src/compiler/nir/glsl_to_nir.h index 20d2a380a26..e3fe9b0246a 100644 --- a/src/compiler/nir/glsl_to_nir.h +++ b/src/compiler/nir/glsl_to_nir.h @@ -26,7 +26,7 @@ */ #include "nir.h" -#include "glsl/glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #ifdef __cplusplus extern "C" { diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 54e23eb4754..aec75fb930c 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -28,7 +28,7 @@ #pragma once #include "util/hash_table.h" -#include "glsl/list.h" +#include "compiler/glsl/list.h" #include "GL/gl.h" /* GLenum */ #include "util/list.h" #include "util/ralloc.h" diff --git a/src/compiler/nir/nir_lower_atomics.c b/src/compiler/nir/nir_lower_atomics.c index 2cbc1b75348..1a4458d4f84 100644 --- a/src/compiler/nir/nir_lower_atomics.c +++ b/src/compiler/nir/nir_lower_atomics.c @@ -25,7 +25,7 @@ * */ -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "nir.h" #include "main/config.h" #include diff --git a/src/compiler/nir/nir_lower_samplers.c b/src/compiler/nir/nir_lower_samplers.c index 9c912129f09..96e82914014 100644 --- a/src/compiler/nir/nir_lower_samplers.c +++ b/src/compiler/nir/nir_lower_samplers.c @@ -26,7 +26,7 @@ #include "nir.h" #include "nir_builder.h" #include "program/hash_table.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "main/compiler.h" #include "main/mtypes.h" diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp index ddc43becf9a..a87dcd8dc6a 100644 --- a/src/compiler/nir_types.cpp +++ b/src/compiler/nir_types.cpp @@ -26,7 +26,7 @@ */ #include "nir_types.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" void glsl_print_type(const glsl_type *type, FILE *fp) diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index 6649e403d08..3e7d69f73ed 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -26,7 +26,7 @@ #include "compiler/nir/nir.h" #include "compiler/nir/nir_control_flow.h" #include "compiler/nir/nir_builder.h" -#include "glsl/list.h" +#include "compiler/glsl/list.h" #include "compiler/shader_enums.h" #include "tgsi_to_nir.h" diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 69506f2a3fd..8dc44fda0f2 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -165,7 +165,7 @@ libmesa_la_SOURCES = \ $(MESA_ASM_FILES_FOR_ARCH) libmesa_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/compiler/glsl/libglsl.la \ $(ARCH_LIBS) libmesagallium_la_SOURCES = \ @@ -175,7 +175,7 @@ libmesagallium_la_SOURCES = \ $(MESA_ASM_FILES_FOR_ARCH) libmesagallium_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/compiler/glsl/libglsl.la \ $(ARCH_LIBS) libmesa_sse41_la_SOURCES = \ diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 386d6aa3815..7af8becd607 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -623,10 +623,7 @@ MESA_GALLIUM_FILES = \ INCLUDE_DIRS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/glsl \ -I$(top_builddir)/src/compiler/nir \ - -I$(top_builddir)/src/glsl \ - -I$(top_srcdir)/src/glsl/glcpp \ -I$(top_srcdir)/src/mesa \ -I$(top_builddir)/src/mesa \ -I$(top_srcdir)/src/mesa/main \ diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c index 9eadb7e00fa..0ab9ebdab3c 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.c +++ b/src/mesa/drivers/dri/i965/brw_cs.c @@ -32,7 +32,7 @@ #include "intel_batchbuffer.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void assign_cs_binding_table_offsets(const struct brw_device_info *devinfo, diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp index 3d6aa74d830..2ff9ec16fdb 100644 --- a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp +++ b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp @@ -31,7 +31,7 @@ */ #include "compiler/glsl_types.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "program/prog_instruction.h" /* For WRITEMASK_* */ class brw_cubemap_normalize_visitor : public ir_hierarchical_visitor { diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index b75ebfedb3d..4612a287bb7 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -30,7 +30,7 @@ #include "brw_shader.h" #include "brw_ir_fs.h" #include "brw_fs_builder.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "compiler/nir/nir.h" struct bblock_t; diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp index 22877797522..689e0911b17 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -41,8 +41,8 @@ * we do retain the vector types in that case. */ -#include "glsl/ir.h" -#include "glsl/ir_expression_flattening.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_expression_flattening.h" #include "compiler/glsl_types.h" class ir_channel_expressions_visitor : public ir_hierarchical_visitor { diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index f9df2a4e3b6..68a86a9a85e 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "main/shaderimage.h" #include "brw_fs.h" #include "brw_fs_surface_builder.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp index 0970959bbd6..5fe24debeec 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp @@ -38,8 +38,8 @@ */ #include "main/imports.h" -#include "glsl/ir.h" -#include "glsl/ir_rvalue_visitor.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_rvalue_visitor.h" #include "compiler/glsl_types.h" #include "util/hash_table.h" diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index edb52ac44b7..c888ef2bd67 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -34,7 +34,7 @@ #include "brw_ff_gs.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void brw_gs_debug_recompile(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 234afd554df..db4ba88cb1c 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -26,7 +26,7 @@ #include "brw_fs.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_optimization.h" +#include "compiler/glsl/ir_optimization.h" #include "program/program.h" #include "main/shaderapi.h" #include "main/uniforms.h" diff --git a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp index c83b2728b98..0848e1ec536 100644 --- a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp +++ b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp @@ -25,8 +25,8 @@ * \file brw_lower_texture_gradients.cpp */ -#include "glsl/ir.h" -#include "glsl/ir_builder.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_builder.h" #include "program/prog_instruction.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp index eafbdf68ea0..f5d7baee6db 100644 --- a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp +++ b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp @@ -32,8 +32,8 @@ */ #include "compiler/glsl_types.h" -#include "glsl/ir.h" -#include "glsl/ir_builder.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_builder.h" using namespace ir_builder; diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 0849ca40046..f3361d69786 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -23,7 +23,7 @@ #include "brw_shader.h" #include "brw_nir.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void brw_nir_setup_glsl_builtin_uniform(nir_variable *var, diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 20d4e0d6c4a..368efeecb2d 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -37,7 +37,7 @@ #include "program/programopt.h" #include "tnl/tnl.h" #include "util/ralloc.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "brw_program.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 4e00fd0ec0d..1460f4599bf 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -31,7 +31,7 @@ #include "brw_ir_vec4.h" #endif -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "compiler/nir/nir.h" diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index 6d6988c6a41..e07c05a92c1 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -31,7 +31,7 @@ #include "intel_batchbuffer.h" #include "brw_state.h" #include "program/prog_statevars.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static unsigned get_cs_thread_count(const struct brw_cs_prog_data *cs_prog_data) diff --git a/src/mesa/drivers/dri/i965/intel_resolve_map.h b/src/mesa/drivers/dri/i965/intel_resolve_map.h index 9bb9fca0455..726b287722a 100644 --- a/src/mesa/drivers/dri/i965/intel_resolve_map.h +++ b/src/mesa/drivers/dri/i965/intel_resolve_map.h @@ -24,7 +24,7 @@ #pragma once #include -#include "glsl/list.h" +#include "compiler/glsl/list.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index f3fd01f395e..8b415ed6019 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -142,7 +142,7 @@ #include "sparc/sparc.h" #endif -#include "glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #include diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index b2b1ee9ba44..b0ce8c472ef 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -36,10 +36,10 @@ #include "main/texenvprogram.h" #include "main/texobj.h" #include "main/uniforms.h" -#include "glsl/ir_builder.h" -#include "glsl/ir_optimization.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/glsl_symbol_table.h" +#include "compiler/glsl/ir_builder.h" +#include "compiler/glsl/ir_optimization.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/glsl_symbol_table.h" #include "compiler/glsl_types.h" #include "program/ir_to_mesa.h" #include "program/program.h" diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index f2a872dc83a..0e4a0af0b0f 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -43,8 +43,8 @@ #include "main/shaderobj.h" #include "main/transformfeedback.h" #include "main/uniforms.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/ir_uniform.h" #include "program/program.h" #include "program/prog_parameter.h" #include "util/ralloc.h" diff --git a/src/mesa/main/program_resource.c b/src/mesa/main/program_resource.c index 9a15cfe70b8..50659b0cd21 100644 --- a/src/mesa/main/program_resource.c +++ b/src/mesa/main/program_resource.c @@ -30,7 +30,7 @@ #include "main/shaderobj.h" #include "main/context.h" #include "program_resource.h" -#include "ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static bool supported_interface_enum(struct gl_context *ctx, GLenum iface) { diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index e902585924a..4967e4b1df1 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -34,9 +34,9 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "glsl/glsl_symbol_table.h" -#include "glsl/ir.h" -#include "glsl/program.h" +#include "compiler/glsl/glsl_symbol_table.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" #include "util/strndup.h" diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index a988f41697b..df92c0912af 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -49,10 +49,10 @@ #include "main/shaderobj.h" #include "main/transformfeedback.h" #include "main/uniforms.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/program.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/program.h" #include "program/program.h" #include "program/prog_print.h" #include "program/prog_parameter.h" diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 766a465cb11..2ced201ebca 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -31,10 +31,10 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/program.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 47010badbc6..b1968b3f795 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -43,7 +43,7 @@ #include "main/shaderobj.h" #include "main/uniforms.h" #include "main/enums.h" -#include "ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "compiler/glsl_types.h" #include "program/program.h" diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index baf49a752b1..88fe9580167 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -28,7 +28,7 @@ #include "main/glheader.h" #include "compiler/glsl_types.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "program/prog_parameter.h" #ifdef __cplusplus diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 70c477ec4fd..c9c30449734 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -35,16 +35,16 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "glsl/ast.h" -#include "glsl/ir.h" -#include "glsl/ir_expression_flattening.h" -#include "glsl/ir_visitor.h" -#include "glsl/ir_optimization.h" -#include "glsl/ir_uniform.h" -#include "glsl/glsl_parser_extras.h" +#include "compiler/glsl/ast.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_expression_flattening.h" +#include "compiler/glsl/ir_visitor.h" +#include "compiler/glsl/ir_optimization.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/glsl_parser_extras.h" #include "compiler/glsl_types.h" -#include "glsl/linker.h" -#include "glsl/program.h" +#include "compiler/glsl/linker.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" #include "program/prog_instruction.h" #include "program/prog_optimize.h" diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index a2ebb1ba77c..ebcc5288c2e 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -25,7 +25,7 @@ #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" -#include "glsl/list.h" +#include "compiler/glsl/list.h" #include "main/imports.h" #include "util/ralloc.h" diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp index 9137d1858e9..f118552d64e 100644 --- a/src/mesa/program/sampler.cpp +++ b/src/mesa/program/sampler.cpp @@ -25,10 +25,10 @@ #include "main/mtypes.h" #include "compiler/glsl_types.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/ir_visitor.h" -#include "glsl/program.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/ir_visitor.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" #include "program/prog_parameter.h" #include "program/program.h" diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 03788f33468..10e294cd147 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -42,7 +42,7 @@ #include "main/macros.h" #include "main/varray.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "vbo/vbo.h" diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index d424e3b335f..f5b8c33622e 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -32,8 +32,8 @@ #include "st_glsl_to_tgsi.h" -#include "glsl_parser_extras.h" -#include "ir_optimization.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/ir_optimization.h" #include "main/errors.h" #include "main/shaderobj.h" -- 2.30.2