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/main | |
| 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/main')
| -rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index e63d0f1ec55..b2b1ee9ba44 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -40,7 +40,7 @@ #include "glsl/ir_optimization.h" #include "glsl/glsl_parser_extras.h" #include "glsl/glsl_symbol_table.h" -#include "glsl/nir/glsl_types.h" +#include "compiler/glsl_types.h" #include "program/ir_to_mesa.h" #include "program/program.h" #include "program/programopt.h" diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 47f80ce2001..47010badbc6 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -44,7 +44,7 @@ #include "main/uniforms.h" #include "main/enums.h" #include "ir_uniform.h" -#include "glsl_types.h" +#include "compiler/glsl_types.h" #include "program/program.h" /** diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 2f88b65043d..baf49a752b1 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -27,7 +27,7 @@ #define UNIFORMS_H #include "main/glheader.h" -#include "glsl/nir/glsl_types.h" +#include "compiler/glsl_types.h" #include "glsl/ir_uniform.h" #include "program/prog_parameter.h" |