On 08/06/2010 05:20 PM, tom fogal wrote: > > Well, it does appear to be some type of symbol resolution/overloading > issue. However it seems to be with internal Mesa symbols. Switching > to a single library -- that is, putting OSMesaCreateContext, etc. into > libGL directly, and getting rid of libOSMesa altogether -- seems like > it would be the solution, but I imagine there's some reason that's not > happening already. >
Just for grins this morning I added basically everything in mesa/src/mesa/drivers/osmesa/Makefile to mesa/src/mesa/drivers/x11/Makefile The diff is attached. I built VTK with : OPENGL_gl_LIBRARY:FILEPATH=/home/kevin/mesa/lib/libGL.so OSMESA_LIBRARY:FILEPATH=/home/kevin/mesa/lib/libGL.so The VTK's TestOSConeCxx now passes along with 6 of the other tests that were failing. For ParaView this change made the failing test count go from 161 failed tests out of 1001 to 12 tests failed out of 1001.
diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile index b5b0c1f..17d1cab 100644 --- a/src/mesa/drivers/x11/Makefile +++ b/src/mesa/drivers/x11/Makefile @@ -34,7 +34,8 @@ SOURCES = \ xm_image.c \ xm_line.c \ xm_span.c \ - xm_tri.c + xm_tri.c \ + $(TOP)/src/mesa/drivers/osmesa/osmesa.c OBJECTS = $(SOURCES:.c=.o) @@ -45,9 +46,11 @@ INCLUDE_DIRS = \ -I$(TOP)/src/mesa/main \ $(X11_INCLUDES) -CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mapi/glapi/libglapi.a - - +CORE_MESA = \ + $(TOP)/src/mesa/libmesa.a \ + $(TOP)/src/mapi/glapi/libglapi.a \ + $(TOP)/src/glsl/cl/libglslcl.a \ + $(TOP)/src/glsl/pp/libglslpp.a .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
