diff --git a/Android.mk b/Android.mk index 1d765590010..908078a02ce 100644 --- a/Android.mk +++ b/Android.mk @@ -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 44d16c62033..a18080d4ce5 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 9f51e444dd0..272e68ce875 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 106b87d4251..4ba0a32d669 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 similarity index 71% rename from src/glsl/Android.gen.mk rename to src/compiler/Android.gen.mk index 59cc8577a6e..fcd5f94d459 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 00000000000..888780ba3fb --- /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 00000000000..e3d297fe299 --- /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 _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 00000000000..2a4568aa679 --- /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 00000000000..8d71b82bee0 --- /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 similarity index 100% rename from src/glsl/nir/builtin_type_macros.h rename to src/compiler/builtin_type_macros.h diff --git a/src/glsl/.gitignore b/src/compiler/glsl/.gitignore similarity index 100% rename from src/glsl/.gitignore rename to src/compiler/glsl/.gitignore diff --git a/src/compiler/glsl/Android.gen.mk b/src/compiler/glsl/Android.gen.mk new file mode 100644 index 00000000000..c5741b40bc5 --- /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 +# 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 similarity index 98% rename from src/glsl/Android.mk rename to src/compiler/glsl/Android.mk index f63b7daf26e..9cbb9a339a1 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 similarity index 79% rename from src/glsl/Makefile.am rename to src/compiler/glsl/Makefile.am index bd6bbf2a531..d6b1f9ed695 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 similarity index 96% rename from src/glsl/Makefile.sources rename to src/compiler/glsl/Makefile.sources index 348b4880875..3f537d5b37a 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 similarity index 100% rename from src/glsl/README rename to src/compiler/glsl/README diff --git a/src/glsl/SConscript b/src/compiler/glsl/SConscript similarity index 92% rename from src/glsl/SConscript rename to src/compiler/glsl/SConscript index a9d38c163b7..ef82a9d317a 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 similarity index 100% rename from src/glsl/TODO rename to src/compiler/glsl/TODO diff --git a/src/glsl/ast.h b/src/compiler/glsl/ast.h similarity index 100% rename from src/glsl/ast.h rename to src/compiler/glsl/ast.h diff --git a/src/glsl/ast_array_index.cpp b/src/compiler/glsl/ast_array_index.cpp similarity index 99% rename from src/glsl/ast_array_index.cpp rename to src/compiler/glsl/ast_array_index.cpp index ca7a9a10c36..f5baeb9ea32 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 similarity index 100% rename from src/glsl/ast_expr.cpp rename to src/compiler/glsl/ast_expr.cpp diff --git a/src/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp similarity index 99% rename from src/glsl/ast_function.cpp rename to src/compiler/glsl/ast_function.cpp index e32a588f091..0eb456a2b1f 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 similarity index 99% rename from src/glsl/ast_to_hir.cpp rename to src/compiler/glsl/ast_to_hir.cpp index 8d66131b2ca..98d8bc5f268 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 similarity index 100% rename from src/glsl/ast_type.cpp rename to src/compiler/glsl/ast_type.cpp diff --git a/src/glsl/blob.c b/src/compiler/glsl/blob.c similarity index 100% rename from src/glsl/blob.c rename to src/compiler/glsl/blob.c diff --git a/src/glsl/blob.h b/src/compiler/glsl/blob.h similarity index 100% rename from src/glsl/blob.h rename to src/compiler/glsl/blob.h diff --git a/src/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp similarity index 100% rename from src/glsl/builtin_functions.cpp rename to src/compiler/glsl/builtin_functions.cpp diff --git a/src/glsl/builtin_types.cpp b/src/compiler/glsl/builtin_types.cpp similarity index 99% rename from src/glsl/builtin_types.cpp rename to src/compiler/glsl/builtin_types.cpp index bbdcd199e92..ee24bd5e411 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 similarity index 100% rename from src/glsl/builtin_variables.cpp rename to src/compiler/glsl/builtin_variables.cpp diff --git a/src/glsl/glcpp/.gitignore b/src/compiler/glsl/glcpp/.gitignore similarity index 100% rename from src/glsl/glcpp/.gitignore rename to src/compiler/glsl/glcpp/.gitignore diff --git a/src/glsl/glcpp/README b/src/compiler/glsl/glcpp/README similarity index 100% rename from src/glsl/glcpp/README rename to src/compiler/glsl/glcpp/README diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/compiler/glsl/glcpp/glcpp-lex.l similarity index 100% rename from src/glsl/glcpp/glcpp-lex.l rename to src/compiler/glsl/glcpp/glcpp-lex.l diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y similarity index 100% rename from src/glsl/glcpp/glcpp-parse.y rename to src/compiler/glsl/glcpp/glcpp-parse.y diff --git a/src/glsl/glcpp/glcpp.c b/src/compiler/glsl/glcpp/glcpp.c similarity index 100% rename from src/glsl/glcpp/glcpp.c rename to src/compiler/glsl/glcpp/glcpp.c diff --git a/src/glsl/glcpp/glcpp.h b/src/compiler/glsl/glcpp/glcpp.h similarity index 100% rename from src/glsl/glcpp/glcpp.h rename to src/compiler/glsl/glcpp/glcpp.h diff --git a/src/glsl/glcpp/pp.c b/src/compiler/glsl/glcpp/pp.c similarity index 100% rename from src/glsl/glcpp/pp.c rename to src/compiler/glsl/glcpp/pp.c diff --git a/src/glsl/glcpp/tests/.gitignore b/src/compiler/glsl/glcpp/tests/.gitignore similarity index 100% rename from src/glsl/glcpp/tests/.gitignore rename to src/compiler/glsl/glcpp/tests/.gitignore diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c similarity index 100% rename from src/glsl/glcpp/tests/000-content-with-spaces.c rename to src/compiler/glsl/glcpp/tests/000-content-with-spaces.c diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected b/src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected similarity index 100% rename from src/glsl/glcpp/tests/000-content-with-spaces.c.expected rename to src/compiler/glsl/glcpp/tests/000-content-with-spaces.c.expected diff --git a/src/glsl/glcpp/tests/001-define.c b/src/compiler/glsl/glcpp/tests/001-define.c similarity index 100% rename from src/glsl/glcpp/tests/001-define.c rename to src/compiler/glsl/glcpp/tests/001-define.c diff --git a/src/glsl/glcpp/tests/001-define.c.expected b/src/compiler/glsl/glcpp/tests/001-define.c.expected similarity index 100% rename from src/glsl/glcpp/tests/001-define.c.expected rename to src/compiler/glsl/glcpp/tests/001-define.c.expected diff --git a/src/glsl/glcpp/tests/002-define-chain.c b/src/compiler/glsl/glcpp/tests/002-define-chain.c similarity index 100% rename from src/glsl/glcpp/tests/002-define-chain.c rename to src/compiler/glsl/glcpp/tests/002-define-chain.c diff --git a/src/glsl/glcpp/tests/002-define-chain.c.expected b/src/compiler/glsl/glcpp/tests/002-define-chain.c.expected similarity index 100% rename from src/glsl/glcpp/tests/002-define-chain.c.expected rename to src/compiler/glsl/glcpp/tests/002-define-chain.c.expected diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c similarity index 100% rename from src/glsl/glcpp/tests/003-define-chain-reverse.c rename to src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected b/src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected similarity index 100% rename from src/glsl/glcpp/tests/003-define-chain-reverse.c.expected rename to src/compiler/glsl/glcpp/tests/003-define-chain-reverse.c.expected diff --git a/src/glsl/glcpp/tests/004-define-recursive.c b/src/compiler/glsl/glcpp/tests/004-define-recursive.c similarity index 100% rename from src/glsl/glcpp/tests/004-define-recursive.c rename to src/compiler/glsl/glcpp/tests/004-define-recursive.c diff --git a/src/glsl/glcpp/tests/004-define-recursive.c.expected b/src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected similarity index 100% rename from src/glsl/glcpp/tests/004-define-recursive.c.expected rename to src/compiler/glsl/glcpp/tests/004-define-recursive.c.expected diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c similarity index 100% rename from src/glsl/glcpp/tests/005-define-composite-chain.c rename to src/compiler/glsl/glcpp/tests/005-define-composite-chain.c diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected b/src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected similarity index 100% rename from src/glsl/glcpp/tests/005-define-composite-chain.c.expected rename to src/compiler/glsl/glcpp/tests/005-define-composite-chain.c.expected diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c similarity index 100% rename from src/glsl/glcpp/tests/006-define-composite-chain-reverse.c rename to src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected b/src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected similarity index 100% rename from src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected rename to src/compiler/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c similarity index 100% rename from src/glsl/glcpp/tests/007-define-composite-recursive.c rename to src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected b/src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected similarity index 100% rename from src/glsl/glcpp/tests/007-define-composite-recursive.c.expected rename to src/compiler/glsl/glcpp/tests/007-define-composite-recursive.c.expected diff --git a/src/glsl/glcpp/tests/008-define-empty.c b/src/compiler/glsl/glcpp/tests/008-define-empty.c similarity index 100% rename from src/glsl/glcpp/tests/008-define-empty.c rename to src/compiler/glsl/glcpp/tests/008-define-empty.c diff --git a/src/glsl/glcpp/tests/008-define-empty.c.expected b/src/compiler/glsl/glcpp/tests/008-define-empty.c.expected similarity index 100% rename from src/glsl/glcpp/tests/008-define-empty.c.expected rename to src/compiler/glsl/glcpp/tests/008-define-empty.c.expected diff --git a/src/glsl/glcpp/tests/009-undef.c b/src/compiler/glsl/glcpp/tests/009-undef.c similarity index 100% rename from src/glsl/glcpp/tests/009-undef.c rename to src/compiler/glsl/glcpp/tests/009-undef.c diff --git a/src/glsl/glcpp/tests/009-undef.c.expected b/src/compiler/glsl/glcpp/tests/009-undef.c.expected similarity index 100% rename from src/glsl/glcpp/tests/009-undef.c.expected rename to src/compiler/glsl/glcpp/tests/009-undef.c.expected diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c similarity index 100% rename from src/glsl/glcpp/tests/010-undef-re-define.c rename to src/compiler/glsl/glcpp/tests/010-undef-re-define.c diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c.expected b/src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected similarity index 100% rename from src/glsl/glcpp/tests/010-undef-re-define.c.expected rename to src/compiler/glsl/glcpp/tests/010-undef-re-define.c.expected diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c similarity index 100% rename from src/glsl/glcpp/tests/011-define-func-empty.c rename to src/compiler/glsl/glcpp/tests/011-define-func-empty.c diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c.expected b/src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected similarity index 100% rename from src/glsl/glcpp/tests/011-define-func-empty.c.expected rename to src/compiler/glsl/glcpp/tests/011-define-func-empty.c.expected diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c similarity index 100% rename from src/glsl/glcpp/tests/012-define-func-no-args.c rename to src/compiler/glsl/glcpp/tests/012-define-func-no-args.c diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected b/src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected similarity index 100% rename from src/glsl/glcpp/tests/012-define-func-no-args.c.expected rename to src/compiler/glsl/glcpp/tests/012-define-func-no-args.c.expected diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c similarity index 100% rename from src/glsl/glcpp/tests/013-define-func-1-arg-unused.c rename to src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected b/src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected similarity index 100% rename from src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected rename to src/compiler/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c similarity index 100% rename from src/glsl/glcpp/tests/014-define-func-2-arg-unused.c rename to src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected b/src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected similarity index 100% rename from src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected rename to src/compiler/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c similarity index 100% rename from src/glsl/glcpp/tests/015-define-object-with-parens.c rename to src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected b/src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected similarity index 100% rename from src/glsl/glcpp/tests/015-define-object-with-parens.c.expected rename to src/compiler/glsl/glcpp/tests/015-define-object-with-parens.c.expected diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c similarity index 100% rename from src/glsl/glcpp/tests/016-define-func-1-arg.c rename to src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected b/src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected similarity index 100% rename from src/glsl/glcpp/tests/016-define-func-1-arg.c.expected rename to src/compiler/glsl/glcpp/tests/016-define-func-1-arg.c.expected diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c similarity index 100% rename from src/glsl/glcpp/tests/017-define-func-2-args.c rename to src/compiler/glsl/glcpp/tests/017-define-func-2-args.c diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected b/src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected similarity index 100% rename from src/glsl/glcpp/tests/017-define-func-2-args.c.expected rename to src/compiler/glsl/glcpp/tests/017-define-func-2-args.c.expected diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c similarity index 100% rename from src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c rename to src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected b/src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected similarity index 100% rename from src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected rename to src/compiler/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c similarity index 100% rename from src/glsl/glcpp/tests/019-define-func-1-arg-multi.c rename to src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected b/src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected similarity index 100% rename from src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected rename to src/compiler/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c similarity index 100% rename from src/glsl/glcpp/tests/020-define-func-2-arg-multi.c rename to src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected b/src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected similarity index 100% rename from src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected rename to src/compiler/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c similarity index 100% rename from src/glsl/glcpp/tests/021-define-func-compose.c rename to src/compiler/glsl/glcpp/tests/021-define-func-compose.c diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected similarity index 100% rename from src/glsl/glcpp/tests/021-define-func-compose.c.expected rename to src/compiler/glsl/glcpp/tests/021-define-func-compose.c.expected diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c similarity index 100% rename from src/glsl/glcpp/tests/022-define-func-arg-with-parens.c rename to src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected b/src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected similarity index 100% rename from src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected rename to src/compiler/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c similarity index 100% rename from src/glsl/glcpp/tests/023-define-extra-whitespace.c rename to src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected b/src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected similarity index 100% rename from src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected rename to src/compiler/glsl/glcpp/tests/023-define-extra-whitespace.c.expected diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c similarity index 100% rename from src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c rename to src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected b/src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected similarity index 100% rename from src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected rename to src/compiler/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c similarity index 100% rename from src/glsl/glcpp/tests/025-func-macro-as-non-macro.c rename to src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected b/src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected similarity index 100% rename from src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected rename to src/compiler/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c similarity index 100% rename from src/glsl/glcpp/tests/026-define-func-extra-newlines.c rename to src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected b/src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected similarity index 100% rename from src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected rename to src/compiler/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c similarity index 100% rename from src/glsl/glcpp/tests/027-define-chain-obj-to-func.c rename to src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected b/src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected similarity index 100% rename from src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected rename to src/compiler/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c similarity index 100% rename from src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c rename to src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected b/src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected similarity index 100% rename from src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected rename to src/compiler/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c similarity index 100% rename from src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c rename to src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected b/src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected similarity index 100% rename from src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected rename to src/compiler/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c similarity index 100% rename from src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c rename to src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected similarity index 100% rename from src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected rename to src/compiler/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c similarity index 100% rename from src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c rename to src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected b/src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected similarity index 100% rename from src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected rename to src/compiler/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c similarity index 100% rename from src/glsl/glcpp/tests/032-define-func-self-recurse.c rename to src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected b/src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected similarity index 100% rename from src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected rename to src/compiler/glsl/glcpp/tests/032-define-func-self-recurse.c.expected diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c similarity index 100% rename from src/glsl/glcpp/tests/033-define-func-self-compose.c rename to src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected b/src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected similarity index 100% rename from src/glsl/glcpp/tests/033-define-func-self-compose.c.expected rename to src/compiler/glsl/glcpp/tests/033-define-func-self-compose.c.expected diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c similarity index 100% rename from src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c rename to src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected b/src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected similarity index 100% rename from src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected rename to src/compiler/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c similarity index 100% rename from src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c rename to src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected b/src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected similarity index 100% rename from src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected rename to src/compiler/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c similarity index 100% rename from src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c rename to src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected b/src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected similarity index 100% rename from src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected rename to src/compiler/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c similarity index 100% rename from src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c rename to src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected b/src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected similarity index 100% rename from src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected rename to src/compiler/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c similarity index 100% rename from src/glsl/glcpp/tests/038-func-arg-with-commas.c rename to src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected b/src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected similarity index 100% rename from src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected rename to src/compiler/glsl/glcpp/tests/038-func-arg-with-commas.c.expected diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c similarity index 100% rename from src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c rename to src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected b/src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected similarity index 100% rename from src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected rename to src/compiler/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected diff --git a/src/glsl/glcpp/tests/040-token-pasting.c b/src/compiler/glsl/glcpp/tests/040-token-pasting.c similarity index 100% rename from src/glsl/glcpp/tests/040-token-pasting.c rename to src/compiler/glsl/glcpp/tests/040-token-pasting.c diff --git a/src/glsl/glcpp/tests/040-token-pasting.c.expected b/src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected similarity index 100% rename from src/glsl/glcpp/tests/040-token-pasting.c.expected rename to src/compiler/glsl/glcpp/tests/040-token-pasting.c.expected diff --git a/src/glsl/glcpp/tests/041-if-0.c b/src/compiler/glsl/glcpp/tests/041-if-0.c similarity index 100% rename from src/glsl/glcpp/tests/041-if-0.c rename to src/compiler/glsl/glcpp/tests/041-if-0.c diff --git a/src/glsl/glcpp/tests/041-if-0.c.expected b/src/compiler/glsl/glcpp/tests/041-if-0.c.expected similarity index 100% rename from src/glsl/glcpp/tests/041-if-0.c.expected rename to src/compiler/glsl/glcpp/tests/041-if-0.c.expected diff --git a/src/glsl/glcpp/tests/042-if-1.c b/src/compiler/glsl/glcpp/tests/042-if-1.c similarity index 100% rename from src/glsl/glcpp/tests/042-if-1.c rename to src/compiler/glsl/glcpp/tests/042-if-1.c diff --git a/src/glsl/glcpp/tests/042-if-1.c.expected b/src/compiler/glsl/glcpp/tests/042-if-1.c.expected similarity index 100% rename from src/glsl/glcpp/tests/042-if-1.c.expected rename to src/compiler/glsl/glcpp/tests/042-if-1.c.expected diff --git a/src/glsl/glcpp/tests/043-if-0-else.c b/src/compiler/glsl/glcpp/tests/043-if-0-else.c similarity index 100% rename from src/glsl/glcpp/tests/043-if-0-else.c rename to src/compiler/glsl/glcpp/tests/043-if-0-else.c diff --git a/src/glsl/glcpp/tests/043-if-0-else.c.expected b/src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected similarity index 100% rename from src/glsl/glcpp/tests/043-if-0-else.c.expected rename to src/compiler/glsl/glcpp/tests/043-if-0-else.c.expected diff --git a/src/glsl/glcpp/tests/044-if-1-else.c b/src/compiler/glsl/glcpp/tests/044-if-1-else.c similarity index 100% rename from src/glsl/glcpp/tests/044-if-1-else.c rename to src/compiler/glsl/glcpp/tests/044-if-1-else.c diff --git a/src/glsl/glcpp/tests/044-if-1-else.c.expected b/src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected similarity index 100% rename from src/glsl/glcpp/tests/044-if-1-else.c.expected rename to src/compiler/glsl/glcpp/tests/044-if-1-else.c.expected diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c similarity index 100% rename from src/glsl/glcpp/tests/045-if-0-elif.c rename to src/compiler/glsl/glcpp/tests/045-if-0-elif.c diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c.expected b/src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected similarity index 100% rename from src/glsl/glcpp/tests/045-if-0-elif.c.expected rename to src/compiler/glsl/glcpp/tests/045-if-0-elif.c.expected diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c similarity index 100% rename from src/glsl/glcpp/tests/046-if-1-elsif.c rename to src/compiler/glsl/glcpp/tests/046-if-1-elsif.c diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected b/src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected similarity index 100% rename from src/glsl/glcpp/tests/046-if-1-elsif.c.expected rename to src/compiler/glsl/glcpp/tests/046-if-1-elsif.c.expected diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c similarity index 100% rename from src/glsl/glcpp/tests/047-if-elif-else.c rename to src/compiler/glsl/glcpp/tests/047-if-elif-else.c diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c.expected b/src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected similarity index 100% rename from src/glsl/glcpp/tests/047-if-elif-else.c.expected rename to src/compiler/glsl/glcpp/tests/047-if-elif-else.c.expected diff --git a/src/glsl/glcpp/tests/048-if-nested.c b/src/compiler/glsl/glcpp/tests/048-if-nested.c similarity index 100% rename from src/glsl/glcpp/tests/048-if-nested.c rename to src/compiler/glsl/glcpp/tests/048-if-nested.c diff --git a/src/glsl/glcpp/tests/048-if-nested.c.expected b/src/compiler/glsl/glcpp/tests/048-if-nested.c.expected similarity index 100% rename from src/glsl/glcpp/tests/048-if-nested.c.expected rename to src/compiler/glsl/glcpp/tests/048-if-nested.c.expected diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c similarity index 100% rename from src/glsl/glcpp/tests/049-if-expression-precedence.c rename to src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected b/src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected similarity index 100% rename from src/glsl/glcpp/tests/049-if-expression-precedence.c.expected rename to src/compiler/glsl/glcpp/tests/049-if-expression-precedence.c.expected diff --git a/src/glsl/glcpp/tests/050-if-defined.c b/src/compiler/glsl/glcpp/tests/050-if-defined.c similarity index 100% rename from src/glsl/glcpp/tests/050-if-defined.c rename to src/compiler/glsl/glcpp/tests/050-if-defined.c diff --git a/src/glsl/glcpp/tests/050-if-defined.c.expected b/src/compiler/glsl/glcpp/tests/050-if-defined.c.expected similarity index 100% rename from src/glsl/glcpp/tests/050-if-defined.c.expected rename to src/compiler/glsl/glcpp/tests/050-if-defined.c.expected diff --git a/src/glsl/glcpp/tests/051-if-relational.c b/src/compiler/glsl/glcpp/tests/051-if-relational.c similarity index 100% rename from src/glsl/glcpp/tests/051-if-relational.c rename to src/compiler/glsl/glcpp/tests/051-if-relational.c diff --git a/src/glsl/glcpp/tests/051-if-relational.c.expected b/src/compiler/glsl/glcpp/tests/051-if-relational.c.expected similarity index 100% rename from src/glsl/glcpp/tests/051-if-relational.c.expected rename to src/compiler/glsl/glcpp/tests/051-if-relational.c.expected diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c similarity index 100% rename from src/glsl/glcpp/tests/052-if-bitwise.c rename to src/compiler/glsl/glcpp/tests/052-if-bitwise.c diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c.expected b/src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected similarity index 100% rename from src/glsl/glcpp/tests/052-if-bitwise.c.expected rename to src/compiler/glsl/glcpp/tests/052-if-bitwise.c.expected diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c similarity index 100% rename from src/glsl/glcpp/tests/053-if-divide-and-shift.c rename to src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected b/src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected similarity index 100% rename from src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected rename to src/compiler/glsl/glcpp/tests/053-if-divide-and-shift.c.expected diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c similarity index 100% rename from src/glsl/glcpp/tests/054-if-with-macros.c rename to src/compiler/glsl/glcpp/tests/054-if-with-macros.c diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c.expected b/src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected similarity index 100% rename from src/glsl/glcpp/tests/054-if-with-macros.c.expected rename to src/compiler/glsl/glcpp/tests/054-if-with-macros.c.expected diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c similarity index 100% rename from src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c rename to src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected b/src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected similarity index 100% rename from src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected rename to src/compiler/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c similarity index 100% rename from src/glsl/glcpp/tests/056-macro-argument-with-comma.c rename to src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected b/src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected similarity index 100% rename from src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected rename to src/compiler/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c similarity index 100% rename from src/glsl/glcpp/tests/057-empty-arguments.c rename to src/compiler/glsl/glcpp/tests/057-empty-arguments.c diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c.expected b/src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected similarity index 100% rename from src/glsl/glcpp/tests/057-empty-arguments.c.expected rename to src/compiler/glsl/glcpp/tests/057-empty-arguments.c.expected diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c similarity index 100% rename from src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c rename to src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected b/src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected similarity index 100% rename from src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected rename to src/compiler/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c similarity index 100% rename from src/glsl/glcpp/tests/059-token-pasting-integer.c rename to src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected b/src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected similarity index 100% rename from src/glsl/glcpp/tests/059-token-pasting-integer.c.expected rename to src/compiler/glsl/glcpp/tests/059-token-pasting-integer.c.expected diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c similarity index 100% rename from src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c rename to src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected b/src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected similarity index 100% rename from src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected rename to src/compiler/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c similarity index 100% rename from src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c rename to src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected b/src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected similarity index 100% rename from src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected rename to src/compiler/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c similarity index 100% rename from src/glsl/glcpp/tests/062-if-0-skips-garbage.c rename to src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected b/src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected similarity index 100% rename from src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected rename to src/compiler/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected diff --git a/src/glsl/glcpp/tests/063-comments.c b/src/compiler/glsl/glcpp/tests/063-comments.c similarity index 100% rename from src/glsl/glcpp/tests/063-comments.c rename to src/compiler/glsl/glcpp/tests/063-comments.c diff --git a/src/glsl/glcpp/tests/063-comments.c.expected b/src/compiler/glsl/glcpp/tests/063-comments.c.expected similarity index 100% rename from src/glsl/glcpp/tests/063-comments.c.expected rename to src/compiler/glsl/glcpp/tests/063-comments.c.expected diff --git a/src/glsl/glcpp/tests/064-version.c b/src/compiler/glsl/glcpp/tests/064-version.c similarity index 100% rename from src/glsl/glcpp/tests/064-version.c rename to src/compiler/glsl/glcpp/tests/064-version.c diff --git a/src/glsl/glcpp/tests/064-version.c.expected b/src/compiler/glsl/glcpp/tests/064-version.c.expected similarity index 100% rename from src/glsl/glcpp/tests/064-version.c.expected rename to src/compiler/glsl/glcpp/tests/064-version.c.expected diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c similarity index 100% rename from src/glsl/glcpp/tests/065-if-defined-parens.c rename to src/compiler/glsl/glcpp/tests/065-if-defined-parens.c diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected b/src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected similarity index 100% rename from src/glsl/glcpp/tests/065-if-defined-parens.c.expected rename to src/compiler/glsl/glcpp/tests/065-if-defined-parens.c.expected diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c similarity index 100% rename from src/glsl/glcpp/tests/066-if-nospace-expression.c rename to src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected b/src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected similarity index 100% rename from src/glsl/glcpp/tests/066-if-nospace-expression.c.expected rename to src/compiler/glsl/glcpp/tests/066-if-nospace-expression.c.expected diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c similarity index 100% rename from src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c rename to src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected b/src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected similarity index 100% rename from src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected rename to src/compiler/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c similarity index 100% rename from src/glsl/glcpp/tests/068-accidental-pasting.c rename to src/compiler/glsl/glcpp/tests/068-accidental-pasting.c diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected b/src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected similarity index 100% rename from src/glsl/glcpp/tests/068-accidental-pasting.c.expected rename to src/compiler/glsl/glcpp/tests/068-accidental-pasting.c.expected diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c similarity index 100% rename from src/glsl/glcpp/tests/069-repeated-argument.c rename to src/compiler/glsl/glcpp/tests/069-repeated-argument.c diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c.expected b/src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected similarity index 100% rename from src/glsl/glcpp/tests/069-repeated-argument.c.expected rename to src/compiler/glsl/glcpp/tests/069-repeated-argument.c.expected diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c similarity index 100% rename from src/glsl/glcpp/tests/070-undefined-macro-in-expression.c rename to src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected b/src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected similarity index 100% rename from src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected rename to src/compiler/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected diff --git a/src/glsl/glcpp/tests/071-punctuator.c b/src/compiler/glsl/glcpp/tests/071-punctuator.c similarity index 100% rename from src/glsl/glcpp/tests/071-punctuator.c rename to src/compiler/glsl/glcpp/tests/071-punctuator.c diff --git a/src/glsl/glcpp/tests/071-punctuator.c.expected b/src/compiler/glsl/glcpp/tests/071-punctuator.c.expected similarity index 100% rename from src/glsl/glcpp/tests/071-punctuator.c.expected rename to src/compiler/glsl/glcpp/tests/071-punctuator.c.expected diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c similarity index 100% rename from src/glsl/glcpp/tests/072-token-pasting-same-line.c rename to src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected b/src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected similarity index 100% rename from src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected rename to src/compiler/glsl/glcpp/tests/072-token-pasting-same-line.c.expected diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c similarity index 100% rename from src/glsl/glcpp/tests/073-if-in-ifdef.c rename to src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected b/src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected similarity index 100% rename from src/glsl/glcpp/tests/073-if-in-ifdef.c.expected rename to src/compiler/glsl/glcpp/tests/073-if-in-ifdef.c.expected diff --git a/src/glsl/glcpp/tests/074-elif-undef.c b/src/compiler/glsl/glcpp/tests/074-elif-undef.c similarity index 100% rename from src/glsl/glcpp/tests/074-elif-undef.c rename to src/compiler/glsl/glcpp/tests/074-elif-undef.c diff --git a/src/glsl/glcpp/tests/074-elif-undef.c.expected b/src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected similarity index 100% rename from src/glsl/glcpp/tests/074-elif-undef.c.expected rename to src/compiler/glsl/glcpp/tests/074-elif-undef.c.expected diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c similarity index 100% rename from src/glsl/glcpp/tests/075-elif-elif-undef.c rename to src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected b/src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected similarity index 100% rename from src/glsl/glcpp/tests/075-elif-elif-undef.c.expected rename to src/compiler/glsl/glcpp/tests/075-elif-elif-undef.c.expected diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c similarity index 100% rename from src/glsl/glcpp/tests/076-elif-undef-nested.c rename to src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected b/src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected similarity index 100% rename from src/glsl/glcpp/tests/076-elif-undef-nested.c.expected rename to src/compiler/glsl/glcpp/tests/076-elif-undef-nested.c.expected diff --git a/src/glsl/glcpp/tests/077-else-without-if.c b/src/compiler/glsl/glcpp/tests/077-else-without-if.c similarity index 100% rename from src/glsl/glcpp/tests/077-else-without-if.c rename to src/compiler/glsl/glcpp/tests/077-else-without-if.c diff --git a/src/glsl/glcpp/tests/077-else-without-if.c.expected b/src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected similarity index 100% rename from src/glsl/glcpp/tests/077-else-without-if.c.expected rename to src/compiler/glsl/glcpp/tests/077-else-without-if.c.expected diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c similarity index 100% rename from src/glsl/glcpp/tests/078-elif-without-if.c rename to src/compiler/glsl/glcpp/tests/078-elif-without-if.c diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c.expected b/src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected similarity index 100% rename from src/glsl/glcpp/tests/078-elif-without-if.c.expected rename to src/compiler/glsl/glcpp/tests/078-elif-without-if.c.expected diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c similarity index 100% rename from src/glsl/glcpp/tests/079-endif-without-if.c rename to src/compiler/glsl/glcpp/tests/079-endif-without-if.c diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c.expected b/src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected similarity index 100% rename from src/glsl/glcpp/tests/079-endif-without-if.c.expected rename to src/compiler/glsl/glcpp/tests/079-endif-without-if.c.expected diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c similarity index 100% rename from src/glsl/glcpp/tests/080-if-without-expression.c rename to src/compiler/glsl/glcpp/tests/080-if-without-expression.c diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c.expected b/src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected similarity index 100% rename from src/glsl/glcpp/tests/080-if-without-expression.c.expected rename to src/compiler/glsl/glcpp/tests/080-if-without-expression.c.expected diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c similarity index 100% rename from src/glsl/glcpp/tests/081-elif-without-expression.c rename to src/compiler/glsl/glcpp/tests/081-elif-without-expression.c diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected b/src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected similarity index 100% rename from src/glsl/glcpp/tests/081-elif-without-expression.c.expected rename to src/compiler/glsl/glcpp/tests/081-elif-without-expression.c.expected diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c similarity index 100% rename from src/glsl/glcpp/tests/082-invalid-paste.c rename to src/compiler/glsl/glcpp/tests/082-invalid-paste.c diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c.expected b/src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected similarity index 100% rename from src/glsl/glcpp/tests/082-invalid-paste.c.expected rename to src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c similarity index 100% rename from src/glsl/glcpp/tests/083-unterminated-if.c rename to src/compiler/glsl/glcpp/tests/083-unterminated-if.c diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c.expected b/src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected similarity index 100% rename from src/glsl/glcpp/tests/083-unterminated-if.c.expected rename to src/compiler/glsl/glcpp/tests/083-unterminated-if.c.expected diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c similarity index 100% rename from src/glsl/glcpp/tests/084-unbalanced-parentheses.c rename to src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected b/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected similarity index 100% rename from src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected rename to src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c similarity index 100% rename from src/glsl/glcpp/tests/085-incorrect-argument-count.c rename to src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected b/src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected similarity index 100% rename from src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected rename to src/compiler/glsl/glcpp/tests/085-incorrect-argument-count.c.expected diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c similarity index 100% rename from src/glsl/glcpp/tests/086-reserved-macro-names.c rename to src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected b/src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected similarity index 100% rename from src/glsl/glcpp/tests/086-reserved-macro-names.c.expected rename to src/compiler/glsl/glcpp/tests/086-reserved-macro-names.c.expected diff --git a/src/glsl/glcpp/tests/087-if-comments.c b/src/compiler/glsl/glcpp/tests/087-if-comments.c similarity index 100% rename from src/glsl/glcpp/tests/087-if-comments.c rename to src/compiler/glsl/glcpp/tests/087-if-comments.c diff --git a/src/glsl/glcpp/tests/087-if-comments.c.expected b/src/compiler/glsl/glcpp/tests/087-if-comments.c.expected similarity index 100% rename from src/glsl/glcpp/tests/087-if-comments.c.expected rename to src/compiler/glsl/glcpp/tests/087-if-comments.c.expected diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c similarity index 100% rename from src/glsl/glcpp/tests/088-redefine-macro-legitimate.c rename to src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected b/src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected similarity index 100% rename from src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected rename to src/compiler/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c similarity index 100% rename from src/glsl/glcpp/tests/089-redefine-macro-error.c rename to src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected b/src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected similarity index 100% rename from src/glsl/glcpp/tests/089-redefine-macro-error.c.expected rename to src/compiler/glsl/glcpp/tests/089-redefine-macro-error.c.expected diff --git a/src/glsl/glcpp/tests/090-hash-error.c b/src/compiler/glsl/glcpp/tests/090-hash-error.c similarity index 100% rename from src/glsl/glcpp/tests/090-hash-error.c rename to src/compiler/glsl/glcpp/tests/090-hash-error.c diff --git a/src/glsl/glcpp/tests/090-hash-error.c.expected b/src/compiler/glsl/glcpp/tests/090-hash-error.c.expected similarity index 100% rename from src/glsl/glcpp/tests/090-hash-error.c.expected rename to src/compiler/glsl/glcpp/tests/090-hash-error.c.expected diff --git a/src/glsl/glcpp/tests/091-hash-line.c b/src/compiler/glsl/glcpp/tests/091-hash-line.c similarity index 100% rename from src/glsl/glcpp/tests/091-hash-line.c rename to src/compiler/glsl/glcpp/tests/091-hash-line.c diff --git a/src/glsl/glcpp/tests/091-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/091-hash-line.c.expected similarity index 100% rename from src/glsl/glcpp/tests/091-hash-line.c.expected rename to src/compiler/glsl/glcpp/tests/091-hash-line.c.expected diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c similarity index 100% rename from src/glsl/glcpp/tests/092-redefine-macro-error-2.c rename to src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected b/src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected similarity index 100% rename from src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected rename to src/compiler/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c similarity index 100% rename from src/glsl/glcpp/tests/093-divide-by-zero.c rename to src/compiler/glsl/glcpp/tests/093-divide-by-zero.c diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected b/src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected similarity index 100% rename from src/glsl/glcpp/tests/093-divide-by-zero.c.expected rename to src/compiler/glsl/glcpp/tests/093-divide-by-zero.c.expected diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c similarity index 100% rename from src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c rename to src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected b/src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected similarity index 100% rename from src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected rename to src/compiler/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected diff --git a/src/glsl/glcpp/tests/095-recursive-define.c b/src/compiler/glsl/glcpp/tests/095-recursive-define.c similarity index 100% rename from src/glsl/glcpp/tests/095-recursive-define.c rename to src/compiler/glsl/glcpp/tests/095-recursive-define.c diff --git a/src/glsl/glcpp/tests/095-recursive-define.c.expected b/src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected similarity index 100% rename from src/glsl/glcpp/tests/095-recursive-define.c.expected rename to src/compiler/glsl/glcpp/tests/095-recursive-define.c.expected diff --git a/src/glsl/glcpp/tests/096-paste-twice.c b/src/compiler/glsl/glcpp/tests/096-paste-twice.c similarity index 100% rename from src/glsl/glcpp/tests/096-paste-twice.c rename to src/compiler/glsl/glcpp/tests/096-paste-twice.c diff --git a/src/glsl/glcpp/tests/096-paste-twice.c.expected b/src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected similarity index 100% rename from src/glsl/glcpp/tests/096-paste-twice.c.expected rename to src/compiler/glsl/glcpp/tests/096-paste-twice.c.expected diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c similarity index 100% rename from src/glsl/glcpp/tests/097-paste-with-non-function-macro.c rename to src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected b/src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected similarity index 100% rename from src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected rename to src/compiler/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c similarity index 100% rename from src/glsl/glcpp/tests/098-elif-undefined.c rename to src/compiler/glsl/glcpp/tests/098-elif-undefined.c diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c.expected b/src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected similarity index 100% rename from src/glsl/glcpp/tests/098-elif-undefined.c.expected rename to src/compiler/glsl/glcpp/tests/098-elif-undefined.c.expected diff --git a/src/glsl/glcpp/tests/099-c99-example.c b/src/compiler/glsl/glcpp/tests/099-c99-example.c similarity index 100% rename from src/glsl/glcpp/tests/099-c99-example.c rename to src/compiler/glsl/glcpp/tests/099-c99-example.c diff --git a/src/glsl/glcpp/tests/099-c99-example.c.expected b/src/compiler/glsl/glcpp/tests/099-c99-example.c.expected similarity index 100% rename from src/glsl/glcpp/tests/099-c99-example.c.expected rename to src/compiler/glsl/glcpp/tests/099-c99-example.c.expected diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c similarity index 100% rename from src/glsl/glcpp/tests/100-macro-with-colon.c rename to src/compiler/glsl/glcpp/tests/100-macro-with-colon.c diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected b/src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected similarity index 100% rename from src/glsl/glcpp/tests/100-macro-with-colon.c.expected rename to src/compiler/glsl/glcpp/tests/100-macro-with-colon.c.expected diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c similarity index 100% rename from src/glsl/glcpp/tests/101-macros-used-twice.c rename to src/compiler/glsl/glcpp/tests/101-macros-used-twice.c diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected b/src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected similarity index 100% rename from src/glsl/glcpp/tests/101-macros-used-twice.c.expected rename to src/compiler/glsl/glcpp/tests/101-macros-used-twice.c.expected diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c similarity index 100% rename from src/glsl/glcpp/tests/102-garbage-after-endif.c rename to src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected b/src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected similarity index 100% rename from src/glsl/glcpp/tests/102-garbage-after-endif.c.expected rename to src/compiler/glsl/glcpp/tests/102-garbage-after-endif.c.expected diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c similarity index 100% rename from src/glsl/glcpp/tests/103-garbage-after-else-0.c rename to src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected b/src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected similarity index 100% rename from src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected rename to src/compiler/glsl/glcpp/tests/103-garbage-after-else-0.c.expected diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c similarity index 100% rename from src/glsl/glcpp/tests/104-hash-line-followed-by-code.c rename to src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected b/src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected similarity index 100% rename from src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected rename to src/compiler/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c similarity index 100% rename from src/glsl/glcpp/tests/105-multiline-hash-line.c rename to src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected similarity index 100% rename from src/glsl/glcpp/tests/105-multiline-hash-line.c.expected rename to src/compiler/glsl/glcpp/tests/105-multiline-hash-line.c.expected diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c similarity index 100% rename from src/glsl/glcpp/tests/106-multiline-hash-if.c rename to src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected b/src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected similarity index 100% rename from src/glsl/glcpp/tests/106-multiline-hash-if.c.expected rename to src/compiler/glsl/glcpp/tests/106-multiline-hash-if.c.expected diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c similarity index 100% rename from src/glsl/glcpp/tests/107-multiline-hash-elif.c rename to src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected similarity index 100% rename from src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected rename to src/compiler/glsl/glcpp/tests/107-multiline-hash-elif.c.expected diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c similarity index 100% rename from src/glsl/glcpp/tests/108-no-space-after-hash-version.c rename to src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected b/src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected similarity index 100% rename from src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected rename to src/compiler/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c similarity index 100% rename from src/glsl/glcpp/tests/109-no-space-after-hash-line.c rename to src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected b/src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected similarity index 100% rename from src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected rename to src/compiler/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c similarity index 100% rename from src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c rename to src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected similarity index 100% rename from src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected rename to src/compiler/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c similarity index 100% rename from src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c rename to src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected b/src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected similarity index 100% rename from src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected rename to src/compiler/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c similarity index 100% rename from src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c rename to src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected b/src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected similarity index 100% rename from src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected rename to src/compiler/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c similarity index 100% rename from src/glsl/glcpp/tests/113-line-and-file-macros.c rename to src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected b/src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected similarity index 100% rename from src/glsl/glcpp/tests/113-line-and-file-macros.c.expected rename to src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c similarity index 100% rename from src/glsl/glcpp/tests/114-paste-integer-tokens.c rename to src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected b/src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected similarity index 100% rename from src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected rename to src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected diff --git a/src/glsl/glcpp/tests/115-line-continuations.c b/src/compiler/glsl/glcpp/tests/115-line-continuations.c similarity index 100% rename from src/glsl/glcpp/tests/115-line-continuations.c rename to src/compiler/glsl/glcpp/tests/115-line-continuations.c diff --git a/src/glsl/glcpp/tests/115-line-continuations.c.expected b/src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected similarity index 100% rename from src/glsl/glcpp/tests/115-line-continuations.c.expected rename to src/compiler/glsl/glcpp/tests/115-line-continuations.c.expected diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c similarity index 100% rename from src/glsl/glcpp/tests/116-disable-line-continuations.c rename to src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected b/src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected similarity index 100% rename from src/glsl/glcpp/tests/116-disable-line-continuations.c.expected rename to src/compiler/glsl/glcpp/tests/116-disable-line-continuations.c.expected diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c similarity index 100% rename from src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c rename to src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected b/src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected similarity index 100% rename from src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected rename to src/compiler/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c similarity index 100% rename from src/glsl/glcpp/tests/118-comment-becomes-space.c rename to src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected b/src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected similarity index 100% rename from src/glsl/glcpp/tests/118-comment-becomes-space.c.expected rename to src/compiler/glsl/glcpp/tests/118-comment-becomes-space.c.expected diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c similarity index 100% rename from src/glsl/glcpp/tests/119-elif-after-else.c rename to src/compiler/glsl/glcpp/tests/119-elif-after-else.c diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c.expected b/src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected similarity index 100% rename from src/glsl/glcpp/tests/119-elif-after-else.c.expected rename to src/compiler/glsl/glcpp/tests/119-elif-after-else.c.expected diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c similarity index 100% rename from src/glsl/glcpp/tests/120-undef-builtin.c rename to src/compiler/glsl/glcpp/tests/120-undef-builtin.c diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c.expected b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected similarity index 100% rename from src/glsl/glcpp/tests/120-undef-builtin.c.expected rename to src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c similarity index 100% rename from src/glsl/glcpp/tests/121-comment-bug-72686.c rename to src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected b/src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected similarity index 100% rename from src/glsl/glcpp/tests/121-comment-bug-72686.c.expected rename to src/compiler/glsl/glcpp/tests/121-comment-bug-72686.c.expected diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c similarity index 100% rename from src/glsl/glcpp/tests/122-redefine-whitespace.c rename to src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected b/src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected similarity index 100% rename from src/glsl/glcpp/tests/122-redefine-whitespace.c.expected rename to src/compiler/glsl/glcpp/tests/122-redefine-whitespace.c.expected diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c similarity index 100% rename from src/glsl/glcpp/tests/123-garbage-after-else-1.c rename to src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected b/src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected similarity index 100% rename from src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected rename to src/compiler/glsl/glcpp/tests/123-garbage-after-else-1.c.expected diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c similarity index 100% rename from src/glsl/glcpp/tests/124-preprocessing-numbers.c rename to src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected b/src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected similarity index 100% rename from src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected rename to src/compiler/glsl/glcpp/tests/124-preprocessing-numbers.c.expected diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c similarity index 100% rename from src/glsl/glcpp/tests/125-es-short-circuit-undefined.c rename to src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected b/src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected similarity index 100% rename from src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected rename to src/compiler/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c similarity index 100% rename from src/glsl/glcpp/tests/126-garbage-after-directive.c rename to src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected b/src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected similarity index 100% rename from src/glsl/glcpp/tests/126-garbage-after-directive.c.expected rename to src/compiler/glsl/glcpp/tests/126-garbage-after-directive.c.expected diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c similarity index 100% rename from src/glsl/glcpp/tests/127-pragma-empty.c rename to src/compiler/glsl/glcpp/tests/127-pragma-empty.c diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c.expected b/src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected similarity index 100% rename from src/glsl/glcpp/tests/127-pragma-empty.c.expected rename to src/compiler/glsl/glcpp/tests/127-pragma-empty.c.expected diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c similarity index 100% rename from src/glsl/glcpp/tests/128-space-before-hash.c rename to src/compiler/glsl/glcpp/tests/128-space-before-hash.c diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c.expected b/src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected similarity index 100% rename from src/glsl/glcpp/tests/128-space-before-hash.c.expected rename to src/compiler/glsl/glcpp/tests/128-space-before-hash.c.expected diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c similarity index 100% rename from src/glsl/glcpp/tests/129-define-non-identifier.c rename to src/compiler/glsl/glcpp/tests/129-define-non-identifier.c diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected b/src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected similarity index 100% rename from src/glsl/glcpp/tests/129-define-non-identifier.c.expected rename to src/compiler/glsl/glcpp/tests/129-define-non-identifier.c.expected diff --git a/src/glsl/glcpp/tests/130-define-comment.c b/src/compiler/glsl/glcpp/tests/130-define-comment.c similarity index 100% rename from src/glsl/glcpp/tests/130-define-comment.c rename to src/compiler/glsl/glcpp/tests/130-define-comment.c diff --git a/src/glsl/glcpp/tests/130-define-comment.c.expected b/src/compiler/glsl/glcpp/tests/130-define-comment.c.expected similarity index 100% rename from src/glsl/glcpp/tests/130-define-comment.c.expected rename to src/compiler/glsl/glcpp/tests/130-define-comment.c.expected diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c similarity index 100% rename from src/glsl/glcpp/tests/131-eof-without-newline.c rename to src/compiler/glsl/glcpp/tests/131-eof-without-newline.c diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c.expected b/src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected similarity index 100% rename from src/glsl/glcpp/tests/131-eof-without-newline.c.expected rename to src/compiler/glsl/glcpp/tests/131-eof-without-newline.c.expected diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c similarity index 100% rename from src/glsl/glcpp/tests/132-eof-without-newline-define.c rename to src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected b/src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected similarity index 100% rename from src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected rename to src/compiler/glsl/glcpp/tests/132-eof-without-newline-define.c.expected diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c similarity index 100% rename from src/glsl/glcpp/tests/133-eof-without-newline-comment.c rename to src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected b/src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected similarity index 100% rename from src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected rename to src/compiler/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c similarity index 100% rename from src/glsl/glcpp/tests/134-hash-comment-directive.c rename to src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected b/src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected similarity index 100% rename from src/glsl/glcpp/tests/134-hash-comment-directive.c.expected rename to src/compiler/glsl/glcpp/tests/134-hash-comment-directive.c.expected diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c similarity index 100% rename from src/glsl/glcpp/tests/135-duplicate-parameter.c rename to src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected b/src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected similarity index 100% rename from src/glsl/glcpp/tests/135-duplicate-parameter.c.expected rename to src/compiler/glsl/glcpp/tests/135-duplicate-parameter.c.expected diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c similarity index 100% rename from src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c rename to src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected b/src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected similarity index 100% rename from src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected rename to src/compiler/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c similarity index 100% rename from src/glsl/glcpp/tests/137-expand-macro-after-period.c rename to src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected b/src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected similarity index 100% rename from src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected rename to src/compiler/glsl/glcpp/tests/137-expand-macro-after-period.c.expected diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c similarity index 100% rename from src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c rename to src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected b/src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected similarity index 100% rename from src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected rename to src/compiler/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c similarity index 100% rename from src/glsl/glcpp/tests/139-define-without-macro-name.c rename to src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected b/src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected similarity index 100% rename from src/glsl/glcpp/tests/139-define-without-macro-name.c.expected rename to src/compiler/glsl/glcpp/tests/139-define-without-macro-name.c.expected diff --git a/src/glsl/glcpp/tests/140-null-directive.c b/src/compiler/glsl/glcpp/tests/140-null-directive.c similarity index 100% rename from src/glsl/glcpp/tests/140-null-directive.c rename to src/compiler/glsl/glcpp/tests/140-null-directive.c diff --git a/src/glsl/glcpp/tests/140-null-directive.c.expected b/src/compiler/glsl/glcpp/tests/140-null-directive.c.expected similarity index 100% rename from src/glsl/glcpp/tests/140-null-directive.c.expected rename to src/compiler/glsl/glcpp/tests/140-null-directive.c.expected diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c similarity index 100% rename from src/glsl/glcpp/tests/141-pragma-and-__LINE__.c rename to src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected b/src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected similarity index 100% rename from src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected rename to src/compiler/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c similarity index 100% rename from src/glsl/glcpp/tests/142-defined-within-macro.c rename to src/compiler/glsl/glcpp/tests/142-defined-within-macro.c diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c.expected b/src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected similarity index 100% rename from src/glsl/glcpp/tests/142-defined-within-macro.c.expected rename to src/compiler/glsl/glcpp/tests/142-defined-within-macro.c.expected diff --git a/src/glsl/glcpp/tests/143-multiple-else.c b/src/compiler/glsl/glcpp/tests/143-multiple-else.c similarity index 100% rename from src/glsl/glcpp/tests/143-multiple-else.c rename to src/compiler/glsl/glcpp/tests/143-multiple-else.c diff --git a/src/glsl/glcpp/tests/143-multiple-else.c.expected b/src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected similarity index 100% rename from src/glsl/glcpp/tests/143-multiple-else.c.expected rename to src/compiler/glsl/glcpp/tests/143-multiple-else.c.expected diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/compiler/glsl/glcpp/tests/glcpp-test similarity index 95% rename from src/glsl/glcpp/tests/glcpp-test rename to src/compiler/glsl/glcpp/tests/glcpp-test index 825c22e71fb..3945ee4f6ce 100755 --- a/src/glsl/glcpp/tests/glcpp-test +++ b/src/compiler/glsl/glcpp/tests/glcpp-test @@ -1,9 +1,9 @@ #!/bin/sh if [ ! -z "$srcdir" ]; then - testdir=$srcdir/glcpp/tests - outdir=`pwd`/glcpp/tests - glcpp=`pwd`/glcpp/glcpp + testdir=$srcdir/glsl/glcpp/tests + outdir=`pwd`/glsl/glcpp/tests + glcpp=`pwd`/glsl/glcpp/glcpp else testdir=. outdir=. diff --git a/src/glsl/glcpp/tests/glcpp-test-cr-lf b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf similarity index 90% rename from src/glsl/glcpp/tests/glcpp-test-cr-lf rename to src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf index c4ed0b86d74..c75370f48c3 100755 --- a/src/glsl/glcpp/tests/glcpp-test-cr-lf +++ b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf @@ -6,8 +6,8 @@ # glcpp-test script. if [ ! -z "$srcdir" ]; then - testdir="$srcdir/glcpp/tests" - glcpp_test="$srcdir/glcpp/tests/glcpp-test" + testdir="$srcdir/glsl/glcpp/tests" + glcpp_test="$srcdir/glsl/glcpp/tests/glcpp-test" else testdir=. glcpp_test=./glcpp-test @@ -99,7 +99,7 @@ mkdir subtest-cr for file in "$testdir"/*.c; do base=$(basename "$file") tr "\n" "\r" < "$file" > subtest-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected done run_test "${glcpp_test} --testdir=subtest-cr" @@ -112,7 +112,7 @@ mkdir subtest-cr-lf for file in "$testdir"/*.c; do base=$(basename "$file") sed -e 's/$/ /' < "$file" > subtest-cr-lf/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected done run_test "${glcpp_test} --testdir=subtest-cr-lf" @@ -125,7 +125,7 @@ mkdir subtest-lf-cr for file in "$testdir"/*.c; do base=$(basename "$file") sed -e 's/$/ /' < "$file" | tr "\n\r" "\r\n" > subtest-lf-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected + cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected done run_test "${glcpp_test} --testdir=subtest-lf-cr" diff --git a/src/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll similarity index 100% rename from src/glsl/glsl_lexer.ll rename to src/compiler/glsl/glsl_lexer.ll diff --git a/src/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy similarity index 99% rename from src/glsl/glsl_parser.yy rename to src/compiler/glsl/glsl_parser.yy index 2109fb2eedd..99bd0e61d0e 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 similarity index 100% rename from src/glsl/glsl_parser_extras.cpp rename to src/compiler/glsl/glsl_parser_extras.cpp diff --git a/src/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h similarity index 100% rename from src/glsl/glsl_parser_extras.h rename to src/compiler/glsl/glsl_parser_extras.h diff --git a/src/glsl/glsl_symbol_table.cpp b/src/compiler/glsl/glsl_symbol_table.cpp similarity index 100% rename from src/glsl/glsl_symbol_table.cpp rename to src/compiler/glsl/glsl_symbol_table.cpp diff --git a/src/glsl/glsl_symbol_table.h b/src/compiler/glsl/glsl_symbol_table.h similarity index 100% rename from src/glsl/glsl_symbol_table.h rename to src/compiler/glsl/glsl_symbol_table.h diff --git a/src/glsl/hir_field_selection.cpp b/src/compiler/glsl/hir_field_selection.cpp similarity index 98% rename from src/glsl/hir_field_selection.cpp rename to src/compiler/glsl/hir_field_selection.cpp index 92bb4139194..eab08ad8235 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 similarity index 99% rename from src/glsl/ir.cpp rename to src/compiler/glsl/ir.cpp index db1947453ea..5debca32411 100644 --- a/src/glsl/ir.cpp +++ b/src/compiler/glsl/ir.cpp @@ -23,7 +23,7 @@ #include #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 similarity index 99% rename from src/glsl/ir.h rename to src/compiler/glsl/ir.h index b453187c32a..09e21b22188 100644 --- a/src/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -30,7 +30,7 @@ #include #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 similarity index 100% rename from src/glsl/ir_basic_block.cpp rename to src/compiler/glsl/ir_basic_block.cpp diff --git a/src/glsl/ir_basic_block.h b/src/compiler/glsl/ir_basic_block.h similarity index 100% rename from src/glsl/ir_basic_block.h rename to src/compiler/glsl/ir_basic_block.h diff --git a/src/glsl/ir_builder.cpp b/src/compiler/glsl/ir_builder.cpp similarity index 100% rename from src/glsl/ir_builder.cpp rename to src/compiler/glsl/ir_builder.cpp diff --git a/src/glsl/ir_builder.h b/src/compiler/glsl/ir_builder.h similarity index 100% rename from src/glsl/ir_builder.h rename to src/compiler/glsl/ir_builder.h diff --git a/src/glsl/ir_clone.cpp b/src/compiler/glsl/ir_clone.cpp similarity index 99% rename from src/glsl/ir_clone.cpp rename to src/compiler/glsl/ir_clone.cpp index 2aef4fcb4ac..b32ec17f1af 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/compiler/glsl/ir_clone.cpp @@ -24,7 +24,7 @@ #include #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 similarity index 99% rename from src/glsl/ir_constant_expression.cpp rename to src/compiler/glsl/ir_constant_expression.cpp index c99a8239cbb..fbbf7794da6 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 similarity index 100% rename from src/glsl/ir_equals.cpp rename to src/compiler/glsl/ir_equals.cpp diff --git a/src/glsl/ir_expression_flattening.cpp b/src/compiler/glsl/ir_expression_flattening.cpp similarity index 100% rename from src/glsl/ir_expression_flattening.cpp rename to src/compiler/glsl/ir_expression_flattening.cpp diff --git a/src/glsl/ir_expression_flattening.h b/src/compiler/glsl/ir_expression_flattening.h similarity index 100% rename from src/glsl/ir_expression_flattening.h rename to src/compiler/glsl/ir_expression_flattening.h diff --git a/src/glsl/ir_function.cpp b/src/compiler/glsl/ir_function.cpp similarity index 99% rename from src/glsl/ir_function.cpp rename to src/compiler/glsl/ir_function.cpp index 93034bedb5a..0b4cb4bd30d 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 similarity index 100% rename from src/glsl/ir_function_can_inline.cpp rename to src/compiler/glsl/ir_function_can_inline.cpp diff --git a/src/glsl/ir_function_detect_recursion.cpp b/src/compiler/glsl/ir_function_detect_recursion.cpp similarity index 100% rename from src/glsl/ir_function_detect_recursion.cpp rename to src/compiler/glsl/ir_function_detect_recursion.cpp diff --git a/src/glsl/ir_function_inlining.h b/src/compiler/glsl/ir_function_inlining.h similarity index 100% rename from src/glsl/ir_function_inlining.h rename to src/compiler/glsl/ir_function_inlining.h diff --git a/src/glsl/ir_hierarchical_visitor.cpp b/src/compiler/glsl/ir_hierarchical_visitor.cpp similarity index 100% rename from src/glsl/ir_hierarchical_visitor.cpp rename to src/compiler/glsl/ir_hierarchical_visitor.cpp diff --git a/src/glsl/ir_hierarchical_visitor.h b/src/compiler/glsl/ir_hierarchical_visitor.h similarity index 100% rename from src/glsl/ir_hierarchical_visitor.h rename to src/compiler/glsl/ir_hierarchical_visitor.h diff --git a/src/glsl/ir_hv_accept.cpp b/src/compiler/glsl/ir_hv_accept.cpp similarity index 100% rename from src/glsl/ir_hv_accept.cpp rename to src/compiler/glsl/ir_hv_accept.cpp diff --git a/src/glsl/ir_import_prototypes.cpp b/src/compiler/glsl/ir_import_prototypes.cpp similarity index 100% rename from src/glsl/ir_import_prototypes.cpp rename to src/compiler/glsl/ir_import_prototypes.cpp diff --git a/src/glsl/ir_optimization.h b/src/compiler/glsl/ir_optimization.h similarity index 100% rename from src/glsl/ir_optimization.h rename to src/compiler/glsl/ir_optimization.h diff --git a/src/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp similarity index 99% rename from src/glsl/ir_print_visitor.cpp rename to src/compiler/glsl/ir_print_visitor.cpp index fd7bc2eea98..960b23fe0ed 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 similarity index 100% rename from src/glsl/ir_print_visitor.h rename to src/compiler/glsl/ir_print_visitor.h diff --git a/src/glsl/ir_reader.cpp b/src/compiler/glsl/ir_reader.cpp similarity index 99% rename from src/glsl/ir_reader.cpp rename to src/compiler/glsl/ir_reader.cpp index 7c0af1b712f..15315aac522 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 similarity index 100% rename from src/glsl/ir_reader.h rename to src/compiler/glsl/ir_reader.h diff --git a/src/glsl/ir_rvalue_visitor.cpp b/src/compiler/glsl/ir_rvalue_visitor.cpp similarity index 99% rename from src/glsl/ir_rvalue_visitor.cpp rename to src/compiler/glsl/ir_rvalue_visitor.cpp index 6486838b8b8..6ab6cf02176 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 similarity index 100% rename from src/glsl/ir_rvalue_visitor.h rename to src/compiler/glsl/ir_rvalue_visitor.h diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp similarity index 99% rename from src/glsl/ir_set_program_inouts.cpp rename to src/compiler/glsl/ir_set_program_inouts.cpp index a2dea67c6a9..df06923b870 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 similarity index 100% rename from src/glsl/ir_uniform.h rename to src/compiler/glsl/ir_uniform.h diff --git a/src/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp similarity index 99% rename from src/glsl/ir_validate.cpp rename to src/compiler/glsl/ir_validate.cpp index 12928836597..2ec5a3f73f7 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 similarity index 99% rename from src/glsl/ir_variable_refcount.cpp rename to src/compiler/glsl/ir_variable_refcount.cpp index 790627bd1e3..8306be10b9c 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 similarity index 98% rename from src/glsl/ir_variable_refcount.h rename to src/compiler/glsl/ir_variable_refcount.h index 5c74c314781..08a11c01495 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 similarity index 100% rename from src/glsl/ir_visitor.h rename to src/compiler/glsl/ir_visitor.h diff --git a/src/glsl/link_atomics.cpp b/src/compiler/glsl/link_atomics.cpp similarity index 100% rename from src/glsl/link_atomics.cpp rename to src/compiler/glsl/link_atomics.cpp diff --git a/src/glsl/link_functions.cpp b/src/compiler/glsl/link_functions.cpp similarity index 100% rename from src/glsl/link_functions.cpp rename to src/compiler/glsl/link_functions.cpp diff --git a/src/glsl/link_interface_blocks.cpp b/src/compiler/glsl/link_interface_blocks.cpp similarity index 100% rename from src/glsl/link_interface_blocks.cpp rename to src/compiler/glsl/link_interface_blocks.cpp diff --git a/src/glsl/link_uniform_block_active_visitor.cpp b/src/compiler/glsl/link_uniform_block_active_visitor.cpp similarity index 100% rename from src/glsl/link_uniform_block_active_visitor.cpp rename to src/compiler/glsl/link_uniform_block_active_visitor.cpp diff --git a/src/glsl/link_uniform_block_active_visitor.h b/src/compiler/glsl/link_uniform_block_active_visitor.h similarity index 100% rename from src/glsl/link_uniform_block_active_visitor.h rename to src/compiler/glsl/link_uniform_block_active_visitor.h diff --git a/src/glsl/link_uniform_blocks.cpp b/src/compiler/glsl/link_uniform_blocks.cpp similarity index 100% rename from src/glsl/link_uniform_blocks.cpp rename to src/compiler/glsl/link_uniform_blocks.cpp diff --git a/src/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp similarity index 100% rename from src/glsl/link_uniform_initializers.cpp rename to src/compiler/glsl/link_uniform_initializers.cpp diff --git a/src/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp similarity index 100% rename from src/glsl/link_uniforms.cpp rename to src/compiler/glsl/link_uniforms.cpp diff --git a/src/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp similarity index 100% rename from src/glsl/link_varyings.cpp rename to src/compiler/glsl/link_varyings.cpp diff --git a/src/glsl/link_varyings.h b/src/compiler/glsl/link_varyings.h similarity index 100% rename from src/glsl/link_varyings.h rename to src/compiler/glsl/link_varyings.h diff --git a/src/glsl/linker.cpp b/src/compiler/glsl/linker.cpp similarity index 100% rename from src/glsl/linker.cpp rename to src/compiler/glsl/linker.cpp diff --git a/src/glsl/linker.h b/src/compiler/glsl/linker.h similarity index 100% rename from src/glsl/linker.h rename to src/compiler/glsl/linker.h diff --git a/src/glsl/list.h b/src/compiler/glsl/list.h similarity index 100% rename from src/glsl/list.h rename to src/compiler/glsl/list.h diff --git a/src/glsl/loop_analysis.cpp b/src/compiler/glsl/loop_analysis.cpp similarity index 99% rename from src/glsl/loop_analysis.cpp rename to src/compiler/glsl/loop_analysis.cpp index 21d46ebce53..096a80abb34 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 similarity index 100% rename from src/glsl/loop_analysis.h rename to src/compiler/glsl/loop_analysis.h diff --git a/src/glsl/loop_controls.cpp b/src/compiler/glsl/loop_controls.cpp similarity index 99% rename from src/glsl/loop_controls.cpp rename to src/compiler/glsl/loop_controls.cpp index 51804bb5fe8..c717605ec74 100644 --- a/src/glsl/loop_controls.cpp +++ b/src/compiler/glsl/loop_controls.cpp @@ -23,7 +23,7 @@ #include #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 similarity index 99% rename from src/glsl/loop_unroll.cpp rename to src/compiler/glsl/loop_unroll.cpp index b9ea3507782..aea2743cdb1 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 similarity index 100% rename from src/glsl/lower_buffer_access.cpp rename to src/compiler/glsl/lower_buffer_access.cpp diff --git a/src/glsl/lower_buffer_access.h b/src/compiler/glsl/lower_buffer_access.h similarity index 100% rename from src/glsl/lower_buffer_access.h rename to src/compiler/glsl/lower_buffer_access.h diff --git a/src/glsl/lower_clip_distance.cpp b/src/compiler/glsl/lower_clip_distance.cpp similarity index 100% rename from src/glsl/lower_clip_distance.cpp rename to src/compiler/glsl/lower_clip_distance.cpp diff --git a/src/glsl/lower_const_arrays_to_uniforms.cpp b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp similarity index 99% rename from src/glsl/lower_const_arrays_to_uniforms.cpp rename to src/compiler/glsl/lower_const_arrays_to_uniforms.cpp index 44967dcdb53..2d024d4b78c 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 similarity index 99% rename from src/glsl/lower_discard.cpp rename to src/compiler/glsl/lower_discard.cpp index b44d2a6d28d..b62eb20dcb4 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 similarity index 99% rename from src/glsl/lower_discard_flow.cpp rename to src/compiler/glsl/lower_discard_flow.cpp index ee45bf22155..9d0a56b230d 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 similarity index 99% rename from src/glsl/lower_if_to_cond_assign.cpp rename to src/compiler/glsl/lower_if_to_cond_assign.cpp index 3232ce92aab..6a7034794b2 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 similarity index 99% rename from src/glsl/lower_instructions.cpp rename to src/compiler/glsl/lower_instructions.cpp index 7c2d4d7ce51..1875149b7a6 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 similarity index 99% rename from src/glsl/lower_jumps.cpp rename to src/compiler/glsl/lower_jumps.cpp index ec7a0c537ff..3cfa2e00ae8 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 #include "ir.h" diff --git a/src/glsl/lower_mat_op_to_vec.cpp b/src/compiler/glsl/lower_mat_op_to_vec.cpp similarity index 99% rename from src/glsl/lower_mat_op_to_vec.cpp rename to src/compiler/glsl/lower_mat_op_to_vec.cpp index e96cda216dd..266fdc6a250 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 similarity index 100% rename from src/glsl/lower_named_interface_blocks.cpp rename to src/compiler/glsl/lower_named_interface_blocks.cpp diff --git a/src/glsl/lower_noise.cpp b/src/compiler/glsl/lower_noise.cpp similarity index 100% rename from src/glsl/lower_noise.cpp rename to src/compiler/glsl/lower_noise.cpp diff --git a/src/glsl/lower_offset_array.cpp b/src/compiler/glsl/lower_offset_array.cpp similarity index 98% rename from src/glsl/lower_offset_array.cpp rename to src/compiler/glsl/lower_offset_array.cpp index c30f8014342..96486c3a711 100644 --- a/src/glsl/lower_offset_array.cpp +++ b/src/compiler/glsl/lower_offset_array.cpp @@ -31,7 +31,7 @@ * \author Chris Forbes */ -#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 similarity index 100% rename from src/glsl/lower_output_reads.cpp rename to src/compiler/glsl/lower_output_reads.cpp diff --git a/src/glsl/lower_packed_varyings.cpp b/src/compiler/glsl/lower_packed_varyings.cpp similarity index 100% rename from src/glsl/lower_packed_varyings.cpp rename to src/compiler/glsl/lower_packed_varyings.cpp diff --git a/src/glsl/lower_packing_builtins.cpp b/src/compiler/glsl/lower_packing_builtins.cpp similarity index 100% rename from src/glsl/lower_packing_builtins.cpp rename to src/compiler/glsl/lower_packing_builtins.cpp diff --git a/src/glsl/lower_shared_reference.cpp b/src/compiler/glsl/lower_shared_reference.cpp similarity index 100% rename from src/glsl/lower_shared_reference.cpp rename to src/compiler/glsl/lower_shared_reference.cpp diff --git a/src/glsl/lower_subroutine.cpp b/src/compiler/glsl/lower_subroutine.cpp similarity index 99% rename from src/glsl/lower_subroutine.cpp rename to src/compiler/glsl/lower_subroutine.cpp index ac8ade13d99..e80c1be768a 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 similarity index 100% rename from src/glsl/lower_tess_level.cpp rename to src/compiler/glsl/lower_tess_level.cpp diff --git a/src/glsl/lower_texture_projection.cpp b/src/compiler/glsl/lower_texture_projection.cpp similarity index 100% rename from src/glsl/lower_texture_projection.cpp rename to src/compiler/glsl/lower_texture_projection.cpp diff --git a/src/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp similarity index 100% rename from src/glsl/lower_ubo_reference.cpp rename to src/compiler/glsl/lower_ubo_reference.cpp diff --git a/src/glsl/lower_variable_index_to_cond_assign.cpp b/src/compiler/glsl/lower_variable_index_to_cond_assign.cpp similarity index 99% rename from src/glsl/lower_variable_index_to_cond_assign.cpp rename to src/compiler/glsl/lower_variable_index_to_cond_assign.cpp index a1ba9345e32..278d5450bfb 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 similarity index 99% rename from src/glsl/lower_vec_index_to_cond_assign.cpp rename to src/compiler/glsl/lower_vec_index_to_cond_assign.cpp index b6238825f8a..784db085924 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 similarity index 99% rename from src/glsl/lower_vec_index_to_swizzle.cpp rename to src/compiler/glsl/lower_vec_index_to_swizzle.cpp index 4d4d2f17ef6..8b18e95509c 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 similarity index 100% rename from src/glsl/lower_vector.cpp rename to src/compiler/glsl/lower_vector.cpp diff --git a/src/glsl/lower_vector_derefs.cpp b/src/compiler/glsl/lower_vector_derefs.cpp similarity index 100% rename from src/glsl/lower_vector_derefs.cpp rename to src/compiler/glsl/lower_vector_derefs.cpp diff --git a/src/glsl/lower_vector_insert.cpp b/src/compiler/glsl/lower_vector_insert.cpp similarity index 100% rename from src/glsl/lower_vector_insert.cpp rename to src/compiler/glsl/lower_vector_insert.cpp diff --git a/src/glsl/lower_vertex_id.cpp b/src/compiler/glsl/lower_vertex_id.cpp similarity index 100% rename from src/glsl/lower_vertex_id.cpp rename to src/compiler/glsl/lower_vertex_id.cpp diff --git a/src/glsl/main.cpp b/src/compiler/glsl/main.cpp similarity index 100% rename from src/glsl/main.cpp rename to src/compiler/glsl/main.cpp diff --git a/src/glsl/opt_algebraic.cpp b/src/compiler/glsl/opt_algebraic.cpp similarity index 99% rename from src/glsl/opt_algebraic.cpp rename to src/compiler/glsl/opt_algebraic.cpp index c4b87151199..1e58062cb0d 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 similarity index 99% rename from src/glsl/opt_array_splitting.cpp rename to src/compiler/glsl/opt_array_splitting.cpp index 89ce76bed2b..cceec6b6431 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 similarity index 98% rename from src/glsl/opt_conditional_discard.cpp rename to src/compiler/glsl/opt_conditional_discard.cpp index 8a3ad24873e..1ca8803f643 100644 --- a/src/glsl/opt_conditional_discard.cpp +++ b/src/compiler/glsl/opt_conditional_discard.cpp @@ -33,7 +33,7 @@ * (discard ) */ -#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 similarity index 99% rename from src/glsl/opt_constant_folding.cpp rename to src/compiler/glsl/opt_constant_folding.cpp index 4aae3f0ddf2..150a17b2af6 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 similarity index 99% rename from src/glsl/opt_constant_propagation.cpp rename to src/compiler/glsl/opt_constant_propagation.cpp index fb24a4fad04..416ba16a3c5 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 similarity index 99% rename from src/glsl/opt_constant_variable.cpp rename to src/compiler/glsl/opt_constant_variable.cpp index 56f6a819e1e..3ddb12904c7 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 similarity index 99% rename from src/glsl/opt_copy_propagation.cpp rename to src/compiler/glsl/opt_copy_propagation.cpp index 5d4cb4fe613..310708db868 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 similarity index 99% rename from src/glsl/opt_copy_propagation_elements.cpp rename to src/compiler/glsl/opt_copy_propagation_elements.cpp index 353a5c66841..a6791801943 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 similarity index 100% rename from src/glsl/opt_dead_builtin_variables.cpp rename to src/compiler/glsl/opt_dead_builtin_variables.cpp diff --git a/src/glsl/opt_dead_builtin_varyings.cpp b/src/compiler/glsl/opt_dead_builtin_varyings.cpp similarity index 99% rename from src/glsl/opt_dead_builtin_varyings.cpp rename to src/compiler/glsl/opt_dead_builtin_varyings.cpp index 53871130e12..37bcbccf0c5 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 similarity index 99% rename from src/glsl/opt_dead_code.cpp rename to src/compiler/glsl/opt_dead_code.cpp index c2ce0b94ece..dbdb7de8bb8 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 similarity index 99% rename from src/glsl/opt_dead_code_local.cpp rename to src/compiler/glsl/opt_dead_code_local.cpp index ee9f22c0373..d38fd2bf638 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 similarity index 99% rename from src/glsl/opt_dead_functions.cpp rename to src/compiler/glsl/opt_dead_functions.cpp index 5dff165215a..2e90b650fa8 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 similarity index 100% rename from src/glsl/opt_flatten_nested_if_blocks.cpp rename to src/compiler/glsl/opt_flatten_nested_if_blocks.cpp diff --git a/src/glsl/opt_flip_matrices.cpp b/src/compiler/glsl/opt_flip_matrices.cpp similarity index 100% rename from src/glsl/opt_flip_matrices.cpp rename to src/compiler/glsl/opt_flip_matrices.cpp diff --git a/src/glsl/opt_function_inlining.cpp b/src/compiler/glsl/opt_function_inlining.cpp similarity index 99% rename from src/glsl/opt_function_inlining.cpp rename to src/compiler/glsl/opt_function_inlining.cpp index 84a9e4fa093..19f5fae0a17 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 similarity index 100% rename from src/glsl/opt_if_simplification.cpp rename to src/compiler/glsl/opt_if_simplification.cpp diff --git a/src/glsl/opt_minmax.cpp b/src/compiler/glsl/opt_minmax.cpp similarity index 99% rename from src/glsl/opt_minmax.cpp rename to src/compiler/glsl/opt_minmax.cpp index 23d0b109d8b..29482ee69de 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 similarity index 98% rename from src/glsl/opt_noop_swizzle.cpp rename to src/compiler/glsl/opt_noop_swizzle.cpp index 586ad5e6107..41890ab2b15 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 similarity index 100% rename from src/glsl/opt_rebalance_tree.cpp rename to src/compiler/glsl/opt_rebalance_tree.cpp diff --git a/src/glsl/opt_redundant_jumps.cpp b/src/compiler/glsl/opt_redundant_jumps.cpp similarity index 100% rename from src/glsl/opt_redundant_jumps.cpp rename to src/compiler/glsl/opt_redundant_jumps.cpp diff --git a/src/glsl/opt_structure_splitting.cpp b/src/compiler/glsl/opt_structure_splitting.cpp similarity index 99% rename from src/glsl/opt_structure_splitting.cpp rename to src/compiler/glsl/opt_structure_splitting.cpp index abf4310feb3..0d18a2f7584 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 similarity index 98% rename from src/glsl/opt_swizzle_swizzle.cpp rename to src/compiler/glsl/opt_swizzle_swizzle.cpp index 7564c6b3b10..7285474b089 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 similarity index 99% rename from src/glsl/opt_tree_grafting.cpp rename to src/compiler/glsl/opt_tree_grafting.cpp index cd58213c019..83effb7424c 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 similarity index 99% rename from src/glsl/opt_vectorize.cpp rename to src/compiler/glsl/opt_vectorize.cpp index 2f71a83583b..88318cd8a6e 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 similarity index 100% rename from src/glsl/program.h rename to src/compiler/glsl/program.h diff --git a/src/glsl/s_expression.cpp b/src/compiler/glsl/s_expression.cpp similarity index 100% rename from src/glsl/s_expression.cpp rename to src/compiler/glsl/s_expression.cpp diff --git a/src/glsl/s_expression.h b/src/compiler/glsl/s_expression.h similarity index 100% rename from src/glsl/s_expression.h rename to src/compiler/glsl/s_expression.h diff --git a/src/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp similarity index 100% rename from src/glsl/standalone_scaffolding.cpp rename to src/compiler/glsl/standalone_scaffolding.cpp diff --git a/src/glsl/standalone_scaffolding.h b/src/compiler/glsl/standalone_scaffolding.h similarity index 100% rename from src/glsl/standalone_scaffolding.h rename to src/compiler/glsl/standalone_scaffolding.h diff --git a/src/glsl/test.cpp b/src/compiler/glsl/test.cpp similarity index 100% rename from src/glsl/test.cpp rename to src/compiler/glsl/test.cpp diff --git a/src/glsl/test_optpass.cpp b/src/compiler/glsl/test_optpass.cpp similarity index 100% rename from src/glsl/test_optpass.cpp rename to src/compiler/glsl/test_optpass.cpp diff --git a/src/glsl/test_optpass.h b/src/compiler/glsl/test_optpass.h similarity index 100% rename from src/glsl/test_optpass.h rename to src/compiler/glsl/test_optpass.h diff --git a/src/glsl/tests/.gitignore b/src/compiler/glsl/tests/.gitignore similarity index 100% rename from src/glsl/tests/.gitignore rename to src/compiler/glsl/tests/.gitignore diff --git a/src/glsl/tests/blob_test.c b/src/compiler/glsl/tests/blob_test.c similarity index 100% rename from src/glsl/tests/blob_test.c rename to src/compiler/glsl/tests/blob_test.c diff --git a/src/glsl/tests/builtin_variable_test.cpp b/src/compiler/glsl/tests/builtin_variable_test.cpp similarity index 100% rename from src/glsl/tests/builtin_variable_test.cpp rename to src/compiler/glsl/tests/builtin_variable_test.cpp diff --git a/src/glsl/tests/compare_ir b/src/compiler/glsl/tests/compare_ir similarity index 100% rename from src/glsl/tests/compare_ir rename to src/compiler/glsl/tests/compare_ir diff --git a/src/glsl/tests/copy_constant_to_storage_tests.cpp b/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp similarity index 100% rename from src/glsl/tests/copy_constant_to_storage_tests.cpp rename to src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp diff --git a/src/glsl/tests/general_ir_test.cpp b/src/compiler/glsl/tests/general_ir_test.cpp similarity index 100% rename from src/glsl/tests/general_ir_test.cpp rename to src/compiler/glsl/tests/general_ir_test.cpp diff --git a/src/glsl/tests/invalidate_locations_test.cpp b/src/compiler/glsl/tests/invalidate_locations_test.cpp similarity index 100% rename from src/glsl/tests/invalidate_locations_test.cpp rename to src/compiler/glsl/tests/invalidate_locations_test.cpp diff --git a/src/glsl/tests/lower_jumps/.gitignore b/src/compiler/glsl/tests/lower_jumps/.gitignore similarity index 100% rename from src/glsl/tests/lower_jumps/.gitignore rename to src/compiler/glsl/tests/lower_jumps/.gitignore diff --git a/src/glsl/tests/lower_jumps/create_test_cases.py b/src/compiler/glsl/tests/lower_jumps/create_test_cases.py similarity index 100% rename from src/glsl/tests/lower_jumps/create_test_cases.py rename to src/compiler/glsl/tests/lower_jumps/create_test_cases.py diff --git a/src/glsl/tests/optimization-test b/src/compiler/glsl/tests/optimization-test similarity index 100% rename from src/glsl/tests/optimization-test rename to src/compiler/glsl/tests/optimization-test diff --git a/src/glsl/tests/sampler_types_test.cpp b/src/compiler/glsl/tests/sampler_types_test.cpp similarity index 100% rename from src/glsl/tests/sampler_types_test.cpp rename to src/compiler/glsl/tests/sampler_types_test.cpp diff --git a/src/glsl/tests/set_uniform_initializer_tests.cpp b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp similarity index 100% rename from src/glsl/tests/set_uniform_initializer_tests.cpp rename to src/compiler/glsl/tests/set_uniform_initializer_tests.cpp diff --git a/src/glsl/tests/sexps.py b/src/compiler/glsl/tests/sexps.py similarity index 100% rename from src/glsl/tests/sexps.py rename to src/compiler/glsl/tests/sexps.py diff --git a/src/glsl/tests/uniform_initializer_utils.cpp b/src/compiler/glsl/tests/uniform_initializer_utils.cpp similarity index 100% rename from src/glsl/tests/uniform_initializer_utils.cpp rename to src/compiler/glsl/tests/uniform_initializer_utils.cpp diff --git a/src/glsl/tests/uniform_initializer_utils.h b/src/compiler/glsl/tests/uniform_initializer_utils.h similarity index 100% rename from src/glsl/tests/uniform_initializer_utils.h rename to src/compiler/glsl/tests/uniform_initializer_utils.h diff --git a/src/glsl/tests/varyings_test.cpp b/src/compiler/glsl/tests/varyings_test.cpp similarity index 100% rename from src/glsl/tests/varyings_test.cpp rename to src/compiler/glsl/tests/varyings_test.cpp diff --git a/src/glsl/nir/glsl_types.cpp b/src/compiler/glsl_types.cpp similarity index 99% rename from src/glsl/nir/glsl_types.cpp rename to src/compiler/glsl_types.cpp index 71095fa92e4..5920c2e2611 100644 --- a/src/glsl/nir/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -23,7 +23,7 @@ #include #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 similarity index 99% rename from src/glsl/nir/glsl_types.h rename to src/compiler/glsl_types.h index ff8dcc7a5f6..a9b5281e774 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 similarity index 100% rename from src/glsl/nir/.gitignore rename to src/compiler/nir/.gitignore diff --git a/src/compiler/nir/Makefile.sources b/src/compiler/nir/Makefile.sources new file mode 100644 index 00000000000..04e8ab88a35 --- /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 similarity index 100% rename from src/glsl/nir/README rename to src/compiler/nir/README diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp similarity index 99% rename from src/glsl/nir/glsl_to_nir.cpp rename to src/compiler/nir/glsl_to_nir.cpp index f29377cc260..2a3047dd33c 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 similarity index 97% rename from src/glsl/nir/glsl_to_nir.h rename to src/compiler/nir/glsl_to_nir.h index 29badcda08d..e3fe9b0246a 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 similarity index 100% rename from src/glsl/nir/nir.c rename to src/compiler/nir/nir.c diff --git a/src/glsl/nir/nir.h b/src/compiler/nir/nir.h similarity index 99% rename from src/glsl/nir/nir.h rename to src/compiler/nir/nir.h index ec6595b091d..f130e5e0eb1 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 #include "nir_opcodes.h" diff --git a/src/glsl/nir/nir_algebraic.py b/src/compiler/nir/nir_algebraic.py similarity index 100% rename from src/glsl/nir/nir_algebraic.py rename to src/compiler/nir/nir_algebraic.py diff --git a/src/glsl/nir/nir_array.h b/src/compiler/nir/nir_array.h similarity index 100% rename from src/glsl/nir/nir_array.h rename to src/compiler/nir/nir_array.h diff --git a/src/glsl/nir/nir_builder.h b/src/compiler/nir/nir_builder.h similarity index 100% rename from src/glsl/nir/nir_builder.h rename to 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 similarity index 100% rename from src/glsl/nir/nir_builder_opcodes_h.py rename to src/compiler/nir/nir_builder_opcodes_h.py diff --git a/src/glsl/nir/nir_clone.c b/src/compiler/nir/nir_clone.c similarity index 100% rename from src/glsl/nir/nir_clone.c rename to src/compiler/nir/nir_clone.c diff --git a/src/glsl/nir/nir_constant_expressions.h b/src/compiler/nir/nir_constant_expressions.h similarity index 100% rename from src/glsl/nir/nir_constant_expressions.h rename to 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 similarity index 100% rename from src/glsl/nir/nir_constant_expressions.py rename to 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 similarity index 100% rename from src/glsl/nir/nir_control_flow.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_control_flow.h rename to 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 similarity index 100% rename from src/glsl/nir/nir_control_flow_private.h rename to src/compiler/nir/nir_control_flow_private.h diff --git a/src/glsl/nir/nir_dominance.c b/src/compiler/nir/nir_dominance.c similarity index 100% rename from src/glsl/nir/nir_dominance.c rename to src/compiler/nir/nir_dominance.c diff --git a/src/glsl/nir/nir_from_ssa.c b/src/compiler/nir/nir_from_ssa.c similarity index 100% rename from src/glsl/nir/nir_from_ssa.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_gather_info.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_gs_count_vertices.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_inline_functions.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_instr_set.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_instr_set.h rename to src/compiler/nir/nir_instr_set.h diff --git a/src/glsl/nir/nir_intrinsics.c b/src/compiler/nir/nir_intrinsics.c similarity index 100% rename from src/glsl/nir/nir_intrinsics.c rename to src/compiler/nir/nir_intrinsics.c diff --git a/src/glsl/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h similarity index 100% rename from src/glsl/nir/nir_intrinsics.h rename to src/compiler/nir/nir_intrinsics.h diff --git a/src/glsl/nir/nir_liveness.c b/src/compiler/nir/nir_liveness.c similarity index 100% rename from src/glsl/nir/nir_liveness.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_alu_to_scalar.c rename to 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 similarity index 99% rename from src/glsl/nir/nir_lower_atomics.c rename to src/compiler/nir/nir_lower_atomics.c index a9d0ddbbd41..b07e199d71b 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 diff --git a/src/glsl/nir/nir_lower_clip.c b/src/compiler/nir/nir_lower_clip.c similarity index 100% rename from src/glsl/nir/nir_lower_clip.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_global_vars_to_local.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_gs_intrinsics.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_idiv.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_indirect_derefs.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_io.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_load_const_to_scalar.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_locals_to_regs.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_outputs_to_temporaries.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_phis_to_scalar.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_returns.c rename to 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 similarity index 99% rename from src/glsl/nir/nir_lower_samplers.c rename to src/compiler/nir/nir_lower_samplers.c index e4cd415a9c3..29654136aee 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 similarity index 100% rename from src/glsl/nir/nir_lower_system_values.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_tex.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_to_source_mods.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_two_sided_color.c rename to 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 similarity index 99% rename from src/glsl/nir/nir_lower_var_copies.c rename to src/compiler/nir/nir_lower_var_copies.c index 350e99c3423..8cb3edd0a84 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 similarity index 100% rename from src/glsl/nir/nir_lower_vars_to_ssa.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_lower_vec_to_movs.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_metadata.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_move_vec_src_uses_to_dest.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_normalize_cubemap_coords.c rename to src/compiler/nir/nir_normalize_cubemap_coords.c diff --git a/src/glsl/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py similarity index 100% rename from src/glsl/nir/nir_opcodes.py rename to src/compiler/nir/nir_opcodes.py diff --git a/src/glsl/nir/nir_opcodes_c.py b/src/compiler/nir/nir_opcodes_c.py similarity index 100% rename from src/glsl/nir/nir_opcodes_c.py rename to 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 similarity index 100% rename from src/glsl/nir/nir_opcodes_h.py rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_algebraic.py rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_constant_folding.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_copy_propagate.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_cse.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_dce.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_dead_cf.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_gcm.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_global_to_local.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_peephole_select.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_remove_phis.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_opt_undef.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_phi_builder.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_phi_builder.h rename to src/compiler/nir/nir_phi_builder.h diff --git a/src/glsl/nir/nir_print.c b/src/compiler/nir/nir_print.c similarity index 99% rename from src/glsl/nir/nir_print.c rename to src/compiler/nir/nir_print.c index a137706b15b..f36b91de6e0 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 #include diff --git a/src/glsl/nir/nir_remove_dead_variables.c b/src/compiler/nir/nir_remove_dead_variables.c similarity index 100% rename from src/glsl/nir/nir_remove_dead_variables.c rename to 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 similarity index 100% rename from src/glsl/nir/nir_repair_ssa.c rename to src/compiler/nir/nir_repair_ssa.c diff --git a/src/glsl/nir/nir_search.c b/src/compiler/nir/nir_search.c similarity index 100% rename from src/glsl/nir/nir_search.c rename to src/compiler/nir/nir_search.c diff --git a/src/glsl/nir/nir_search.h b/src/compiler/nir/nir_search.h similarity index 100% rename from src/glsl/nir/nir_search.h rename to 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 similarity index 100% rename from src/glsl/nir/nir_split_var_copies.c rename to src/compiler/nir/nir_split_var_copies.c diff --git a/src/glsl/nir/nir_sweep.c b/src/compiler/nir/nir_sweep.c similarity index 100% rename from src/glsl/nir/nir_sweep.c rename to src/compiler/nir/nir_sweep.c diff --git a/src/glsl/nir/nir_to_ssa.c b/src/compiler/nir/nir_to_ssa.c similarity index 100% rename from src/glsl/nir/nir_to_ssa.c rename to src/compiler/nir/nir_to_ssa.c diff --git a/src/glsl/nir/nir_validate.c b/src/compiler/nir/nir_validate.c similarity index 100% rename from src/glsl/nir/nir_validate.c rename to src/compiler/nir/nir_validate.c diff --git a/src/glsl/nir/nir_vla.h b/src/compiler/nir/nir_vla.h similarity index 100% rename from src/glsl/nir/nir_vla.h rename to src/compiler/nir/nir_vla.h diff --git a/src/glsl/nir/nir_worklist.c b/src/compiler/nir/nir_worklist.c similarity index 100% rename from src/glsl/nir/nir_worklist.c rename to src/compiler/nir/nir_worklist.c diff --git a/src/glsl/nir/nir_worklist.h b/src/compiler/nir/nir_worklist.h similarity index 100% rename from src/glsl/nir/nir_worklist.h rename to 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 similarity index 100% rename from src/glsl/nir/spirv/GLSL.std.450.h rename to 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 similarity index 98% rename from src/glsl/nir/spirv/nir_spirv.h rename to src/compiler/nir/spirv/nir_spirv.h index 9c9c93d36c2..500f2cb94df 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 similarity index 100% rename from src/glsl/nir/spirv/spirv.h rename to 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 similarity index 100% rename from src/glsl/nir/spirv/spirv_to_nir.c rename to 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 similarity index 100% rename from src/glsl/nir/spirv/vtn_alu.c rename to 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 similarity index 100% rename from src/glsl/nir/spirv/vtn_cfg.c rename to 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 similarity index 100% rename from src/glsl/nir/spirv/vtn_glsl450.c rename to 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 similarity index 100% rename from src/glsl/nir/spirv/vtn_private.h rename to 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 similarity index 100% rename from src/glsl/nir/spirv/vtn_variables.c rename to src/compiler/nir/spirv/vtn_variables.c diff --git a/src/glsl/nir/spirv2nir.c b/src/compiler/nir/spirv2nir.c similarity index 100% rename from src/glsl/nir/spirv2nir.c rename to 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 similarity index 100% rename from src/glsl/nir/tests/control_flow_tests.cpp rename to src/compiler/nir/tests/control_flow_tests.cpp diff --git a/src/glsl/nir/nir_types.cpp b/src/compiler/nir_types.cpp similarity index 99% rename from src/glsl/nir/nir_types.cpp rename to src/compiler/nir_types.cpp index f4408def9a0..00703fe6f52 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 similarity index 98% rename from src/glsl/nir/nir_types.h rename to src/compiler/nir_types.h index 8cb7ec16ce3..4ef0dcf9a31 100644 --- a/src/glsl/nir/nir_types.h +++ b/src/compiler/nir_types.h @@ -28,8 +28,9 @@ #pragma once #include +#include -/* 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 similarity index 100% rename from src/glsl/nir/shader_enums.c rename to src/compiler/shader_enums.c diff --git a/src/glsl/nir/shader_enums.h b/src/compiler/shader_enums.h similarity index 100% rename from src/glsl/nir/shader_enums.h rename to src/compiler/shader_enums.h diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index bcdf297030f..0ac5c9802f2 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 dfda80f228f..3e7d69f73ed 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 1a185a83219..0651870ea80 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 3de8e0fd5ad..329a4204c3a 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 534199d3744..e2d88596094 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 6eee2ebbab6..8815ac981eb 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 b3c28a41387..03d4fa2e927 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 a3bf72fc72a..caa5059fbd3 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 6d9a624c9b0..a13e309985a 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 bf6631e944e..d47e3bf52b0 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 2490819c297..6a952c62d5f 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 3e402d048ba..7db1b03cbc1 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 4ab4d35d0ca..bae31768bd8 100644 --- a/src/gallium/drivers/vc4/vc4_qir.h +++ b/src/gallium/drivers/vc4/vc4_qir.h @@ -32,7 +32,7 @@ #include #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 b4516598675..bf3baa7094b 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 210721c420f..b7c13731d68 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 594f34d7fad..3a63e3e6a3e 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 687a8b9d3ed..e1c78dd06a0 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 4a9115ba1cf..eeaacbcaf64 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 4bc3b55f26b..0b516de0b5b 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 a63fd6903a4..cdd9a862e4a 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 cd31e148222..ba952da4ad4 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 9e150eaa3c0..894ae20a239 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 427a35f4f6e..ee8887b73ec 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 69506f2a3fd..8dc44fda0f2 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -165,7 +165,7 @@ libmesa_la_SOURCES = \ $(MESA_ASM_FILES_FOR_ARCH) libmesa_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/compiler/glsl/libglsl.la \ $(ARCH_LIBS) libmesagallium_la_SOURCES = \ @@ -175,7 +175,7 @@ libmesagallium_la_SOURCES = \ $(MESA_ASM_FILES_FOR_ARCH) libmesagallium_la_LIBADD = \ - $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/compiler/glsl/libglsl.la \ $(ARCH_LIBS) libmesa_sse41_la_SOURCES = \ diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 13a05f53b22..7af8becd607 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 c986326d2bf..5b80a216fef 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 ad687bf59a4..0db5a51e725 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 3d93772c691..0401e397031 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 9eadb7e00fa..0ab9ebdab3c 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.c +++ b/src/mesa/drivers/dri/i965/brw_cs.c @@ -32,7 +32,7 @@ #include "intel_batchbuffer.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void assign_cs_binding_table_offsets(const struct brw_device_info *devinfo, diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp index 33d2048e657..2ff9ec16fdb 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 */ -#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 922f7200a30..b7ea1bf8d93 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 c931910136d..ccdf9433798 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 cbad47ee40a..4c2e360edf9 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 48cdaf6d9c2..6c3a8d70677 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 0c8ad76aa50..5fe24debeec 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp @@ -38,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 4011bf5a2b7..6b9bfcf0b85 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 edb52ac44b7..c888ef2bd67 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -34,7 +34,7 @@ #include "brw_ff_gs.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void brw_gs_debug_recompile(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index ab9d7929c05..f48c6fe12a1 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -26,7 +26,7 @@ #include "brw_fs.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_optimization.h" +#include "compiler/glsl/ir_optimization.h" #include "program/program.h" #include "main/shaderapi.h" #include "main/uniforms.h" diff --git a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp index c83b2728b98..0848e1ec536 100644 --- a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp +++ b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp @@ -25,8 +25,8 @@ * \file brw_lower_texture_gradients.cpp */ -#include "glsl/ir.h" -#include "glsl/ir_builder.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_builder.h" #include "program/prog_instruction.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp index 4219d471def..f5d7baee6db 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 */ -#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 d6987c80ed6..ef5b34cc687 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 78b139b991d..079d8b25174 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 0849ca40046..f3361d69786 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -23,7 +23,7 @@ #include "brw_shader.h" #include "brw_nir.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void brw_nir_setup_glsl_builtin_uniform(nir_variable *var, diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 94ceb526762..c9872b68d75 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 83d9edae8ca..e5ae9f24156 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 6d6988c6a41..e07c05a92c1 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -31,7 +31,7 @@ #include "intel_batchbuffer.h" #include "brw_state.h" #include "program/prog_statevars.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static unsigned get_cs_thread_count(const struct brw_cs_prog_data *cs_prog_data) diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c index 59cc863268f..459ea60690a 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 9bb9fca0455..726b287722a 100644 --- a/src/mesa/drivers/dri/i965/intel_resolve_map.h +++ b/src/mesa/drivers/dri/i965/intel_resolve_map.h @@ -24,7 +24,7 @@ #pragma once #include -#include "glsl/list.h" +#include "compiler/glsl/list.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index bca783aea86..ee7c1d7bc2c 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 d29f9874f44..45419973d39 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 f3fd01f395e..8b415ed6019 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -142,7 +142,7 @@ #include "sparc/sparc.h" #endif -#include "glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #include diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index e63d0f1ec55..b0ce8c472ef 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 c5400ab1a7e..56dce2d1b81 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 f2a872dc83a..0e4a0af0b0f 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -43,8 +43,8 @@ #include "main/shaderobj.h" #include "main/transformfeedback.h" #include "main/uniforms.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/ir_uniform.h" #include "program/program.h" #include "program/prog_parameter.h" #include "util/ralloc.h" diff --git a/src/mesa/main/program_resource.c b/src/mesa/main/program_resource.c index 9a15cfe70b8..50659b0cd21 100644 --- a/src/mesa/main/program_resource.c +++ b/src/mesa/main/program_resource.c @@ -30,7 +30,7 @@ #include "main/shaderobj.h" #include "main/context.h" #include "program_resource.h" -#include "ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static bool supported_interface_enum(struct gl_context *ctx, GLenum iface) { diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index e902585924a..4967e4b1df1 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -34,9 +34,9 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "glsl/glsl_symbol_table.h" -#include "glsl/ir.h" -#include "glsl/program.h" +#include "compiler/glsl/glsl_symbol_table.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" #include "util/strndup.h" diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index a988f41697b..df92c0912af 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -49,10 +49,10 @@ #include "main/shaderobj.h" #include "main/transformfeedback.h" #include "main/uniforms.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/program.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/program.h" #include "program/program.h" #include "program/prog_print.h" #include "program/prog_parameter.h" diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 766a465cb11..2ced201ebca 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -31,10 +31,10 @@ #include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "glsl/ir.h" -#include "glsl/ir_uniform.h" -#include "glsl/glsl_parser_extras.h" -#include "glsl/program.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_uniform.h" +#include "compiler/glsl/glsl_parser_extras.h" +#include "compiler/glsl/program.h" #include "program/hash_table.h" diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 47f80ce2001..b1968b3f795 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 2f88b65043d..88fe9580167 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 cc67f8aeadd..0bc97a6b3d4 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 88d8337bb3e..3c51d18ed62 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 72c9e97d721..f8659f65339 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 84e2504baba..f118552d64e 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 03788f33468..10e294cd147 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -42,7 +42,7 @@ #include "main/macros.h" #include "main/varray.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "vbo/vbo.h" diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index a06683f31c8..cf91d39ff92 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 06f67cfd5f8..58668c7cf88 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 b40151c2be6..72a927a08ee 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 027217b88dc..15e24a32a75 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 2107a758fde..f1c985e04cf 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 9a7a76fe216..c76314d9df6 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 6837a80460d..a5e3238a36a 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 b7b8bd18ef9..00ed7766acb 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 106b9221dd7..3c5072ba924 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"