glsl: (mostly) remove libglsl_util

Now that NIR does not depend on glsl, we can (mostly[*]) get rid of the
libglsl_util hack.

[*] glsl_compiler is the one remaining user of libglsl_util

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index dff95ba..3de8e0f 100644 (file)
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -19,7 +19,7 @@ libfreedreno_la_SOURCES = \
 
 noinst_PROGRAMS = ir3_compiler
 
-# XXX: Required due to the C++ sources in libnir/libglsl_util
+# XXX: Required due to the C++ sources in libnir
 nodist_EXTRA_ir3_compiler_SOURCES = dummy.cpp
 ir3_compiler_SOURCES = \
        ir3/ir3_cmdline.c
@@ -28,7 +28,6 @@ ir3_compiler_LDADD = \
        libfreedreno.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/glsl/libnir.la \
-       $(top_builddir)/src/libglsl_util.la \
        $(top_builddir)/src/util/libmesautil.la \
        $(GALLIUM_COMMON_LIB_DEPS) \
        $(FREEDRENO_LIBS)

diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am
index e26ca33..b522147 100644 (file)
--- a/src/gallium/targets/d3dadapter9/Makefile.am
+++ b/src/gallium/targets/d3dadapter9/Makefile.am
@@ -76,7 +76,6 @@ d3dadapter9_la_LIBADD = \
        $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/glsl/libnir.la \
-       $(top_builddir)/src/libglsl_util.la \
        $(top_builddir)/src/gallium/state_trackers/nine/libninetracker.la \
        $(top_builddir)/src/util/libmesautil.la \
        $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \

diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 4d9f7be..4f25b4f 100644 (file)
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -53,7 +53,6 @@ endif
 PIPE_LIBS += \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/glsl/libnir.la \
-       $(top_builddir)/src/libglsl_util.la \
        $(top_builddir)/src/util/libmesautil.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \

diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am
index 92173de..02c42c6 100644 (file)
--- a/src/gallium/targets/xa/Makefile.am
+++ b/src/gallium/targets/xa/Makefile.am
@@ -38,7 +38,6 @@ libxatracker_la_LIBADD = \
        $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/glsl/libnir.la \
-       $(top_builddir)/src/libglsl_util.la \
        $(top_builddir)/src/util/libmesautil.la \
        $(LIBDRM_LIBS) \
        $(GALLIUM_COMMON_LIB_DEPS)

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 437c6a5..ebea816 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -96,7 +96,6 @@ tests_general_ir_test_CFLAGS =                                \
 tests_general_ir_test_LDADD =                          \
        $(top_builddir)/src/gtest/libgtest.la           \
        $(top_builddir)/src/glsl/libglsl.la             \
-       $(top_builddir)/src/libglsl_util.la             \
        $(PTHREAD_LIBS)
 
 tests_uniform_initializer_test_SOURCES =               \
@@ -109,7 +108,6 @@ tests_uniform_initializer_test_CFLAGS =                     \
 tests_uniform_initializer_test_LDADD =                 \
        $(top_builddir)/src/gtest/libgtest.la           \
        $(top_builddir)/src/glsl/libglsl.la             \
-       $(top_builddir)/src/libglsl_util.la             \
        $(PTHREAD_LIBS)
 
 tests_sampler_types_test_SOURCES =                     \
@@ -119,7 +117,6 @@ tests_sampler_types_test_CFLAGS =                   \
 tests_sampler_types_test_LDADD =                       \
        $(top_builddir)/src/gtest/libgtest.la           \
        $(top_builddir)/src/glsl/libglsl.la             \
-       $(top_builddir)/src/libglsl_util.la             \
        $(PTHREAD_LIBS)
 
 libglcpp_la_LIBADD =                                   \
@@ -134,7 +131,6 @@ glcpp_glcpp_SOURCES =                                       \
        glcpp/glcpp.c
 glcpp_glcpp_LDADD =                                    \
        libglcpp.la                                     \
-       $(top_builddir)/src/libglsl_util.la             \
        -lm
 
 libglsl_la_LIBADD = libglcpp.la
@@ -168,7 +164,6 @@ glsl_test_SOURCES = \
 
 glsl_test_LDADD =                                      \
        libglsl.la                                      \
-       $(top_builddir)/src/libglsl_util.la             \
        $(PTHREAD_LIBS)
 
 # We write our own rules for yacc and lex below. We'd rather use automake,
@@ -272,6 +267,5 @@ nir_tests_control_flow_tests_CFLAGS =                       \
 nir_tests_control_flow_tests_LDADD =                   \
        $(top_builddir)/src/gtest/libgtest.la           \
        $(top_builddir)/src/glsl/libnir.la              \
-       $(top_builddir)/src/libglsl_util.la             \
        $(top_builddir)/src/util/libmesautil.la         \
        $(PTHREAD_LIBS)