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/mesa/drivers/dri/i965/brw_cs.c | 2 +- src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs.h | 2 +- src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp | 4 ++-- src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp | 4 ++-- src/mesa/drivers/dri/i965/brw_gs.c | 2 +- src/mesa/drivers/dri/i965/brw_link.cpp | 2 +- src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp | 4 ++-- src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp | 4 ++-- src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 2 +- src/mesa/drivers/dri/i965/brw_program.c | 2 +- src/mesa/drivers/dri/i965/brw_vec4.h | 2 +- src/mesa/drivers/dri/i965/gen7_cs_state.c | 2 +- src/mesa/drivers/dri/i965/intel_resolve_map.h | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c index 9eadb7e00fa..0ab9ebdab3c 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.c +++ b/src/mesa/drivers/dri/i965/brw_cs.c @@ -32,7 +32,7 @@ #include "intel_batchbuffer.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void assign_cs_binding_table_offsets(const struct brw_device_info *devinfo, diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp index 3d6aa74d830..2ff9ec16fdb 100644 --- a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp +++ b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp @@ -31,7 +31,7 @@ */ #include "compiler/glsl_types.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "program/prog_instruction.h" /* For WRITEMASK_* */ class brw_cubemap_normalize_visitor : public ir_hierarchical_visitor { diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index b75ebfedb3d..4612a287bb7 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -30,7 +30,7 @@ #include "brw_shader.h" #include "brw_ir_fs.h" #include "brw_fs_builder.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "compiler/nir/nir.h" struct bblock_t; diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp index 22877797522..689e0911b17 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -41,8 +41,8 @@ * we do retain the vector types in that case. */ -#include "glsl/ir.h" -#include "glsl/ir_expression_flattening.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_expression_flattening.h" #include "compiler/glsl_types.h" class ir_channel_expressions_visitor : public ir_hierarchical_visitor { diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index f9df2a4e3b6..68a86a9a85e 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "main/shaderimage.h" #include "brw_fs.h" #include "brw_fs_surface_builder.h" diff --git a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp index 0970959bbd6..5fe24debeec 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp @@ -38,8 +38,8 @@ */ #include "main/imports.h" -#include "glsl/ir.h" -#include "glsl/ir_rvalue_visitor.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_rvalue_visitor.h" #include "compiler/glsl_types.h" #include "util/hash_table.h" diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index edb52ac44b7..c888ef2bd67 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -34,7 +34,7 @@ #include "brw_ff_gs.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void brw_gs_debug_recompile(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 234afd554df..db4ba88cb1c 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -26,7 +26,7 @@ #include "brw_fs.h" #include "brw_nir.h" #include "brw_program.h" -#include "glsl/ir_optimization.h" +#include "compiler/glsl/ir_optimization.h" #include "program/program.h" #include "main/shaderapi.h" #include "main/uniforms.h" diff --git a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp index c83b2728b98..0848e1ec536 100644 --- a/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp +++ b/src/mesa/drivers/dri/i965/brw_lower_texture_gradients.cpp @@ -25,8 +25,8 @@ * \file brw_lower_texture_gradients.cpp */ -#include "glsl/ir.h" -#include "glsl/ir_builder.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_builder.h" #include "program/prog_instruction.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp index eafbdf68ea0..f5d7baee6db 100644 --- a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp +++ b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp @@ -32,8 +32,8 @@ */ #include "compiler/glsl_types.h" -#include "glsl/ir.h" -#include "glsl/ir_builder.h" +#include "compiler/glsl/ir.h" +#include "compiler/glsl/ir_builder.h" using namespace ir_builder; diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 0849ca40046..f3361d69786 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -23,7 +23,7 @@ #include "brw_shader.h" #include "brw_nir.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static void brw_nir_setup_glsl_builtin_uniform(nir_variable *var, diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 20d4e0d6c4a..368efeecb2d 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -37,7 +37,7 @@ #include "program/programopt.h" #include "tnl/tnl.h" #include "util/ralloc.h" -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "brw_program.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 4e00fd0ec0d..1460f4599bf 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -31,7 +31,7 @@ #include "brw_ir_vec4.h" #endif -#include "glsl/ir.h" +#include "compiler/glsl/ir.h" #include "compiler/nir/nir.h" diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index 6d6988c6a41..e07c05a92c1 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -31,7 +31,7 @@ #include "intel_batchbuffer.h" #include "brw_state.h" #include "program/prog_statevars.h" -#include "glsl/ir_uniform.h" +#include "compiler/glsl/ir_uniform.h" static unsigned get_cs_thread_count(const struct brw_cs_prog_data *cs_prog_data) diff --git a/src/mesa/drivers/dri/i965/intel_resolve_map.h b/src/mesa/drivers/dri/i965/intel_resolve_map.h index 9bb9fca0455..726b287722a 100644 --- a/src/mesa/drivers/dri/i965/intel_resolve_map.h +++ b/src/mesa/drivers/dri/i965/intel_resolve_map.h @@ -24,7 +24,7 @@ #pragma once #include -#include "glsl/list.h" +#include "compiler/glsl/list.h" #ifdef __cplusplus extern "C" { -- cgit v1.2.3