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/main/ff_fragment_shader.cpp | |
| 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/main/ff_fragment_shader.cpp')
| -rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index e63d0f1..b2b1ee9 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" |