On 19 September 2011 23:13, Kenneth Graunke <kenn...@whitecape.org> wrote:
> builtin_stubs.cpp is only supposed to be used for builtin_compiler. It > contains a stub version of _mesa_glsl_initialize_functions() that does > nothing. > > libglsl.a already contains builtin_function.cpp, the generated file that > contains a version of _mesa_glsl_initialize_functions() that actually > initializes all the built-in functions. > > By mistakenly linking to builtin_stubs, glsl_compiler and glsl_test are > unable to compile any shaders that use built-in functions. > > Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> > --- > src/glsl/Makefile | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/glsl/Makefile b/src/glsl/Makefile > index c20a6c9..00b7b91 100644 > --- a/src/glsl/Makefile > +++ b/src/glsl/Makefile > @@ -188,11 +188,11 @@ install-dricore: default > > ##### RULES ##### > > -glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o > - $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) > builtin_stubs.o $(LIBS) -o $@ > +glsl_compiler: $(GLSL2_OBJECTS) libglsl.a > + $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) > $(LIBS) -o $@ > > -glsl_test: $(TEST_OBJECTS) libglsl.a builtin_stubs.o > - $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) > builtin_stubs.o $(LIBS) -o $@ > +glsl_test: $(TEST_OBJECTS) libglsl.a > + $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) $(LIBS) > -o $@ > > glcpp: glcpp/glcpp > glcpp/glcpp: $(GLCPP_OBJECTS) > -- > 1.7.6.1 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev > Reviewed-by: Paul Berry <stereotype...@gmail.com>
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
