[Mesa-dev] [PATCH 1/3] glsl: Move glsl_to_nir files to LIBGLSL_FILES
Kristian Høgsberg
krh at bitplanet.net
Fri Jan 8 11:36:23 PST 2016
From: Kristian Høgsberg Kristensen <krh at owl.jf.intel.com>
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 infrastructre and can be used without also linking to
libglsl.la.
---
src/glsl/Makefile.sources | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index 97fac86..d4efbfb 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 \
@@ -194,6 +192,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 \
--
2.5.0
More information about the mesa-dev
mailing list