On 19 September 2011 23:13, Kenneth Graunke <span dir="ltr"><<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
builtin_stubs.cpp is only supposed to be used for builtin_compiler. It<br>
contains a stub version of _mesa_glsl_initialize_functions() that does<br>
nothing.<br>
<br>
libglsl.a already contains builtin_function.cpp, the generated file that<br>
contains a version of _mesa_glsl_initialize_functions() that actually<br>
initializes all the built-in functions.<br>
<br>
By mistakenly linking to builtin_stubs, glsl_compiler and glsl_test are<br>
unable to compile any shaders that use built-in functions.<br>
<br>
Signed-off-by: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>><br>
---<br>
src/glsl/Makefile | 8 ++++----<br>
1 files changed, 4 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/src/glsl/Makefile b/src/glsl/Makefile<br>
index c20a6c9..00b7b91 100644<br>
--- a/src/glsl/Makefile<br>
+++ b/src/glsl/Makefile<br>
@@ -188,11 +188,11 @@ install-dricore: default<br>
<br>
##### RULES #####<br>
<br>
-glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o<br>
- $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@<br>
+glsl_compiler: $(GLSL2_OBJECTS) libglsl.a<br>
+ $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) $(LIBS) -o $@<br>
<br>
-glsl_test: $(TEST_OBJECTS) libglsl.a builtin_stubs.o<br>
- $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) builtin_stubs.o $(LIBS) -o $@<br>
+glsl_test: $(TEST_OBJECTS) libglsl.a<br>
+ $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) $(LIBS) -o $@<br>
<br>
glcpp: glcpp/glcpp<br>
glcpp/glcpp: $(GLCPP_OBJECTS)<br>
<font color="#888888">--<br>
1.7.6.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></blockquote></div><br>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br>