[Mesa-dev] [PATCH 02/10] glsl: Link uniform-initializer-test with standalone_scaffolding.cpp.

Paul Berry stereotype441 at gmail.com
Fri Sep 27 12:05:28 PDT 2013


Future patches in this series will add calls to _mesa_glsl_error() to
ir.cpp.  _mesa_glsl_error() calls _mesa_glsl_msg(), which calls
_mesa_shader_debug(), which is defined in mesa/main/errors.c (and
hence not available when compiling GLSL unit tests).  To avoid link
errors, link uniform-initializer-test with standalone_scaffolding.cpp,
which also provides _mesa_shader_debug().
---
 src/glsl/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 2e161b8..7ee71bc 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -54,6 +54,7 @@ tests_uniform_initializer_test_SOURCES =		\
 	$(top_srcdir)/src/mesa/main/imports.c		\
 	$(top_srcdir)/src/mesa/program/prog_hash_table.c\
 	$(top_srcdir)/src/mesa/program/symbol_table.c	\
+	$(GLSL_SRCDIR)/standalone_scaffolding.cpp \
 	tests/copy_constant_to_storage_tests.cpp	\
 	tests/set_uniform_initializer_tests.cpp		\
 	tests/uniform_initializer_utils.cpp
-- 
1.8.4



More information about the mesa-dev mailing list