diff options
| author | Emil Velikov <[email protected]> | 2016-01-18 10:47:13 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-01-26 16:08:20 +0000 |
| commit | 1a882fd2ee84ae28a06cf07902dc4645d8ad4a6d (patch) | |
| tree | dc85ad30ac20db8eecc658e7efcb3b0d7de898af /src/mesa | |
| parent | 2f86383091bde24a2a0b90a43c11a13165f8c397 (diff) | |
nir: move shader_enums.[ch] to compiler
This way one can reuse it in glsl, nir or other infrastructure without
pulling nir as dependency.
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Matt Turner <[email protected]>
Acked-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/x11/SConscript | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript index d29f9874f44..45419973d39 100644 --- a/src/mesa/drivers/x11/SConscript +++ b/src/mesa/drivers/x11/SConscript @@ -18,6 +18,7 @@ env.Prepend(LIBPATH = env['X11_LIBPATH']) env.Prepend(LIBS = [ glapi, mesautil, + compiler, glsl, mesa, ]) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 15dd1ca7cdf..f3102dc21e3 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -42,7 +42,7 @@ #include "main/config.h" #include "glapi/glapi.h" #include "math/m_matrix.h" /* GLmatrix */ -#include "glsl/nir/shader_enums.h" +#include "compiler/shader_enums.h" #include "main/formats.h" /* MESA_FORMAT_COUNT */ |