summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2016-05-25 16:00:38 -0700
committerJason Ekstrand <[email protected]>2016-05-26 14:13:38 -0700
commit32210dea8e474f8e93f5df681fb6a8265a0cda4b (patch)
treec25fdd05d4f55131c161b7197b5ebf09eb5cf503 /src/mesa/state_tracker
parentddcfc35f62ed3ad83b100beacb5b30394dcd9960 (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/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_glsl_to_nir.cpp2
1 files changed, 1 insertions, 1 deletions
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"