diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-01-18 11:35:29 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-01-26 16:08:24 +0000 |
| commit | 24f984f64ae58c274f79eaf9148aea37df67131c (patch) | |
| tree | c24704b371a23a90349f0b979bd93a6a138c2284 /src/mesa/drivers/dri/i965 | |
| parent | 1a882fd2ee84ae28a06cf07902dc4645d8ad4a6d (diff) | |
| download | external_mesa3d-24f984f64ae58c274f79eaf9148aea37df67131c.zip external_mesa3d-24f984f64ae58c274f79eaf9148aea37df67131c.tar.gz external_mesa3d-24f984f64ae58c274f79eaf9148aea37df67131c.tar.bz2 | |
nir: move glsl_types.{cpp,h} to compiler
Allows us to remove the SCons workaround :-)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Acked-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965')
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp index 33d2048..3d6aa74 100644 --- a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp +++ b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp @@ -30,7 +30,7 @@ * \author Eric Anholt <eric@anholt.net> */ -#include "glsl/nir/glsl_types.h" +#include "compiler/glsl_types.h" #include "glsl/ir.h" #include "program/prog_instruction.h" /* For WRITEMASK_* */ diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index cbeab6f..41a3f81 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_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp index 21f0b70..2287779 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -43,7 +43,7 @@ #include "glsl/ir.h" #include "glsl/ir_expression_flattening.h" -#include "glsl/nir/glsl_types.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_vector_splitting.cpp b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp index 0c8ad76..0970959 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp @@ -40,7 +40,7 @@ #include "main/imports.h" #include "glsl/ir.h" #include "glsl/ir_rvalue_visitor.h" -#include "glsl/nir/glsl_types.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 25240ad..aad512f 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_lower_unnormalized_offset.cpp b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp index 4219d47..eafbdf6 100644 --- a/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp +++ b/src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp @@ -31,7 +31,7 @@ * \author Chris Forbes <chrisf@ijw.co.nz> */ -#include "glsl/nir/glsl_types.h" +#include "compiler/glsl_types.h" #include "glsl/ir.h" #include "glsl/ir_builder.h" |