From eb63640c1d38a200a7b1540405051d3ff79d0d8a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 18 Jan 2016 12:16:48 +0200 Subject: glsl: move to compiler/ Signed-off-by: Emil Velikov Acked-by: Matt Turner Acked-by: Jose Fonseca --- src/compiler/nir/Makefile.sources | 71 +++++++++++++++++++++++++++++++++++ src/compiler/nir/glsl_to_nir.cpp | 6 +-- src/compiler/nir/glsl_to_nir.h | 2 +- src/compiler/nir/nir.h | 2 +- src/compiler/nir/nir_lower_atomics.c | 2 +- src/compiler/nir/nir_lower_samplers.c | 2 +- 6 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 src/compiler/nir/Makefile.sources (limited to 'src/compiler/nir') diff --git a/src/compiler/nir/Makefile.sources b/src/compiler/nir/Makefile.sources new file mode 100644 index 00000000000..0755a100e65 --- /dev/null +++ b/src/compiler/nir/Makefile.sources @@ -0,0 +1,71 @@ +NIR_GENERATED_FILES = \ + nir_builder_opcodes.h \ + nir_constant_expressions.c \ + nir_opcodes.c \ + nir_opcodes.h \ + nir_opt_algebraic.c + +NIR_FILES = \ + glsl_to_nir.cpp \ + glsl_to_nir.h \ + nir.c \ + nir.h \ + nir_array.h \ + nir_builder.h \ + nir_clone.c \ + nir_constant_expressions.h \ + nir_control_flow.c \ + nir_control_flow.h \ + nir_control_flow_private.h \ + nir_dominance.c \ + nir_from_ssa.c \ + nir_gs_count_vertices.c \ + nir_intrinsics.c \ + nir_intrinsics.h \ + nir_instr_set.c \ + nir_instr_set.h \ + nir_liveness.c \ + nir_lower_alu_to_scalar.c \ + nir_lower_atomics.c \ + nir_lower_clip.c \ + nir_lower_global_vars_to_local.c \ + nir_lower_gs_intrinsics.c \ + nir_lower_load_const_to_scalar.c \ + nir_lower_locals_to_regs.c \ + nir_lower_idiv.c \ + nir_lower_io.c \ + nir_lower_outputs_to_temporaries.c \ + nir_lower_phis_to_scalar.c \ + nir_lower_samplers.c \ + nir_lower_system_values.c \ + nir_lower_tex.c \ + nir_lower_to_source_mods.c \ + nir_lower_two_sided_color.c \ + nir_lower_vars_to_ssa.c \ + nir_lower_var_copies.c \ + nir_lower_vec_to_movs.c \ + nir_metadata.c \ + nir_move_vec_src_uses_to_dest.c \ + nir_normalize_cubemap_coords.c \ + nir_opt_constant_folding.c \ + nir_opt_copy_propagate.c \ + nir_opt_cse.c \ + nir_opt_dce.c \ + nir_opt_dead_cf.c \ + nir_opt_gcm.c \ + nir_opt_global_to_local.c \ + nir_opt_peephole_select.c \ + nir_opt_remove_phis.c \ + nir_opt_undef.c \ + nir_print.c \ + nir_remove_dead_variables.c \ + nir_search.c \ + nir_search.h \ + nir_split_var_copies.c \ + nir_sweep.c \ + nir_to_ssa.c \ + nir_validate.c \ + nir_vla.h \ + nir_worklist.c \ + nir_worklist.h + diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp index 33b1f5c7b9e..4b76d234420 100644 --- a/src/compiler/nir/glsl_to_nir.cpp +++ b/src/compiler/nir/glsl_to_nir.cpp @@ -28,9 +28,9 @@ #include "glsl_to_nir.h" #include "nir_control_flow.h" #include "nir_builder.h" -#include "glsl/ir_visitor.h" -#include "glsl/ir_hierarchical_visitor.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir_visitor.h" +#include "compiler/glsl/ir_hierarchical_visitor.h" +#include "compiler/glsl/ir.h" #include "main/imports.h" /* diff --git a/src/compiler/nir/glsl_to_nir.h b/src/compiler/nir/glsl_to_nir.h index 20d2a380a26..e3fe9b0246a 100644 --- a/src/compiler/nir/glsl_to_nir.h +++ b/src/compiler/nir/glsl_to_nir.h @@ -26,7 +26,7 @@ */ #include "nir.h" -#include "glsl/glsl_parser_extras.h" +#include "compiler/glsl/glsl_parser_extras.h" #ifdef __cplusplus extern "C" { diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 54e23eb4754..aec75fb930c 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -28,7 +28,7 @@ #pragma once #include "util/hash_table.h" -#include "glsl/list.h" +#include "compiler/glsl/list.h" #include "GL/gl.h" /* GLenum */ #include "util/list.h" #include "util/ralloc.h" diff --git a/src/compiler/nir/nir_lower_atomics.c b/src/compiler/nir/nir_lower_atomics.c index 2cbc1b75348..1a4458d4f84 100644 --- a/src/compiler/nir/nir_lower_atomics.c +++ b/src/compiler/nir/nir_lower_atomics.c @@ -25,7 +25,7 @@ * */ -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "nir.h" #include "main/config.h" #include diff --git a/src/compiler/nir/nir_lower_samplers.c b/src/compiler/nir/nir_lower_samplers.c index 9c912129f09..96e82914014 100644 --- a/src/compiler/nir/nir_lower_samplers.c +++ b/src/compiler/nir/nir_lower_samplers.c @@ -26,7 +26,7 @@ #include "nir.h" #include "nir_builder.h" #include "program/hash_table.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" #include "main/compiler.h" #include "main/mtypes.h" -- cgit v1.2.3