diff options
| author | Emil Velikov <[email protected]> | 2016-01-18 11:35:29 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-01-26 16:08:24 +0000 |
| commit | 24f984f64ae58c274f79eaf9148aea37df67131c (patch) | |
| tree | c24704b371a23a90349f0b979bd93a6a138c2284 /src/mesa/program | |
| parent | 1a882fd2ee84ae28a06cf07902dc4645d8ad4a6d (diff) | |
nir: move glsl_types.{cpp,h} to compiler
Allows us to remove the SCons workaround :-)
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Matt Turner <[email protected]>
Acked-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/program/sampler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 9cde28dfc0a..70c477ec4fd 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -42,7 +42,7 @@ #include "glsl/ir_optimization.h" #include "glsl/ir_uniform.h" #include "glsl/glsl_parser_extras.h" -#include "glsl/nir/glsl_types.h" +#include "compiler/glsl_types.h" #include "glsl/linker.h" #include "glsl/program.h" #include "program/hash_table.h" diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp index 84e2504baba..9137d1858e9 100644 --- a/src/mesa/program/sampler.cpp +++ b/src/mesa/program/sampler.cpp @@ -24,7 +24,7 @@ */ #include "main/mtypes.h" -#include "glsl/nir/glsl_types.h" +#include "compiler/glsl_types.h" #include "glsl/ir.h" #include "glsl/ir_uniform.h" #include "glsl/ir_visitor.h" |