diff options
-rw-r--r-- | src/compiler/Android.gen.mk | 91 | ||||
-rw-r--r-- | src/compiler/Android.mk | 23 | ||||
-rw-r--r-- | src/compiler/Makefile.am | 78 | ||||
-rw-r--r-- | src/compiler/Makefile.sources | 71 | ||||
-rw-r--r-- | src/compiler/nir/.gitignore (renamed from src/glsl/nir/.gitignore) | 0 | ||||
-rw-r--r-- | src/compiler/nir/README (renamed from src/glsl/nir/README) | 0 | ||||
-rw-r--r-- | src/compiler/nir/glsl_to_nir.cpp (renamed from src/glsl/nir/glsl_to_nir.cpp) | 6 | ||||
-rw-r--r-- | src/compiler/nir/glsl_to_nir.h (renamed from src/glsl/nir/glsl_to_nir.h) | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir.c (renamed from src/glsl/nir/nir.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir.h (renamed from src/glsl/nir/nir.h) | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_algebraic.py (renamed from src/glsl/nir/nir_algebraic.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_array.h (renamed from src/glsl/nir/nir_array.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_builder.h (renamed from src/glsl/nir/nir_builder.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_builder_opcodes_h.py (renamed from src/glsl/nir/nir_builder_opcodes_h.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_clone.c (renamed from src/glsl/nir/nir_clone.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_constant_expressions.h (renamed from src/glsl/nir/nir_constant_expressions.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_constant_expressions.py (renamed from src/glsl/nir/nir_constant_expressions.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_control_flow.c (renamed from src/glsl/nir/nir_control_flow.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_control_flow.h (renamed from src/glsl/nir/nir_control_flow.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_control_flow_private.h (renamed from src/glsl/nir/nir_control_flow_private.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_dominance.c (renamed from src/glsl/nir/nir_dominance.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_from_ssa.c (renamed from src/glsl/nir/nir_from_ssa.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_gs_count_vertices.c (renamed from src/glsl/nir/nir_gs_count_vertices.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_instr_set.c (renamed from src/glsl/nir/nir_instr_set.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_instr_set.h (renamed from src/glsl/nir/nir_instr_set.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_intrinsics.c (renamed from src/glsl/nir/nir_intrinsics.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_intrinsics.h (renamed from src/glsl/nir/nir_intrinsics.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_liveness.c (renamed from src/glsl/nir/nir_liveness.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_alu_to_scalar.c (renamed from src/glsl/nir/nir_lower_alu_to_scalar.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_atomics.c (renamed from src/glsl/nir/nir_lower_atomics.c) | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_clip.c (renamed from src/glsl/nir/nir_lower_clip.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_global_vars_to_local.c (renamed from src/glsl/nir/nir_lower_global_vars_to_local.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_gs_intrinsics.c (renamed from src/glsl/nir/nir_lower_gs_intrinsics.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_idiv.c (renamed from src/glsl/nir/nir_lower_idiv.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_io.c (renamed from src/glsl/nir/nir_lower_io.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_load_const_to_scalar.c (renamed from src/glsl/nir/nir_lower_load_const_to_scalar.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_locals_to_regs.c (renamed from src/glsl/nir/nir_lower_locals_to_regs.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_outputs_to_temporaries.c (renamed from src/glsl/nir/nir_lower_outputs_to_temporaries.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_phis_to_scalar.c (renamed from src/glsl/nir/nir_lower_phis_to_scalar.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_samplers.c (renamed from src/glsl/nir/nir_lower_samplers.c) | 2 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_system_values.c (renamed from src/glsl/nir/nir_lower_system_values.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_tex.c (renamed from src/glsl/nir/nir_lower_tex.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_to_source_mods.c (renamed from src/glsl/nir/nir_lower_to_source_mods.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_two_sided_color.c (renamed from src/glsl/nir/nir_lower_two_sided_color.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_var_copies.c (renamed from src/glsl/nir/nir_lower_var_copies.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_vars_to_ssa.c (renamed from src/glsl/nir/nir_lower_vars_to_ssa.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_lower_vec_to_movs.c (renamed from src/glsl/nir/nir_lower_vec_to_movs.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_metadata.c (renamed from src/glsl/nir/nir_metadata.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_move_vec_src_uses_to_dest.c (renamed from src/glsl/nir/nir_move_vec_src_uses_to_dest.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_normalize_cubemap_coords.c (renamed from src/glsl/nir/nir_normalize_cubemap_coords.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opcodes.py (renamed from src/glsl/nir/nir_opcodes.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opcodes_c.py (renamed from src/glsl/nir/nir_opcodes_c.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opcodes_h.py (renamed from src/glsl/nir/nir_opcodes_h.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_algebraic.py (renamed from src/glsl/nir/nir_opt_algebraic.py) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_constant_folding.c (renamed from src/glsl/nir/nir_opt_constant_folding.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_copy_propagate.c (renamed from src/glsl/nir/nir_opt_copy_propagate.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_cse.c (renamed from src/glsl/nir/nir_opt_cse.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_dce.c (renamed from src/glsl/nir/nir_opt_dce.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_dead_cf.c (renamed from src/glsl/nir/nir_opt_dead_cf.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_gcm.c (renamed from src/glsl/nir/nir_opt_gcm.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_global_to_local.c (renamed from src/glsl/nir/nir_opt_global_to_local.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_peephole_select.c (renamed from src/glsl/nir/nir_opt_peephole_select.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_remove_phis.c (renamed from src/glsl/nir/nir_opt_remove_phis.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_opt_undef.c (renamed from src/glsl/nir/nir_opt_undef.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_print.c (renamed from src/glsl/nir/nir_print.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_remove_dead_variables.c (renamed from src/glsl/nir/nir_remove_dead_variables.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_search.c (renamed from src/glsl/nir/nir_search.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_search.h (renamed from src/glsl/nir/nir_search.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_split_var_copies.c (renamed from src/glsl/nir/nir_split_var_copies.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_sweep.c (renamed from src/glsl/nir/nir_sweep.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_to_ssa.c (renamed from src/glsl/nir/nir_to_ssa.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_validate.c (renamed from src/glsl/nir/nir_validate.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_vla.h (renamed from src/glsl/nir/nir_vla.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_worklist.c (renamed from src/glsl/nir/nir_worklist.c) | 0 | ||||
-rw-r--r-- | src/compiler/nir/nir_worklist.h (renamed from src/glsl/nir/nir_worklist.h) | 0 | ||||
-rw-r--r-- | src/compiler/nir/tests/control_flow_tests.cpp (renamed from src/glsl/nir/tests/control_flow_tests.cpp) | 0 | ||||
-rw-r--r-- | src/gallium/auxiliary/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/nir/tgsi_to_nir.c | 8 | ||||
-rw-r--r-- | src/gallium/auxiliary/nir/tgsi_to_nir.h | 2 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/Makefile.am | 4 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_nir.h | 2 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_nir_lower_blend.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_nir_lower_io.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_program.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_qir.h | 2 | ||||
-rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/xa/Makefile.am | 2 | ||||
-rw-r--r-- | src/glsl/Android.gen.mk | 54 | ||||
-rw-r--r-- | src/glsl/Makefile.am | 62 | ||||
-rw-r--r-- | src/mesa/Android.libmesa_dricore.mk | 2 | ||||
-rw-r--r-- | src/mesa/Android.libmesa_glsl_utils.mk | 4 | ||||
-rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 2 | ||||
-rw-r--r-- | src/mesa/Makefile.sources | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.h | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.h | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.h | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_asm_annotation.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 2 | ||||
-rw-r--r-- | src/mesa/program/Android.mk | 2 | ||||
-rw-r--r-- | src/mesa/program/prog_to_nir.c | 4 |
105 files changed, 310 insertions, 157 deletions
diff --git a/src/compiler/Android.gen.mk b/src/compiler/Android.gen.mk new file mode 100644 index 0000000000..fcd5f94d45 --- /dev/null +++ b/src/compiler/Android.gen.mk @@ -0,0 +1,91 @@ +# Mesa 3-D graphics library +# +# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com> +# Copyright (C) 2010-2011 LunarG Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# included by glsl Android.mk for source generation + +ifeq ($(LOCAL_MODULE_CLASS),) +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +endif + +intermediates := $(call local-generated-sources-dir) + +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) + +LOCAL_C_INCLUDES += \ + $(intermediates)/nir \ + $(MESA_TOP)/src/compiler/nir + +LOCAL_EXPORT_C_INCLUDE_DIRS += \ + $(intermediates)/nir \ + $(MESA_TOP)/src/compiler/nir + +LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ + $(NIR_GENERATED_FILES)) + + +nir_builder_opcodes_gen := $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py +nir_builder_opcodes_deps := \ + $(LOCAL_PATH)/nir/nir_opcodes.py \ + $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py + +$(intermediates)/nir/nir_builder_opcodes.h: $(nir_builder_opcodes_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(nir_builder_opcodes_gen) $< > $@ + +nir_constant_expressions_gen := $(LOCAL_PATH)/nir/nir_constant_expressions.py +nir_constant_expressions_deps := \ + $(LOCAL_PATH)/nir/nir_opcodes.py \ + $(LOCAL_PATH)/nir/nir_constant_expressions.py + +$(intermediates)/nir/nir_constant_expressions.c: $(nir_constant_expressions_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(nir_constant_expressions_gen) $< > $@ + +nir_opcodes_h_gen := $(LOCAL_PATH)/nir/nir_opcodes_h.py +nir_opcodes_h_deps := \ + $(LOCAL_PATH)/nir/nir_opcodes.py \ + $(LOCAL_PATH)/nir/nir_opcodes_h.py + +$(intermediates)/nir/nir_opcodes.h: $(nir_opcodes_h_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(nir_opcodes_h_gen) $< > $@ + +$(LOCAL_PATH)/nir/nir.h: $(intermediates)/nir/nir_opcodes.h + +nir_opcodes_c_gen := $(LOCAL_PATH)/nir/nir_opcodes_c.py +nir_opcodes_c_deps := \ + $(LOCAL_PATH)/nir/nir_opcodes.py \ + $(LOCAL_PATH)/nir/nir_opcodes_c.py + +$(intermediates)/nir/nir_opcodes.c: $(nir_opcodes_c_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(nir_opcodes_c_gen) $< > $@ + +nir_opt_algebraic_gen := $(LOCAL_PATH)/nir/nir_opt_algebraic.py +nir_opt_algebraic_deps := \ + $(LOCAL_PATH)/nir/nir_opt_algebraic.py \ + $(LOCAL_PATH)/nir/nir_algebraic.py + +$(intermediates)/nir/nir_opt_algebraic.c: $(nir_opt_algebraic_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(nir_opt_algebraic_gen) $< > $@ diff --git a/src/compiler/Android.mk b/src/compiler/Android.mk index 8ebd49778e..888780ba3f 100644 --- a/src/compiler/Android.mk +++ b/src/compiler/Android.mk @@ -42,3 +42,26 @@ 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 index fd1dd4b6d3..1e3778df8d 100644 --- a/src/compiler/Makefile.am +++ b/src/compiler/Makefile.am @@ -29,6 +29,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/gtest/include \ $(DEFINES) AM_CFLAGS = \ @@ -43,4 +44,81 @@ noinst_LTLIBRARIES = libcompiler.la libcompiler_la_SOURCES = $(LIBCOMPILER_FILES) +check_PROGRAMS = +TESTS = +BUILT_SOURCES = +CLEANFILES = EXTRA_DIST = SConscript + + +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) \ + $(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 \ + $(top_builddir)/src/compiler/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 index e1228cafa2..fe12e419af 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -6,3 +6,74 @@ LIBCOMPILER_FILES = \ nir_types.h \ shader_enums.c \ shader_enums.h + +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_gs_count_vertices.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_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_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_print.c \ + nir/nir_remove_dead_variables.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 diff --git a/src/glsl/nir/.gitignore b/src/compiler/nir/.gitignore index 64828eba6d..64828eba6d 100644 --- a/src/glsl/nir/.gitignore +++ b/src/compiler/nir/.gitignore diff --git a/src/glsl/nir/README b/src/compiler/nir/README index 2c81db9db6..2c81db9db6 100644 --- a/src/glsl/nir/README +++ b/src/compiler/nir/README diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp index c7399ebba0..33b1f5c7b9 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 "glsl/ir_visitor.h" +#include "glsl/ir_hierarchical_visitor.h" +#include "glsl/ir.h" #include "main/imports.h" /* diff --git a/src/glsl/nir/glsl_to_nir.h b/src/compiler/nir/glsl_to_nir.h index 29badcda08..20d2a380a2 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 "glsl/glsl_parser_extras.h" #ifdef __cplusplus extern "C" { diff --git a/src/glsl/nir/nir.c b/src/compiler/nir/nir.c index 21bf678c04..21bf678c04 100644 --- a/src/glsl/nir/nir.c +++ b/src/compiler/nir/nir.c diff --git a/src/glsl/nir/nir.h b/src/compiler/nir/nir.h index d76df66bb6..54e23eb475 100644 --- a/src/glsl/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -28,7 +28,7 @@ #pragma once #include "util/hash_table.h" -#include "../list.h" +#include "glsl/list.h" #include "GL/gl.h" /* GLenum */ #include "util/list.h" #include "util/ralloc.h" diff --git a/src/glsl/nir/nir_algebraic.py b/src/compiler/nir/nir_algebraic.py index a30652f2af..a30652f2af 100644 --- a/src/glsl/nir/nir_algebraic.py +++ b/src/compiler/nir/nir_algebraic.py diff --git a/src/glsl/nir/nir_array.h b/src/compiler/nir/nir_array.h index 1db4e8cea3..1db4e8cea3 100644 --- a/src/glsl/nir/nir_array.h +++ b/src/compiler/nir/nir_array.h diff --git a/src/glsl/nir/nir_builder.h b/src/compiler/nir/nir_builder.h index 88ba3a1c26..88ba3a1c26 100644 --- a/src/glsl/nir/nir_builder.h +++ b/src/compiler/nir/nir_builder.h diff --git a/src/glsl/nir/nir_builder_opcodes_h.py b/src/compiler/nir/nir_builder_opcodes_h.py index e27206ea8f..e27206ea8f 100644 --- a/src/glsl/nir/nir_builder_opcodes_h.py +++ b/src/compiler/nir/nir_builder_opcodes_h.py diff --git a/src/glsl/nir/nir_clone.c b/src/compiler/nir/nir_clone.c index 5eff743d83..5eff743d83 100644 --- a/src/glsl/nir/nir_clone.c +++ b/src/compiler/nir/nir_clone.c diff --git a/src/glsl/nir/nir_constant_expressions.h b/src/compiler/nir/nir_constant_expressions.h index 97997f2e51..97997f2e51 100644 --- a/src/glsl/nir/nir_constant_expressions.h +++ b/src/compiler/nir/nir_constant_expressions.h diff --git a/src/glsl/nir/nir_constant_expressions.py b/src/compiler/nir/nir_constant_expressions.py index 32784f6398..32784f6398 100644 --- a/src/glsl/nir/nir_constant_expressions.py +++ b/src/compiler/nir/nir_constant_expressions.py diff --git a/src/glsl/nir/nir_control_flow.c b/src/compiler/nir/nir_control_flow.c index 96395a4161..96395a4161 100644 --- a/src/glsl/nir/nir_control_flow.c +++ b/src/compiler/nir/nir_control_flow.c diff --git a/src/glsl/nir/nir_control_flow.h b/src/compiler/nir/nir_control_flow.h index b71382fc59..b71382fc59 100644 --- a/src/glsl/nir/nir_control_flow.h +++ b/src/compiler/nir/nir_control_flow.h diff --git a/src/glsl/nir/nir_control_flow_private.h b/src/compiler/nir/nir_control_flow_private.h index f32b57a8ce..f32b57a8ce 100644 --- a/src/glsl/nir/nir_control_flow_private.h +++ b/src/compiler/nir/nir_control_flow_private.h diff --git a/src/glsl/nir/nir_dominance.c b/src/compiler/nir/nir_dominance.c index b345b85e8a..b345b85e8a 100644 --- a/src/glsl/nir/nir_dominance.c +++ b/src/compiler/nir/nir_dominance.c diff --git a/src/glsl/nir/nir_from_ssa.c b/src/compiler/nir/nir_from_ssa.c index 8bc9f24e40..8bc9f24e40 100644 --- a/src/glsl/nir/nir_from_ssa.c +++ b/src/compiler/nir/nir_from_ssa.c diff --git a/src/glsl/nir/nir_gs_count_vertices.c b/src/compiler/nir/nir_gs_count_vertices.c index db15d160ee..db15d160ee 100644 --- a/src/glsl/nir/nir_gs_count_vertices.c +++ b/src/compiler/nir/nir_gs_count_vertices.c diff --git a/src/glsl/nir/nir_instr_set.c b/src/compiler/nir/nir_instr_set.c index d3f939fe80..d3f939fe80 100644 --- a/src/glsl/nir/nir_instr_set.c +++ b/src/compiler/nir/nir_instr_set.c diff --git a/src/glsl/nir/nir_instr_set.h b/src/compiler/nir/nir_instr_set.h index 939e8ddbf5..939e8ddbf5 100644 --- a/src/glsl/nir/nir_instr_set.h +++ b/src/compiler/nir/nir_instr_set.h diff --git a/src/glsl/nir/nir_intrinsics.c b/src/compiler/nir/nir_intrinsics.c index a7c868c39a..a7c868c39a 100644 --- a/src/glsl/nir/nir_intrinsics.c +++ b/src/compiler/nir/nir_intrinsics.c diff --git a/src/glsl/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h index 62eead4878..62eead4878 100644 --- a/src/glsl/nir/nir_intrinsics.h +++ b/src/compiler/nir/nir_intrinsics.h diff --git a/src/glsl/nir/nir_liveness.c b/src/compiler/nir/nir_liveness.c index 05f79d7bc6..05f79d7bc6 100644 --- a/src/glsl/nir/nir_liveness.c +++ b/src/compiler/nir/nir_liveness.c diff --git a/src/glsl/nir/nir_lower_alu_to_scalar.c b/src/compiler/nir/nir_lower_alu_to_scalar.c index 0a27e66cf0..0a27e66cf0 100644 --- a/src/glsl/nir/nir_lower_alu_to_scalar.c +++ b/src/compiler/nir/nir_lower_alu_to_scalar.c diff --git a/src/glsl/nir/nir_lower_atomics.c b/src/compiler/nir/nir_lower_atomics.c index 1aa78e18a8..2cbc1b7534 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 "glsl/ir_uniform.h" #include "nir.h" #include "main/config.h" #include <assert.h> diff --git a/src/glsl/nir/nir_lower_clip.c b/src/compiler/nir/nir_lower_clip.c index 0ca6a28939..0ca6a28939 100644 --- a/src/glsl/nir/nir_lower_clip.c +++ b/src/compiler/nir/nir_lower_clip.c diff --git a/src/glsl/nir/nir_lower_global_vars_to_local.c b/src/compiler/nir/nir_lower_global_vars_to_local.c index 7b4cd4ee8d..7b4cd4ee8d 100644 --- a/src/glsl/nir/nir_lower_global_vars_to_local.c +++ b/src/compiler/nir/nir_lower_global_vars_to_local.c diff --git a/src/glsl/nir/nir_lower_gs_intrinsics.c b/src/compiler/nir/nir_lower_gs_intrinsics.c index fdff1656b4..fdff1656b4 100644 --- a/src/glsl/nir/nir_lower_gs_intrinsics.c +++ b/src/compiler/nir/nir_lower_gs_intrinsics.c diff --git a/src/glsl/nir/nir_lower_idiv.c b/src/compiler/nir/nir_lower_idiv.c index a084ad9c0e..a084ad9c0e 100644 --- a/src/glsl/nir/nir_lower_idiv.c +++ b/src/compiler/nir/nir_lower_idiv.c diff --git a/src/glsl/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index 80c5151f0e..80c5151f0e 100644 --- a/src/glsl/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c diff --git a/src/glsl/nir/nir_lower_load_const_to_scalar.c b/src/compiler/nir/nir_lower_load_const_to_scalar.c index 1eeed13cba..1eeed13cba 100644 --- a/src/glsl/nir/nir_lower_load_const_to_scalar.c +++ b/src/compiler/nir/nir_lower_load_const_to_scalar.c diff --git a/src/glsl/nir/nir_lower_locals_to_regs.c b/src/compiler/nir/nir_lower_locals_to_regs.c index 51b0fa733f..51b0fa733f 100644 --- a/src/glsl/nir/nir_lower_locals_to_regs.c +++ b/src/compiler/nir/nir_lower_locals_to_regs.c diff --git a/src/glsl/nir/nir_lower_outputs_to_temporaries.c b/src/compiler/nir/nir_lower_outputs_to_temporaries.c index 71b06b81fc..71b06b81fc 100644 --- a/src/glsl/nir/nir_lower_outputs_to_temporaries.c +++ b/src/compiler/nir/nir_lower_outputs_to_temporaries.c diff --git a/src/glsl/nir/nir_lower_phis_to_scalar.c b/src/compiler/nir/nir_lower_phis_to_scalar.c index dd2abcf72f..dd2abcf72f 100644 --- a/src/glsl/nir/nir_lower_phis_to_scalar.c +++ b/src/compiler/nir/nir_lower_phis_to_scalar.c diff --git a/src/glsl/nir/nir_lower_samplers.c b/src/compiler/nir/nir_lower_samplers.c index 95ea072bdf..9c912129f0 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 "glsl/ir_uniform.h" #include "main/compiler.h" #include "main/mtypes.h" diff --git a/src/glsl/nir/nir_lower_system_values.c b/src/compiler/nir/nir_lower_system_values.c index 2bd787d357..2bd787d357 100644 --- a/src/glsl/nir/nir_lower_system_values.c +++ b/src/compiler/nir/nir_lower_system_values.c diff --git a/src/glsl/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c index ae24fb2e16..ae24fb2e16 100644 --- a/src/glsl/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c diff --git a/src/glsl/nir/nir_lower_to_source_mods.c b/src/compiler/nir/nir_lower_to_source_mods.c index 6c4e1f0d3f..6c4e1f0d3f 100644 --- a/src/glsl/nir/nir_lower_to_source_mods.c +++ b/src/compiler/nir/nir_lower_to_source_mods.c diff --git a/src/glsl/nir/nir_lower_two_sided_color.c b/src/compiler/nir/nir_lower_two_sided_color.c index 1294cb8900..1294cb8900 100644 --- a/src/glsl/nir/nir_lower_two_sided_color.c +++ b/src/compiler/nir/nir_lower_two_sided_color.c diff --git a/src/glsl/nir/nir_lower_var_copies.c b/src/compiler/nir/nir_lower_var_copies.c index 8cb3edd0a8..8cb3edd0a8 100644 --- a/src/glsl/nir/nir_lower_var_copies.c +++ b/src/compiler/nir/nir_lower_var_copies.c diff --git a/src/glsl/nir/nir_lower_vars_to_ssa.c b/src/compiler/nir/nir_lower_vars_to_ssa.c index 75d31ff60a..75d31ff60a 100644 --- a/src/glsl/nir/nir_lower_vars_to_ssa.c +++ b/src/compiler/nir/nir_lower_vars_to_ssa.c diff --git a/src/glsl/nir/nir_lower_vec_to_movs.c b/src/compiler/nir/nir_lower_vec_to_movs.c index 06d627900c..06d627900c 100644 --- a/src/glsl/nir/nir_lower_vec_to_movs.c +++ b/src/compiler/nir/nir_lower_vec_to_movs.c diff --git a/src/glsl/nir/nir_metadata.c b/src/compiler/nir/nir_metadata.c index 61aae73221..61aae73221 100644 --- a/src/glsl/nir/nir_metadata.c +++ b/src/compiler/nir/nir_metadata.c diff --git a/src/glsl/nir/nir_move_vec_src_uses_to_dest.c b/src/compiler/nir/nir_move_vec_src_uses_to_dest.c index b5186e6e94..b5186e6e94 100644 --- a/src/glsl/nir/nir_move_vec_src_uses_to_dest.c +++ b/src/compiler/nir/nir_move_vec_src_uses_to_dest.c diff --git a/src/glsl/nir/nir_normalize_cubemap_coords.c b/src/compiler/nir/nir_normalize_cubemap_coords.c index 9c15eb8c15..9c15eb8c15 100644 --- a/src/glsl/nir/nir_normalize_cubemap_coords.c +++ b/src/compiler/nir/nir_normalize_cubemap_coords.c diff --git a/src/glsl/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py index e79810c199..e79810c199 100644 --- a/src/glsl/nir/nir_opcodes.py +++ b/src/compiler/nir/nir_opcodes.py diff --git a/src/glsl/nir/nir_opcodes_c.py b/src/compiler/nir/nir_opcodes_c.py index 7049c5be67..7049c5be67 100644 --- a/src/glsl/nir/nir_opcodes_c.py +++ b/src/compiler/nir/nir_opcodes_c.py diff --git a/src/glsl/nir/nir_opcodes_h.py b/src/compiler/nir/nir_opcodes_h.py index be15a96d23..be15a96d23 100644 --- a/src/glsl/nir/nir_opcodes_h.py +++ b/src/compiler/nir/nir_opcodes_h.py diff --git a/src/glsl/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index 7745b76f7c..7745b76f7c 100644 --- a/src/glsl/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py diff --git a/src/glsl/nir/nir_opt_constant_folding.c b/src/compiler/nir/nir_opt_constant_folding.c index 28a73f86f9..28a73f86f9 100644 --- a/src/glsl/nir/nir_opt_constant_folding.c +++ b/src/compiler/nir/nir_opt_constant_folding.c diff --git a/src/glsl/nir/nir_opt_copy_propagate.c b/src/compiler/nir/nir_opt_copy_propagate.c index d99f78ddb3..d99f78ddb3 100644 --- a/src/glsl/nir/nir_opt_copy_propagate.c +++ b/src/compiler/nir/nir_opt_copy_propagate.c diff --git a/src/glsl/nir/nir_opt_cse.c b/src/compiler/nir/nir_opt_cse.c index 364fb023dc..364fb023dc 100644 --- a/src/glsl/nir/nir_opt_cse.c +++ b/src/compiler/nir/nir_opt_cse.c diff --git a/src/glsl/nir/nir_opt_dce.c b/src/compiler/nir/nir_opt_dce.c index 32436c18b6..32436c18b6 100644 --- a/src/glsl/nir/nir_opt_dce.c +++ b/src/compiler/nir/nir_opt_dce.c diff --git a/src/glsl/nir/nir_opt_dead_cf.c b/src/compiler/nir/nir_opt_dead_cf.c index 4cc6798702..4cc6798702 100644 --- a/src/glsl/nir/nir_opt_dead_cf.c +++ b/src/compiler/nir/nir_opt_dead_cf.c diff --git a/src/glsl/nir/nir_opt_gcm.c b/src/compiler/nir/nir_opt_gcm.c index a8779ce5b8..a8779ce5b8 100644 --- a/src/glsl/nir/nir_opt_gcm.c +++ b/src/compiler/nir/nir_opt_gcm.c diff --git a/src/glsl/nir/nir_opt_global_to_local.c b/src/compiler/nir/nir_opt_global_to_local.c index bccb45b623..bccb45b623 100644 --- a/src/glsl/nir/nir_opt_global_to_local.c +++ b/src/compiler/nir/nir_opt_global_to_local.c diff --git a/src/glsl/nir/nir_opt_peephole_select.c b/src/compiler/nir/nir_opt_peephole_select.c index 0fc658df86..0fc658df86 100644 --- a/src/glsl/nir/nir_opt_peephole_select.c +++ b/src/compiler/nir/nir_opt_peephole_select.c diff --git a/src/glsl/nir/nir_opt_remove_phis.c b/src/compiler/nir/nir_opt_remove_phis.c index 646183707b..646183707b 100644 --- a/src/glsl/nir/nir_opt_remove_phis.c +++ b/src/compiler/nir/nir_opt_remove_phis.c diff --git a/src/glsl/nir/nir_opt_undef.c b/src/compiler/nir/nir_opt_undef.c index 374564d34c..374564d34c 100644 --- a/src/glsl/nir/nir_opt_undef.c +++ b/src/compiler/nir/nir_opt_undef.c diff --git a/src/glsl/nir/nir_print.c b/src/compiler/nir/nir_print.c index 48ecb48a62..48ecb48a62 100644 --- a/src/glsl/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c diff --git a/src/glsl/nir/nir_remove_dead_variables.c b/src/compiler/nir/nir_remove_dead_variables.c index db754e56b1..db754e56b1 100644 --- a/src/glsl/nir/nir_remove_dead_variables.c +++ b/src/compiler/nir/nir_remove_dead_variables.c diff --git a/src/glsl/nir/nir_search.c b/src/compiler/nir/nir_search.c index 56d7e8162f..56d7e8162f 100644 --- a/src/glsl/nir/nir_search.c +++ b/src/compiler/nir/nir_search.c diff --git a/src/glsl/nir/nir_search.h b/src/compiler/nir/nir_search.h index 7d47792945..7d47792945 100644 --- a/src/glsl/nir/nir_search.h +++ b/src/compiler/nir/nir_search.h diff --git a/src/glsl/nir/nir_split_var_copies.c b/src/compiler/nir/nir_split_var_copies.c index 6fdaefa32c..6fdaefa32c 100644 --- a/src/glsl/nir/nir_split_var_copies.c +++ b/src/compiler/nir/nir_split_var_copies.c diff --git a/src/glsl/nir/nir_sweep.c b/src/compiler/nir/nir_sweep.c index 0710bdba7c..0710bdba7c 100644 --- a/src/glsl/nir/nir_sweep.c +++ b/src/compiler/nir/nir_sweep.c diff --git a/src/glsl/nir/nir_to_ssa.c b/src/compiler/nir/nir_to_ssa.c index 44a5054773..44a5054773 100644 --- a/src/glsl/nir/nir_to_ssa.c +++ b/src/compiler/nir/nir_to_ssa.c diff --git a/src/glsl/nir/nir_validate.c b/src/compiler/nir/nir_validate.c index e4db68db3c..e4db68db3c 100644 --- a/src/glsl/nir/nir_validate.c +++ b/src/compiler/nir/nir_validate.c diff --git a/src/glsl/nir/nir_vla.h b/src/compiler/nir/nir_vla.h index 753783316a..753783316a 100644 --- a/src/glsl/nir/nir_vla.h +++ b/src/compiler/nir/nir_vla.h diff --git a/src/glsl/nir/nir_worklist.c b/src/compiler/nir/nir_worklist.c index 3087a1d235..3087a1d235 100644 --- a/src/glsl/nir/nir_worklist.c +++ b/src/compiler/nir/nir_worklist.c diff --git a/src/glsl/nir/nir_worklist.h b/src/compiler/nir/nir_worklist.h index 829bff24a5..829bff24a5 100644 --- a/src/glsl/nir/nir_worklist.h +++ b/src/compiler/nir/nir_worklist.h diff --git a/src/glsl/nir/tests/control_flow_tests.cpp b/src/compiler/nir/tests/control_flow_tests.cpp index b9379ef3b0..b9379ef3b0 100644 --- a/src/glsl/nir/tests/control_flow_tests.cpp +++ b/src/compiler/nir/tests/control_flow_tests.cpp diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index bcdf297030..0ac5c9802f 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 0d6eb76eab..6649e403d0 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 "compiler/nir/nir.h" +#include "compiler/nir/nir_control_flow.h" +#include "compiler/nir/nir_builder.h" #include "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 1a185a8321..0651870ea8 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 3de8e0fd5a..329a4204c3 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 311a40338e..e2d8859609 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_nir.h +++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.h @@ -29,7 +29,7 @@ #ifndef IR3_NIR_H_ #define IR3_NIR_H_ -#include "glsl/nir/nir.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 6eee2ebbab..8815ac981e 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/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am index a3bf72fc72..caa5059fbd 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 6d9a624c9b..a13e309985 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 bf6631e944..d47e3bf52b 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 2490819c29..6a952c62d5 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 3e402d048b..7db1b03cbc 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 4ab4d35d0c..bae31768bd 100644 --- a/src/gallium/drivers/vc4/vc4_qir.h +++ b/src/gallium/drivers/vc4/vc4_qir.h @@ -32,7 +32,7 @@ #include <string.h> #include "util/macros.h" -#include "glsl/nir/nir.h" +#include "compiler/nir/nir.h" #include "util/list.h" #include "util/u_math.h" diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 4bc3b55f26..0b516de0b5 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 a63fd6903a..cdd9a862e4 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/glsl/Android.gen.mk b/src/glsl/Android.gen.mk index 59cc8577a6..c5741b40bc 100644 --- a/src/glsl/Android.gen.mk +++ b/src/glsl/Android.gen.mk @@ -33,17 +33,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) LOCAL_C_INCLUDES += \ $(intermediates)/glcpp \ - $(intermediates)/nir \ $(MESA_TOP)/src/glsl/glcpp \ - $(MESA_TOP)/src/glsl/nir - -LOCAL_EXPORT_C_INCLUDE_DIRS += \ - $(intermediates)/nir \ - $(MESA_TOP)/src/glsl/nir LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(LIBGLCPP_GENERATED_FILES) \ - $(NIR_GENERATED_FILES) \ $(LIBGLSL_GENERATED_CXX_FILES)) define local-l-or-ll-to-c-or-cpp @@ -81,50 +74,3 @@ $(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l $(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 := \ - $(LOCAL_PATH)/nir/nir_opcodes.py \ - $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py - -$(intermediates)/nir/nir_builder_opcodes.h: $(nir_builder_opcodes_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_builder_opcodes_gen) $< > $@ - -nir_constant_expressions_gen := $(LOCAL_PATH)/nir/nir_constant_expressions.py -nir_constant_expressions_deps := \ - $(LOCAL_PATH)/nir/nir_opcodes.py \ - $(LOCAL_PATH)/nir/nir_constant_expressions.py - -$(intermediates)/nir/nir_constant_expressions.c: $(nir_constant_expressions_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_constant_expressions_gen) $< > $@ - -nir_opcodes_h_gen := $(LOCAL_PATH)/nir/nir_opcodes_h.py -nir_opcodes_h_deps := \ - $(LOCAL_PATH)/nir/nir_opcodes.py \ - $(LOCAL_PATH)/nir/nir_opcodes_h.py - -$(intermediates)/nir/nir_opcodes.h: $(nir_opcodes_h_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_opcodes_h_gen) $< > $@ - -$(LOCAL_PATH)/nir/nir.h: $(intermediates)/nir/nir_opcodes.h - -nir_opcodes_c_gen := $(LOCAL_PATH)/nir/nir_opcodes_c.py -nir_opcodes_c_deps := \ - $(LOCAL_PATH)/nir/nir_opcodes.py \ - $(LOCAL_PATH)/nir/nir_opcodes_c.py - -$(intermediates)/nir/nir_opcodes.c: $(nir_opcodes_c_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_opcodes_c_gen) $< > $@ - -nir_opt_algebraic_gen := $(LOCAL_PATH)/nir/nir_opt_algebraic.py -nir_opt_algebraic_deps := \ - $(LOCAL_PATH)/nir/nir_opt_algebraic.py \ - $(LOCAL_PATH)/nir/nir_algebraic.py - -$(intermediates)/nir/nir_opt_algebraic.c: $(nir_opt_algebraic_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_opt_algebraic_gen) $< > $@ diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index 07d5267df5..9954b81240 100644 --- a/src/glsl/Makefile.am +++ b/src/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 \ @@ -138,24 +126,15 @@ glcpp_glcpp_LDADD = \ -lm libglsl_la_LIBADD = \ - $(top_builddir)/src/compiler/libcompiler.la \ + $(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) \ - $(NIR_GENERATED_FILES) \ - $(GLSL_TO_NIR_FILES) + $(LIBGLSL_FILES) -libnir_la_LIBADD = \ - $(top_builddir)/src/compiler/libcompiler.la - -libnir_la_SOURCES = \ - $(NIR_FILES) \ - $(NIR_GENERATED_FILES) glsl_compiler_SOURCES = \ $(GLSL_COMPILER_CXX_FILES) @@ -235,8 +214,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 \ @@ -248,35 +226,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/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index cd31e14822..ba952da4ad 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 9e150eaa3c..894ae20a23 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 427a35f4f6..ee8887b73e 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.sources b/src/mesa/Makefile.sources index 13a05f53b2..386d6aa381 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -624,9 +624,8 @@ 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/compiler/nir \ -I$(top_builddir)/src/glsl \ - -I$(top_builddir)/src/glsl/nir \ -I$(top_srcdir)/src/glsl/glcpp \ -I$(top_srcdir)/src/mesa \ -I$(top_builddir)/src/mesa \ diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index ad687bf59a..0db5a51e72 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_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index 9a54c2dd0b..b75ebfedb3 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -31,7 +31,7 @@ #include "brw_ir_fs.h" #include "brw_fs_builder.h" #include "glsl/ir.h" -#include "glsl/nir/nir.h" +#include "compiler/nir/nir.h" struct bblock_t; namespace { diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 935529a600..287f935d53 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 78b139b991..079d8b2517 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_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index ddfd87d31c..4e00fd0ec0 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -32,7 +32,7 @@ #endif #include "glsl/ir.h" -#include "glsl/nir/nir.h" +#include "compiler/nir/nir.h" #ifdef __cplusplus diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c index 59cc863268..459ea60690 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_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index bca783aea8..ee7c1d7bc2 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/program/Android.mk b/src/mesa/program/Android.mk index cc67f8aead..0bc97a6b3d 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/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index ce6f6997d2..a2ebb1ba77 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -23,8 +23,8 @@ * IN THE SOFTWARE. */ -#include "nir/nir.h" -#include "nir/nir_builder.h" +#include "compiler/nir/nir.h" +#include "compiler/nir/nir_builder.h" #include "glsl/list.h" #include "main/imports.h" #include "util/ralloc.h" |