diff options
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/Makefile.am | 5 | ||||
-rw-r--r-- | src/SConscript | 2 | ||||
-rw-r--r-- | src/compiler/Android.gen.mk (renamed from src/glsl/Android.gen.mk) | 45 | ||||
-rw-r--r-- | src/compiler/Android.mk | 67 | ||||
-rw-r--r-- | src/compiler/Makefile.am | 333 | ||||
-rw-r--r-- | src/compiler/Makefile.sources | 242 | ||||
-rw-r--r-- | src/compiler/SConscript | 24 | ||||
-rw-r--r-- | src/compiler/builtin_type_macros.h (renamed from src/glsl/nir/builtin_type_macros.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/.gitignore (renamed from src/glsl/.gitignore) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/Android.gen.mk | 76 | ||||
-rw-r--r-- | src/compiler/glsl/Android.mk (renamed from src/glsl/Android.mk) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/Makefile.am (renamed from src/glsl/Makefile.am) | 65 | ||||
-rw-r--r-- | src/compiler/glsl/Makefile.sources (renamed from src/glsl/Makefile.sources) | 9 | ||||
-rw-r--r-- | src/compiler/glsl/README (renamed from src/glsl/README) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/SConscript (renamed from src/glsl/SConscript) | 10 | ||||
-rw-r--r-- | src/compiler/glsl/TODO (renamed from src/glsl/TODO) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ast.h (renamed from src/glsl/ast.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ast_array_index.cpp (renamed from src/glsl/ast_array_index.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ast_expr.cpp (renamed from src/glsl/ast_expr.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ast_function.cpp (renamed from src/glsl/ast_function.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp (renamed from src/glsl/ast_to_hir.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ast_type.cpp (renamed from src/glsl/ast_type.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/blob.c (renamed from src/glsl/blob.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/blob.h (renamed from src/glsl/blob.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/builtin_functions.cpp (renamed from src/glsl/builtin_functions.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/builtin_types.cpp (renamed from src/glsl/builtin_types.cpp) | 4 | ||||
-rw-r--r-- | src/compiler/glsl/builtin_variables.cpp (renamed from src/glsl/builtin_variables.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/.gitignore (renamed from src/glsl/glcpp/.gitignore) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/README (renamed from src/glsl/glcpp/README) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/glcpp-lex.l (renamed from src/glsl/glcpp/glcpp-lex.l) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/glcpp-parse.y (renamed from src/glsl/glcpp/glcpp-parse.y) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/glcpp.c (renamed from src/glsl/glcpp/glcpp.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/glcpp.h (renamed from src/glsl/glcpp/glcpp.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/pp.c (renamed from src/glsl/glcpp/pp.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/.gitignore (renamed from src/glsl/glcpp/tests/.gitignore) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/000-content-with-spaces.c (renamed from src/glsl/glcpp/tests/000-content-with-spaces.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected (renamed from src/glsl/glcpp/tests/000-content-with-spaces.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/001-define.c (renamed from src/glsl/glcpp/tests/001-define.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/001-define.c.expected (renamed from src/glsl/glcpp/tests/001-define.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/002-define-chain.c (renamed from src/glsl/glcpp/tests/002-define-chain.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/002-define-chain.c.expected (renamed from src/glsl/glcpp/tests/002-define-chain.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c (renamed from src/glsl/glcpp/tests/003-define-chain-reverse.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected (renamed from src/glsl/glcpp/tests/003-define-chain-reverse.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/004-define-recursive.c (renamed from src/glsl/glcpp/tests/004-define-recursive.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected (renamed from src/glsl/glcpp/tests/004-define-recursive.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/005-define-composite-chain.c (renamed from src/glsl/glcpp/tests/005-define-composite-chain.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected (renamed from src/glsl/glcpp/tests/005-define-composite-chain.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c (renamed from src/glsl/glcpp/tests/006-define-composite-chain-reverse.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected (renamed from src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c (renamed from src/glsl/glcpp/tests/007-define-composite-recursive.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected (renamed from src/glsl/glcpp/tests/007-define-composite-recursive.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/008-define-empty.c (renamed from src/glsl/glcpp/tests/008-define-empty.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/008-define-empty.c.expected (renamed from src/glsl/glcpp/tests/008-define-empty.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/009-undef.c (renamed from src/glsl/glcpp/tests/009-undef.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/009-undef.c.expected (renamed from src/glsl/glcpp/tests/009-undef.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/010-undef-re-define.c (renamed from src/glsl/glcpp/tests/010-undef-re-define.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected (renamed from src/glsl/glcpp/tests/010-undef-re-define.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/011-define-func-empty.c (renamed from src/glsl/glcpp/tests/011-define-func-empty.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected (renamed from src/glsl/glcpp/tests/011-define-func-empty.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/012-define-func-no-args.c (renamed from src/glsl/glcpp/tests/012-define-func-no-args.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected (renamed from src/glsl/glcpp/tests/012-define-func-no-args.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c (renamed from src/glsl/glcpp/tests/013-define-func-1-arg-unused.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected (renamed from src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c (renamed from src/glsl/glcpp/tests/014-define-func-2-arg-unused.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected (renamed from src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c (renamed from src/glsl/glcpp/tests/015-define-object-with-parens.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected (renamed from src/glsl/glcpp/tests/015-define-object-with-parens.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c (renamed from src/glsl/glcpp/tests/016-define-func-1-arg.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected (renamed from src/glsl/glcpp/tests/016-define-func-1-arg.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/017-define-func-2-args.c (renamed from src/glsl/glcpp/tests/017-define-func-2-args.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected (renamed from src/glsl/glcpp/tests/017-define-func-2-args.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c (renamed from src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected (renamed from src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c (renamed from src/glsl/glcpp/tests/019-define-func-1-arg-multi.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected (renamed from src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c (renamed from src/glsl/glcpp/tests/020-define-func-2-arg-multi.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected (renamed from src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/021-define-func-compose.c (renamed from src/glsl/glcpp/tests/021-define-func-compose.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected (renamed from src/glsl/glcpp/tests/021-define-func-compose.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c (renamed from src/glsl/glcpp/tests/022-define-func-arg-with-parens.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected (renamed from src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c (renamed from src/glsl/glcpp/tests/023-define-extra-whitespace.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected (renamed from src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c (renamed from src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected (renamed from src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c (renamed from src/glsl/glcpp/tests/025-func-macro-as-non-macro.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected (renamed from src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c (renamed from src/glsl/glcpp/tests/026-define-func-extra-newlines.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected (renamed from src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c (renamed from src/glsl/glcpp/tests/027-define-chain-obj-to-func.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected (renamed from src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c (renamed from src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected (renamed from src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c (renamed from src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected (renamed from src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c (renamed from src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected (renamed from src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c (renamed from src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected (renamed from src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c (renamed from src/glsl/glcpp/tests/032-define-func-self-recurse.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected (renamed from src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c (renamed from src/glsl/glcpp/tests/033-define-func-self-compose.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected (renamed from src/glsl/glcpp/tests/033-define-func-self-compose.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c (renamed from src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected (renamed from src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c (renamed from src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected (renamed from src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c (renamed from src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected (renamed from src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c (renamed from src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected (renamed from src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c (renamed from src/glsl/glcpp/tests/038-func-arg-with-commas.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected (renamed from src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c (renamed from src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected (renamed from src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/040-token-pasting.c (renamed from src/glsl/glcpp/tests/040-token-pasting.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected (renamed from src/glsl/glcpp/tests/040-token-pasting.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/041-if-0.c (renamed from src/glsl/glcpp/tests/041-if-0.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/041-if-0.c.expected (renamed from src/glsl/glcpp/tests/041-if-0.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/042-if-1.c (renamed from src/glsl/glcpp/tests/042-if-1.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/042-if-1.c.expected (renamed from src/glsl/glcpp/tests/042-if-1.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/043-if-0-else.c (renamed from src/glsl/glcpp/tests/043-if-0-else.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected (renamed from src/glsl/glcpp/tests/043-if-0-else.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/044-if-1-else.c (renamed from src/glsl/glcpp/tests/044-if-1-else.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected (renamed from src/glsl/glcpp/tests/044-if-1-else.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/045-if-0-elif.c (renamed from src/glsl/glcpp/tests/045-if-0-elif.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected (renamed from src/glsl/glcpp/tests/045-if-0-elif.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/046-if-1-elsif.c (renamed from src/glsl/glcpp/tests/046-if-1-elsif.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected (renamed from src/glsl/glcpp/tests/046-if-1-elsif.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/047-if-elif-else.c (renamed from src/glsl/glcpp/tests/047-if-elif-else.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected (renamed from src/glsl/glcpp/tests/047-if-elif-else.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/048-if-nested.c (renamed from src/glsl/glcpp/tests/048-if-nested.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/048-if-nested.c.expected (renamed from src/glsl/glcpp/tests/048-if-nested.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c (renamed from src/glsl/glcpp/tests/049-if-expression-precedence.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected (renamed from src/glsl/glcpp/tests/049-if-expression-precedence.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/050-if-defined.c (renamed from src/glsl/glcpp/tests/050-if-defined.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/050-if-defined.c.expected (renamed from src/glsl/glcpp/tests/050-if-defined.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/051-if-relational.c (renamed from src/glsl/glcpp/tests/051-if-relational.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/051-if-relational.c.expected (renamed from src/glsl/glcpp/tests/051-if-relational.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/052-if-bitwise.c (renamed from src/glsl/glcpp/tests/052-if-bitwise.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected (renamed from src/glsl/glcpp/tests/052-if-bitwise.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c (renamed from src/glsl/glcpp/tests/053-if-divide-and-shift.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected (renamed from src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/054-if-with-macros.c (renamed from src/glsl/glcpp/tests/054-if-with-macros.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected (renamed from src/glsl/glcpp/tests/054-if-with-macros.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c (renamed from src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected (renamed from src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c (renamed from src/glsl/glcpp/tests/056-macro-argument-with-comma.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected (renamed from src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/057-empty-arguments.c (renamed from src/glsl/glcpp/tests/057-empty-arguments.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected (renamed from src/glsl/glcpp/tests/057-empty-arguments.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c (renamed from src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected (renamed from src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c (renamed from src/glsl/glcpp/tests/059-token-pasting-integer.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected (renamed from src/glsl/glcpp/tests/059-token-pasting-integer.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c (renamed from src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected (renamed from src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c (renamed from src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected (renamed from src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c (renamed from src/glsl/glcpp/tests/062-if-0-skips-garbage.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected (renamed from src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/063-comments.c (renamed from src/glsl/glcpp/tests/063-comments.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/063-comments.c.expected (renamed from src/glsl/glcpp/tests/063-comments.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/064-version.c (renamed from src/glsl/glcpp/tests/064-version.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/064-version.c.expected (renamed from src/glsl/glcpp/tests/064-version.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/065-if-defined-parens.c (renamed from src/glsl/glcpp/tests/065-if-defined-parens.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected (renamed from src/glsl/glcpp/tests/065-if-defined-parens.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c (renamed from src/glsl/glcpp/tests/066-if-nospace-expression.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected (renamed from src/glsl/glcpp/tests/066-if-nospace-expression.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c (renamed from src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected (renamed from src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/068-accidental-pasting.c (renamed from src/glsl/glcpp/tests/068-accidental-pasting.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected (renamed from src/glsl/glcpp/tests/068-accidental-pasting.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/069-repeated-argument.c (renamed from src/glsl/glcpp/tests/069-repeated-argument.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected (renamed from src/glsl/glcpp/tests/069-repeated-argument.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c (renamed from src/glsl/glcpp/tests/070-undefined-macro-in-expression.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected (renamed from src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/071-punctuator.c (renamed from src/glsl/glcpp/tests/071-punctuator.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/071-punctuator.c.expected (renamed from src/glsl/glcpp/tests/071-punctuator.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c (renamed from src/glsl/glcpp/tests/072-token-pasting-same-line.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected (renamed from src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c (renamed from src/glsl/glcpp/tests/073-if-in-ifdef.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected (renamed from src/glsl/glcpp/tests/073-if-in-ifdef.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/074-elif-undef.c (renamed from src/glsl/glcpp/tests/074-elif-undef.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected (renamed from src/glsl/glcpp/tests/074-elif-undef.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c (renamed from src/glsl/glcpp/tests/075-elif-elif-undef.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected (renamed from src/glsl/glcpp/tests/075-elif-elif-undef.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c (renamed from src/glsl/glcpp/tests/076-elif-undef-nested.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected (renamed from src/glsl/glcpp/tests/076-elif-undef-nested.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/077-else-without-if.c (renamed from src/glsl/glcpp/tests/077-else-without-if.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected (renamed from src/glsl/glcpp/tests/077-else-without-if.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/078-elif-without-if.c (renamed from src/glsl/glcpp/tests/078-elif-without-if.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected (renamed from src/glsl/glcpp/tests/078-elif-without-if.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/079-endif-without-if.c (renamed from src/glsl/glcpp/tests/079-endif-without-if.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected (renamed from src/glsl/glcpp/tests/079-endif-without-if.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/080-if-without-expression.c (renamed from src/glsl/glcpp/tests/080-if-without-expression.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected (renamed from src/glsl/glcpp/tests/080-if-without-expression.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/081-elif-without-expression.c (renamed from src/glsl/glcpp/tests/081-elif-without-expression.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected (renamed from src/glsl/glcpp/tests/081-elif-without-expression.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/082-invalid-paste.c (renamed from src/glsl/glcpp/tests/082-invalid-paste.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected (renamed from src/glsl/glcpp/tests/082-invalid-paste.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/083-unterminated-if.c (renamed from src/glsl/glcpp/tests/083-unterminated-if.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected (renamed from src/glsl/glcpp/tests/083-unterminated-if.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c (renamed from src/glsl/glcpp/tests/084-unbalanced-parentheses.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected (renamed from src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c (renamed from src/glsl/glcpp/tests/085-incorrect-argument-count.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected (renamed from src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c (renamed from src/glsl/glcpp/tests/086-reserved-macro-names.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected (renamed from src/glsl/glcpp/tests/086-reserved-macro-names.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/087-if-comments.c (renamed from src/glsl/glcpp/tests/087-if-comments.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/087-if-comments.c.expected (renamed from src/glsl/glcpp/tests/087-if-comments.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c (renamed from src/glsl/glcpp/tests/088-redefine-macro-legitimate.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected (renamed from src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c (renamed from src/glsl/glcpp/tests/089-redefine-macro-error.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected (renamed from src/glsl/glcpp/tests/089-redefine-macro-error.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/090-hash-error.c (renamed from src/glsl/glcpp/tests/090-hash-error.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/090-hash-error.c.expected (renamed from src/glsl/glcpp/tests/090-hash-error.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/091-hash-line.c (renamed from src/glsl/glcpp/tests/091-hash-line.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/091-hash-line.c.expected (renamed from src/glsl/glcpp/tests/091-hash-line.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c (renamed from src/glsl/glcpp/tests/092-redefine-macro-error-2.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected (renamed from src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/093-divide-by-zero.c (renamed from src/glsl/glcpp/tests/093-divide-by-zero.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected (renamed from src/glsl/glcpp/tests/093-divide-by-zero.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c (renamed from src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected (renamed from src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/095-recursive-define.c (renamed from src/glsl/glcpp/tests/095-recursive-define.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected (renamed from src/glsl/glcpp/tests/095-recursive-define.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/096-paste-twice.c (renamed from src/glsl/glcpp/tests/096-paste-twice.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected (renamed from src/glsl/glcpp/tests/096-paste-twice.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c (renamed from src/glsl/glcpp/tests/097-paste-with-non-function-macro.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected (renamed from src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/098-elif-undefined.c (renamed from src/glsl/glcpp/tests/098-elif-undefined.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected (renamed from src/glsl/glcpp/tests/098-elif-undefined.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/099-c99-example.c (renamed from src/glsl/glcpp/tests/099-c99-example.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/099-c99-example.c.expected (renamed from src/glsl/glcpp/tests/099-c99-example.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/100-macro-with-colon.c (renamed from src/glsl/glcpp/tests/100-macro-with-colon.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected (renamed from src/glsl/glcpp/tests/100-macro-with-colon.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/101-macros-used-twice.c (renamed from src/glsl/glcpp/tests/101-macros-used-twice.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected (renamed from src/glsl/glcpp/tests/101-macros-used-twice.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c (renamed from src/glsl/glcpp/tests/102-garbage-after-endif.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected (renamed from src/glsl/glcpp/tests/102-garbage-after-endif.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c (renamed from src/glsl/glcpp/tests/103-garbage-after-else-0.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected (renamed from src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c (renamed from src/glsl/glcpp/tests/104-hash-line-followed-by-code.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected (renamed from src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c (renamed from src/glsl/glcpp/tests/105-multiline-hash-line.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected (renamed from src/glsl/glcpp/tests/105-multiline-hash-line.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c (renamed from src/glsl/glcpp/tests/106-multiline-hash-if.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected (renamed from src/glsl/glcpp/tests/106-multiline-hash-if.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c (renamed from src/glsl/glcpp/tests/107-multiline-hash-elif.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected (renamed from src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c (renamed from src/glsl/glcpp/tests/108-no-space-after-hash-version.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected (renamed from src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c (renamed from src/glsl/glcpp/tests/109-no-space-after-hash-line.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected (renamed from src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c (renamed from src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected (renamed from src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c (renamed from src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected (renamed from src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c (renamed from src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected (renamed from src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c (renamed from src/glsl/glcpp/tests/113-line-and-file-macros.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected (renamed from src/glsl/glcpp/tests/113-line-and-file-macros.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c (renamed from src/glsl/glcpp/tests/114-paste-integer-tokens.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected (renamed from src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/115-line-continuations.c (renamed from src/glsl/glcpp/tests/115-line-continuations.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected (renamed from src/glsl/glcpp/tests/115-line-continuations.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c (renamed from src/glsl/glcpp/tests/116-disable-line-continuations.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected (renamed from src/glsl/glcpp/tests/116-disable-line-continuations.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c (renamed from src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected (renamed from src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c (renamed from src/glsl/glcpp/tests/118-comment-becomes-space.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected (renamed from src/glsl/glcpp/tests/118-comment-becomes-space.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/119-elif-after-else.c (renamed from src/glsl/glcpp/tests/119-elif-after-else.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected (renamed from src/glsl/glcpp/tests/119-elif-after-else.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/120-undef-builtin.c (renamed from src/glsl/glcpp/tests/120-undef-builtin.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected (renamed from src/glsl/glcpp/tests/120-undef-builtin.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c (renamed from src/glsl/glcpp/tests/121-comment-bug-72686.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected (renamed from src/glsl/glcpp/tests/121-comment-bug-72686.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c (renamed from src/glsl/glcpp/tests/122-redefine-whitespace.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected (renamed from src/glsl/glcpp/tests/122-redefine-whitespace.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c (renamed from src/glsl/glcpp/tests/123-garbage-after-else-1.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected (renamed from src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c (renamed from src/glsl/glcpp/tests/124-preprocessing-numbers.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected (renamed from src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c (renamed from src/glsl/glcpp/tests/125-es-short-circuit-undefined.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected (renamed from src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c (renamed from src/glsl/glcpp/tests/126-garbage-after-directive.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected (renamed from src/glsl/glcpp/tests/126-garbage-after-directive.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/127-pragma-empty.c (renamed from src/glsl/glcpp/tests/127-pragma-empty.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected (renamed from src/glsl/glcpp/tests/127-pragma-empty.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/128-space-before-hash.c (renamed from src/glsl/glcpp/tests/128-space-before-hash.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected (renamed from src/glsl/glcpp/tests/128-space-before-hash.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/129-define-non-identifier.c (renamed from src/glsl/glcpp/tests/129-define-non-identifier.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected (renamed from src/glsl/glcpp/tests/129-define-non-identifier.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/130-define-comment.c (renamed from src/glsl/glcpp/tests/130-define-comment.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/130-define-comment.c.expected (renamed from src/glsl/glcpp/tests/130-define-comment.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/131-eof-without-newline.c (renamed from src/glsl/glcpp/tests/131-eof-without-newline.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected (renamed from src/glsl/glcpp/tests/131-eof-without-newline.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c (renamed from src/glsl/glcpp/tests/132-eof-without-newline-define.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected (renamed from src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c (renamed from src/glsl/glcpp/tests/133-eof-without-newline-comment.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected (renamed from src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c (renamed from src/glsl/glcpp/tests/134-hash-comment-directive.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected (renamed from src/glsl/glcpp/tests/134-hash-comment-directive.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c (renamed from src/glsl/glcpp/tests/135-duplicate-parameter.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected (renamed from src/glsl/glcpp/tests/135-duplicate-parameter.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c (renamed from src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected (renamed from src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c (renamed from src/glsl/glcpp/tests/137-expand-macro-after-period.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected (renamed from src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c (renamed from src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected (renamed from src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c (renamed from src/glsl/glcpp/tests/139-define-without-macro-name.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected (renamed from src/glsl/glcpp/tests/139-define-without-macro-name.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/140-null-directive.c (renamed from src/glsl/glcpp/tests/140-null-directive.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/140-null-directive.c.expected (renamed from src/glsl/glcpp/tests/140-null-directive.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c (renamed from src/glsl/glcpp/tests/141-pragma-and-__LINE__.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected (renamed from src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/142-defined-within-macro.c (renamed from src/glsl/glcpp/tests/142-defined-within-macro.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected (renamed from src/glsl/glcpp/tests/142-defined-within-macro.c.expected) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/143-multiple-else.c (renamed from src/glsl/glcpp/tests/143-multiple-else.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected (renamed from src/glsl/glcpp/tests/143-multiple-else.c.expected) | 0 | ||||
-rwxr-xr-x | src/compiler/glsl/glcpp/tests/glcpp-test (renamed from src/glsl/glcpp/tests/glcpp-test) | 6 | ||||
-rwxr-xr-x | src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf (renamed from src/glsl/glcpp/tests/glcpp-test-cr-lf) | 10 | ||||
-rw-r--r-- | src/compiler/glsl/glsl_lexer.ll (renamed from src/glsl/glsl_lexer.ll) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glsl_parser.yy (renamed from src/glsl/glsl_parser.yy) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp (renamed from src/glsl/glsl_parser_extras.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glsl_parser_extras.h (renamed from src/glsl/glsl_parser_extras.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glsl_symbol_table.cpp (renamed from src/glsl/glsl_symbol_table.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/glsl_symbol_table.h (renamed from src/glsl/glsl_symbol_table.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/hir_field_selection.cpp (renamed from src/glsl/hir_field_selection.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir.cpp (renamed from src/glsl/ir.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir.h (renamed from src/glsl/ir.h) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_basic_block.cpp (renamed from src/glsl/ir_basic_block.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_basic_block.h (renamed from src/glsl/ir_basic_block.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_builder.cpp (renamed from src/glsl/ir_builder.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_builder.h (renamed from src/glsl/ir_builder.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_clone.cpp (renamed from src/glsl/ir_clone.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_constant_expression.cpp (renamed from src/glsl/ir_constant_expression.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_equals.cpp (renamed from src/glsl/ir_equals.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_expression_flattening.cpp (renamed from src/glsl/ir_expression_flattening.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_expression_flattening.h (renamed from src/glsl/ir_expression_flattening.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_function.cpp (renamed from src/glsl/ir_function.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_function_can_inline.cpp (renamed from src/glsl/ir_function_can_inline.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_function_detect_recursion.cpp (renamed from src/glsl/ir_function_detect_recursion.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_function_inlining.h (renamed from src/glsl/ir_function_inlining.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_hierarchical_visitor.cpp (renamed from src/glsl/ir_hierarchical_visitor.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_hierarchical_visitor.h (renamed from src/glsl/ir_hierarchical_visitor.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_hv_accept.cpp (renamed from src/glsl/ir_hv_accept.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_import_prototypes.cpp (renamed from src/glsl/ir_import_prototypes.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_optimization.h (renamed from src/glsl/ir_optimization.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_print_visitor.cpp (renamed from src/glsl/ir_print_visitor.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_print_visitor.h (renamed from src/glsl/ir_print_visitor.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_reader.cpp (renamed from src/glsl/ir_reader.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_reader.h (renamed from src/glsl/ir_reader.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_rvalue_visitor.cpp (renamed from src/glsl/ir_rvalue_visitor.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_rvalue_visitor.h (renamed from src/glsl/ir_rvalue_visitor.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_set_program_inouts.cpp (renamed from src/glsl/ir_set_program_inouts.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_uniform.h (renamed from src/glsl/ir_uniform.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/ir_validate.cpp (renamed from src/glsl/ir_validate.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_variable_refcount.cpp (renamed from src/glsl/ir_variable_refcount.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_variable_refcount.h (renamed from src/glsl/ir_variable_refcount.h) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/ir_visitor.h (renamed from src/glsl/ir_visitor.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_atomics.cpp (renamed from src/glsl/link_atomics.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_functions.cpp (renamed from src/glsl/link_functions.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_interface_blocks.cpp (renamed from src/glsl/link_interface_blocks.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_uniform_block_active_visitor.cpp (renamed from src/glsl/link_uniform_block_active_visitor.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_uniform_block_active_visitor.h (renamed from src/glsl/link_uniform_block_active_visitor.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_uniform_blocks.cpp (renamed from src/glsl/link_uniform_blocks.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_uniform_initializers.cpp (renamed from src/glsl/link_uniform_initializers.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_uniforms.cpp (renamed from src/glsl/link_uniforms.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_varyings.cpp (renamed from src/glsl/link_varyings.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/link_varyings.h (renamed from src/glsl/link_varyings.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/linker.cpp (renamed from src/glsl/linker.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/linker.h (renamed from src/glsl/linker.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/list.h (renamed from src/glsl/list.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/loop_analysis.cpp (renamed from src/glsl/loop_analysis.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/loop_analysis.h (renamed from src/glsl/loop_analysis.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/loop_controls.cpp (renamed from src/glsl/loop_controls.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/loop_unroll.cpp (renamed from src/glsl/loop_unroll.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_buffer_access.cpp (renamed from src/glsl/lower_buffer_access.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_buffer_access.h (renamed from src/glsl/lower_buffer_access.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_clip_distance.cpp (renamed from src/glsl/lower_clip_distance.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_const_arrays_to_uniforms.cpp (renamed from src/glsl/lower_const_arrays_to_uniforms.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_discard.cpp (renamed from src/glsl/lower_discard.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_discard_flow.cpp (renamed from src/glsl/lower_discard_flow.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_if_to_cond_assign.cpp (renamed from src/glsl/lower_if_to_cond_assign.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_instructions.cpp (renamed from src/glsl/lower_instructions.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_jumps.cpp (renamed from src/glsl/lower_jumps.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_mat_op_to_vec.cpp (renamed from src/glsl/lower_mat_op_to_vec.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_named_interface_blocks.cpp (renamed from src/glsl/lower_named_interface_blocks.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_noise.cpp (renamed from src/glsl/lower_noise.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_offset_array.cpp (renamed from src/glsl/lower_offset_array.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_output_reads.cpp (renamed from src/glsl/lower_output_reads.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_packed_varyings.cpp (renamed from src/glsl/lower_packed_varyings.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_packing_builtins.cpp (renamed from src/glsl/lower_packing_builtins.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_shared_reference.cpp (renamed from src/glsl/lower_shared_reference.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_subroutine.cpp (renamed from src/glsl/lower_subroutine.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_tess_level.cpp (renamed from src/glsl/lower_tess_level.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_texture_projection.cpp (renamed from src/glsl/lower_texture_projection.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_ubo_reference.cpp (renamed from src/glsl/lower_ubo_reference.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_variable_index_to_cond_assign.cpp (renamed from src/glsl/lower_variable_index_to_cond_assign.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_vec_index_to_cond_assign.cpp (renamed from src/glsl/lower_vec_index_to_cond_assign.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_vec_index_to_swizzle.cpp (renamed from src/glsl/lower_vec_index_to_swizzle.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/lower_vector.cpp (renamed from src/glsl/lower_vector.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_vector_derefs.cpp (renamed from src/glsl/lower_vector_derefs.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_vector_insert.cpp (renamed from src/glsl/lower_vector_insert.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/lower_vertex_id.cpp (renamed from src/glsl/lower_vertex_id.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/main.cpp (renamed from src/glsl/main.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/opt_algebraic.cpp (renamed from src/glsl/opt_algebraic.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_array_splitting.cpp (renamed from src/glsl/opt_array_splitting.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_conditional_discard.cpp (renamed from src/glsl/opt_conditional_discard.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_constant_folding.cpp (renamed from src/glsl/opt_constant_folding.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_constant_propagation.cpp (renamed from src/glsl/opt_constant_propagation.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_constant_variable.cpp (renamed from src/glsl/opt_constant_variable.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_copy_propagation.cpp (renamed from src/glsl/opt_copy_propagation.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_copy_propagation_elements.cpp (renamed from src/glsl/opt_copy_propagation_elements.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_dead_builtin_variables.cpp (renamed from src/glsl/opt_dead_builtin_variables.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/opt_dead_builtin_varyings.cpp (renamed from src/glsl/opt_dead_builtin_varyings.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_dead_code.cpp (renamed from src/glsl/opt_dead_code.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_dead_code_local.cpp (renamed from src/glsl/opt_dead_code_local.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_dead_functions.cpp (renamed from src/glsl/opt_dead_functions.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_flatten_nested_if_blocks.cpp (renamed from src/glsl/opt_flatten_nested_if_blocks.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/opt_flip_matrices.cpp (renamed from src/glsl/opt_flip_matrices.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/opt_function_inlining.cpp (renamed from src/glsl/opt_function_inlining.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_if_simplification.cpp (renamed from src/glsl/opt_if_simplification.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/opt_minmax.cpp (renamed from src/glsl/opt_minmax.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_noop_swizzle.cpp (renamed from src/glsl/opt_noop_swizzle.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_rebalance_tree.cpp (renamed from src/glsl/opt_rebalance_tree.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/opt_redundant_jumps.cpp (renamed from src/glsl/opt_redundant_jumps.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/opt_structure_splitting.cpp (renamed from src/glsl/opt_structure_splitting.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_swizzle_swizzle.cpp (renamed from src/glsl/opt_swizzle_swizzle.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_tree_grafting.cpp (renamed from src/glsl/opt_tree_grafting.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/opt_vectorize.cpp (renamed from src/glsl/opt_vectorize.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/glsl/program.h (renamed from src/glsl/program.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/s_expression.cpp (renamed from src/glsl/s_expression.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/s_expression.h (renamed from src/glsl/s_expression.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/standalone_scaffolding.cpp (renamed from src/glsl/standalone_scaffolding.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/standalone_scaffolding.h (renamed from src/glsl/standalone_scaffolding.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/test.cpp (renamed from src/glsl/test.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/test_optpass.cpp (renamed from src/glsl/test_optpass.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/test_optpass.h (renamed from src/glsl/test_optpass.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/.gitignore (renamed from src/glsl/tests/.gitignore) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/blob_test.c (renamed from src/glsl/tests/blob_test.c) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/builtin_variable_test.cpp (renamed from src/glsl/tests/builtin_variable_test.cpp) | 0 | ||||
-rwxr-xr-x | src/compiler/glsl/tests/compare_ir (renamed from src/glsl/tests/compare_ir) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp (renamed from src/glsl/tests/copy_constant_to_storage_tests.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/general_ir_test.cpp (renamed from src/glsl/tests/general_ir_test.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/invalidate_locations_test.cpp (renamed from src/glsl/tests/invalidate_locations_test.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/lower_jumps/.gitignore (renamed from src/glsl/tests/lower_jumps/.gitignore) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/lower_jumps/create_test_cases.py (renamed from src/glsl/tests/lower_jumps/create_test_cases.py) | 0 | ||||
-rwxr-xr-x | src/compiler/glsl/tests/optimization-test (renamed from src/glsl/tests/optimization-test) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/sampler_types_test.cpp (renamed from src/glsl/tests/sampler_types_test.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/set_uniform_initializer_tests.cpp (renamed from src/glsl/tests/set_uniform_initializer_tests.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/sexps.py (renamed from src/glsl/tests/sexps.py) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/uniform_initializer_utils.cpp (renamed from src/glsl/tests/uniform_initializer_utils.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/uniform_initializer_utils.h (renamed from src/glsl/tests/uniform_initializer_utils.h) | 0 | ||||
-rw-r--r-- | src/compiler/glsl/tests/varyings_test.cpp (renamed from src/glsl/tests/varyings_test.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/glsl_types.cpp (renamed from src/glsl/nir/glsl_types.cpp) | 4 | ||||
-rw-r--r-- | src/compiler/glsl_types.h (renamed from src/glsl/nir/glsl_types.h) | 4 | ||||
-rw-r--r-- | src/compiler/nir/.gitignore (renamed from src/glsl/nir/.gitignore) | 0 | ||||
-rw-r--r-- | src/compiler/nir/Makefile.sources | 87 | ||||
-rw-r--r-- | src/compiler/nir/README (renamed from src/glsl/nir/README) | 0 | ||||
-rw-r--r-- | src/compiler/nir/glsl_to_nir.cpp (renamed from src/glsl/nir/glsl_to_nir.cpp) | 6 | ||||
-rw-r--r-- | src/compiler/nir/glsl_to_nir.h (renamed from src/glsl/nir/glsl_to_nir.h) | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir.c (renamed from src/glsl/nir/nir.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir.h (renamed from src/glsl/nir/nir.h) | 6 | ||||
-rw-r--r-- | src/compiler/nir/nir_algebraic.py (renamed from src/glsl/nir/nir_algebraic.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_array.h (renamed from src/glsl/nir/nir_array.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_builder.h (renamed from src/glsl/nir/nir_builder.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_builder_opcodes_h.py (renamed from src/glsl/nir/nir_builder_opcodes_h.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_clone.c (renamed from src/glsl/nir/nir_clone.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_constant_expressions.h (renamed from src/glsl/nir/nir_constant_expressions.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_constant_expressions.py (renamed from src/glsl/nir/nir_constant_expressions.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_control_flow.c (renamed from src/glsl/nir/nir_control_flow.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_control_flow.h (renamed from src/glsl/nir/nir_control_flow.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_control_flow_private.h (renamed from src/glsl/nir/nir_control_flow_private.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_dominance.c (renamed from src/glsl/nir/nir_dominance.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_from_ssa.c (renamed from src/glsl/nir/nir_from_ssa.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_gather_info.c (renamed from src/glsl/nir/nir_gather_info.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_gs_count_vertices.c (renamed from src/glsl/nir/nir_gs_count_vertices.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_inline_functions.c (renamed from src/glsl/nir/nir_inline_functions.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_instr_set.c (renamed from src/glsl/nir/nir_instr_set.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_instr_set.h (renamed from src/glsl/nir/nir_instr_set.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_intrinsics.c (renamed from src/glsl/nir/nir_intrinsics.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_intrinsics.h (renamed from src/glsl/nir/nir_intrinsics.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_liveness.c (renamed from src/glsl/nir/nir_liveness.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_alu_to_scalar.c (renamed from src/glsl/nir/nir_lower_alu_to_scalar.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_atomics.c (renamed from src/glsl/nir/nir_lower_atomics.c) | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_clip.c (renamed from src/glsl/nir/nir_lower_clip.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_global_vars_to_local.c (renamed from src/glsl/nir/nir_lower_global_vars_to_local.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_gs_intrinsics.c (renamed from src/glsl/nir/nir_lower_gs_intrinsics.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_idiv.c (renamed from src/glsl/nir/nir_lower_idiv.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_indirect_derefs.c (renamed from src/glsl/nir/nir_lower_indirect_derefs.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_io.c (renamed from src/glsl/nir/nir_lower_io.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_load_const_to_scalar.c (renamed from src/glsl/nir/nir_lower_load_const_to_scalar.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_locals_to_regs.c (renamed from src/glsl/nir/nir_lower_locals_to_regs.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_outputs_to_temporaries.c (renamed from src/glsl/nir/nir_lower_outputs_to_temporaries.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_phis_to_scalar.c (renamed from src/glsl/nir/nir_lower_phis_to_scalar.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_returns.c (renamed from src/glsl/nir/nir_lower_returns.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_samplers.c (renamed from src/glsl/nir/nir_lower_samplers.c) | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_system_values.c (renamed from src/glsl/nir/nir_lower_system_values.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_tex.c (renamed from src/glsl/nir/nir_lower_tex.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_to_source_mods.c (renamed from src/glsl/nir/nir_lower_to_source_mods.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_two_sided_color.c (renamed from src/glsl/nir/nir_lower_two_sided_color.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_var_copies.c (renamed from src/glsl/nir/nir_lower_var_copies.c) | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_vars_to_ssa.c (renamed from src/glsl/nir/nir_lower_vars_to_ssa.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_vec_to_movs.c (renamed from src/glsl/nir/nir_lower_vec_to_movs.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_metadata.c (renamed from src/glsl/nir/nir_metadata.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_move_vec_src_uses_to_dest.c (renamed from src/glsl/nir/nir_move_vec_src_uses_to_dest.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_normalize_cubemap_coords.c (renamed from src/glsl/nir/nir_normalize_cubemap_coords.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opcodes.py (renamed from src/glsl/nir/nir_opcodes.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opcodes_c.py (renamed from src/glsl/nir/nir_opcodes_c.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opcodes_h.py (renamed from src/glsl/nir/nir_opcodes_h.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_algebraic.py (renamed from src/glsl/nir/nir_opt_algebraic.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_constant_folding.c (renamed from src/glsl/nir/nir_opt_constant_folding.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_copy_propagate.c (renamed from src/glsl/nir/nir_opt_copy_propagate.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_cse.c (renamed from src/glsl/nir/nir_opt_cse.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_dce.c (renamed from src/glsl/nir/nir_opt_dce.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_dead_cf.c (renamed from src/glsl/nir/nir_opt_dead_cf.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_gcm.c (renamed from src/glsl/nir/nir_opt_gcm.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_global_to_local.c (renamed from src/glsl/nir/nir_opt_global_to_local.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_peephole_select.c (renamed from src/glsl/nir/nir_opt_peephole_select.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_remove_phis.c (renamed from src/glsl/nir/nir_opt_remove_phis.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_undef.c (renamed from src/glsl/nir/nir_opt_undef.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_phi_builder.c (renamed from src/glsl/nir/nir_phi_builder.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_phi_builder.h (renamed from src/glsl/nir/nir_phi_builder.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_print.c (renamed from src/glsl/nir/nir_print.c) | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_remove_dead_variables.c (renamed from src/glsl/nir/nir_remove_dead_variables.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_repair_ssa.c (renamed from src/glsl/nir/nir_repair_ssa.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_search.c (renamed from src/glsl/nir/nir_search.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_search.h (renamed from src/glsl/nir/nir_search.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_split_var_copies.c (renamed from src/glsl/nir/nir_split_var_copies.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_sweep.c (renamed from src/glsl/nir/nir_sweep.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_to_ssa.c (renamed from src/glsl/nir/nir_to_ssa.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_validate.c (renamed from src/glsl/nir/nir_validate.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_vla.h (renamed from src/glsl/nir/nir_vla.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_worklist.c (renamed from src/glsl/nir/nir_worklist.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_worklist.h (renamed from src/glsl/nir/nir_worklist.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/spirv/GLSL.std.450.h (renamed from src/glsl/nir/spirv/GLSL.std.450.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/spirv/nir_spirv.h (renamed from src/glsl/nir/spirv/nir_spirv.h) | 2 | ||||
-rw-r--r-- | src/compiler/nir/spirv/spirv.h (renamed from src/glsl/nir/spirv/spirv.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/spirv/spirv_to_nir.c (renamed from src/glsl/nir/spirv/spirv_to_nir.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/spirv/vtn_alu.c (renamed from src/glsl/nir/spirv/vtn_alu.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/spirv/vtn_cfg.c (renamed from src/glsl/nir/spirv/vtn_cfg.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/spirv/vtn_glsl450.c (renamed from src/glsl/nir/spirv/vtn_glsl450.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/spirv/vtn_private.h (renamed from src/glsl/nir/spirv/vtn_private.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/spirv/vtn_variables.c (renamed from src/glsl/nir/spirv/vtn_variables.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/spirv2nir.c (renamed from src/glsl/nir/spirv2nir.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/tests/control_flow_tests.cpp (renamed from src/glsl/nir/tests/control_flow_tests.cpp) | 0 | ||||
-rw-r--r-- | src/compiler/nir_types.cpp (renamed from src/glsl/nir/nir_types.cpp) | 2 | ||||
-rw-r--r-- | src/compiler/nir_types.h (renamed from src/glsl/nir/nir_types.h) | 3 | ||||
-rw-r--r-- | src/compiler/shader_enums.c (renamed from src/glsl/nir/shader_enums.c) | 0 | ||||
-rw-r--r-- | src/compiler/shader_enums.h (renamed from src/glsl/nir/shader_enums.h) | 0 | ||||
-rw-r--r-- | src/gallium/auxiliary/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/nir/tgsi_to_nir.c | 12 | ||||
-rw-r--r-- | src/gallium/auxiliary/nir/tgsi_to_nir.h | 2 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/Makefile.am | 4 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_nir.h | 4 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_shader.h | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_nir_lower_blend.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_nir_lower_io.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_program.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_qir.h | 2 | ||||
-rw-r--r-- | src/gallium/targets/dri/SConscript | 1 | ||||
-rw-r--r-- | src/gallium/targets/haiku-softpipe/SConscript | 1 | ||||
-rw-r--r-- | src/gallium/targets/libgl-gdi/SConscript | 2 | ||||
-rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 1 | ||||
-rw-r--r-- | src/gallium/targets/osmesa/SConscript | 1 | ||||
-rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/xa/Makefile.am | 2 | ||||
-rw-r--r-- | src/mesa/Android.libmesa_dricore.mk | 2 | ||||
-rw-r--r-- | src/mesa/Android.libmesa_glsl_utils.mk | 4 | ||||
-rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 2 | ||||
-rw-r--r-- | src/mesa/Makefile.am | 4 | ||||
-rw-r--r-- | src/mesa/Makefile.sources | 6 | ||||
-rw-r--r-- | src/mesa/SConscript | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_compiler.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_cs.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.h | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp | 6 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp | 6 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_gs.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_link.cpp | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp | 6 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.h | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.h | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/gen7_cs_state.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_asm_annotation.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_resolve_map.h | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/x11/SConscript | 1 | ||||
-rw-r--r-- | src/mesa/main/context.c | 2 | ||||
-rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 10 | ||||
-rw-r--r-- | src/mesa/main/mtypes.h | 2 | ||||
-rw-r--r-- | src/mesa/main/pipelineobj.c | 4 | ||||
-rw-r--r-- | src/mesa/main/program_resource.c | 2 | ||||
-rw-r--r-- | src/mesa/main/shader_query.cpp | 6 | ||||
-rw-r--r-- | src/mesa/main/shaderapi.c | 8 | ||||
-rw-r--r-- | src/mesa/main/uniform_query.cpp | 8 | ||||
-rw-r--r-- | src/mesa/main/uniforms.c | 4 | ||||
-rw-r--r-- | src/mesa/main/uniforms.h | 4 | ||||
-rw-r--r-- | src/mesa/program/Android.mk | 2 | ||||
-rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 20 | ||||
-rw-r--r-- | src/mesa/program/prog_to_nir.c | 6 | ||||
-rw-r--r-- | src/mesa/program/sampler.cpp | 10 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_draw.c | 2 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 | ||||
-rw-r--r-- | src/vulkan/Makefile.am | 4 | ||||
-rw-r--r-- | src/vulkan/anv_meta.c | 2 | ||||
-rw-r--r-- | src/vulkan/anv_meta_clear.c | 2 | ||||
-rw-r--r-- | src/vulkan/anv_meta_resolve.c | 2 | ||||
-rw-r--r-- | src/vulkan/anv_nir.h | 2 | ||||
-rw-r--r-- | src/vulkan/anv_nir_apply_dynamic_offsets.c | 2 | ||||
-rw-r--r-- | src/vulkan/anv_nir_apply_pipeline_layout.c | 2 | ||||
-rw-r--r-- | src/vulkan/anv_pipeline.c | 2 |
631 files changed, 1057 insertions, 327 deletions
@@ -86,6 +86,7 @@ ifneq ($(strip $(MESA_GPU_DRIVERS)),) SUBDIRS := \ src/loader \ src/mapi \ + src/compiler \ src/glsl \ src/mesa \ src/util \ diff --git a/configure.ac b/configure.ac index 44d16c6..a18080d 100644 --- a/configure.ac +++ b/configure.ac @@ -2445,6 +2445,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" dnl Substitute the config AC_CONFIG_FILES([Makefile src/Makefile + src/compiler/Makefile src/egl/Makefile src/egl/main/egl.pc src/egl/wayland/wayland-drm/Makefile @@ -2514,7 +2515,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 9f51e44..272e68c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,8 +21,11 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi +# include only conditionally ? +SUBDIRS += compiler + if NEED_OPENGL_COMMON -SUBDIRS += glsl mesa +SUBDIRS += mesa endif SUBDIRS += loader diff --git a/src/SConscript b/src/SConscript index 106b87d..4ba0a32 100644 --- a/src/SConscript +++ b/src/SConscript @@ -5,7 +5,7 @@ if env['platform'] == 'windows': SConscript('getopt/SConscript') SConscript('util/SConscript') -SConscript('glsl/SConscript') +SConscript('compiler/SConscript') if env['hostonly']: # We are just compiling the things necessary on the host for cross diff --git a/src/glsl/Android.gen.mk b/src/compiler/Android.gen.mk index 59cc857..fcd5f94 100644 --- a/src/glsl/Android.gen.mk +++ b/src/compiler/Android.gen.mk @@ -32,55 +32,16 @@ intermediates := $(call local-generated-sources-dir) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) LOCAL_C_INCLUDES += \ - $(intermediates)/glcpp \ $(intermediates)/nir \ - $(MESA_TOP)/src/glsl/glcpp \ - $(MESA_TOP)/src/glsl/nir + $(MESA_TOP)/src/compiler/nir LOCAL_EXPORT_C_INCLUDE_DIRS += \ $(intermediates)/nir \ - $(MESA_TOP)/src/glsl/nir + $(MESA_TOP)/src/compiler/nir LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(LIBGLCPP_GENERATED_FILES) \ - $(NIR_GENERATED_FILES) \ - $(LIBGLSL_GENERATED_CXX_FILES)) + $(NIR_GENERATED_FILES)) -define local-l-or-ll-to-c-or-cpp - @mkdir -p $(dir $@) - @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<" - $(hide) $(LEX) --nounistd -o$@ $< -endef - -define glsl_local-y-to-c-and-h - @mkdir -p $(dir $@) - @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" - $(hide) $(YACC) -o $@ -p "glcpp_parser_" $< -endef - -define local-yy-to-cpp-and-h - @mkdir -p $(dir $@) - @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" - $(hide) $(YACC) -p "_mesa_glsl_" -o $@ $< - touch $(@:$1=$(YACC_HEADER_SUFFIX)) - echo '#ifndef '$(@F:$1=_h) > $(@:$1=.h) - echo '#define '$(@F:$1=_h) >> $(@:$1=.h) - cat $(@:$1=$(YACC_HEADER_SUFFIX)) >> $(@:$1=.h) - echo '#endif' >> $(@:$1=.h) - rm -f $(@:$1=$(YACC_HEADER_SUFFIX)) -endef - -$(intermediates)/glsl_lexer.cpp: $(LOCAL_PATH)/glsl_lexer.ll - $(call local-l-or-ll-to-c-or-cpp) - -$(intermediates)/glsl_parser.cpp: $(LOCAL_PATH)/glsl_parser.yy - $(call local-yy-to-cpp-and-h,.cpp) - -$(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l - $(call local-l-or-ll-to-c-or-cpp) - -$(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y - $(call glsl_local-y-to-c-and-h) nir_builder_opcodes_gen := $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py nir_builder_opcodes_deps := \ diff --git a/src/compiler/Android.mk b/src/compiler/Android.mk new file mode 100644 index 0000000..888780b --- /dev/null +++ b/src/compiler/Android.mk @@ -0,0 +1,67 @@ +# Mesa 3-D graphics library +# +# Copyright (C) 2015 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +include $(LOCAL_PATH)/Makefile.sources + +# --------------------------------------- +# Build libmesa_compiler +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(LIBCOMPILER_FILES) + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src/mesa \ + $(MESA_TOP)/src/gallium/include \ + $(MESA_TOP)/src/gallium/auxiliary + +LOCAL_MODULE := libmesa_compiler + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +# --------------------------------------- +# Build libmesa_nir +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(NIR_FILES) + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src/mesa \ + $(MESA_TOP)/src/gallium/include \ + $(MESA_TOP)/src/gallium/auxiliary + +LOCAL_STATIC_LIBRARIES := libmesa_compiler + +LOCAL_MODULE := libmesa_nir + +include $(LOCAL_PATH)/Android.gen.mk +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am new file mode 100644 index 0000000..e3d297f --- /dev/null +++ b/src/compiler/Makefile.am @@ -0,0 +1,333 @@ +# +# Copyright © 2012 Jon TURNEY +# Copyright (C) 2015 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +include Makefile.sources + +AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -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 \ + $(DEFINES) + +AM_CFLAGS = \ + $(VISIBILITY_CFLAGS) \ + $(MSVC2013_COMPAT_CFLAGS) + +AM_CXXFLAGS = \ + $(VISIBILITY_CXXFLAGS) \ + $(MSVC2013_COMPAT_CXXFLAGS) + +noinst_LTLIBRARIES = libcompiler.la + +libcompiler_la_SOURCES = $(LIBCOMPILER_FILES) + +check_PROGRAMS = +TESTS = +BUILT_SOURCES = +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 spirv2nir + +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) + +spirv2nir_SOURCES = \ + nir/spirv2nir.c + +spirv2nir_LDADD = \ + nir/libnir.la \ + $(top_builddir)/src/util/libmesautil.la \ + -lm -lstdc++ \ + $(PTHREAD_LIBS) + +# We write our own rules for yacc and lex below. We'd rather use automake, +# but automake makes it especially difficult for a number of reasons: +# +# * < automake-1.12 generates .h files from .yy and .ypp files, but +# >=automake-1.12 generates .hh and .hpp files respectively. There's no +# good way of making a project that uses C++ yacc files compatible with +# both versions of automake. Strong work automake developers. +# +# * Since we're generating code from .l/.y files in a subdirectory (glcpp/) +# we'd like the resulting generated code to also go in glcpp/ for purposes +# of distribution. Automake gives no way to do this. +# +# * Since we're building multiple yacc parsers into one library (and via one +# Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes +# automake to name the resulting generated code as <library-name>_filename.c. +# Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file. + +# In order to make build output print "LEX" and "YACC", we reproduce the +# automake variables below. + +AM_V_LEX = $(am__v_LEX_$(V)) +am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY)) +am__v_LEX_0 = @echo " LEX " $@; +am__v_LEX_1 = + +AM_V_YACC = $(am__v_YACC_$(V)) +am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY)) +am__v_YACC_0 = @echo " YACC " $@; +am__v_YACC_1 = + +MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) +YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS) +LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS) + +glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy + $(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl/glsl_parser.h $(srcdir)/glsl/glsl_parser.yy + +glsl/glsl_lexer.cpp: glsl/glsl_lexer.ll + $(LEX_GEN) -o $@ $(srcdir)/glsl/glsl_lexer.ll + +glsl/glcpp/glcpp-parse.c glsl/glcpp/glcpp-parse.h: glsl/glcpp/glcpp-parse.y + $(MKDIR_GEN) + $(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glsl/glcpp/glcpp-parse.h $(srcdir)/glsl/glcpp/glcpp-parse.y + +glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l + $(MKDIR_GEN) + $(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l + +# Only the parsers (specifically the header files generated at the same time) +# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is +# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files +# YACC is only executed once for each parser. The rest of the generated code +# will be created at the appropriate times according to standard automake +# dependency rules. +BUILT_SOURCES += \ + glsl/glsl_parser.cpp \ + glsl/glsl_lexer.cpp \ + glsl/glcpp/glcpp-parse.c \ + glsl/glcpp/glcpp-lex.c +CLEANFILES += \ + glsl/glcpp/glcpp-parse.h \ + glsl/glsl_parser.h \ + glsl/glsl_parser.cpp \ + glsl/glsl_lexer.cpp \ + glsl/glcpp/glcpp-parse.c \ + glsl/glcpp/glcpp-lex.c + +clean-local: + $(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr + +dist-hook: + $(RM) glsl/glcpp/tests/*.out + $(RM) glsl/glcpp/tests/subtest*/*.out + +noinst_LTLIBRARIES += nir/libnir.la + +nir_libnir_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_builddir)/src/compiler/nir \ + -I$(top_srcdir)/src/compiler/nir + +nir_libnir_la_LIBADD = \ + libcompiler.la + +nir_libnir_la_SOURCES = \ + $(NIR_FILES) \ + $(SPIRV_FILES) \ + $(NIR_GENERATED_FILES) + +PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) + +nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false) + +nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@ || ($(RM) $@; false) + +nir/nir_opcodes.h: nir/nir_opcodes.py nir/nir_opcodes_h.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_h.py > $@ || ($(RM) $@; false) + +nir/nir_opcodes.c: nir/nir_opcodes.py nir/nir_opcodes_c.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_c.py > $@ || ($(RM) $@; false) + +nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false) + + +check_PROGRAMS += nir/tests/control_flow_tests + +nir_tests_control_flow_tests_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_builddir)/src/compiler/nir \ + -I$(top_srcdir)/src/compiler/nir + +nir_tests_control_flow_tests_SOURCES = \ + nir/tests/control_flow_tests.cpp +nir_tests_control_flow_tests_CFLAGS = \ + $(PTHREAD_CFLAGS) +nir_tests_control_flow_tests_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + nir/libnir.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(PTHREAD_LIBS) + + +TESTS += nir/tests/control_flow_tests + + +BUILT_SOURCES += $(NIR_GENERATED_FILES) +CLEANFILES += $(NIR_GENERATED_FILES) + +EXTRA_DIST += \ + nir/nir_algebraic.py \ + nir/nir_builder_opcodes_h.py \ + nir/nir_constant_expressions.py \ + nir/nir_opcodes.py \ + nir/nir_opcodes_c.py \ + nir/nir_opcodes_h.py \ + nir/nir_opt_algebraic.py \ + nir/tests \ + nir/Makefile.sources diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources new file mode 100644 index 0000000..2a4568a --- /dev/null +++ b/src/compiler/Makefile.sources @@ -0,0 +1,242 @@ +LIBCOMPILER_FILES = \ + builtin_type_macros.h \ + glsl_types.cpp \ + glsl_types.h \ + nir_types.cpp \ + nir_types.h \ + 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 \ + nir/nir_opcodes.c \ + nir/nir_opcodes.h \ + nir/nir_opt_algebraic.c + +NIR_FILES = \ + nir/glsl_to_nir.cpp \ + nir/glsl_to_nir.h \ + nir/nir.c \ + nir/nir.h \ + nir/nir_array.h \ + nir/nir_builder.h \ + nir/nir_clone.c \ + nir/nir_constant_expressions.h \ + nir/nir_control_flow.c \ + nir/nir_control_flow.h \ + nir/nir_control_flow_private.h \ + nir/nir_dominance.c \ + nir/nir_from_ssa.c \ + nir/nir_gather_info.c \ + nir/nir_gs_count_vertices.c \ + nir/nir_inline_functions.c \ + nir/nir_intrinsics.c \ + nir/nir_intrinsics.h \ + nir/nir_instr_set.c \ + nir/nir_instr_set.h \ + nir/nir_liveness.c \ + nir/nir_lower_alu_to_scalar.c \ + nir/nir_lower_atomics.c \ + nir/nir_lower_clip.c \ + nir/nir_lower_global_vars_to_local.c \ + nir/nir_lower_gs_intrinsics.c \ + nir/nir_lower_indirect_derefs.c \ + nir/nir_lower_load_const_to_scalar.c \ + nir/nir_lower_locals_to_regs.c \ + nir/nir_lower_idiv.c \ + nir/nir_lower_io.c \ + nir/nir_lower_outputs_to_temporaries.c \ + nir/nir_lower_phis_to_scalar.c \ + nir/nir_lower_returns.c \ + nir/nir_lower_samplers.c \ + nir/nir_lower_system_values.c \ + nir/nir_lower_tex.c \ + nir/nir_lower_to_source_mods.c \ + nir/nir_lower_two_sided_color.c \ + nir/nir_lower_vars_to_ssa.c \ + nir/nir_lower_var_copies.c \ + nir/nir_lower_vec_to_movs.c \ + nir/nir_metadata.c \ + nir/nir_move_vec_src_uses_to_dest.c \ + nir/nir_normalize_cubemap_coords.c \ + nir/nir_opt_constant_folding.c \ + nir/nir_opt_copy_propagate.c \ + nir/nir_opt_cse.c \ + nir/nir_opt_dce.c \ + nir/nir_opt_dead_cf.c \ + nir/nir_opt_gcm.c \ + nir/nir_opt_global_to_local.c \ + nir/nir_opt_peephole_select.c \ + nir/nir_opt_remove_phis.c \ + nir/nir_opt_undef.c \ + nir/nir_phi_builder.c \ + nir/nir_phi_builder.h \ + nir/nir_print.c \ + nir/nir_remove_dead_variables.c \ + nir/nir_repair_ssa.c \ + nir/nir_search.c \ + nir/nir_search.h \ + nir/nir_split_var_copies.c \ + nir/nir_sweep.c \ + nir/nir_to_ssa.c \ + nir/nir_validate.c \ + nir/nir_vla.h \ + nir/nir_worklist.c \ + nir/nir_worklist.h + +SPIRV_FILES = \ + nir/spirv/nir_spirv.h \ + nir/spirv/spirv_to_nir.c \ + nir/spirv/vtn_alu.c \ + nir/spirv/vtn_cfg.c \ + nir/spirv/vtn_glsl450.c \ + nir/spirv/vtn_private.h \ + nir/spirv/vtn_variables.c diff --git a/src/compiler/SConscript b/src/compiler/SConscript new file mode 100644 index 0000000..8d71b82 --- /dev/null +++ b/src/compiler/SConscript @@ -0,0 +1,24 @@ +Import('*') + +env = env.Clone() + +env.MSVC2013Compat() + +env.Prepend(CPPPATH = [ + '#include', + '#src', + '#src/mapi', + '#src/mesa', + '#src/gallium/include', + '#src/gallium/auxiliary', +]) + +sources = env.ParseSourceList('Makefile.sources', 'LIBCOMPILER_FILES') + +compiler = env.ConvenienceLibrary( + target = 'compiler', + source = sources +) +Export('compiler') + +SConscript('glsl/SConscript') diff --git a/src/glsl/nir/builtin_type_macros.h b/src/compiler/builtin_type_macros.h index 7bd2e4e..7bd2e4e 100644 --- a/src/glsl/nir/builtin_type_macros.h +++ b/src/compiler/builtin_type_macros.h diff --git a/src/glsl/.gitignore b/src/compiler/glsl/.gitignore index e80f8af..e80f8af 100644 --- a/src/glsl/.gitignore +++ b/src/compiler/glsl/.gitignore diff --git a/src/compiler/glsl/Android.gen.mk b/src/compiler/glsl/Android.gen.mk new file mode 100644 index 0000000..c5741b4 --- /dev/null +++ b/src/compiler/glsl/Android.gen.mk @@ -0,0 +1,76 @@ +# Mesa 3-D graphics library +# +# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com> +# Copyright (C) 2010-2011 LunarG Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# included by glsl Android.mk for source generation + +ifeq ($(LOCAL_MODULE_CLASS),) +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +endif + +intermediates := $(call local-generated-sources-dir) + +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) + +LOCAL_C_INCLUDES += \ + $(intermediates)/glcpp \ + $(MESA_TOP)/src/glsl/glcpp \ + +LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ + $(LIBGLCPP_GENERATED_FILES) \ + $(LIBGLSL_GENERATED_CXX_FILES)) + +define local-l-or-ll-to-c-or-cpp + @mkdir -p $(dir $@) + @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<" + $(hide) $(LEX) --nounistd -o$@ $< +endef + +define glsl_local-y-to-c-and-h + @mkdir -p $(dir $@) + @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" + $(hide) $(YACC) -o $@ -p "glcpp_parser_" $< +endef + +define local-yy-to-cpp-and-h + @mkdir -p $(dir $@) + @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" + $(hide) $(YACC) -p "_mesa_glsl_" -o $@ $< + touch $(@:$1=$(YACC_HEADER_SUFFIX)) + echo '#ifndef '$(@F:$1=_h) > $(@:$1=.h) + echo '#define '$(@F:$1=_h) >> $(@:$1=.h) + cat $(@:$1=$(YACC_HEADER_SUFFIX)) >> $(@:$1=.h) + echo '#endif' >> $(@:$1=.h) + rm -f $(@:$1=$(YACC_HEADER_SUFFIX)) +endef + +$(intermediates)/glsl_lexer.cpp: $(LOCAL_PATH)/glsl_lexer.ll + $(call local-l-or-ll-to-c-or-cpp) + +$(intermediates)/glsl_parser.cpp: $(LOCAL_PATH)/glsl_parser.yy + $(call local-yy-to-cpp-and-h,.cpp) + +$(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l + $(call local-l-or-ll-to-c-or-cpp) + +$(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y + $(call glsl_local-y-to-c-and-h) diff --git a/src/glsl/Android.mk b/src/compiler/glsl/Android.mk index f63b7da..9cbb9a3 100644 --- a/src/glsl/Android.mk +++ b/src/compiler/glsl/Android.mk @@ -44,6 +44,8 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary +LOCAL_STATIC_LIBRARIES := libmesa_compiler + LOCAL_MODULE := libmesa_glsl include $(LOCAL_PATH)/Android.gen.mk diff --git a/src/glsl/Makefile.am b/src/compiler/glsl/Makefile.am index bd6bbf2..d6b1f9e 100644 --- a/src/glsl/Makefile.am +++ b/src/compiler/glsl/Makefile.am @@ -27,9 +27,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/glsl/glcpp \ - -I$(top_srcdir)/src/glsl/nir \ -I$(top_srcdir)/src/gtest/include \ - -I$(top_builddir)/src/glsl/nir \ $(DEFINES) AM_CFLAGS = \ $(VISIBILITY_CFLAGS) \ @@ -43,21 +41,12 @@ EXTRA_DIST = tests glcpp/tests README TODO glcpp/README \ glsl_parser.yy \ glcpp/glcpp-lex.l \ glcpp/glcpp-parse.y \ - nir/nir_algebraic.py \ - nir/nir_builder_opcodes_h.py \ - nir/nir_constant_expressions.py \ - nir/nir_opcodes.py \ - nir/nir_opcodes_c.py \ - nir/nir_opcodes_h.py \ - nir/nir_opt_algebraic.py \ - nir/tests \ SConscript include Makefile.sources TESTS = glcpp/tests/glcpp-test \ glcpp/tests/glcpp-test-cr-lf \ - nir/tests/control_flow_tests \ tests/blob-test \ tests/general-ir-test \ tests/optimization-test \ @@ -68,11 +57,10 @@ TESTS_ENVIRONMENT= \ export PYTHON2=$(PYTHON2); \ export PYTHON_FLAGS=$(PYTHON_FLAGS); -noinst_LTLIBRARIES = libnir.la libglsl.la libglcpp.la +noinst_LTLIBRARIES = libglsl.la libglcpp.la check_PROGRAMS = \ glcpp/glcpp \ glsl_test \ - nir/tests/control_flow_tests \ tests/blob-test \ tests/general-ir-test \ tests/sampler-types-test \ @@ -137,21 +125,15 @@ glcpp_glcpp_LDADD = \ $(top_builddir)/src/libglsl_util.la \ -lm -libglsl_la_LIBADD = libglcpp.la +libglsl_la_LIBADD = \ + $(top_builddir)/src/compiler/nir/libnir.la \ + libglcpp.la + libglsl_la_SOURCES = \ glsl_lexer.cpp \ glsl_parser.cpp \ glsl_parser.h \ - $(LIBGLSL_FILES) \ - $(NIR_FILES) \ - $(SPIRV_FILES) \ - $(NIR_GENERATED_FILES) \ - $(GLSL_TO_NIR_FILES) - -libnir_la_SOURCES = \ - $(NIR_FILES) \ - $(SPIRV_FILES) \ - $(NIR_GENERATED_FILES) + $(LIBGLSL_FILES) glsl_compiler_SOURCES = \ $(GLSL_COMPILER_CXX_FILES) @@ -241,8 +223,7 @@ BUILT_SOURCES = \ glsl_parser.cpp \ glsl_lexer.cpp \ glcpp/glcpp-parse.c \ - glcpp/glcpp-lex.c \ - $(NIR_GENERATED_FILES) + glcpp/glcpp-lex.c CLEANFILES = \ glcpp/glcpp-parse.h \ glsl_parser.h \ @@ -254,35 +235,3 @@ clean-local: dist-hook: $(RM) glcpp/tests/*.out $(RM) glcpp/tests/subtest*/*.out - -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) - -nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false) - -nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@ || ($(RM) $@; false) - -nir/nir_opcodes.h: nir/nir_opcodes.py nir/nir_opcodes_h.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_h.py > $@ || ($(RM) $@; false) - -nir/nir_opcodes.c: nir/nir_opcodes.py nir/nir_opcodes_c.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_c.py > $@ || ($(RM) $@; false) - -nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false) - -nir_tests_control_flow_tests_SOURCES = \ - nir/tests/control_flow_tests.cpp -nir_tests_control_flow_tests_CFLAGS = \ - $(PTHREAD_CFLAGS) -nir_tests_control_flow_tests_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/glsl/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) diff --git a/src/glsl/Makefile.sources b/src/compiler/glsl/Makefile.sources index 348b488..3f537d5 100644 --- a/src/glsl/Makefile.sources +++ b/src/compiler/glsl/Makefile.sources @@ -18,9 +18,6 @@ NIR_GENERATED_FILES = \ nir/nir_opt_algebraic.c NIR_FILES = \ - nir/glsl_types.cpp \ - nir/glsl_types.h \ - nir/builtin_type_macros.h \ nir/nir.c \ nir/nir.h \ nir/nir_array.h \ @@ -84,14 +81,10 @@ NIR_FILES = \ nir/nir_split_var_copies.c \ nir/nir_sweep.c \ nir/nir_to_ssa.c \ - nir/nir_types.h \ nir/nir_validate.c \ nir/nir_vla.h \ nir/nir_worklist.c \ - nir/nir_worklist.h \ - nir/nir_types.cpp \ - nir/shader_enums.h \ - nir/shader_enums.c + nir/nir_worklist.h SPIRV_FILES = \ nir/spirv/nir_spirv.h \ diff --git a/src/glsl/README b/src/compiler/glsl/README index bfcf69f..bfcf69f 100644 --- a/src/glsl/README +++ b/src/compiler/glsl/README diff --git a/src/glsl/SConscript b/src/compiler/glsl/SConscript index a9d38c1..ef82a9d 100644 --- a/src/glsl/SConscript +++ b/src/compiler/glsl/SConscript @@ -16,7 +16,6 @@ env.Prepend(CPPPATH = [ '#src/gallium/include', '#src/gallium/auxiliary', '#src/glsl', - '#src/glsl/nir', '#src/glsl/glcpp', ]) @@ -61,13 +60,6 @@ source_lists = env.ParseSourceList('Makefile.sources') for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'): glsl_sources += source_lists[l] -# add nir/glsl_types.cpp manually, because SCons still doesn't know about NIR. -# XXX: Remove this once we build NIR and NIR_FILES. -glsl_sources += [ - 'nir/glsl_types.cpp', - 'nir/shader_enums.c', -] - if env['msvc']: env.Prepend(CPPPATH = ['#/src/getopt']) env.PrependUnique(LIBS = [getopt]) @@ -115,7 +107,7 @@ if env['platform'] == 'windows': 'user32', ]) -env.Prepend(LIBS = [glsl]) +env.Prepend(LIBS = [compiler, glsl]) glsl_compiler = env.Program( target = 'glsl_compiler', diff --git a/src/glsl/TODO b/src/compiler/glsl/TODO index bd077a8..bd077a8 100644 --- a/src/glsl/TODO +++ b/src/compiler/glsl/TODO diff --git a/src/glsl/ast.h b/src/compiler/glsl/ast.h index 03df6c0..03df6c0 100644 --- a/src/glsl/ast.h +++ b/src/compiler/glsl/ast.h diff --git a/src/glsl/ast_array_index.cpp b/src/compiler/glsl/ast_array_index.cpp index ca7a9a1..f5baeb9 100644 --- a/src/glsl/ast_array_index.cpp +++ b/src/compiler/glsl/ast_array_index.cpp @@ -22,7 +22,7 @@ */ #include "ast.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "ir.h" void diff --git a/src/glsl/ast_expr.cpp b/src/compiler/glsl/ast_expr.cpp index e624d11..e624d11 100644 --- a/src/glsl/ast_expr.cpp +++ b/src/compiler/glsl/ast_expr.cpp diff --git a/src/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp index e32a588..0eb456a 100644 --- a/src/glsl/ast_function.cpp +++ b/src/compiler/glsl/ast_function.cpp @@ -23,7 +23,7 @@ #include "glsl_symbol_table.h" #include "ast.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "ir.h" #include "main/core.h" /* for MIN2 */ #include "main/shaderobj.h" diff --git a/src/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 8d66131..98d8bc5 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -52,7 +52,7 @@ #include "glsl_symbol_table.h" #include "glsl_parser_extras.h" #include "ast.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "program/hash_table.h" #include "main/shaderobj.h" #include "ir.h" diff --git a/src/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp index e0e3311..e0e3311 100644 --- a/src/glsl/ast_type.cpp +++ b/src/compiler/glsl/ast_type.cpp diff --git a/src/glsl/blob.c b/src/compiler/glsl/blob.c index dd4341b..dd4341b 100644 --- a/src/glsl/blob.c +++ b/src/compiler/glsl/blob.c diff --git a/src/glsl/blob.h b/src/compiler/glsl/blob.h index ec903ec..ec903ec 100644 --- a/src/glsl/blob.h +++ b/src/compiler/glsl/blob.h diff --git a/src/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index 95e86df..95e86df 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp diff --git a/src/glsl/builtin_types.cpp b/src/compiler/glsl/builtin_types.cpp index bbdcd19..ee24bd5 100644 --- a/src/glsl/builtin_types.cpp +++ b/src/compiler/glsl/builtin_types.cpp @@ -34,7 +34,7 @@ * version and set of enabled extensions. */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "glsl_parser_extras.h" #include "util/macros.h" @@ -112,7 +112,7 @@ static const struct glsl_struct_field gl_FogParameters_fields[] = { glsl_struct_field(glsl_type::float_type, "scale"), }; -#include "builtin_type_macros.h" +#include "compiler/builtin_type_macros.h" /** @} */ /** diff --git a/src/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index ccc04c0..ccc04c0 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp diff --git a/src/glsl/glcpp/.gitignore b/src/compiler/glsl/glcpp/.gitignore index 24a7119..24a7119 100644 --- a/src/glsl/glcpp/.gitignore +++ b/src/compiler/glsl/glcpp/.gitignore diff --git a/src/glsl/glcpp/README b/src/compiler/glsl/glcpp/README index 0637935..0637935 100644 --- a/src/glsl/glcpp/README +++ b/src/compiler/glsl/glcpp/README diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/compiler/glsl/glcpp/glcpp-lex.l index fa9aa50..fa9aa50 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/compiler/glsl/glcpp/glcpp-lex.l diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index ef1a657..ef1a657 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y diff --git a/src/glsl/glcpp/glcpp.c b/src/compiler/glsl/glcpp/glcpp.c index c62f4ef..c62f4ef 100644 --- a/src/glsl/glcpp/glcpp.c +++ b/src/compiler/glsl/glcpp/glcpp.c diff --git a/src/glsl/glcpp/glcpp.h b/src/compiler/glsl/glcpp/glcpp.h index 70aa14b..70aa14b 100644 --- a/src/glsl/glcpp/glcpp.h +++ b/src/compiler/glsl/glcpp/glcpp.h diff --git a/src/glsl/glcpp/pp.c b/src/compiler/glsl/glcpp/pp.c index 160c666..160c666 100644 --- a/src/glsl/glcpp/pp.c +++ b/src/compiler/glsl/glcpp/pp.c diff --git a/src/glsl/glcpp/tests/.gitignore b/src/compiler/glsl/glcpp/tests/.gitignore index 3802c85..3802c85 100644 --- a/src/glsl/glcpp/tests/.gitignore +++ b/src/compiler/glsl/glcpp/tests/.gitignore diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c index 1f2320e..1f2320e 100644 --- a/src/glsl/glcpp/tests/000-content-with-spaces.c +++ b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected index 0079191..0079191 100644 --- a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected +++ b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected diff --git a/src/glsl/glcpp/tests/001-define.c b/src/compiler/glsl/glcpp/tests/001-define.c index cbf2fee..cbf2fee 100644 --- a/src/glsl/glcpp/tests/001-define.c +++ b/src/compiler/glsl/glcpp/tests/001-define.c diff --git a/src/glsl/glcpp/tests/001-define.c.expected b/src/compiler/glsl/glcpp/tests/001-define.c.expected index a464d9d..a464d9d 100644 --- a/src/glsl/glcpp/tests/001-define.c.expected +++ b/src/compiler/glsl/glcpp/tests/001-define.c.expected diff --git a/src/glsl/glcpp/tests/002-define-chain.c b/src/compiler/glsl/glcpp/tests/002-define-chain.c index 87d75c6..87d75c6 100644 --- a/src/glsl/glcpp/tests/002-define-chain.c +++ b/src/compiler/glsl/glcpp/tests/002-define-chain.c diff --git a/src/glsl/glcpp/tests/002-define-chain.c.expected b/src/compiler/glsl/glcpp/tests/002-define-chain.c.expected index c6c9ee3..c6c9ee3 100644 --- a/src/glsl/glcpp/tests/002-define-chain.c.expected +++ b/src/compiler/glsl/glcpp/tests/002-define-chain.c.expected diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c index a18b724..a18b724 100644 --- a/src/glsl/glcpp/tests/003-define-chain-reverse.c +++ b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected index c6c9ee3..c6c9ee3 100644 --- a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected +++ b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected diff --git a/src/glsl/glcpp/tests/004-define-recursive.c b/src/compiler/glsl/glcpp/tests/004-define-recursive.c index 2ac56ea..2ac56ea 100644 --- a/src/glsl/glcpp/tests/004-define-recursive.c +++ b/src/compiler/glsl/glcpp/tests/004-define-recursive.c diff --git a/src/glsl/glcpp/tests/004-define-recursive.c.expected b/src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected index 2d07687..2d07687 100644 --- a/src/glsl/glcpp/tests/004-define-recursive.c.expected +++ b/src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c index f5521df..f5521df 100644 --- a/src/glsl/glcpp/tests/005-define-composite-chain.c +++ b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected index 892975c..892975c 100644 --- a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected +++ b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c index 4bb91a1..4bb91a1 100644 --- a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c +++ b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected index 892975c..892975c 100644 --- a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected +++ b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c index 5784565..5784565 100644 --- a/src/glsl/glcpp/tests/007-define-composite-recursive.c +++ b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected index 0b0b477..0b0b477 100644 --- a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected +++ b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected diff --git a/src/glsl/glcpp/tests/008-define-empty.c b/src/compiler/glsl/glcpp/tests/008-define-empty.c index b1bd17e..b1bd17e 100644 --- a/src/glsl/glcpp/tests/008-define-empty.c +++ b/src/compiler/glsl/glcpp/tests/008-define-empty.c diff --git a/src/glsl/glcpp/tests/008-define-empty.c.expected b/src/compiler/glsl/glcpp/tests/008-define-empty.c.expected index d148bc8..d148bc8 100644 --- a/src/glsl/glcpp/tests/008-define-empty.c.expected +++ b/src/compiler/glsl/glcpp/tests/008-define-empty.c.expected diff --git a/src/glsl/glcpp/tests/009-undef.c b/src/compiler/glsl/glcpp/tests/009-undef.c index 3fc1fb4..3fc1fb4 100644 --- a/src/glsl/glcpp/tests/009-undef.c +++ b/src/compiler/glsl/glcpp/tests/009-undef.c diff --git a/src/glsl/glcpp/tests/009-undef.c.expected b/src/compiler/glsl/glcpp/tests/009-undef.c.expected index 9c0b35a..9c0b35a 100644 --- a/src/glsl/glcpp/tests/009-undef.c.expected +++ b/src/compiler/glsl/glcpp/tests/009-undef.c.expected diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c index 32ff737..32ff737 100644 --- a/src/glsl/glcpp/tests/010-undef-re-define.c +++ b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c.expected b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected index 5970f49..5970f49 100644 --- a/src/glsl/glcpp/tests/010-undef-re-define.c.expected +++ b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c index d9ce13c..d9ce13c 100644 --- a/src/glsl/glcpp/tests/011-define-func-empty.c +++ b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c.expected b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected index d148bc8..d148bc8 100644 --- a/src/glsl/glcpp/tests/011-define-func-empty.c.expected +++ b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c index c2bb730..c2bb730 100644 --- a/src/glsl/glcpp/tests/012-define-func-no-args.c +++ b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected index 9f075f2..9f075f2 100644 --- a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected +++ b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c index f78fb8b..f78fb8b 100644 --- a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c +++ b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected index a464d9d..a464d9d 100644 --- a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected +++ b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c index 11feb26..11feb26 100644 --- a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c +++ b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected index a464d9d..a464d9d 100644 --- a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected +++ b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c index 558da9c..558da9c 100644 --- a/src/glsl/glcpp/tests/015-define-object-with-parens.c +++ b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected index a70321a..a70321a 100644 --- a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected +++ b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c index a2e2404..a2e2404 100644 --- a/src/glsl/glcpp/tests/016-define-func-1-arg.c +++ b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected index 6bfe04f..6bfe04f 100644 --- a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected +++ b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c index c725383..c725383 100644 --- a/src/glsl/glcpp/tests/017-define-func-2-args.c +++ b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected index f7a2b8c..f7a2b8c 100644 --- a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected +++ b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c index 668130b..668130b 100644 --- a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c +++ b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected index c6c9ee3..c6c9ee3 100644 --- a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected +++ b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c index c4e62b2..c4e62b2 100644 --- a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c +++ b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected index 1e89b8c..1e89b8c 100644 --- a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected +++ b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c index 3049ad1..3049ad1 100644 --- a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c +++ b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected index 19f59f5..19f59f5 100644 --- a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected +++ b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c index 21ddd0e..21ddd0e 100644 --- a/src/glsl/glcpp/tests/021-define-func-compose.c +++ b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected index 87f51f0..87f51f0 100644 --- a/src/glsl/glcpp/tests/021-define-func-compose.c.expected +++ b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c index c20d73a..c20d73a 100644 --- a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c +++ b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected index 1dfc669..1dfc669 100644 --- a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected +++ b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c index 7ebfed6..7ebfed6 100644 --- a/src/glsl/glcpp/tests/023-define-extra-whitespace.c +++ b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected index 9c58275..9c58275 100644 --- a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected +++ b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c index e788adc..e788adc 100644 --- a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c +++ b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected index 15600af..15600af 100644 --- a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected +++ b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c index b433671..b433671 100644 --- a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c +++ b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected index 4a59f05..4a59f05 100644 --- a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected +++ b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c index 0d83740..0d83740 100644 --- a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c +++ b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected index 5e3c70f..5e3c70f 100644 --- a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected +++ b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c index 5ccb52c..5ccb52c 100644 --- a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c +++ b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected index 94c15f9..94c15f9 100644 --- a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected +++ b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c index 44962a7..44962a7 100644 --- a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c +++ b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected index 94c15f9..94c15f9 100644 --- a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected +++ b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c index 261f7d2..261f7d2 100644 --- a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c +++ b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected index 94c15f9..94c15f9 100644 --- a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected +++ b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c index e56fbef..e56fbef 100644 --- a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c +++ b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected index bed826e..bed826e 100644 --- a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected +++ b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c index 3f4c874..3f4c874 100644 --- a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c +++ b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected index bed826e..bed826e 100644 --- a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected +++ b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c index b3ac70f..b3ac70f 100644 --- a/src/glsl/glcpp/tests/032-define-func-self-recurse.c +++ b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected index 983f941..983f941 100644 --- a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected +++ b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c index f65e482..f65e482 100644 --- a/src/glsl/glcpp/tests/033-define-func-self-compose.c +++ b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected index 0818362..0818362 100644 --- a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected +++ b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c index 209a5f7..209a5f7 100644 --- a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c +++ b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected index 3f808fe..3f808fe 100644 --- a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected +++ b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c index c307fbe..c307fbe 100644 --- a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c +++ b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected index 09dfdd6..09dfdd6 100644 --- a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected +++ b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c index b21ff33..b21ff33 100644 --- a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c +++ b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected index 580ed95..580ed95 100644 --- a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected +++ b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c index b3a2f37..b3a2f37 100644 --- a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c +++ b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected index e804d7e..e804d7e 100644 --- a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected +++ b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c index 1407c7d..1407c7d 100644 --- a/src/glsl/glcpp/tests/038-func-arg-with-commas.c +++ b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected index 6544adb..6544adb 100644 --- a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected +++ b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c index a7c053b..a7c053b 100644 --- a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c +++ b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected index 4cc7953..4cc7953 100644 --- a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected +++ b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected diff --git a/src/glsl/glcpp/tests/040-token-pasting.c b/src/compiler/glsl/glcpp/tests/040-token-pasting.c index caab3ba..caab3ba 100644 --- a/src/glsl/glcpp/tests/040-token-pasting.c +++ b/src/compiler/glsl/glcpp/tests/040-token-pasting.c diff --git a/src/glsl/glcpp/tests/040-token-pasting.c.expected b/src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected index 48e836e..48e836e 100644 --- a/src/glsl/glcpp/tests/040-token-pasting.c.expected +++ b/src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected diff --git a/src/glsl/glcpp/tests/041-if-0.c b/src/compiler/glsl/glcpp/tests/041-if-0.c index 2cab677..2cab677 100644 --- a/src/glsl/glcpp/tests/041-if-0.c +++ b/src/compiler/glsl/glcpp/tests/041-if-0.c diff --git a/src/glsl/glcpp/tests/041-if-0.c.expected b/src/compiler/glsl/glcpp/tests/041-if-0.c.expected index 8b506b3..8b506b3 100644 --- a/src/glsl/glcpp/tests/041-if-0.c.expected +++ b/src/compiler/glsl/glcpp/tests/041-if-0.c.expected diff --git a/src/glsl/glcpp/tests/042-if-1.c b/src/compiler/glsl/glcpp/tests/042-if-1.c index 874a25c..874a25c 100644 --- a/src/glsl/glcpp/tests/042-if-1.c +++ b/src/compiler/glsl/glcpp/tests/042-if-1.c diff --git a/src/glsl/glcpp/tests/042-if-1.c.expected b/src/compiler/glsl/glcpp/tests/042-if-1.c.expected index a6ae946..a6ae946 100644 --- a/src/glsl/glcpp/tests/042-if-1.c.expected +++ b/src/compiler/glsl/glcpp/tests/042-if-1.c.expected diff --git a/src/glsl/glcpp/tests/043-if-0-else.c b/src/compiler/glsl/glcpp/tests/043-if-0-else.c index 323351f..323351f 100644 --- a/src/glsl/glcpp/tests/043-if-0-else.c +++ b/src/compiler/glsl/glcpp/tests/043-if-0-else.c diff --git a/src/glsl/glcpp/tests/043-if-0-else.c.expected b/src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected index 3d7e6be..3d7e6be 100644 --- a/src/glsl/glcpp/tests/043-if-0-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected diff --git a/src/glsl/glcpp/tests/044-if-1-else.c b/src/compiler/glsl/glcpp/tests/044-if-1-else.c index 28dfc25..28dfc25 100644 --- a/src/glsl/glcpp/tests/044-if-1-else.c +++ b/src/compiler/glsl/glcpp/tests/044-if-1-else.c diff --git a/src/glsl/glcpp/tests/044-if-1-else.c.expected b/src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected index 4a31e1c..4a31e1c 100644 --- a/src/glsl/glcpp/tests/044-if-1-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c index e50f686..e50f686 100644 --- a/src/glsl/glcpp/tests/045-if-0-elif.c +++ b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c.expected b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected index a9bb158..a9bb158 100644 --- a/src/glsl/glcpp/tests/045-if-0-elif.c.expected +++ b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c index 130515a..130515a 100644 --- a/src/glsl/glcpp/tests/046-if-1-elsif.c +++ b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected index a499571..a499571 100644 --- a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected +++ b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c index e8f0838..e8f0838 100644 --- a/src/glsl/glcpp/tests/047-if-elif-else.c +++ b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c.expected b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected index 54d3086..54d3086 100644 --- a/src/glsl/glcpp/tests/047-if-elif-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected diff --git a/src/glsl/glcpp/tests/048-if-nested.c b/src/compiler/glsl/glcpp/tests/048-if-nested.c index fc4679c..fc4679c 100644 --- a/src/glsl/glcpp/tests/048-if-nested.c +++ b/src/compiler/glsl/glcpp/tests/048-if-nested.c diff --git a/src/glsl/glcpp/tests/048-if-nested.c.expected b/src/compiler/glsl/glcpp/tests/048-if-nested.c.expected index 8beb9c3..8beb9c3 100644 --- a/src/glsl/glcpp/tests/048-if-nested.c.expected +++ b/src/compiler/glsl/glcpp/tests/048-if-nested.c.expected diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c index 833ea03..833ea03 100644 --- a/src/glsl/glcpp/tests/049-if-expression-precedence.c +++ b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected index 729bdd1..729bdd1 100644 --- a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected +++ b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected diff --git a/src/glsl/glcpp/tests/050-if-defined.c b/src/compiler/glsl/glcpp/tests/050-if-defined.c index 34f0f95..34f0f95 100644 --- a/src/glsl/glcpp/tests/050-if-defined.c +++ b/src/compiler/glsl/glcpp/tests/050-if-defined.c diff --git a/src/glsl/glcpp/tests/050-if-defined.c.expected b/src/compiler/glsl/glcpp/tests/050-if-defined.c.expected index 737eb8d..737eb8d 100644 --- a/src/glsl/glcpp/tests/050-if-defined.c.expected +++ b/src/compiler/glsl/glcpp/tests/050-if-defined.c.expected diff --git a/src/glsl/glcpp/tests/051-if-relational.c b/src/compiler/glsl/glcpp/tests/051-if-relational.c index c3db488..c3db488 100644 --- a/src/glsl/glcpp/tests/051-if-relational.c +++ b/src/compiler/glsl/glcpp/tests/051-if-relational.c diff --git a/src/glsl/glcpp/tests/051-if-relational.c.expected b/src/compiler/glsl/glcpp/tests/051-if-relational.c.expected index 652fefd..652fefd 100644 --- a/src/glsl/glcpp/tests/051-if-relational.c.expected +++ b/src/compiler/glsl/glcpp/tests/051-if-relational.c.expected diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c index 2d8e45e..2d8e45e 100644 --- a/src/glsl/glcpp/tests/052-if-bitwise.c +++ b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c.expected b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected index 44e52b2..44e52b2 100644 --- a/src/glsl/glcpp/tests/052-if-bitwise.c.expected +++ b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c index d24c54a..d24c54a 100644 --- a/src/glsl/glcpp/tests/053-if-divide-and-shift.c +++ b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected index 7e78e04..7e78e04 100644 --- a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected +++ b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c index 3da79a0..3da79a0 100644 --- a/src/glsl/glcpp/tests/054-if-with-macros.c +++ b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c.expected b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected index 70f737c..70f737c 100644 --- a/src/glsl/glcpp/tests/054-if-with-macros.c.expected +++ b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c index 00f2c23..00f2c23 100644 --- a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c +++ b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected index 94c15f9..94c15f9 100644 --- a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected +++ b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c index 58701d1..58701d1 100644 --- a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c +++ b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected index bed826e..bed826e 100644 --- a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected +++ b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c index 6140232..6140232 100644 --- a/src/glsl/glcpp/tests/057-empty-arguments.c +++ b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c.expected b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected index 7d97e15..7d97e15 100644 --- a/src/glsl/glcpp/tests/057-empty-arguments.c.expected +++ b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c index 8ac260c..8ac260c 100644 --- a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c +++ b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected index e0967a1..e0967a1 100644 --- a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected +++ b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c index 37b895a..37b895a 100644 --- a/src/glsl/glcpp/tests/059-token-pasting-integer.c +++ b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected index f1288aa..f1288aa 100644 --- a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected +++ b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c index ed80ea8..ed80ea8 100644 --- a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c +++ b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected index 3e5501a..3e5501a 100644 --- a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected +++ b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c index 6dbfd1f..6dbfd1f 100644 --- a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c +++ b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected index 15eb64b..15eb64b 100644 --- a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected +++ b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c index d9e439b..d9e439b 100644 --- a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c +++ b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected index 3f2ff2d..3f2ff2d 100644 --- a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected +++ b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected diff --git a/src/glsl/glcpp/tests/063-comments.c b/src/compiler/glsl/glcpp/tests/063-comments.c index e641d2f..e641d2f 100644 --- a/src/glsl/glcpp/tests/063-comments.c +++ b/src/compiler/glsl/glcpp/tests/063-comments.c diff --git a/src/glsl/glcpp/tests/063-comments.c.expected b/src/compiler/glsl/glcpp/tests/063-comments.c.expected index f6e10ce..f6e10ce 100644 --- a/src/glsl/glcpp/tests/063-comments.c.expected +++ b/src/compiler/glsl/glcpp/tests/063-comments.c.expected diff --git a/src/glsl/glcpp/tests/064-version.c b/src/compiler/glsl/glcpp/tests/064-version.c index 2132648..2132648 100644 --- a/src/glsl/glcpp/tests/064-version.c +++ b/src/compiler/glsl/glcpp/tests/064-version.c diff --git a/src/glsl/glcpp/tests/064-version.c.expected b/src/compiler/glsl/glcpp/tests/064-version.c.expected index 4036b1e..4036b1e 100644 --- a/src/glsl/glcpp/tests/064-version.c.expected +++ b/src/compiler/glsl/glcpp/tests/064-version.c.expected diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c index 48aa0f8..48aa0f8 100644 --- a/src/glsl/glcpp/tests/065-if-defined-parens.c +++ b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected index 737eb8d..737eb8d 100644 --- a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected +++ b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c index 3b0b473..3b0b473 100644 --- a/src/glsl/glcpp/tests/066-if-nospace-expression.c +++ b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected index 5a28fb3..5a28fb3 100644 --- a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected +++ b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c index f46cce4..f46cce4 100644 --- a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c +++ b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected index 9a5ed2e..9a5ed2e 100644 --- a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected +++ b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c index 699ac51..699ac51 100644 --- a/src/glsl/glcpp/tests/068-accidental-pasting.c +++ b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected index 27582cd..27582cd 100644 --- a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected +++ b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c index 2b46ead..2b46ead 100644 --- a/src/glsl/glcpp/tests/069-repeated-argument.c +++ b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c.expected b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected index 8b4b095..8b4b095 100644 --- a/src/glsl/glcpp/tests/069-repeated-argument.c.expected +++ b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c index d15a484..d15a484 100644 --- a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c +++ b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected index 44b93a4..44b93a4 100644 --- a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected +++ b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected diff --git a/src/glsl/glcpp/tests/071-punctuator.c b/src/compiler/glsl/glcpp/tests/071-punctuator.c index 959d682..959d682 100644 --- a/src/glsl/glcpp/tests/071-punctuator.c +++ b/src/compiler/glsl/glcpp/tests/071-punctuator.c diff --git a/src/glsl/glcpp/tests/071-punctuator.c.expected b/src/compiler/glsl/glcpp/tests/071-punctuator.c.expected index 959d682..959d682 100644 --- a/src/glsl/glcpp/tests/071-punctuator.c.expected +++ b/src/compiler/glsl/glcpp/tests/071-punctuator.c.expected diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c index e421e9d..e421e9d 100644 --- a/src/glsl/glcpp/tests/072-token-pasting-same-line.c +++ b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected index 7b80af7..7b80af7 100644 --- a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected +++ b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c index 61a4809..61a4809 100644 --- a/src/glsl/glcpp/tests/073-if-in-ifdef.c +++ b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected index fd40910..fd40910 100644 --- a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected +++ b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected diff --git a/src/glsl/glcpp/tests/074-elif-undef.c b/src/compiler/glsl/glcpp/tests/074-elif-undef.c index 67aac89..67aac89 100644 --- a/src/glsl/glcpp/tests/074-elif-undef.c +++ b/src/compiler/glsl/glcpp/tests/074-elif-undef.c diff --git a/src/glsl/glcpp/tests/074-elif-undef.c.expected b/src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected index b28b04f..b28b04f 100644 --- a/src/glsl/glcpp/tests/074-elif-undef.c.expected +++ b/src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c index 264bc4f..264bc4f 100644 --- a/src/glsl/glcpp/tests/075-elif-elif-undef.c +++ b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected index fd40910..fd40910 100644 --- a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected +++ b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c index ebd550e..ebd550e 100644 --- a/src/glsl/glcpp/tests/076-elif-undef-nested.c +++ b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected index 3f2ff2d..3f2ff2d 100644 --- a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected +++ b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected diff --git a/src/glsl/glcpp/tests/077-else-without-if.c b/src/compiler/glsl/glcpp/tests/077-else-without-if.c index 81f00bf..81f00bf 100644 --- a/src/glsl/glcpp/tests/077-else-without-if.c +++ b/src/compiler/glsl/glcpp/tests/077-else-without-if.c diff --git a/src/glsl/glcpp/tests/077-else-without-if.c.expected b/src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected index 69f3404..69f3404 100644 --- a/src/glsl/glcpp/tests/077-else-without-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c index 60466b3..60466b3 100644 --- a/src/glsl/glcpp/tests/078-elif-without-if.c +++ b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c.expected b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected index b8e40ec..b8e40ec 100644 --- a/src/glsl/glcpp/tests/078-elif-without-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c index 69331c3..69331c3 100644 --- a/src/glsl/glcpp/tests/079-endif-without-if.c +++ b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c.expected b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected index 7ae579d..7ae579d 100644 --- a/src/glsl/glcpp/tests/079-endif-without-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c index a27ba36..a27ba36 100644 --- a/src/glsl/glcpp/tests/080-if-without-expression.c +++ b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c.expected b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected index 2e4cd73..2e4cd73 100644 --- a/src/glsl/glcpp/tests/080-if-without-expression.c.expected +++ b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c index 79c7866..79c7866 100644 --- a/src/glsl/glcpp/tests/081-elif-without-expression.c +++ b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected index b607b84..b607b84 100644 --- a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected +++ b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c index 8b84d50..8b84d50 100644 --- a/src/glsl/glcpp/tests/082-invalid-paste.c +++ b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c.expected b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected index b48a2d6..b48a2d6 100644 --- a/src/glsl/glcpp/tests/082-invalid-paste.c.expected +++ b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c index 9180635..9180635 100644 --- a/src/glsl/glcpp/tests/083-unterminated-if.c +++ b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c.expected b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected index 4659ab6..4659ab6 100644 --- a/src/glsl/glcpp/tests/083-unterminated-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c index 0789ba5..0789ba5 100644 --- a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c +++ b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected index af49a37..af49a37 100644 --- a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected +++ b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c index 91bea60..91bea60 100644 --- a/src/glsl/glcpp/tests/085-incorrect-argument-count.c +++ b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected index d23845b..d23845b 100644 --- a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected +++ b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c index a6b7201..a6b7201 100644 --- a/src/glsl/glcpp/tests/086-reserved-macro-names.c +++ b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected index 38b089d..38b089d 100644 --- a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected +++ b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected diff --git a/src/glsl/glcpp/tests/087-if-comments.c b/src/compiler/glsl/glcpp/tests/087-if-comments.c index ce8dc43..ce8dc43 100644 --- a/src/glsl/glcpp/tests/087-if-comments.c +++ b/src/compiler/glsl/glcpp/tests/087-if-comments.c diff --git a/src/glsl/glcpp/tests/087-if-comments.c.expected b/src/compiler/glsl/glcpp/tests/087-if-comments.c.expected index 2783a9c..2783a9c 100644 --- a/src/glsl/glcpp/tests/087-if-comments.c.expected +++ b/src/compiler/glsl/glcpp/tests/087-if-comments.c.expected diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c index 422c654..422c654 100644 --- a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c +++ b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected index 3f2ff2d..3f2ff2d 100644 --- a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected +++ b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c index b3d1391..b3d1391 100644 --- a/src/glsl/glcpp/tests/089-redefine-macro-error.c +++ b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected index a945161..a945161 100644 --- a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected +++ b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected diff --git a/src/glsl/glcpp/tests/090-hash-error.c b/src/compiler/glsl/glcpp/tests/090-hash-error.c index d19bb7f..d19bb7f 100644 --- a/src/glsl/glcpp/tests/090-hash-error.c +++ b/src/compiler/glsl/glcpp/tests/090-hash-error.c diff --git a/src/glsl/glcpp/tests/090-hash-error.c.expected b/src/compiler/glsl/glcpp/tests/090-hash-error.c.expected index 876a6ea..876a6ea 100644 --- a/src/glsl/glcpp/tests/090-hash-error.c.expected +++ b/src/compiler/glsl/glcpp/tests/090-hash-error.c.expected diff --git a/src/glsl/glcpp/tests/091-hash-line.c b/src/compiler/glsl/glcpp/tests/091-hash-line.c index 26d7038..26d7038 100644 --- a/src/glsl/glcpp/tests/091-hash-line.c +++ b/src/compiler/glsl/glcpp/tests/091-hash-line.c diff --git a/src/glsl/glcpp/tests/091-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/091-hash-line.c.expected index ac9ab25..ac9ab25 100644 --- a/src/glsl/glcpp/tests/091-hash-line.c.expected +++ b/src/compiler/glsl/glcpp/tests/091-hash-line.c.expected diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c index 3c161a5..3c161a5 100644 --- a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c +++ b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected index 698294d..698294d 100644 --- a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected +++ b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c index bf65d4f..bf65d4f 100644 --- a/src/glsl/glcpp/tests/093-divide-by-zero.c +++ b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected index a858870..a858870 100644 --- a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected +++ b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c index 04497b1..04497b1 100644 --- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c +++ b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected index 570952b..570952b 100644 --- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected +++ b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected diff --git a/src/glsl/glcpp/tests/095-recursive-define.c b/src/compiler/glsl/glcpp/tests/095-recursive-define.c index 801d90c..801d90c 100644 --- a/src/glsl/glcpp/tests/095-recursive-define.c +++ b/src/compiler/glsl/glcpp/tests/095-recursive-define.c diff --git a/src/glsl/glcpp/tests/095-recursive-define.c.expected b/src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected index 493ab09..493ab09 100644 --- a/src/glsl/glcpp/tests/095-recursive-define.c.expected +++ b/src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected diff --git a/src/glsl/glcpp/tests/096-paste-twice.c b/src/compiler/glsl/glcpp/tests/096-paste-twice.c index 8da756f..8da756f 100644 --- a/src/glsl/glcpp/tests/096-paste-twice.c +++ b/src/compiler/glsl/glcpp/tests/096-paste-twice.c diff --git a/src/glsl/glcpp/tests/096-paste-twice.c.expected b/src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected index 96c57d2..96c57d2 100644 --- a/src/glsl/glcpp/tests/096-paste-twice.c.expected +++ b/src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c index 0f46835..0f46835 100644 --- a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c +++ b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected index 36f6699..36f6699 100644 --- a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected +++ b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c index 1f520d4..1f520d4 100644 --- a/src/glsl/glcpp/tests/098-elif-undefined.c +++ b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c.expected b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected index c6ef689..c6ef689 100644 --- a/src/glsl/glcpp/tests/098-elif-undefined.c.expected +++ b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected diff --git a/src/glsl/glcpp/tests/099-c99-example.c b/src/compiler/glsl/glcpp/tests/099-c99-example.c index d1976b1..d1976b1 100644 --- a/src/glsl/glcpp/tests/099-c99-example.c +++ b/src/compiler/glsl/glcpp/tests/099-c99-example.c diff --git a/src/glsl/glcpp/tests/099-c99-example.c.expected b/src/compiler/glsl/glcpp/tests/099-c99-example.c.expected index 352bbff..352bbff 100644 --- a/src/glsl/glcpp/tests/099-c99-example.c.expected +++ b/src/compiler/glsl/glcpp/tests/099-c99-example.c.expected diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c index 31dbb9a..31dbb9a 100644 --- a/src/glsl/glcpp/tests/100-macro-with-colon.c +++ b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected index 09f1f41..09f1f41 100644 --- a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected +++ b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c index e169380..e169380 100644 --- a/src/glsl/glcpp/tests/101-macros-used-twice.c +++ b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected index 1e0b306..1e0b306 100644 --- a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected +++ b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c index 301779e..301779e 100644 --- a/src/glsl/glcpp/tests/102-garbage-after-endif.c +++ b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected index d9f3bdc..d9f3bdc 100644 --- a/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected +++ b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c index c460fea..c460fea 100644 --- a/src/glsl/glcpp/tests/103-garbage-after-else-0.c +++ b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected index b053b39..b053b39 100644 --- a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected +++ b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c index 3fbeec4..3fbeec4 100644 --- a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c +++ b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected index 3fbeec4..3fbeec4 100644 --- a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected +++ b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c index da156c6..da156c6 100644 --- a/src/glsl/glcpp/tests/105-multiline-hash-line.c +++ b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected index 814cef1..814cef1 100644 --- a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected +++ b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c index 929e93e..929e93e 100644 --- a/src/glsl/glcpp/tests/106-multiline-hash-if.c +++ b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected index 1c0cbc9..1c0cbc9 100644 --- a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c index 8c1c67a..8c1c67a 100644 --- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c +++ b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected index b0601d7..b0601d7 100644 --- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected +++ b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c index 0ce36f2..0ce36f2 100644 --- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c +++ b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected index 4f4243f..4f4243f 100644 --- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected +++ b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c index f52966a..f52966a 100644 --- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c +++ b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected index 4f4243f..4f4243f 100644 --- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected +++ b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c index 6d7d0f3..6d7d0f3 100644 --- a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c +++ b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected index 4d93de4..4d93de4 100644 --- a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected +++ b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c index b341337..b341337 100644 --- a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c +++ b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected index 5c005c3..5c005c3 100644 --- a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected +++ b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c index e8221bc..e8221bc 100644 --- a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c +++ b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected index 86b3703..86b3703 100644 --- a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected +++ b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c index 369c487..369c487 100644 --- a/src/glsl/glcpp/tests/113-line-and-file-macros.c +++ b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected index 55bc788..55bc788 100644 --- a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected +++ b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c index d80d9c7..d80d9c7 100644 --- a/src/glsl/glcpp/tests/114-paste-integer-tokens.c +++ b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected index aa97110..aa97110 100644 --- a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected +++ b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected diff --git a/src/glsl/glcpp/tests/115-line-continuations.c b/src/compiler/glsl/glcpp/tests/115-line-continuations.c index 105590d..105590d 100644 --- a/src/glsl/glcpp/tests/115-line-continuations.c +++ b/src/compiler/glsl/glcpp/tests/115-line-continuations.c diff --git a/src/glsl/glcpp/tests/115-line-continuations.c.expected b/src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected index 428b5e8..428b5e8 100644 --- a/src/glsl/glcpp/tests/115-line-continuations.c.expected +++ b/src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c index 83d5ddf..83d5ddf 100644 --- a/src/glsl/glcpp/tests/116-disable-line-continuations.c +++ b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected index 5ca7892..5ca7892 100644 --- a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected +++ b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c index 6a6f282..6a6f282 100644 --- a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c +++ b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected index 8aaa04d..8aaa04d 100644 --- a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected +++ b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c index 53e8039..53e8039 100644 --- a/src/glsl/glcpp/tests/118-comment-becomes-space.c +++ b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected index 1fa8135..1fa8135 100644 --- a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected +++ b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c index 9b9e923..9b9e923 100644 --- a/src/glsl/glcpp/tests/119-elif-after-else.c +++ b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c.expected b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected index 6369567..6369567 100644 --- a/src/glsl/glcpp/tests/119-elif-after-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c index 49e7696..49e7696 100644 --- a/src/glsl/glcpp/tests/120-undef-builtin.c +++ b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c.expected b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected index 3b736df..3b736df 100644 --- a/src/glsl/glcpp/tests/120-undef-builtin.c.expected +++ b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c index 67ebe73..67ebe73 100644 --- a/src/glsl/glcpp/tests/121-comment-bug-72686.c +++ b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected index 8cb7cb9..8cb7cb9 100644 --- a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected +++ b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c index ae7ea09..ae7ea09 100644 --- a/src/glsl/glcpp/tests/122-redefine-whitespace.c +++ b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected index 602bdef..602bdef 100644 --- a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected +++ b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c index 0b341a3..0b341a3 100644 --- a/src/glsl/glcpp/tests/123-garbage-after-else-1.c +++ b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected index b053b39..b053b39 100644 --- a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected +++ b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c index 947ba18..947ba18 100644 --- a/src/glsl/glcpp/tests/124-preprocessing-numbers.c +++ b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected index 6ec5888..6ec5888 100644 --- a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected +++ b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c index 4ee29f6..4ee29f6 100644 --- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c +++ b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected index 616aa91..616aa91 100644 --- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected +++ b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c index 4c0d290..4c0d290 100644 --- a/src/glsl/glcpp/tests/126-garbage-after-directive.c +++ b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected index 82a06f8..82a06f8 100644 --- a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected +++ b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c index 0f9b0b3..0f9b0b3 100644 --- a/src/glsl/glcpp/tests/127-pragma-empty.c +++ b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c.expected b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected index 92371a0..92371a0 100644 --- a/src/glsl/glcpp/tests/127-pragma-empty.c.expected +++ b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c index fba9596..fba9596 100644 --- a/src/glsl/glcpp/tests/128-space-before-hash.c +++ b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c.expected b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected index 9babb6f..9babb6f 100644 --- a/src/glsl/glcpp/tests/128-space-before-hash.c.expected +++ b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c index a229179..a229179 100644 --- a/src/glsl/glcpp/tests/129-define-non-identifier.c +++ b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected index fd0b413..fd0b413 100644 --- a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected +++ b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected diff --git a/src/glsl/glcpp/tests/130-define-comment.c b/src/compiler/glsl/glcpp/tests/130-define-comment.c index 3331236..3331236 100644 --- a/src/glsl/glcpp/tests/130-define-comment.c +++ b/src/compiler/glsl/glcpp/tests/130-define-comment.c diff --git a/src/glsl/glcpp/tests/130-define-comment.c.expected b/src/compiler/glsl/glcpp/tests/130-define-comment.c.expected index d789e29..d789e29 100644 --- a/src/glsl/glcpp/tests/130-define-comment.c.expected +++ b/src/compiler/glsl/glcpp/tests/130-define-comment.c.expected diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c index 240292d..240292d 100644 --- a/src/glsl/glcpp/tests/131-eof-without-newline.c +++ b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c.expected b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected index 5780030..5780030 100644 --- a/src/glsl/glcpp/tests/131-eof-without-newline.c.expected +++ b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c index 6795e35..6795e35 100644 --- a/src/glsl/glcpp/tests/132-eof-without-newline-define.c +++ b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected index 341e5e2..341e5e2 100644 --- a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected +++ b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c index 56ec5f7..56ec5f7 100644 --- a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c +++ b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected index d186f48..d186f48 100644 --- a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected +++ b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c index 3015f0e..3015f0e 100644 --- a/src/glsl/glcpp/tests/134-hash-comment-directive.c +++ b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected index 760c960..760c960 100644 --- a/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected +++ b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c index fd96bd6..fd96bd6 100644 --- a/src/glsl/glcpp/tests/135-duplicate-parameter.c +++ b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected index bc1a334..bc1a334 100644 --- a/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected +++ b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c index 167d3c8..167d3c8 100644 --- a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c +++ b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected index 137921b..137921b 100644 --- a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected +++ b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c index c8cd47f..c8cd47f 100644 --- a/src/glsl/glcpp/tests/137-expand-macro-after-period.c +++ b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected index f9f5be1..f9f5be1 100644 --- a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected +++ b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c index 38967dc..38967dc 100644 --- a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c +++ b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected index 0d6ef4d..0d6ef4d 100644 --- a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected +++ b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c index 30e128d..30e128d 100644 --- a/src/glsl/glcpp/tests/139-define-without-macro-name.c +++ b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected index 42b02d1..42b02d1 100644 --- a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected +++ b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected diff --git a/src/glsl/glcpp/tests/140-null-directive.c b/src/compiler/glsl/glcpp/tests/140-null-directive.c index 1dcb26e..1dcb26e 100644 --- a/src/glsl/glcpp/tests/140-null-directive.c +++ b/src/compiler/glsl/glcpp/tests/140-null-directive.c diff --git a/src/glsl/glcpp/tests/140-null-directive.c.expected b/src/compiler/glsl/glcpp/tests/140-null-directive.c.expected index fa103f6..fa103f6 100644 --- a/src/glsl/glcpp/tests/140-null-directive.c.expected +++ b/src/compiler/glsl/glcpp/tests/140-null-directive.c.expected diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c index a93f3ce..a93f3ce 100644 --- a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c +++ b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected index 330731d..330731d 100644 --- a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected +++ b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c index b60c042..b60c042 100644 --- a/src/glsl/glcpp/tests/142-defined-within-macro.c +++ b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c.expected b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected index 4eca90b..4eca90b 100644 --- a/src/glsl/glcpp/tests/142-defined-within-macro.c.expected +++ b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected diff --git a/src/glsl/glcpp/tests/143-multiple-else.c b/src/compiler/glsl/glcpp/tests/143-multiple-else.c index 62ad49c..62ad49c 100644 --- a/src/glsl/glcpp/tests/143-multiple-else.c +++ b/src/compiler/glsl/glcpp/tests/143-multiple-else.c diff --git a/src/glsl/glcpp/tests/143-multiple-else.c.expected b/src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected index 00b3328..00b3328 100644 --- a/src/glsl/glcpp/tests/143-multiple-else.c.expected +++ b/src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/compiler/glsl/glcpp/tests/glcpp-test index 825c22e..3945ee4 100755 --- a/src/glsl/glcpp/tests/glcpp-test +++ b/src/compiler/glsl/glcpp/tests/glcpp-test @@ -1,9 +1,9 @@ #!/bin/sh if [ ! -z "$srcdir" ]; then - testdir=$srcdir/glcpp/tests - outdir=`pwd`/glcpp/tests - glcpp=`pwd`/glcpp/glcpp + testdir=$srcdir/glsl/glcpp/tests + outdir=`pwd`/glsl/glcpp/tests + glcpp=`pwd`/glsl/glcpp/glcpp else testdir=. outdir=. diff --git a/src/glsl/glcpp/tests/glcpp-test-cr-lf b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf index c4ed0b8..c75370f 100755 --- a/src/glsl/glcpp/tests/glcpp-test-cr-lf +++ b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf @@ -6,8 +6,8 @@ # glcpp-test script. if [ ! -z "$srcdir" ]; then - testdir="$srcdir/glcpp/tests" - glcpp_test="$srcdir/glcpp/tests/glcpp-test" + testdir="$srcdir/glsl/glcpp/tests" + glcpp_test="$srcdir/glsl/glcpp/tests/glcpp-test" else testdir=. glcpp_test=./glcpp-test @@ -99,7 +99,7 @@ mkdir subtest-cr for file in "$testdir"/*.c; do base=$(basename "$file") tr "\n" "\r" < "$file" > subtest-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected done run_test "${glcpp_test} --testdir=subtest-cr" @@ -112,7 +112,7 @@ mkdir subtest-cr-lf for file in "$testdir"/*.c; do base=$(basename "$file") sed -e 's/$/
/' < "$file" > subtest-cr-lf/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected done run_test "${glcpp_test} --testdir=subtest-cr-lf" @@ -125,7 +125,7 @@ mkdir subtest-lf-cr for file in "$testdir"/*.c; do base=$(basename "$file") sed -e 's/$/
/' < "$file" | tr "\n\r" "\r\n" > subtest-lf-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected done run_test "${glcpp_test} --testdir=subtest-lf-cr" diff --git a/src/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll index e59f93e..e59f93e 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/compiler/glsl/glsl_lexer.ll diff --git a/src/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index 2109fb2..99bd0e6 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -31,7 +31,7 @@ #include "ast.h" #include "glsl_parser_extras.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "main/context.h" #ifdef _MSC_VER diff --git a/src/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index ecf0d7f..ecf0d7f 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp diff --git a/src/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index 3f88e01..3f88e01 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h diff --git a/src/glsl/glsl_symbol_table.cpp b/src/compiler/glsl/glsl_symbol_table.cpp index 6c682ac..6c682ac 100644 --- a/src/glsl/glsl_symbol_table.cpp +++ b/src/compiler/glsl/glsl_symbol_table.cpp diff --git a/src/glsl/glsl_symbol_table.h b/src/compiler/glsl/glsl_symbol_table.h index 5d654e5..5d654e5 100644 --- a/src/glsl/glsl_symbol_table.h +++ b/src/compiler/glsl/glsl_symbol_table.h diff --git a/src/glsl/hir_field_selection.cpp b/src/compiler/glsl/hir_field_selection.cpp index 92bb413..eab08ad 100644 --- a/src/glsl/hir_field_selection.cpp +++ b/src/compiler/glsl/hir_field_selection.cpp @@ -24,7 +24,7 @@ #include "ir.h" #include "glsl_parser_extras.h" #include "ast.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" ir_rvalue * _mesa_ast_field_selection_to_hir(const ast_expression *expr, diff --git a/src/glsl/ir.cpp b/src/compiler/glsl/ir.cpp index db19474..5debca3 100644 --- a/src/glsl/ir.cpp +++ b/src/compiler/glsl/ir.cpp @@ -23,7 +23,7 @@ #include <string.h> #include "main/core.h" /* for MAX2 */ #include "ir.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" ir_rvalue::ir_rvalue(enum ir_node_type t) : ir_instruction(t) diff --git a/src/glsl/ir.h b/src/compiler/glsl/ir.h index b453187..09e21b2 100644 --- a/src/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -30,7 +30,7 @@ #include <stdlib.h> #include "util/ralloc.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "list.h" #include "ir_visitor.h" #include "ir_hierarchical_visitor.h" diff --git a/src/glsl/ir_basic_block.cpp b/src/compiler/glsl/ir_basic_block.cpp index 15481aa..15481aa 100644 --- a/src/glsl/ir_basic_block.cpp +++ b/src/compiler/glsl/ir_basic_block.cpp diff --git a/src/glsl/ir_basic_block.h b/src/compiler/glsl/ir_basic_block.h index dbd678b..dbd678b 100644 --- a/src/glsl/ir_basic_block.h +++ b/src/compiler/glsl/ir_basic_block.h diff --git a/src/glsl/ir_builder.cpp b/src/compiler/glsl/ir_builder.cpp index c9cf124..c9cf124 100644 --- a/src/glsl/ir_builder.cpp +++ b/src/compiler/glsl/ir_builder.cpp diff --git a/src/glsl/ir_builder.h b/src/compiler/glsl/ir_builder.h index b483ebf..b483ebf 100644 --- a/src/glsl/ir_builder.h +++ b/src/compiler/glsl/ir_builder.h diff --git a/src/glsl/ir_clone.cpp b/src/compiler/glsl/ir_clone.cpp index 2aef4fc..b32ec17 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/compiler/glsl/ir_clone.cpp @@ -24,7 +24,7 @@ #include <string.h> #include "main/compiler.h" #include "ir.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "program/hash_table.h" ir_rvalue * diff --git a/src/glsl/ir_constant_expression.cpp b/src/compiler/glsl/ir_constant_expression.cpp index c99a823..fbbf779 100644 --- a/src/glsl/ir_constant_expression.cpp +++ b/src/compiler/glsl/ir_constant_expression.cpp @@ -38,7 +38,7 @@ #include "util/rounding.h" /* for _mesa_roundeven */ #include "util/half_float.h" #include "ir.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "program/hash_table.h" static float diff --git a/src/glsl/ir_equals.cpp b/src/compiler/glsl/ir_equals.cpp index b86f4ea..b86f4ea 100644 --- a/src/glsl/ir_equals.cpp +++ b/src/compiler/glsl/ir_equals.cpp diff --git a/src/glsl/ir_expression_flattening.cpp b/src/compiler/glsl/ir_expression_flattening.cpp index c13ae81..c13ae81 100644 --- a/src/glsl/ir_expression_flattening.cpp +++ b/src/compiler/glsl/ir_expression_flattening.cpp diff --git a/src/glsl/ir_expression_flattening.h b/src/compiler/glsl/ir_expression_flattening.h index 2eda159..2eda159 100644 --- a/src/glsl/ir_expression_flattening.h +++ b/src/compiler/glsl/ir_expression_flattening.h diff --git a/src/glsl/ir_function.cpp b/src/compiler/glsl/ir_function.cpp index 93034be..0b4cb4b 100644 --- a/src/glsl/ir_function.cpp +++ b/src/compiler/glsl/ir_function.cpp @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "ir.h" #include "glsl_parser_extras.h" #include "main/errors.h" diff --git a/src/glsl/ir_function_can_inline.cpp b/src/compiler/glsl/ir_function_can_inline.cpp index 3b1d15f..3b1d15f 100644 --- a/src/glsl/ir_function_can_inline.cpp +++ b/src/compiler/glsl/ir_function_can_inline.cpp diff --git a/src/glsl/ir_function_detect_recursion.cpp b/src/compiler/glsl/ir_function_detect_recursion.cpp index b2334d2..b2334d2 100644 --- a/src/glsl/ir_function_detect_recursion.cpp +++ b/src/compiler/glsl/ir_function_detect_recursion.cpp diff --git a/src/glsl/ir_function_inlining.h b/src/compiler/glsl/ir_function_inlining.h index 6db011b..6db011b 100644 --- a/src/glsl/ir_function_inlining.h +++ b/src/compiler/glsl/ir_function_inlining.h diff --git a/src/glsl/ir_hierarchical_visitor.cpp b/src/compiler/glsl/ir_hierarchical_visitor.cpp index 1d23a77..1d23a77 100644 --- a/src/glsl/ir_hierarchical_visitor.cpp +++ b/src/compiler/glsl/ir_hierarchical_visitor.cpp diff --git a/src/glsl/ir_hierarchical_visitor.h b/src/compiler/glsl/ir_hierarchical_visitor.h index 28517b6..28517b6 100644 --- a/src/glsl/ir_hierarchical_visitor.h +++ b/src/compiler/glsl/ir_hierarchical_visitor.h diff --git a/src/glsl/ir_hv_accept.cpp b/src/compiler/glsl/ir_hv_accept.cpp index 213992a..213992a 100644 --- a/src/glsl/ir_hv_accept.cpp +++ b/src/compiler/glsl/ir_hv_accept.cpp diff --git a/src/glsl/ir_import_prototypes.cpp b/src/compiler/glsl/ir_import_prototypes.cpp index b0429fb..b0429fb 100644 --- a/src/glsl/ir_import_prototypes.cpp +++ b/src/compiler/glsl/ir_import_prototypes.cpp diff --git a/src/glsl/ir_optimization.h b/src/compiler/glsl/ir_optimization.h index b56413a..b56413a 100644 --- a/src/glsl/ir_optimization.h +++ b/src/compiler/glsl/ir_optimization.h diff --git a/src/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp index fd7bc2e..960b23f 100644 --- a/src/glsl/ir_print_visitor.cpp +++ b/src/compiler/glsl/ir_print_visitor.cpp @@ -22,7 +22,7 @@ */ #include "ir_print_visitor.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "glsl_parser_extras.h" #include "main/macros.h" #include "util/hash_table.h" diff --git a/src/glsl/ir_print_visitor.h b/src/compiler/glsl/ir_print_visitor.h index 965e63a..965e63a 100644 --- a/src/glsl/ir_print_visitor.h +++ b/src/compiler/glsl/ir_print_visitor.h diff --git a/src/glsl/ir_reader.cpp b/src/compiler/glsl/ir_reader.cpp index 7c0af1b..15315aa 100644 --- a/src/glsl/ir_reader.cpp +++ b/src/compiler/glsl/ir_reader.cpp @@ -23,7 +23,7 @@ #include "ir_reader.h" #include "glsl_parser_extras.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "s_expression.h" static const bool debug = false; diff --git a/src/glsl/ir_reader.h b/src/compiler/glsl/ir_reader.h index aef2ca2..aef2ca2 100644 --- a/src/glsl/ir_reader.h +++ b/src/compiler/glsl/ir_reader.h diff --git a/src/glsl/ir_rvalue_visitor.cpp b/src/compiler/glsl/ir_rvalue_visitor.cpp index 6486838..6ab6cf0 100644 --- a/src/glsl/ir_rvalue_visitor.cpp +++ b/src/compiler/glsl/ir_rvalue_visitor.cpp @@ -32,7 +32,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_rvalue_visitor.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" ir_visitor_status ir_rvalue_base_visitor::rvalue_visit(ir_expression *ir) diff --git a/src/glsl/ir_rvalue_visitor.h b/src/compiler/glsl/ir_rvalue_visitor.h index 185c72a..185c72a 100644 --- a/src/glsl/ir_rvalue_visitor.h +++ b/src/compiler/glsl/ir_rvalue_visitor.h diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp index a2dea67..df06923 100644 --- a/src/glsl/ir_set_program_inouts.cpp +++ b/src/compiler/glsl/ir_set_program_inouts.cpp @@ -40,7 +40,7 @@ #include "main/core.h" /* for struct gl_program */ #include "ir.h" #include "ir_visitor.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/ir_uniform.h b/src/compiler/glsl/ir_uniform.h index 1854279..1854279 100644 --- a/src/glsl/ir_uniform.h +++ b/src/compiler/glsl/ir_uniform.h diff --git a/src/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp index 1292883..2ec5a3f 100644 --- a/src/glsl/ir_validate.cpp +++ b/src/compiler/glsl/ir_validate.cpp @@ -37,7 +37,7 @@ #include "ir_hierarchical_visitor.h" #include "util/hash_table.h" #include "util/set.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/ir_variable_refcount.cpp b/src/compiler/glsl/ir_variable_refcount.cpp index 790627b..8306be1 100644 --- a/src/glsl/ir_variable_refcount.cpp +++ b/src/compiler/glsl/ir_variable_refcount.cpp @@ -32,7 +32,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_variable_refcount.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "util/hash_table.h" ir_variable_refcount_visitor::ir_variable_refcount_visitor() diff --git a/src/glsl/ir_variable_refcount.h b/src/compiler/glsl/ir_variable_refcount.h index 5c74c31..08a11c0 100644 --- a/src/glsl/ir_variable_refcount.h +++ b/src/compiler/glsl/ir_variable_refcount.h @@ -31,7 +31,7 @@ #include "ir.h" #include "ir_visitor.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" struct assignment_entry { exec_node link; diff --git a/src/glsl/ir_visitor.h b/src/compiler/glsl/ir_visitor.h index 7c38481..7c38481 100644 --- a/src/glsl/ir_visitor.h +++ b/src/compiler/glsl/ir_visitor.h diff --git a/src/glsl/link_atomics.cpp b/src/compiler/glsl/link_atomics.cpp index 277d473..277d473 100644 --- a/src/glsl/link_atomics.cpp +++ b/src/compiler/glsl/link_atomics.cpp diff --git a/src/glsl/link_functions.cpp b/src/compiler/glsl/link_functions.cpp index 537f4dc..537f4dc 100644 --- a/src/glsl/link_functions.cpp +++ b/src/compiler/glsl/link_functions.cpp diff --git a/src/glsl/link_interface_blocks.cpp b/src/compiler/glsl/link_interface_blocks.cpp index 64c30fe..64c30fe 100644 --- a/src/glsl/link_interface_blocks.cpp +++ b/src/compiler/glsl/link_interface_blocks.cpp diff --git a/src/glsl/link_uniform_block_active_visitor.cpp b/src/compiler/glsl/link_uniform_block_active_visitor.cpp index 54fea70..54fea70 100644 --- a/src/glsl/link_uniform_block_active_visitor.cpp +++ b/src/compiler/glsl/link_uniform_block_active_visitor.cpp diff --git a/src/glsl/link_uniform_block_active_visitor.h b/src/compiler/glsl/link_uniform_block_active_visitor.h index afb52c1..afb52c1 100644 --- a/src/glsl/link_uniform_block_active_visitor.h +++ b/src/compiler/glsl/link_uniform_block_active_visitor.h diff --git a/src/glsl/link_uniform_blocks.cpp b/src/compiler/glsl/link_uniform_blocks.cpp index 7d75576..7d75576 100644 --- a/src/glsl/link_uniform_blocks.cpp +++ b/src/compiler/glsl/link_uniform_blocks.cpp diff --git a/src/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp index cdc1d3a..cdc1d3a 100644 --- a/src/glsl/link_uniform_initializers.cpp +++ b/src/compiler/glsl/link_uniform_initializers.cpp diff --git a/src/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index 33b2d4c..33b2d4c 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp diff --git a/src/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp index 264b69c..264b69c 100644 --- a/src/glsl/link_varyings.cpp +++ b/src/compiler/glsl/link_varyings.cpp diff --git a/src/glsl/link_varyings.h b/src/compiler/glsl/link_varyings.h index b2812614..b2812614 100644 --- a/src/glsl/link_varyings.h +++ b/src/compiler/glsl/link_varyings.h diff --git a/src/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 6657777..6657777 100644 --- a/src/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp diff --git a/src/glsl/linker.h b/src/compiler/glsl/linker.h index c80be1c..c80be1c 100644 --- a/src/glsl/linker.h +++ b/src/compiler/glsl/linker.h diff --git a/src/glsl/list.h b/src/compiler/glsl/list.h index a1c4d82..a1c4d82 100644 --- a/src/glsl/list.h +++ b/src/compiler/glsl/list.h diff --git a/src/glsl/loop_analysis.cpp b/src/compiler/glsl/loop_analysis.cpp index 21d46eb..096a80a 100644 --- a/src/glsl/loop_analysis.cpp +++ b/src/compiler/glsl/loop_analysis.cpp @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "loop_analysis.h" #include "ir_hierarchical_visitor.h" diff --git a/src/glsl/loop_analysis.h b/src/compiler/glsl/loop_analysis.h index 3b1971d..3b1971d 100644 --- a/src/glsl/loop_analysis.h +++ b/src/compiler/glsl/loop_analysis.h diff --git a/src/glsl/loop_controls.cpp b/src/compiler/glsl/loop_controls.cpp index 51804bb..c717605 100644 --- a/src/glsl/loop_controls.cpp +++ b/src/compiler/glsl/loop_controls.cpp @@ -23,7 +23,7 @@ #include <limits.h> #include "main/compiler.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "loop_analysis.h" #include "ir_hierarchical_visitor.h" diff --git a/src/glsl/loop_unroll.cpp b/src/compiler/glsl/loop_unroll.cpp index b9ea350..aea2743c 100644 --- a/src/glsl/loop_unroll.cpp +++ b/src/compiler/glsl/loop_unroll.cpp @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "loop_analysis.h" #include "ir_hierarchical_visitor.h" diff --git a/src/glsl/lower_buffer_access.cpp b/src/compiler/glsl/lower_buffer_access.cpp index f8c8d14..f8c8d14 100644 --- a/src/glsl/lower_buffer_access.cpp +++ b/src/compiler/glsl/lower_buffer_access.cpp diff --git a/src/glsl/lower_buffer_access.h b/src/compiler/glsl/lower_buffer_access.h index cc4614e..cc4614e 100644 --- a/src/glsl/lower_buffer_access.h +++ b/src/compiler/glsl/lower_buffer_access.h diff --git a/src/glsl/lower_clip_distance.cpp b/src/compiler/glsl/lower_clip_distance.cpp index 1ada215..1ada215 100644 --- a/src/glsl/lower_clip_distance.cpp +++ b/src/compiler/glsl/lower_clip_distance.cpp diff --git a/src/glsl/lower_const_arrays_to_uniforms.cpp b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp index 44967dc..2d024d4 100644 --- a/src/glsl/lower_const_arrays_to_uniforms.cpp +++ b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp @@ -40,7 +40,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_rvalue_visitor.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { class lower_const_array_visitor : public ir_rvalue_visitor { diff --git a/src/glsl/lower_discard.cpp b/src/compiler/glsl/lower_discard.cpp index b44d2a6..b62eb20 100644 --- a/src/glsl/lower_discard.cpp +++ b/src/compiler/glsl/lower_discard.cpp @@ -105,7 +105,7 @@ * Unconditional discards are treated as having a condition of "true". */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "ir.h" namespace { diff --git a/src/glsl/lower_discard_flow.cpp b/src/compiler/glsl/lower_discard_flow.cpp index ee45bf2..9d0a56b 100644 --- a/src/glsl/lower_discard_flow.cpp +++ b/src/compiler/glsl/lower_discard_flow.cpp @@ -44,7 +44,7 @@ * interpretation. */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "ir.h" #include "program/hash_table.h" diff --git a/src/glsl/lower_if_to_cond_assign.cpp b/src/compiler/glsl/lower_if_to_cond_assign.cpp index 3232ce9..6a70347 100644 --- a/src/glsl/lower_if_to_cond_assign.cpp +++ b/src/compiler/glsl/lower_if_to_cond_assign.cpp @@ -45,7 +45,7 @@ * to attempt to flatten any if-statements appearing at depth > N. */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "ir.h" #include "program/hash_table.h" diff --git a/src/glsl/lower_instructions.cpp b/src/compiler/glsl/lower_instructions.cpp index 7c2d4d7..1875149 100644 --- a/src/glsl/lower_instructions.cpp +++ b/src/compiler/glsl/lower_instructions.cpp @@ -117,7 +117,7 @@ #include "c99_math.h" #include "program/prog_instruction.h" /* for swizzle */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "ir.h" #include "ir_builder.h" #include "ir_optimization.h" diff --git a/src/glsl/lower_jumps.cpp b/src/compiler/glsl/lower_jumps.cpp index ec7a0c5..3cfa2e0 100644 --- a/src/glsl/lower_jumps.cpp +++ b/src/compiler/glsl/lower_jumps.cpp @@ -56,7 +56,7 @@ * prevents further optimization, and thus is not currently performed. */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include <string.h> #include "ir.h" diff --git a/src/glsl/lower_mat_op_to_vec.cpp b/src/compiler/glsl/lower_mat_op_to_vec.cpp index e96cda2..266fdc6 100644 --- a/src/glsl/lower_mat_op_to_vec.cpp +++ b/src/compiler/glsl/lower_mat_op_to_vec.cpp @@ -33,7 +33,7 @@ #include "ir.h" #include "ir_expression_flattening.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/lower_named_interface_blocks.cpp b/src/compiler/glsl/lower_named_interface_blocks.cpp index f29eba4..f29eba4 100644 --- a/src/glsl/lower_named_interface_blocks.cpp +++ b/src/compiler/glsl/lower_named_interface_blocks.cpp diff --git a/src/glsl/lower_noise.cpp b/src/compiler/glsl/lower_noise.cpp index 85f59b6..85f59b6 100644 --- a/src/glsl/lower_noise.cpp +++ b/src/compiler/glsl/lower_noise.cpp diff --git a/src/glsl/lower_offset_array.cpp b/src/compiler/glsl/lower_offset_array.cpp index c30f801..96486c3 100644 --- a/src/glsl/lower_offset_array.cpp +++ b/src/compiler/glsl/lower_offset_array.cpp @@ -31,7 +31,7 @@ * \author Chris Forbes <chrisf@ijw.co.nz> */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "ir.h" #include "ir_builder.h" #include "ir_optimization.h" diff --git a/src/glsl/lower_output_reads.cpp b/src/compiler/glsl/lower_output_reads.cpp index 79488df..79488df 100644 --- a/src/glsl/lower_output_reads.cpp +++ b/src/compiler/glsl/lower_output_reads.cpp diff --git a/src/glsl/lower_packed_varyings.cpp b/src/compiler/glsl/lower_packed_varyings.cpp index 8d1eb17..8d1eb17 100644 --- a/src/glsl/lower_packed_varyings.cpp +++ b/src/compiler/glsl/lower_packed_varyings.cpp diff --git a/src/glsl/lower_packing_builtins.cpp b/src/compiler/glsl/lower_packing_builtins.cpp index a41627b..a41627b 100644 --- a/src/glsl/lower_packing_builtins.cpp +++ b/src/compiler/glsl/lower_packing_builtins.cpp diff --git a/src/glsl/lower_shared_reference.cpp b/src/compiler/glsl/lower_shared_reference.cpp index 533cd92..533cd92 100644 --- a/src/glsl/lower_shared_reference.cpp +++ b/src/compiler/glsl/lower_shared_reference.cpp diff --git a/src/glsl/lower_subroutine.cpp b/src/compiler/glsl/lower_subroutine.cpp index ac8ade1..e80c1be 100644 --- a/src/glsl/lower_subroutine.cpp +++ b/src/compiler/glsl/lower_subroutine.cpp @@ -27,7 +27,7 @@ * lowers subroutines to an if ladder. */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "glsl_parser_extras.h" #include "ir.h" #include "ir_builder.h" diff --git a/src/glsl/lower_tess_level.cpp b/src/compiler/glsl/lower_tess_level.cpp index bed2553..bed2553 100644 --- a/src/glsl/lower_tess_level.cpp +++ b/src/compiler/glsl/lower_tess_level.cpp diff --git a/src/glsl/lower_texture_projection.cpp b/src/compiler/glsl/lower_texture_projection.cpp index 95df106..95df106 100644 --- a/src/glsl/lower_texture_projection.cpp +++ b/src/compiler/glsl/lower_texture_projection.cpp diff --git a/src/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp index a172054..a172054 100644 --- a/src/glsl/lower_ubo_reference.cpp +++ b/src/compiler/glsl/lower_ubo_reference.cpp diff --git a/src/glsl/lower_variable_index_to_cond_assign.cpp b/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp index a1ba934..278d545 100644 --- a/src/glsl/lower_variable_index_to_cond_assign.cpp +++ b/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp @@ -49,7 +49,7 @@ #include "ir.h" #include "ir_rvalue_visitor.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "main/macros.h" /** diff --git a/src/glsl/lower_vec_index_to_cond_assign.cpp b/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp index b623882..784db08 100644 --- a/src/glsl/lower_vec_index_to_cond_assign.cpp +++ b/src/compiler/glsl/lower_vec_index_to_cond_assign.cpp @@ -39,7 +39,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/lower_vec_index_to_swizzle.cpp b/src/compiler/glsl/lower_vec_index_to_swizzle.cpp index 4d4d2f1..8b18e95 100644 --- a/src/glsl/lower_vec_index_to_swizzle.cpp +++ b/src/compiler/glsl/lower_vec_index_to_swizzle.cpp @@ -32,7 +32,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "main/macros.h" /** diff --git a/src/glsl/lower_vector.cpp b/src/compiler/glsl/lower_vector.cpp index a658410..a658410 100644 --- a/src/glsl/lower_vector.cpp +++ b/src/compiler/glsl/lower_vector.cpp diff --git a/src/glsl/lower_vector_derefs.cpp b/src/compiler/glsl/lower_vector_derefs.cpp index 4a5d6f0..4a5d6f0 100644 --- a/src/glsl/lower_vector_derefs.cpp +++ b/src/compiler/glsl/lower_vector_derefs.cpp diff --git a/src/glsl/lower_vector_insert.cpp b/src/compiler/glsl/lower_vector_insert.cpp index 26d31b0..26d31b0 100644 --- a/src/glsl/lower_vector_insert.cpp +++ b/src/compiler/glsl/lower_vector_insert.cpp diff --git a/src/glsl/lower_vertex_id.cpp b/src/compiler/glsl/lower_vertex_id.cpp index 3da7a2f..3da7a2f 100644 --- a/src/glsl/lower_vertex_id.cpp +++ b/src/compiler/glsl/lower_vertex_id.cpp diff --git a/src/glsl/main.cpp b/src/compiler/glsl/main.cpp index df93a01..df93a01 100644 --- a/src/glsl/main.cpp +++ b/src/compiler/glsl/main.cpp diff --git a/src/glsl/opt_algebraic.cpp b/src/compiler/glsl/opt_algebraic.cpp index c4b8715..1e58062 100644 --- a/src/glsl/opt_algebraic.cpp +++ b/src/compiler/glsl/opt_algebraic.cpp @@ -33,7 +33,7 @@ #include "ir_rvalue_visitor.h" #include "ir_optimization.h" #include "ir_builder.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" using namespace ir_builder; diff --git a/src/glsl/opt_array_splitting.cpp b/src/compiler/glsl/opt_array_splitting.cpp index 89ce76b..cceec6b 100644 --- a/src/glsl/opt_array_splitting.cpp +++ b/src/compiler/glsl/opt_array_splitting.cpp @@ -36,7 +36,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_rvalue_visitor.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" static bool debug = false; diff --git a/src/glsl/opt_conditional_discard.cpp b/src/compiler/glsl/opt_conditional_discard.cpp index 8a3ad24..1ca8803 100644 --- a/src/glsl/opt_conditional_discard.cpp +++ b/src/compiler/glsl/opt_conditional_discard.cpp @@ -33,7 +33,7 @@ * (discard <condition>) */ -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "ir.h" namespace { diff --git a/src/glsl/opt_constant_folding.cpp b/src/compiler/glsl/opt_constant_folding.cpp index 4aae3f0..150a17b 100644 --- a/src/glsl/opt_constant_folding.cpp +++ b/src/compiler/glsl/opt_constant_folding.cpp @@ -30,7 +30,7 @@ #include "ir_visitor.h" #include "ir_rvalue_visitor.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/opt_constant_propagation.cpp b/src/compiler/glsl/opt_constant_propagation.cpp index fb24a4f..416ba16 100644 --- a/src/glsl/opt_constant_propagation.cpp +++ b/src/compiler/glsl/opt_constant_propagation.cpp @@ -39,7 +39,7 @@ #include "ir_rvalue_visitor.h" #include "ir_basic_block.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "util/hash_table.h" namespace { diff --git a/src/glsl/opt_constant_variable.cpp b/src/compiler/glsl/opt_constant_variable.cpp index 56f6a81..3ddb129 100644 --- a/src/glsl/opt_constant_variable.cpp +++ b/src/compiler/glsl/opt_constant_variable.cpp @@ -35,7 +35,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "util/hash_table.h" namespace { diff --git a/src/glsl/opt_copy_propagation.cpp b/src/compiler/glsl/opt_copy_propagation.cpp index 5d4cb4f..310708d 100644 --- a/src/glsl/opt_copy_propagation.cpp +++ b/src/compiler/glsl/opt_copy_propagation.cpp @@ -36,7 +36,7 @@ #include "ir_visitor.h" #include "ir_basic_block.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/opt_copy_propagation_elements.cpp b/src/compiler/glsl/opt_copy_propagation_elements.cpp index 353a5c6..a679180 100644 --- a/src/glsl/opt_copy_propagation_elements.cpp +++ b/src/compiler/glsl/opt_copy_propagation_elements.cpp @@ -45,7 +45,7 @@ #include "ir_rvalue_visitor.h" #include "ir_basic_block.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" static bool debug = false; diff --git a/src/glsl/opt_dead_builtin_variables.cpp b/src/compiler/glsl/opt_dead_builtin_variables.cpp index 03e5789..03e5789 100644 --- a/src/glsl/opt_dead_builtin_variables.cpp +++ b/src/compiler/glsl/opt_dead_builtin_variables.cpp diff --git a/src/glsl/opt_dead_builtin_varyings.cpp b/src/compiler/glsl/opt_dead_builtin_varyings.cpp index 5387113..37bcbcc 100644 --- a/src/glsl/opt_dead_builtin_varyings.cpp +++ b/src/compiler/glsl/opt_dead_builtin_varyings.cpp @@ -51,7 +51,7 @@ #include "ir_rvalue_visitor.h" #include "ir_optimization.h" #include "ir_print_visitor.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "link_varyings.h" namespace { diff --git a/src/glsl/opt_dead_code.cpp b/src/compiler/glsl/opt_dead_code.cpp index c2ce0b9..dbdb7de 100644 --- a/src/glsl/opt_dead_code.cpp +++ b/src/compiler/glsl/opt_dead_code.cpp @@ -30,7 +30,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_variable_refcount.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "util/hash_table.h" static bool debug = false; diff --git a/src/glsl/opt_dead_code_local.cpp b/src/compiler/glsl/opt_dead_code_local.cpp index ee9f22c..d38fd2b 100644 --- a/src/glsl/opt_dead_code_local.cpp +++ b/src/compiler/glsl/opt_dead_code_local.cpp @@ -36,7 +36,7 @@ #include "ir.h" #include "ir_basic_block.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" static bool debug = false; diff --git a/src/glsl/opt_dead_functions.cpp b/src/compiler/glsl/opt_dead_functions.cpp index 5dff165..2e90b65 100644 --- a/src/glsl/opt_dead_functions.cpp +++ b/src/compiler/glsl/opt_dead_functions.cpp @@ -30,7 +30,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_expression_flattening.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/opt_flatten_nested_if_blocks.cpp b/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp index c702102..c702102 100644 --- a/src/glsl/opt_flatten_nested_if_blocks.cpp +++ b/src/compiler/glsl/opt_flatten_nested_if_blocks.cpp diff --git a/src/glsl/opt_flip_matrices.cpp b/src/compiler/glsl/opt_flip_matrices.cpp index 04c6170..04c6170 100644 --- a/src/glsl/opt_flip_matrices.cpp +++ b/src/compiler/glsl/opt_flip_matrices.cpp diff --git a/src/glsl/opt_function_inlining.cpp b/src/compiler/glsl/opt_function_inlining.cpp index 84a9e4f..19f5fae 100644 --- a/src/glsl/opt_function_inlining.cpp +++ b/src/compiler/glsl/opt_function_inlining.cpp @@ -31,7 +31,7 @@ #include "ir_visitor.h" #include "ir_function_inlining.h" #include "ir_expression_flattening.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "program/hash_table.h" static void diff --git a/src/glsl/opt_if_simplification.cpp b/src/compiler/glsl/opt_if_simplification.cpp index e05f031..e05f031 100644 --- a/src/glsl/opt_if_simplification.cpp +++ b/src/compiler/glsl/opt_if_simplification.cpp diff --git a/src/glsl/opt_minmax.cpp b/src/compiler/glsl/opt_minmax.cpp index 23d0b10..29482ee 100644 --- a/src/glsl/opt_minmax.cpp +++ b/src/compiler/glsl/opt_minmax.cpp @@ -36,7 +36,7 @@ #include "ir_optimization.h" #include "ir_builder.h" #include "program/prog_instruction.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "main/macros.h" using namespace ir_builder; diff --git a/src/glsl/opt_noop_swizzle.cpp b/src/compiler/glsl/opt_noop_swizzle.cpp index 586ad5e..41890ab 100644 --- a/src/glsl/opt_noop_swizzle.cpp +++ b/src/compiler/glsl/opt_noop_swizzle.cpp @@ -32,7 +32,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_rvalue_visitor.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/opt_rebalance_tree.cpp b/src/compiler/glsl/opt_rebalance_tree.cpp index 095f2d7..095f2d7 100644 --- a/src/glsl/opt_rebalance_tree.cpp +++ b/src/compiler/glsl/opt_rebalance_tree.cpp diff --git a/src/glsl/opt_redundant_jumps.cpp b/src/compiler/glsl/opt_redundant_jumps.cpp index ee384d0..ee384d0 100644 --- a/src/glsl/opt_redundant_jumps.cpp +++ b/src/compiler/glsl/opt_redundant_jumps.cpp diff --git a/src/glsl/opt_structure_splitting.cpp b/src/compiler/glsl/opt_structure_splitting.cpp index abf4310..0d18a2f 100644 --- a/src/glsl/opt_structure_splitting.cpp +++ b/src/compiler/glsl/opt_structure_splitting.cpp @@ -35,7 +35,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_rvalue_visitor.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/opt_swizzle_swizzle.cpp b/src/compiler/glsl/opt_swizzle_swizzle.cpp index 7564c6b..7285474 100644 --- a/src/glsl/opt_swizzle_swizzle.cpp +++ b/src/compiler/glsl/opt_swizzle_swizzle.cpp @@ -30,7 +30,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/opt_tree_grafting.cpp b/src/compiler/glsl/opt_tree_grafting.cpp index cd58213..83effb7 100644 --- a/src/glsl/opt_tree_grafting.cpp +++ b/src/compiler/glsl/opt_tree_grafting.cpp @@ -52,7 +52,7 @@ #include "ir_variable_refcount.h" #include "ir_basic_block.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" namespace { diff --git a/src/glsl/opt_vectorize.cpp b/src/compiler/glsl/opt_vectorize.cpp index 2f71a83..88318cd 100644 --- a/src/glsl/opt_vectorize.cpp +++ b/src/compiler/glsl/opt_vectorize.cpp @@ -55,7 +55,7 @@ #include "ir.h" #include "ir_visitor.h" #include "ir_optimization.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "program/prog_instruction.h" namespace { diff --git a/src/glsl/program.h b/src/compiler/glsl/program.h index 64f5463..64f5463 100644 --- a/src/glsl/program.h +++ b/src/compiler/glsl/program.h diff --git a/src/glsl/s_expression.cpp b/src/compiler/glsl/s_expression.cpp index f82e155..f82e155 100644 --- a/src/glsl/s_expression.cpp +++ b/src/compiler/glsl/s_expression.cpp diff --git a/src/glsl/s_expression.h b/src/compiler/glsl/s_expression.h index f0dffb1..f0dffb1 100644 --- a/src/glsl/s_expression.h +++ b/src/compiler/glsl/s_expression.h diff --git a/src/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp index 0f7a16a..0f7a16a 100644 --- a/src/glsl/standalone_scaffolding.cpp +++ b/src/compiler/glsl/standalone_scaffolding.cpp diff --git a/src/glsl/standalone_scaffolding.h b/src/compiler/glsl/standalone_scaffolding.h index f853a18..f853a18 100644 --- a/src/glsl/standalone_scaffolding.h +++ b/src/compiler/glsl/standalone_scaffolding.h diff --git a/src/glsl/test.cpp b/src/compiler/glsl/test.cpp index b1ff92e..b1ff92e 100644 --- a/src/glsl/test.cpp +++ b/src/compiler/glsl/test.cpp diff --git a/src/glsl/test_optpass.cpp b/src/compiler/glsl/test_optpass.cpp index fed1fab..fed1fab 100644 --- a/src/glsl/test_optpass.cpp +++ b/src/compiler/glsl/test_optpass.cpp diff --git a/src/glsl/test_optpass.h b/src/compiler/glsl/test_optpass.h index 923ccf3..923ccf3 100644 --- a/src/glsl/test_optpass.h +++ b/src/compiler/glsl/test_optpass.h diff --git a/src/glsl/tests/.gitignore b/src/compiler/glsl/tests/.gitignore index 13dcdc4..13dcdc4 100644 --- a/src/glsl/tests/.gitignore +++ b/src/compiler/glsl/tests/.gitignore diff --git a/src/glsl/tests/blob_test.c b/src/compiler/glsl/tests/blob_test.c index 4806029..4806029 100644 --- a/src/glsl/tests/blob_test.c +++ b/src/compiler/glsl/tests/blob_test.c diff --git a/src/glsl/tests/builtin_variable_test.cpp b/src/compiler/glsl/tests/builtin_variable_test.cpp index 11e384a..11e384a 100644 --- a/src/glsl/tests/builtin_variable_test.cpp +++ b/src/compiler/glsl/tests/builtin_variable_test.cpp diff --git a/src/glsl/tests/compare_ir b/src/compiler/glsl/tests/compare_ir index a40fc81..a40fc81 100755 --- a/src/glsl/tests/compare_ir +++ b/src/compiler/glsl/tests/compare_ir diff --git a/src/glsl/tests/copy_constant_to_storage_tests.cpp b/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp index cd48bc5..cd48bc5 100644 --- a/src/glsl/tests/copy_constant_to_storage_tests.cpp +++ b/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp diff --git a/src/glsl/tests/general_ir_test.cpp b/src/compiler/glsl/tests/general_ir_test.cpp index 217305b..217305b 100644 --- a/src/glsl/tests/general_ir_test.cpp +++ b/src/compiler/glsl/tests/general_ir_test.cpp diff --git a/src/glsl/tests/invalidate_locations_test.cpp b/src/compiler/glsl/tests/invalidate_locations_test.cpp index ba94d7e..ba94d7e 100644 --- a/src/glsl/tests/invalidate_locations_test.cpp +++ b/src/compiler/glsl/tests/invalidate_locations_test.cpp diff --git a/src/glsl/tests/lower_jumps/.gitignore b/src/compiler/glsl/tests/lower_jumps/.gitignore index e98df62..e98df62 100644 --- a/src/glsl/tests/lower_jumps/.gitignore +++ b/src/compiler/glsl/tests/lower_jumps/.gitignore diff --git a/src/glsl/tests/lower_jumps/create_test_cases.py b/src/compiler/glsl/tests/lower_jumps/create_test_cases.py index 3be1079..3be1079 100644 --- a/src/glsl/tests/lower_jumps/create_test_cases.py +++ b/src/compiler/glsl/tests/lower_jumps/create_test_cases.py diff --git a/src/glsl/tests/optimization-test b/src/compiler/glsl/tests/optimization-test index 26a51be..26a51be 100755 --- a/src/glsl/tests/optimization-test +++ b/src/compiler/glsl/tests/optimization-test diff --git a/src/glsl/tests/sampler_types_test.cpp b/src/compiler/glsl/tests/sampler_types_test.cpp index 04dd65e..04dd65e 100644 --- a/src/glsl/tests/sampler_types_test.cpp +++ b/src/compiler/glsl/tests/sampler_types_test.cpp diff --git a/src/glsl/tests/set_uniform_initializer_tests.cpp b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp index 0b1f66c..0b1f66c 100644 --- a/src/glsl/tests/set_uniform_initializer_tests.cpp +++ b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp diff --git a/src/glsl/tests/sexps.py b/src/compiler/glsl/tests/sexps.py index a714af8..a714af8 100644 --- a/src/glsl/tests/sexps.py +++ b/src/compiler/glsl/tests/sexps.py diff --git a/src/glsl/tests/uniform_initializer_utils.cpp b/src/compiler/glsl/tests/uniform_initializer_utils.cpp index 5006387..5006387 100644 --- a/src/glsl/tests/uniform_initializer_utils.cpp +++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp diff --git a/src/glsl/tests/uniform_initializer_utils.h b/src/compiler/glsl/tests/uniform_initializer_utils.h index b4d0c10..b4d0c10 100644 --- a/src/glsl/tests/uniform_initializer_utils.h +++ b/src/compiler/glsl/tests/uniform_initializer_utils.h diff --git a/src/glsl/tests/varyings_test.cpp b/src/compiler/glsl/tests/varyings_test.cpp index 0c4e0a4..0c4e0a4 100644 --- a/src/glsl/tests/varyings_test.cpp +++ b/src/compiler/glsl/tests/varyings_test.cpp diff --git a/src/glsl/nir/glsl_types.cpp b/src/compiler/glsl_types.cpp index 71095fa..5920c2e 100644 --- a/src/glsl/nir/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -23,7 +23,7 @@ #include <stdio.h> #include "main/macros.h" -#include "glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #include "glsl_types.h" #include "util/hash_table.h" @@ -1946,5 +1946,5 @@ glsl_type::coordinate_components() const #define STRUCT_TYPE(NAME) -#include "builtin_type_macros.h" +#include "compiler/builtin_type_macros.h" /** @} */ diff --git a/src/glsl/nir/glsl_types.h b/src/compiler/glsl_types.h index ff8dcc7..a9b5281 100644 --- a/src/glsl/nir/glsl_types.h +++ b/src/compiler/glsl_types.h @@ -202,7 +202,7 @@ struct glsl_type { #undef STRUCT_TYPE #define STRUCT_TYPE(NAME) \ static const glsl_type *const struct_##NAME##_type; -#include "builtin_type_macros.h" +#include "compiler/builtin_type_macros.h" /*@}*/ /** @@ -804,7 +804,7 @@ private: #define DECL_TYPE(NAME, ...) static const glsl_type _##NAME##_type; #undef STRUCT_TYPE #define STRUCT_TYPE(NAME) static const glsl_type _struct_##NAME##_type; -#include "builtin_type_macros.h" +#include "compiler/builtin_type_macros.h" /*@}*/ /** diff --git a/src/glsl/nir/.gitignore b/src/compiler/nir/.gitignore index 64828eb..64828eb 100644 --- a/src/glsl/nir/.gitignore +++ b/src/compiler/nir/.gitignore diff --git a/src/compiler/nir/Makefile.sources b/src/compiler/nir/Makefile.sources new file mode 100644 index 0000000..04e8ab8 --- /dev/null +++ b/src/compiler/nir/Makefile.sources @@ -0,0 +1,87 @@ +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_gather_info.c \ + nir_gs_count_vertices.c \ + nir_inline_functions.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_indirect_derefs.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_returns.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_phi_builder.c \ + nir_phi_builder.h \ + nir_print.c \ + nir_remove_dead_variables.c \ + nir_repair_ssa.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 + +SPIRV_FILES = \ + spirv/nir_spirv.h \ + spirv/spirv_to_nir.c \ + spirv/vtn_alu.c \ + spirv/vtn_cfg.c \ + spirv/vtn_glsl450.c \ + spirv/vtn_private.h \ + spirv/vtn_variables.c + diff --git a/src/glsl/nir/README b/src/compiler/nir/README index 2c81db9..2c81db9 100644 --- a/src/glsl/nir/README +++ b/src/compiler/nir/README diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp index f29377c..2a3047d 100644 --- a/src/glsl/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 "ir_visitor.h" -#include "ir_hierarchical_visitor.h" -#include "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/glsl/nir/glsl_to_nir.h b/src/compiler/nir/glsl_to_nir.h index 29badcd..e3fe9b0 100644 --- a/src/glsl/nir/glsl_to_nir.h +++ b/src/compiler/nir/glsl_to_nir.h @@ -26,7 +26,7 @@ */ #include "nir.h" -#include "../glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #ifdef __cplusplus extern "C" { diff --git a/src/glsl/nir/nir.c b/src/compiler/nir/nir.c index 42a53f6..42a53f6 100644 --- a/src/glsl/nir/nir.c +++ b/src/compiler/nir/nir.c diff --git a/src/glsl/nir/nir.h b/src/compiler/nir/nir.h index ec6595b..f130e5e 100644 --- a/src/glsl/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -28,14 +28,14 @@ #pragma once #include "util/hash_table.h" -#include "../list.h" +#include "compiler/glsl/list.h" #include "GL/gl.h" /* GLenum */ #include "util/list.h" #include "util/ralloc.h" #include "util/set.h" #include "util/bitset.h" -#include "nir_types.h" -#include "shader_enums.h" +#include "compiler/nir_types.h" +#include "compiler/shader_enums.h" #include <stdio.h> #include "nir_opcodes.h" diff --git a/src/glsl/nir/nir_algebraic.py b/src/compiler/nir/nir_algebraic.py index 14c0e82..14c0e82 100644 --- a/src/glsl/nir/nir_algebraic.py +++ b/src/compiler/nir/nir_algebraic.py diff --git a/src/glsl/nir/nir_array.h b/src/compiler/nir/nir_array.h index 1db4e8c..1db4e8c 100644 --- a/src/glsl/nir/nir_array.h +++ b/src/compiler/nir/nir_array.h diff --git a/src/glsl/nir/nir_builder.h b/src/compiler/nir/nir_builder.h index 1c7c78a..1c7c78a 100644 --- a/src/glsl/nir/nir_builder.h +++ b/src/compiler/nir/nir_builder.h diff --git a/src/glsl/nir/nir_builder_opcodes_h.py b/src/compiler/nir/nir_builder_opcodes_h.py index e27206e..e27206e 100644 --- a/src/glsl/nir/nir_builder_opcodes_h.py +++ b/src/compiler/nir/nir_builder_opcodes_h.py diff --git a/src/glsl/nir/nir_clone.c b/src/compiler/nir/nir_clone.c index bc6df56..bc6df56 100644 --- a/src/glsl/nir/nir_clone.c +++ b/src/compiler/nir/nir_clone.c diff --git a/src/glsl/nir/nir_constant_expressions.h b/src/compiler/nir/nir_constant_expressions.h index 97997f2..97997f2 100644 --- a/src/glsl/nir/nir_constant_expressions.h +++ b/src/compiler/nir/nir_constant_expressions.h diff --git a/src/glsl/nir/nir_constant_expressions.py b/src/compiler/nir/nir_constant_expressions.py index 32784f6..32784f6 100644 --- a/src/glsl/nir/nir_constant_expressions.py +++ b/src/compiler/nir/nir_constant_expressions.py diff --git a/src/glsl/nir/nir_control_flow.c b/src/compiler/nir/nir_control_flow.c index 33b06d0..33b06d0 100644 --- a/src/glsl/nir/nir_control_flow.c +++ b/src/compiler/nir/nir_control_flow.c diff --git a/src/glsl/nir/nir_control_flow.h b/src/compiler/nir/nir_control_flow.h index b71382f..b71382f 100644 --- a/src/glsl/nir/nir_control_flow.h +++ b/src/compiler/nir/nir_control_flow.h diff --git a/src/glsl/nir/nir_control_flow_private.h b/src/compiler/nir/nir_control_flow_private.h index f32b57a..f32b57a 100644 --- a/src/glsl/nir/nir_control_flow_private.h +++ b/src/compiler/nir/nir_control_flow_private.h diff --git a/src/glsl/nir/nir_dominance.c b/src/compiler/nir/nir_dominance.c index d95f396..d95f396 100644 --- a/src/glsl/nir/nir_dominance.c +++ b/src/compiler/nir/nir_dominance.c diff --git a/src/glsl/nir/nir_from_ssa.c b/src/compiler/nir/nir_from_ssa.c index 8bc9f24..8bc9f24 100644 --- a/src/glsl/nir/nir_from_ssa.c +++ b/src/compiler/nir/nir_from_ssa.c diff --git a/src/glsl/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c index b84915c..b84915c 100644 --- a/src/glsl/nir/nir_gather_info.c +++ b/src/compiler/nir/nir_gather_info.c diff --git a/src/glsl/nir/nir_gs_count_vertices.c b/src/compiler/nir/nir_gs_count_vertices.c index db15d16..db15d16 100644 --- a/src/glsl/nir/nir_gs_count_vertices.c +++ b/src/compiler/nir/nir_gs_count_vertices.c diff --git a/src/glsl/nir/nir_inline_functions.c b/src/compiler/nir/nir_inline_functions.c index 3cf8327..3cf8327 100644 --- a/src/glsl/nir/nir_inline_functions.c +++ b/src/compiler/nir/nir_inline_functions.c diff --git a/src/glsl/nir/nir_instr_set.c b/src/compiler/nir/nir_instr_set.c index eb02132..eb02132 100644 --- a/src/glsl/nir/nir_instr_set.c +++ b/src/compiler/nir/nir_instr_set.c diff --git a/src/glsl/nir/nir_instr_set.h b/src/compiler/nir/nir_instr_set.h index 939e8dd..939e8dd 100644 --- a/src/glsl/nir/nir_instr_set.h +++ b/src/compiler/nir/nir_instr_set.h diff --git a/src/glsl/nir/nir_intrinsics.c b/src/compiler/nir/nir_intrinsics.c index a7c868c..a7c868c 100644 --- a/src/glsl/nir/nir_intrinsics.c +++ b/src/compiler/nir/nir_intrinsics.c diff --git a/src/glsl/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h index 3e7cf73..3e7cf73 100644 --- a/src/glsl/nir/nir_intrinsics.h +++ b/src/compiler/nir/nir_intrinsics.h diff --git a/src/glsl/nir/nir_liveness.c b/src/compiler/nir/nir_liveness.c index 05f79d7..05f79d7 100644 --- a/src/glsl/nir/nir_liveness.c +++ b/src/compiler/nir/nir_liveness.c diff --git a/src/glsl/nir/nir_lower_alu_to_scalar.c b/src/compiler/nir/nir_lower_alu_to_scalar.c index 37cb022..37cb022 100644 --- a/src/glsl/nir/nir_lower_alu_to_scalar.c +++ b/src/compiler/nir/nir_lower_alu_to_scalar.c diff --git a/src/glsl/nir/nir_lower_atomics.c b/src/compiler/nir/nir_lower_atomics.c index a9d0ddb..b07e199 100644 --- a/src/glsl/nir/nir_lower_atomics.c +++ b/src/compiler/nir/nir_lower_atomics.c @@ -25,7 +25,7 @@ * */ -#include "ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "nir.h" #include "main/config.h" #include <assert.h> diff --git a/src/glsl/nir/nir_lower_clip.c b/src/compiler/nir/nir_lower_clip.c index 0ca6a28..0ca6a28 100644 --- a/src/glsl/nir/nir_lower_clip.c +++ b/src/compiler/nir/nir_lower_clip.c diff --git a/src/glsl/nir/nir_lower_global_vars_to_local.c b/src/compiler/nir/nir_lower_global_vars_to_local.c index 7b4cd4e..7b4cd4e 100644 --- a/src/glsl/nir/nir_lower_global_vars_to_local.c +++ b/src/compiler/nir/nir_lower_global_vars_to_local.c diff --git a/src/glsl/nir/nir_lower_gs_intrinsics.c b/src/compiler/nir/nir_lower_gs_intrinsics.c index fdff165..fdff165 100644 --- a/src/glsl/nir/nir_lower_gs_intrinsics.c +++ b/src/compiler/nir/nir_lower_gs_intrinsics.c diff --git a/src/glsl/nir/nir_lower_idiv.c b/src/compiler/nir/nir_lower_idiv.c index a084ad9..a084ad9 100644 --- a/src/glsl/nir/nir_lower_idiv.c +++ b/src/compiler/nir/nir_lower_idiv.c diff --git a/src/glsl/nir/nir_lower_indirect_derefs.c b/src/compiler/nir/nir_lower_indirect_derefs.c index 69f2df4..69f2df4 100644 --- a/src/glsl/nir/nir_lower_indirect_derefs.c +++ b/src/compiler/nir/nir_lower_indirect_derefs.c diff --git a/src/glsl/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index 2c5fa16..2c5fa16 100644 --- a/src/glsl/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c diff --git a/src/glsl/nir/nir_lower_load_const_to_scalar.c b/src/compiler/nir/nir_lower_load_const_to_scalar.c index 1eeed13..1eeed13 100644 --- a/src/glsl/nir/nir_lower_load_const_to_scalar.c +++ b/src/compiler/nir/nir_lower_load_const_to_scalar.c diff --git a/src/glsl/nir/nir_lower_locals_to_regs.c b/src/compiler/nir/nir_lower_locals_to_regs.c index 51b0fa7..51b0fa7 100644 --- a/src/glsl/nir/nir_lower_locals_to_regs.c +++ b/src/compiler/nir/nir_lower_locals_to_regs.c diff --git a/src/glsl/nir/nir_lower_outputs_to_temporaries.c b/src/compiler/nir/nir_lower_outputs_to_temporaries.c index 00ac091..00ac091 100644 --- a/src/glsl/nir/nir_lower_outputs_to_temporaries.c +++ b/src/compiler/nir/nir_lower_outputs_to_temporaries.c diff --git a/src/glsl/nir/nir_lower_phis_to_scalar.c b/src/compiler/nir/nir_lower_phis_to_scalar.c index dd2abcf..dd2abcf 100644 --- a/src/glsl/nir/nir_lower_phis_to_scalar.c +++ b/src/compiler/nir/nir_lower_phis_to_scalar.c diff --git a/src/glsl/nir/nir_lower_returns.c b/src/compiler/nir/nir_lower_returns.c index 91bb2f7..91bb2f7 100644 --- a/src/glsl/nir/nir_lower_returns.c +++ b/src/compiler/nir/nir_lower_returns.c diff --git a/src/glsl/nir/nir_lower_samplers.c b/src/compiler/nir/nir_lower_samplers.c index e4cd415..2965413 100644 --- a/src/glsl/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 "ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "main/compiler.h" #include "main/mtypes.h" diff --git a/src/glsl/nir/nir_lower_system_values.c b/src/compiler/nir/nir_lower_system_values.c index 79f6bed..79f6bed 100644 --- a/src/glsl/nir/nir_lower_system_values.c +++ b/src/compiler/nir/nir_lower_system_values.c diff --git a/src/glsl/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c index ae24fb2..ae24fb2 100644 --- a/src/glsl/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c diff --git a/src/glsl/nir/nir_lower_to_source_mods.c b/src/compiler/nir/nir_lower_to_source_mods.c index 6c4e1f0..6c4e1f0 100644 --- a/src/glsl/nir/nir_lower_to_source_mods.c +++ b/src/compiler/nir/nir_lower_to_source_mods.c diff --git a/src/glsl/nir/nir_lower_two_sided_color.c b/src/compiler/nir/nir_lower_two_sided_color.c index 1294cb8..1294cb8 100644 --- a/src/glsl/nir/nir_lower_two_sided_color.c +++ b/src/compiler/nir/nir_lower_two_sided_color.c diff --git a/src/glsl/nir/nir_lower_var_copies.c b/src/compiler/nir/nir_lower_var_copies.c index 350e99c..8cb3edd 100644 --- a/src/glsl/nir/nir_lower_var_copies.c +++ b/src/compiler/nir/nir_lower_var_copies.c @@ -26,7 +26,7 @@ */ #include "nir.h" -#include "nir_types.h" +#include "compiler/nir_types.h" /* * Lowers all copy intrinsics to sequences of load/store intrinsics. diff --git a/src/glsl/nir/nir_lower_vars_to_ssa.c b/src/compiler/nir/nir_lower_vars_to_ssa.c index e1f368d..e1f368d 100644 --- a/src/glsl/nir/nir_lower_vars_to_ssa.c +++ b/src/compiler/nir/nir_lower_vars_to_ssa.c diff --git a/src/glsl/nir/nir_lower_vec_to_movs.c b/src/compiler/nir/nir_lower_vec_to_movs.c index 06d6279..06d6279 100644 --- a/src/glsl/nir/nir_lower_vec_to_movs.c +++ b/src/compiler/nir/nir_lower_vec_to_movs.c diff --git a/src/glsl/nir/nir_metadata.c b/src/compiler/nir/nir_metadata.c index 61aae73..61aae73 100644 --- a/src/glsl/nir/nir_metadata.c +++ b/src/compiler/nir/nir_metadata.c diff --git a/src/glsl/nir/nir_move_vec_src_uses_to_dest.c b/src/compiler/nir/nir_move_vec_src_uses_to_dest.c index b5186e6..b5186e6 100644 --- a/src/glsl/nir/nir_move_vec_src_uses_to_dest.c +++ b/src/compiler/nir/nir_move_vec_src_uses_to_dest.c diff --git a/src/glsl/nir/nir_normalize_cubemap_coords.c b/src/compiler/nir/nir_normalize_cubemap_coords.c index 9c15eb8..9c15eb8 100644 --- a/src/glsl/nir/nir_normalize_cubemap_coords.c +++ b/src/compiler/nir/nir_normalize_cubemap_coords.c diff --git a/src/glsl/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py index 0eff897..0eff897 100644 --- a/src/glsl/nir/nir_opcodes.py +++ b/src/compiler/nir/nir_opcodes.py diff --git a/src/glsl/nir/nir_opcodes_c.py b/src/compiler/nir/nir_opcodes_c.py index 7049c5b..7049c5b 100644 --- a/src/glsl/nir/nir_opcodes_c.py +++ b/src/compiler/nir/nir_opcodes_c.py diff --git a/src/glsl/nir/nir_opcodes_h.py b/src/compiler/nir/nir_opcodes_h.py index be15a96..be15a96 100644 --- a/src/glsl/nir/nir_opcodes_h.py +++ b/src/compiler/nir/nir_opcodes_h.py diff --git a/src/glsl/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index f4bfd3a..f4bfd3a 100644 --- a/src/glsl/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py diff --git a/src/glsl/nir/nir_opt_constant_folding.c b/src/compiler/nir/nir_opt_constant_folding.c index 28a73f8..28a73f8 100644 --- a/src/glsl/nir/nir_opt_constant_folding.c +++ b/src/compiler/nir/nir_opt_constant_folding.c diff --git a/src/glsl/nir/nir_opt_copy_propagate.c b/src/compiler/nir/nir_opt_copy_propagate.c index d99f78d..d99f78d 100644 --- a/src/glsl/nir/nir_opt_copy_propagate.c +++ b/src/compiler/nir/nir_opt_copy_propagate.c diff --git a/src/glsl/nir/nir_opt_cse.c b/src/compiler/nir/nir_opt_cse.c index 364fb02..364fb02 100644 --- a/src/glsl/nir/nir_opt_cse.c +++ b/src/compiler/nir/nir_opt_cse.c diff --git a/src/glsl/nir/nir_opt_dce.c b/src/compiler/nir/nir_opt_dce.c index 32436c1..32436c1 100644 --- a/src/glsl/nir/nir_opt_dce.c +++ b/src/compiler/nir/nir_opt_dce.c diff --git a/src/glsl/nir/nir_opt_dead_cf.c b/src/compiler/nir/nir_opt_dead_cf.c index 4cc6798..4cc6798 100644 --- a/src/glsl/nir/nir_opt_dead_cf.c +++ b/src/compiler/nir/nir_opt_dead_cf.c diff --git a/src/glsl/nir/nir_opt_gcm.c b/src/compiler/nir/nir_opt_gcm.c index a8779ce..a8779ce 100644 --- a/src/glsl/nir/nir_opt_gcm.c +++ b/src/compiler/nir/nir_opt_gcm.c diff --git a/src/glsl/nir/nir_opt_global_to_local.c b/src/compiler/nir/nir_opt_global_to_local.c index bccb45b..bccb45b 100644 --- a/src/glsl/nir/nir_opt_global_to_local.c +++ b/src/compiler/nir/nir_opt_global_to_local.c diff --git a/src/glsl/nir/nir_opt_peephole_select.c b/src/compiler/nir/nir_opt_peephole_select.c index 0fc658d..0fc658d 100644 --- a/src/glsl/nir/nir_opt_peephole_select.c +++ b/src/compiler/nir/nir_opt_peephole_select.c diff --git a/src/glsl/nir/nir_opt_remove_phis.c b/src/compiler/nir/nir_opt_remove_phis.c index 6461837..6461837 100644 --- a/src/glsl/nir/nir_opt_remove_phis.c +++ b/src/compiler/nir/nir_opt_remove_phis.c diff --git a/src/glsl/nir/nir_opt_undef.c b/src/compiler/nir/nir_opt_undef.c index 374564d..374564d 100644 --- a/src/glsl/nir/nir_opt_undef.c +++ b/src/compiler/nir/nir_opt_undef.c diff --git a/src/glsl/nir/nir_phi_builder.c b/src/compiler/nir/nir_phi_builder.c index 5429083..5429083 100644 --- a/src/glsl/nir/nir_phi_builder.c +++ b/src/compiler/nir/nir_phi_builder.c diff --git a/src/glsl/nir/nir_phi_builder.h b/src/compiler/nir/nir_phi_builder.h index 50251bf..50251bf 100644 --- a/src/glsl/nir/nir_phi_builder.h +++ b/src/compiler/nir/nir_phi_builder.h diff --git a/src/glsl/nir/nir_print.c b/src/compiler/nir/nir_print.c index a137706..f36b91d 100644 --- a/src/glsl/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -26,7 +26,7 @@ */ #include "nir.h" -#include "shader_enums.h" +#include "compiler/shader_enums.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/glsl/nir/nir_remove_dead_variables.c b/src/compiler/nir/nir_remove_dead_variables.c index 792c5d4..792c5d4 100644 --- a/src/glsl/nir/nir_remove_dead_variables.c +++ b/src/compiler/nir/nir_remove_dead_variables.c diff --git a/src/glsl/nir/nir_repair_ssa.c b/src/compiler/nir/nir_repair_ssa.c index 3ab4f0f..3ab4f0f 100644 --- a/src/glsl/nir/nir_repair_ssa.c +++ b/src/compiler/nir/nir_repair_ssa.c diff --git a/src/glsl/nir/nir_search.c b/src/compiler/nir/nir_search.c index 56d7e81..56d7e81 100644 --- a/src/glsl/nir/nir_search.c +++ b/src/compiler/nir/nir_search.c diff --git a/src/glsl/nir/nir_search.h b/src/compiler/nir/nir_search.h index 7d47792..7d47792 100644 --- a/src/glsl/nir/nir_search.h +++ b/src/compiler/nir/nir_search.h diff --git a/src/glsl/nir/nir_split_var_copies.c b/src/compiler/nir/nir_split_var_copies.c index 6fdaefa..6fdaefa 100644 --- a/src/glsl/nir/nir_split_var_copies.c +++ b/src/compiler/nir/nir_split_var_copies.c diff --git a/src/glsl/nir/nir_sweep.c b/src/compiler/nir/nir_sweep.c index 5c62154..5c62154 100644 --- a/src/glsl/nir/nir_sweep.c +++ b/src/compiler/nir/nir_sweep.c diff --git a/src/glsl/nir/nir_to_ssa.c b/src/compiler/nir/nir_to_ssa.c index 44a5054..44a5054 100644 --- a/src/glsl/nir/nir_to_ssa.c +++ b/src/compiler/nir/nir_to_ssa.c diff --git a/src/glsl/nir/nir_validate.c b/src/compiler/nir/nir_validate.c index 1a943d7..1a943d7 100644 --- a/src/glsl/nir/nir_validate.c +++ b/src/compiler/nir/nir_validate.c diff --git a/src/glsl/nir/nir_vla.h b/src/compiler/nir/nir_vla.h index 7537833..7537833 100644 --- a/src/glsl/nir/nir_vla.h +++ b/src/compiler/nir/nir_vla.h diff --git a/src/glsl/nir/nir_worklist.c b/src/compiler/nir/nir_worklist.c index 3087a1d..3087a1d 100644 --- a/src/glsl/nir/nir_worklist.c +++ b/src/compiler/nir/nir_worklist.c diff --git a/src/glsl/nir/nir_worklist.h b/src/compiler/nir/nir_worklist.h index 829bff2..829bff2 100644 --- a/src/glsl/nir/nir_worklist.h +++ b/src/compiler/nir/nir_worklist.h diff --git a/src/glsl/nir/spirv/GLSL.std.450.h b/src/compiler/nir/spirv/GLSL.std.450.h index d1c9b5c..d1c9b5c 100644 --- a/src/glsl/nir/spirv/GLSL.std.450.h +++ b/src/compiler/nir/spirv/GLSL.std.450.h diff --git a/src/glsl/nir/spirv/nir_spirv.h b/src/compiler/nir/spirv/nir_spirv.h index 9c9c93d..500f2cb 100644 --- a/src/glsl/nir/spirv/nir_spirv.h +++ b/src/compiler/nir/spirv/nir_spirv.h @@ -30,7 +30,7 @@ #ifndef _NIR_SPIRV_H_ #define _NIR_SPIRV_H_ -#include "nir.h" +#include "nir/nir.h" #ifdef __cplusplus extern "C" { diff --git a/src/glsl/nir/spirv/spirv.h b/src/compiler/nir/spirv/spirv.h index 63bcb2f..63bcb2f 100644 --- a/src/glsl/nir/spirv/spirv.h +++ b/src/compiler/nir/spirv/spirv.h diff --git a/src/glsl/nir/spirv/spirv_to_nir.c b/src/compiler/nir/spirv/spirv_to_nir.c index c002457..c002457 100644 --- a/src/glsl/nir/spirv/spirv_to_nir.c +++ b/src/compiler/nir/spirv/spirv_to_nir.c diff --git a/src/glsl/nir/spirv/vtn_alu.c b/src/compiler/nir/spirv/vtn_alu.c index d866da7..d866da7 100644 --- a/src/glsl/nir/spirv/vtn_alu.c +++ b/src/compiler/nir/spirv/vtn_alu.c diff --git a/src/glsl/nir/spirv/vtn_cfg.c b/src/compiler/nir/spirv/vtn_cfg.c index 041408b..041408b 100644 --- a/src/glsl/nir/spirv/vtn_cfg.c +++ b/src/compiler/nir/spirv/vtn_cfg.c diff --git a/src/glsl/nir/spirv/vtn_glsl450.c b/src/compiler/nir/spirv/vtn_glsl450.c index bc38aa4..bc38aa4 100644 --- a/src/glsl/nir/spirv/vtn_glsl450.c +++ b/src/compiler/nir/spirv/vtn_glsl450.c diff --git a/src/glsl/nir/spirv/vtn_private.h b/src/compiler/nir/spirv/vtn_private.h index 3840d8c..3840d8c 100644 --- a/src/glsl/nir/spirv/vtn_private.h +++ b/src/compiler/nir/spirv/vtn_private.h diff --git a/src/glsl/nir/spirv/vtn_variables.c b/src/compiler/nir/spirv/vtn_variables.c index 3ad98aa..3ad98aa 100644 --- a/src/glsl/nir/spirv/vtn_variables.c +++ b/src/compiler/nir/spirv/vtn_variables.c diff --git a/src/glsl/nir/spirv2nir.c b/src/compiler/nir/spirv2nir.c index c837186..c837186 100644 --- a/src/glsl/nir/spirv2nir.c +++ b/src/compiler/nir/spirv2nir.c diff --git a/src/glsl/nir/tests/control_flow_tests.cpp b/src/compiler/nir/tests/control_flow_tests.cpp index b9379ef..b9379ef 100644 --- a/src/glsl/nir/tests/control_flow_tests.cpp +++ b/src/compiler/nir/tests/control_flow_tests.cpp diff --git a/src/glsl/nir/nir_types.cpp b/src/compiler/nir_types.cpp index f4408de..00703fe 100644 --- a/src/glsl/nir/nir_types.cpp +++ b/src/compiler/nir_types.cpp @@ -26,7 +26,7 @@ */ #include "nir_types.h" -#include "ir.h" +#include "compiler/glsl/ir.h" void glsl_print_type(const glsl_type *type, FILE *fp) diff --git a/src/glsl/nir/nir_types.h b/src/compiler/nir_types.h index 8cb7ec1..4ef0dcf 100644 --- a/src/glsl/nir/nir_types.h +++ b/src/compiler/nir_types.h @@ -28,8 +28,9 @@ #pragma once #include <stdio.h> +#include <stdbool.h> -/* C wrapper around glsl_types.h */ +/* C wrapper around compiler/glsl_types.h */ #include "glsl_types.h" diff --git a/src/glsl/nir/shader_enums.c b/src/compiler/shader_enums.c index ff2f564..ff2f564 100644 --- a/src/glsl/nir/shader_enums.c +++ b/src/compiler/shader_enums.c diff --git a/src/glsl/nir/shader_enums.h b/src/compiler/shader_enums.h index e3f46e3..e3f46e3 100644 --- a/src/glsl/nir/shader_enums.h +++ b/src/compiler/shader_enums.h diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index bcdf297..0ac5c98 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -18,7 +18,7 @@ libgallium_nir_la_SOURCES = \ $(NIR_SOURCES) libgallium_nir_la_CFLAGS = \ - -I$(top_builddir)/src/glsl/nir \ + -I$(top_builddir)/src/compiler/nir \ $(GALLIUM_CFLAGS) \ $(VISIBILITY_CFLAGS) \ $(MSVC2013_COMPAT_CFLAGS) diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index dfda80f..3e7d69f 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -23,13 +23,13 @@ */ #include "util/ralloc.h" -#include "glsl/nir/nir.h" -#include "glsl/nir/nir_control_flow.h" -#include "glsl/nir/nir_builder.h" -#include "glsl/list.h" -#include "glsl/nir/shader_enums.h" +#include "compiler/nir/nir.h" +#include "compiler/nir/nir_control_flow.h" +#include "compiler/nir/nir_builder.h" +#include "compiler/glsl/list.h" +#include "compiler/shader_enums.h" -#include "nir/tgsi_to_nir.h" +#include "tgsi_to_nir.h" #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_info.h" diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.h b/src/gallium/auxiliary/nir/tgsi_to_nir.h index 1a185a8..0651870 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.h +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.h @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "glsl/nir/nir.h" +#include "compiler/nir/nir.h" struct nir_shader_compiler_options *options; diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am index 3de8e0f..329a420 100644 --- a/src/gallium/drivers/freedreno/Makefile.am +++ b/src/gallium/drivers/freedreno/Makefile.am @@ -4,7 +4,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -Wno-packed-bitfield-compat \ -I$(top_srcdir)/src/gallium/drivers/freedreno/ir3 \ - -I$(top_builddir)/src/glsl/nir \ + -I$(top_builddir)/src/compiler/nir \ $(GALLIUM_DRIVER_CFLAGS) \ $(FREEDRENO_CFLAGS) @@ -27,7 +27,7 @@ ir3_compiler_SOURCES = \ ir3_compiler_LDADD = \ libfreedreno.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/glsl/libnir.la \ + $(top_builddir)/src/compiler/nir/libnir.la \ $(top_builddir)/src/util/libmesautil.la \ $(GALLIUM_COMMON_LIB_DEPS) \ $(FREEDRENO_LIBS) diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir.h b/src/gallium/drivers/freedreno/ir3/ir3_nir.h index 534199d..e2d8859 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_nir.h +++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.h @@ -29,8 +29,8 @@ #ifndef IR3_NIR_H_ #define IR3_NIR_H_ -#include "glsl/nir/nir.h" -#include "glsl/nir/shader_enums.h" +#include "compiler/nir/nir.h" +#include "compiler/shader_enums.h" #include "ir3_shader.h" diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c b/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c index 6eee2eb..8815ac9 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c @@ -28,8 +28,8 @@ */ #include "ir3_nir.h" -#include "glsl/nir/nir_builder.h" -#include "glsl/nir/nir_control_flow.h" +#include "compiler/nir/nir_builder.h" +#include "compiler/nir/nir_control_flow.h" /* Based on nir_opt_peephole_select, and hacked up to more aggressively * flatten anything that can be flattened diff --git a/src/gallium/drivers/freedreno/ir3/ir3_shader.h b/src/gallium/drivers/freedreno/ir3/ir3_shader.h index b3c28a4..03d4fa2 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_shader.h +++ b/src/gallium/drivers/freedreno/ir3/ir3_shader.h @@ -30,7 +30,7 @@ #define IR3_SHADER_H_ #include "pipe/p_state.h" -#include "glsl/nir/shader_enums.h" +#include "compiler/shader_enums.h" #include "ir3.h" #include "disasm.h" diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am index a3bf72f..caa5059 100644 --- a/src/gallium/drivers/vc4/Makefile.am +++ b/src/gallium/drivers/vc4/Makefile.am @@ -27,7 +27,7 @@ SIM_LDFLAGS = -lsimpenrose endif AM_CFLAGS = \ - -I$(top_builddir)/src/glsl/nir \ + -I$(top_builddir)/src/compiler/nir \ $(LIBDRM_CFLAGS) \ $(GALLIUM_DRIVER_CFLAGS) \ $(SIM_CFLAGS) \ diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c index 6d9a624..a13e309 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c @@ -41,7 +41,7 @@ */ #include "util/u_format.h" #include "vc4_qir.h" -#include "glsl/nir/nir_builder.h" +#include "compiler/nir/nir_builder.h" #include "vc4_context.h" static bool diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_io.c b/src/gallium/drivers/vc4/vc4_nir_lower_io.c index bf6631e..d47e3bf 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_io.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_io.c @@ -22,7 +22,7 @@ */ #include "vc4_qir.h" -#include "glsl/nir/nir_builder.h" +#include "compiler/nir/nir_builder.h" #include "util/u_format.h" /** diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c b/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c index 2490819..6a952c6 100644 --- a/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c +++ b/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c @@ -24,7 +24,7 @@ #include "vc4_qir.h" #include "kernel/vc4_packet.h" #include "tgsi/tgsi_info.h" -#include "glsl/nir/nir_builder.h" +#include "compiler/nir/nir_builder.h" /** @file vc4_nir_lower_txf_ms.c * Walks the NIR generated by TGSI-to-NIR to lower its nir_texop_txf_ms diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index 3e402d0..7db1b03 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -32,8 +32,8 @@ #include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_lowering.h" #include "tgsi/tgsi_parse.h" -#include "glsl/nir/nir.h" -#include "glsl/nir/nir_builder.h" +#include "compiler/nir/nir.h" +#include "compiler/nir/nir_builder.h" #include "nir/tgsi_to_nir.h" #include "vc4_context.h" #include "vc4_qpu.h" diff --git a/src/gallium/drivers/vc4/vc4_qir.h b/src/gallium/drivers/vc4/vc4_qir.h index 4ab4d35..bae3176 100644 --- a/src/gallium/drivers/vc4/vc4_qir.h +++ b/src/gallium/drivers/vc4/vc4_qir.h @@ -32,7 +32,7 @@ #include <string.h> #include "util/macros.h" -#include "glsl/nir/nir.h" +#include "compiler/nir/nir.h" #include "util/list.h" #include "util/u_math.h" diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index b451659..bf3baa7 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -41,6 +41,7 @@ env.Prepend(LIBS = [ pipe_loader, libloader, mesautil, + compiler, mesa, glsl, gallium, diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript index 210721c..b7c1373 100644 --- a/src/gallium/targets/haiku-softpipe/SConscript +++ b/src/gallium/targets/haiku-softpipe/SConscript @@ -6,6 +6,7 @@ env.Prepend(LIBS = [ trace, rbug, mesautil, + compiler, mesa, glsl, gallium diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript index 594f34d..3a63e3e 100644 --- a/src/gallium/targets/libgl-gdi/SConscript +++ b/src/gallium/targets/libgl-gdi/SConscript @@ -50,7 +50,7 @@ if env['gles']: opengl32 = env.SharedLibrary( target ='opengl32', source = sources, - LIBS = wgl + ws_gdi + glapi + mesa + drivers + gallium + glsl + env['LIBS'], + LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + env['LIBS'], ) env.Alias('opengl32', opengl32) diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 687a8b9d..e1c78dd 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -29,6 +29,7 @@ env.Prepend(LIBS = [ ws_xlib, glapi, mesautil, + compiler, mesa, glsl, gallium, diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript index 4a9115b..eeaacbc 100644 --- a/src/gallium/targets/osmesa/SConscript +++ b/src/gallium/targets/osmesa/SConscript @@ -12,6 +12,7 @@ env.Prepend(LIBS = [ st_osmesa, ws_null, glapi, + compiler, mesa, gallium, trace, diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 4bc3b55..0b516de 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -53,7 +53,7 @@ endif PIPE_LIBS += \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/glsl/libnir.la \ + $(top_builddir)/src/compiler/nir/libnir.la \ $(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index a63fd69..cdd9a86 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -37,7 +37,7 @@ libxatracker_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/glsl/libnir.la \ + $(top_builddir)/src/compiler/nir/libnir.la \ $(top_builddir)/src/util/libmesautil.la \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index cd31e14..ba952da 100644 --- a/src/mesa/Android.libmesa_dricore.mk +++ b/src/mesa/Android.libmesa_dricore.mk @@ -60,7 +60,7 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa/main \ $(MESA_TOP)/src/glsl \ - $(MESA_TOP)/src/glsl/nir \ + $(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk index 9e150ea..894ae20 100644 --- a/src/mesa/Android.libmesa_glsl_utils.mk +++ b/src/mesa/Android.libmesa_glsl_utils.mk @@ -37,7 +37,7 @@ LOCAL_MODULE := libmesa_glsl_utils LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/glsl \ - $(MESA_TOP)/src/glsl/nir \ + $(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary @@ -63,7 +63,7 @@ LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/glsl \ - $(MESA_TOP)/src/glsl/nir \ + $(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk index 427a35f..ee8887b 100644 --- a/src/mesa/Android.libmesa_st_mesa.mk +++ b/src/mesa/Android.libmesa_st_mesa.mk @@ -55,7 +55,7 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa/main \ $(MESA_TOP)/src/glsl \ - $(MESA_TOP)/src/glsl/nir \ + $(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/gallium/auxiliary \ $(MESA_TOP)/src/gallium/include diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 69506f2..8dc44fd 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -165,7 +165,7 @@ libmesa_la_SOURCES = \ $(MESA_ASM_FILES_FOR_ARCH) libmesa_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/compiler/glsl/libglsl.la \ $(ARCH_LIBS) libmesagallium_la_SOURCES = \ @@ -175,7 +175,7 @@ libmesagallium_la_SOURCES = \ $(MESA_ASM_FILES_FOR_ARCH) libmesagallium_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/compiler/glsl/libglsl.la \ $(ARCH_LIBS) libmesa_sse41_la_SOURCES = \ diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 13a05f5..7af8bec 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -623,11 +623,7 @@ MESA_GALLIUM_FILES = \ INCLUDE_DIRS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/glsl \ - -I$(top_srcdir)/src/glsl/nir \ - -I$(top_builddir)/src/glsl \ - -I$(top_builddir)/src/glsl/nir \ - -I$(top_srcdir)/src/glsl/glcpp \ + -I$(top_builddir)/src/compiler/nir \ -I$(top_srcdir)/src/mesa \ -I$(top_builddir)/src/mesa \ -I$(top_srcdir)/src/mesa/main \ diff --git a/src/mesa/SConscript b/src/mesa/SConscript index c986326..5b80a21 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -16,7 +16,6 @@ env.Append(CPPPATH = [ '#/src', '#/src/mapi', '#/src/glsl', - '#/src/glsl/nir', '#/src/mesa', '#/src/gallium/include', '#/src/gallium/auxiliary', diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index ad687bf..0db5a51 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -33,8 +33,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \ -I$(top_srcdir)/src/gtest/include \ - -I$(top_srcdir)/src/glsl/nir \ - -I$(top_builddir)/src/glsl/nir \ + -I$(top_builddir)/src/compiler/nir \ -I$(top_builddir)/src/mesa/drivers/dri/common \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c b/src/mesa/drivers/dri/i965/brw_compiler.c index 3d93772..0401e39 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.c +++ b/src/mesa/drivers/dri/i965/brw_compiler.c @@ -23,7 +23,7 @@ #include "brw_compiler.h" #include "brw_context.h" -#include "glsl/nir/nir.h" +#include "nir.h" #include "main/errors.h" #include "util/debug.h" diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c index 9eadb7e..0ab9ebd 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 33d2048..2ff9ec1 100644 --- a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp +++ b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp @@ -30,8 +30,8 @@ * \author Eric Anholt <eric@anholt.net> */ -#include "glsl/nir/glsl_types.h" -#include "glsl/ir.h" +#include "compiler/glsl_types.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.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 922f720..b7ea1bf 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -38,7 +38,7 @@ #include "brw_cfg.h" #include "brw_program.h" #include "brw_dead_control_flow.h" -#include "glsl/nir/glsl_types.h" +#include "compiler/glsl_types.h" using namespace brw; diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index c931910..ccdf943 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -30,8 +30,8 @@ #include "brw_shader.h" #include "brw_ir_fs.h" #include "brw_fs_builder.h" -#include "glsl/ir.h" -#include "glsl/nir/nir.h" +#include "compiler/glsl/ir.h" +#include "compiler/nir/nir.h" struct bblock_t; namespace { diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp index cbad47e..4c2e360 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -41,9 +41,9 @@ * we do retain the vector types in that case. */ -#include "glsl/ir.h" -#include "glsl/ir_expression_flattening.h" -#include "glsl/nir/glsl_types.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 { public: diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index 48cdaf6..6c3a8d7 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 0c8ad76..5fe24de 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp @@ -38,9 +38,9 @@ */ #include "main/imports.h" -#include "glsl/ir.h" -#include "glsl/ir_rvalue_visitor.h" -#include "glsl/nir/glsl_types.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_rvalue_visitor.h" +#include "compiler/glsl_types.h" #include "util/hash_table.h" static bool debug = false; diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 4011bf5..6b9bfcf 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -28,7 +28,7 @@ * in the GLSL IR or in the native code. */ #include "brw_fs.h" -#include "glsl/nir/glsl_types.h" +#include "compiler/glsl_types.h" using namespace brw; diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index edb52ac..c888ef2 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 ab9d792..f48c6fe 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 c83b272..0848e1e 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 4219d47..f5d7bae 100644 --- a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp +++ b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp @@ -31,9 +31,9 @@ * \author Chris Forbes <chrisf@ijw.co.nz> */ -#include "glsl/nir/glsl_types.h" -#include "glsl/ir.h" -#include "glsl/ir_builder.h" +#include "compiler/glsl_types.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.c b/src/mesa/drivers/dri/i965/brw_nir.c index d6987c8..ef5b34c 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -23,8 +23,8 @@ #include "brw_nir.h" #include "brw_shader.h" -#include "glsl/nir/glsl_to_nir.h" -#include "glsl/nir/nir_builder.h" +#include "compiler/nir/glsl_to_nir.h" +#include "compiler/nir/nir_builder.h" #include "program/prog_to_nir.h" static bool diff --git a/src/mesa/drivers/dri/i965/brw_nir.h b/src/mesa/drivers/dri/i965/brw_nir.h index 78b139b..079d8b2 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.h +++ b/src/mesa/drivers/dri/i965/brw_nir.h @@ -25,7 +25,7 @@ #include "brw_context.h" #include "brw_reg.h" -#include "glsl/nir/nir.h" +#include "compiler/nir/nir.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 0849ca4..f3361d6 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 94ceb52..c9872b6 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 83d9eda..e5ae9f2 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -31,8 +31,8 @@ #include "brw_ir_vec4.h" #endif -#include "glsl/ir.h" -#include "glsl/nir/nir.h" +#include "compiler/glsl/ir.h" +#include "compiler/nir/nir.h" #ifdef __cplusplus diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index 6d6988c..e07c05a 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_asm_annotation.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c index 59cc863..459ea60 100644 --- a/src/mesa/drivers/dri/i965/intel_asm_annotation.c +++ b/src/mesa/drivers/dri/i965/intel_asm_annotation.c @@ -25,7 +25,7 @@ #include "brw_eu.h" #include "intel_debug.h" #include "intel_asm_annotation.h" -#include "glsl/nir/nir.h" +#include "compiler/nir/nir.h" void dump_assembly(void *assembly, int num_annotations, struct annotation *annotation, diff --git a/src/mesa/drivers/dri/i965/intel_resolve_map.h b/src/mesa/drivers/dri/i965/intel_resolve_map.h index 9bb9fca..726b287 100644 --- a/src/mesa/drivers/dri/i965/intel_resolve_map.h +++ b/src/mesa/drivers/dri/i965/intel_resolve_map.h @@ -24,7 +24,7 @@ #pragma once #include <stdint.h> -#include "glsl/list.h" +#include "compiler/glsl/list.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index bca783a..ee7c1d7 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -36,7 +36,7 @@ #include "swrast/s_renderbuffer.h" #include "util/ralloc.h" #include "brw_shader.h" -#include "glsl/nir/nir.h" +#include "compiler/nir/nir.h" #include "utils.h" #include "xmlpool.h" diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript index d29f987..4541997 100644 --- a/src/mesa/drivers/x11/SConscript +++ b/src/mesa/drivers/x11/SConscript @@ -18,6 +18,7 @@ env.Prepend(LIBPATH = env['X11_LIBPATH']) env.Prepend(LIBS = [ glapi, mesautil, + compiler, glsl, mesa, ]) diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index f3fd01f..8b415ed 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -142,7 +142,7 @@ #include "sparc/sparc.h" #endif -#include "glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #include <stdbool.h> diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index e63d0f1..b0ce8c4 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -36,11 +36,11 @@ #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 "glsl/nir/glsl_types.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" #include "program/programopt.h" diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index c5400ab..56dce2d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -42,7 +42,7 @@ #include "main/config.h" #include "glapi/glapi.h" #include "math/m_matrix.h" /* GLmatrix */ -#include "glsl/nir/shader_enums.h" +#include "compiler/shader_enums.h" #include "main/formats.h" /* MESA_FORMAT_COUNT */ diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index f2a872d..0e4a0af 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 9a15cfe..50659b0 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 e902585..4967e4b 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 a988f41..df92c09 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 766a465..2ced201 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 47f80ce..b1968b3 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -43,8 +43,8 @@ #include "main/shaderobj.h" #include "main/uniforms.h" #include "main/enums.h" -#include "ir_uniform.h" -#include "glsl_types.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 2f88b65..88fe958 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -27,8 +27,8 @@ #define UNIFORMS_H #include "main/glheader.h" -#include "glsl/nir/glsl_types.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl_types.h" +#include "compiler/glsl/ir_uniform.h" #include "program/prog_parameter.h" #ifdef __cplusplus diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk index cc67f8a..0bc97a6 100644 --- a/src/mesa/program/Android.mk +++ b/src/mesa/program/Android.mk @@ -75,7 +75,7 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa \ $(MESA_TOP)/src/glsl \ - $(MESA_TOP)/src/glsl/nir \ + $(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/gallium/auxiliary \ $(MESA_TOP)/src/gallium/include diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 88d8337..3c51d18 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 "glsl/nir/glsl_types.h" -#include "glsl/linker.h" -#include "glsl/program.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 "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 72c9e97..f8659f6 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -23,9 +23,9 @@ * IN THE SOFTWARE. */ -#include "nir/nir.h" -#include "nir/nir_builder.h" -#include "glsl/list.h" +#include "compiler/nir/nir.h" +#include "compiler/nir/nir_builder.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 84e2504..f118552 100644 --- a/src/mesa/program/sampler.cpp +++ b/src/mesa/program/sampler.cpp @@ -24,11 +24,11 @@ */ #include "main/mtypes.h" -#include "glsl/nir/glsl_types.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/ir_visitor.h" -#include "glsl/program.h" +#include "compiler/glsl_types.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 03788f3..10e294c 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 a06683f..cf91d39 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" diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index 06f67cf..58668c7 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -54,7 +54,7 @@ AM_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/glsl/nir \ + -I$(top_srcdir)/src/compiler \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ @@ -63,7 +63,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/isl/ \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/glsl/nir \ + -I$(top_builddir)/src/compiler \ -I$(top_builddir)/src/vulkan libvulkan_la_CFLAGS = $(CFLAGS) -Wno-override-init diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index b40151c..72a927a 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -29,7 +29,7 @@ #include "anv_meta.h" #include "anv_private.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" struct anv_render_pass anv_meta_dummy_renderpass = {0}; diff --git a/src/vulkan/anv_meta_clear.c b/src/vulkan/anv_meta_clear.c index 027217b..15e24a3 100644 --- a/src/vulkan/anv_meta_clear.c +++ b/src/vulkan/anv_meta_clear.c @@ -23,7 +23,7 @@ #include "anv_meta.h" #include "anv_private.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" /** Vertex attributes for color clears. */ struct color_clear_vattrs { diff --git a/src/vulkan/anv_meta_resolve.c b/src/vulkan/anv_meta_resolve.c index 2107a75..f1c985e 100644 --- a/src/vulkan/anv_meta_resolve.c +++ b/src/vulkan/anv_meta_resolve.c @@ -26,7 +26,7 @@ #include "anv_meta.h" #include "anv_private.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" /** * Vertex attributes used by all pipelines. diff --git a/src/vulkan/anv_nir.h b/src/vulkan/anv_nir.h index 9a7a76f..c76314d 100644 --- a/src/vulkan/anv_nir.h +++ b/src/vulkan/anv_nir.h @@ -23,7 +23,7 @@ #pragma once -#include "glsl/nir/nir.h" +#include "nir/nir.h" #include "anv_private.h" #ifdef __cplusplus diff --git a/src/vulkan/anv_nir_apply_dynamic_offsets.c b/src/vulkan/anv_nir_apply_dynamic_offsets.c index 6837a80..a5e3238 100644 --- a/src/vulkan/anv_nir_apply_dynamic_offsets.c +++ b/src/vulkan/anv_nir_apply_dynamic_offsets.c @@ -22,7 +22,7 @@ */ #include "anv_nir.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" struct apply_dynamic_offsets_state { nir_shader *shader; diff --git a/src/vulkan/anv_nir_apply_pipeline_layout.c b/src/vulkan/anv_nir_apply_pipeline_layout.c index b7b8bd1..00ed776 100644 --- a/src/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/vulkan/anv_nir_apply_pipeline_layout.c @@ -23,7 +23,7 @@ #include "anv_nir.h" #include "program/prog_parameter.h" -#include "glsl/nir/nir_builder.h" +#include "nir/nir_builder.h" struct apply_pipeline_layout_state { nir_shader *shader; diff --git a/src/vulkan/anv_pipeline.c b/src/vulkan/anv_pipeline.c index 106b922..3c5072b 100644 --- a/src/vulkan/anv_pipeline.c +++ b/src/vulkan/anv_pipeline.c @@ -30,7 +30,7 @@ #include "anv_private.h" #include "brw_nir.h" #include "anv_nir.h" -#include "glsl/nir/spirv/nir_spirv.h" +#include "nir/spirv/nir_spirv.h" /* Needed for SWIZZLE macros */ #include "program/prog_instruction.h" |