summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKristian Høgsberg Kristensen <[email protected]>2016-01-08 12:35:18 -0800
committerKristian Høgsberg Kristensen <[email protected]>2016-01-08 14:26:12 -0800
commite97caba1f6c2bd803f9c8b969b52c21f93daf1d0 (patch)
tree64621eec6ee6619ac2d98a63d978ffb2f6f3f2bc /src
parent1d54ac6c9f41df240497e96770415b019ffdc6b3 (diff)
glsl: Move glsl_to_nir files to LIBGLSL_FILES
libglsl_la_SOURCES includes both NIR_FILES and LIBGLSL_FILES, so for libglsl.la consumers, this is a no-op. libnir.la however no longer uses any GLSL IR infrastructure and can be used without also linking to libglsl.la. Acked-by: Matt Turner <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/glsl/Makefile.sources4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index fc10f14f4c1..4da9b072892 100644
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -18,8 +18,6 @@ NIR_GENERATED_FILES = \
nir/nir_opt_algebraic.c
NIR_FILES = \
- nir/glsl_to_nir.cpp \
- nir/glsl_to_nir.h \
nir/glsl_types.cpp \
nir/glsl_types.h \
nir/builtin_type_macros.h \
@@ -184,6 +182,8 @@ LIBGLSL_FILES = \
lower_output_reads.cpp \
lower_shared_reference.cpp \
lower_ubo_reference.cpp \
+ nir/glsl_to_nir.cpp \
+ nir/glsl_to_nir.h \
opt_algebraic.cpp \
opt_array_splitting.cpp \
opt_conditional_discard.cpp \