diff options
| author | Jason Ekstrand <[email protected]> | 2016-05-25 16:00:38 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-05-26 14:13:38 -0700 |
| commit | 32210dea8e474f8e93f5df681fb6a8265a0cda4b (patch) | |
| tree | c25fdd05d4f55131c161b7197b5ebf09eb5cf503 /src/mesa | |
| parent | ddcfc35f62ed3ad83b100beacb5b30394dcd9960 (diff) | |
compiler: Move glsl_to_nir to libglsl.la
Right now libglsl.la depends on libnir.la so putting it in libnir.la
adds a dependency on libglsl.la that goes the wrong direction.
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Kristian Høgsberg <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 66de93018b6..45551a1c460 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -24,7 +24,7 @@ #include "brw_nir.h" #include "brw_shader.h" #include "compiler/glsl_types.h" -#include "compiler/nir/glsl_to_nir.h" +#include "compiler/glsl/glsl_to_nir.h" #include "compiler/nir/nir_builder.h" #include "program/prog_to_nir.h" #include "program/prog_parameter.h" diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 6cfbb8e7683..98c075fcb2c 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -42,8 +42,8 @@ #include "st_glsl_types.h" #include "compiler/nir/nir.h" -#include "compiler/nir/glsl_to_nir.h" #include "compiler/glsl_types.h" +#include "compiler/glsl/glsl_to_nir.h" #include "compiler/glsl/ir.h" |