Am Freitag, 29. Oktober 2004 21:36 schrieb Roland Scheidegger:
> Dieter Nützel wrote:
> > Addition:
> >
> > XFree86 DRI CVS build works, but libGLcore.a have unresolved symbols.
> >
> > Symbol _mesa_Uniform2iARB from
> > module /usr/X11R6/lib/modules/extensions/libGLcore.a is unresolved!
>
> I suspect you need to include shaderobjects.c/shaderobjects.o in the
> Imakefile.inc of lib/GL/mesa/shader, but I'm really not sure. I'm not
> familiar at all with that build system...
> I think though it is expected that you can't build latest cvs Mesa in
> the xorg/xfree86 directories.
Good point!
Brian pointed in the same direction.
Here comes the patch for XFree86 DRI:
--- xc/lib/GL/mesa/shader/Imakefile.inc 2004-10-30 22:14:42.735599211 +0200
+++ xc/lib/GL/mesa/shader/Imakefile.inc.Dieter 2004-10-30 20:26:44.000000000
+0200
@@ -15,7 +15,8 @@
$(MESASHADERBUILDDIR)nvfragparse.c \
$(MESASHADERBUILDDIR)nvvertexec.c \
$(MESASHADERBUILDDIR)nvvertparse.c \
- $(MESASHADERBUILDDIR)program.c
+ $(MESASHADERBUILDDIR)program.c \
+ $(MESASHADERBUILDDIR)shaderobjects.c
#ifdef NeedToLinkMesaSrc
LinkSourceFile(arbprogparse.c, $(MESASRCDIR)/src/mesa/shader)
@@ -44,6 +45,9 @@
LinkSourceFile(grammar_syn.h, $(MESASRCDIR)/src/mesa/shader)
LinkSourceFile(program.c, $(MESASRCDIR)/src/mesa/shader)
LinkSourceFile(program.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(shaderobjects.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(shaderobjects.h, $(MESASRCDIR)/src/mesa/shader)
+
#endif
MESA_SHADER_OBJS = $(MESASHADERBUILDDIR)arbprogparse.o \
@@ -55,7 +59,8 @@
$(MESASHADERBUILDDIR)nvfragparse.o \
$(MESASHADERBUILDDIR)nvvertexec.o \
$(MESASHADERBUILDDIR)nvvertparse.o \
- $(MESASHADERBUILDDIR)program.o
+ $(MESASHADERBUILDDIR)program.o \
+ $(MESASHADERBUILDDIR)shaderobjects.o
#if defined(DoSharedLib) && DoSharedLib
MESA_SHADER_UOBJS = $(MESASHADERBUILDDIR)unshared/arbprogparse.o \
@@ -67,7 +72,8 @@
$(MESASHADERBUILDDIR)unshared/nvfragparse.o \
$(MESASHADERBUILDDIR)unshared/nvvertexec.o \
$(MESASHADERBUILDDIR)unshared/nvvertparse.o \
- $(MESASHADERBUILDDIR)unshared/program.o
+ $(MESASHADERBUILDDIR)unshared/program.o \
+ $(MESASHADERBUILDDIR)shaderobjects.o
#else
MESA_SHADER_UOBJS = $(MESA_SHADER_OBJS)
#endif
@@ -81,7 +87,8 @@
$(MESASHADERBUILDDIR)debugger/nvfragparse.o \
$(MESASHADERBUILDDIR)debugger/nvvertexec.o \
$(MESASHADERBUILDDIR)debugger/nvvertparse.o \
- $(MESASHADERBUILDDIR)debugger/program.o
+ $(MESASHADERBUILDDIR)debugger/program.o \
+ $(MESASHADERBUILDDIR)shaderobjects.o
MESA_SHADER_POBJS = $(MESASHADERBUILDDIR)profiled/arbprogparse.o \
$(MESASHADERBUILDDIR)profiled/arbprogram.o \
@@ -92,4 +99,5 @@
$(MESASHADERBUILDDIR)profiled/nvfragparse.o \
$(MESASHADERBUILDDIR)profiled/nvvertexec.o \
$(MESASHADERBUILDDIR)profiled/nvvertparse.o \
- $(MESASHADERBUILDDIR)profiled/program.o
+ $(MESASHADERBUILDDIR)profiled/program.o \
+ $(MESASHADERBUILDDIR)shaderobjects.o
Cheers,
Dieter
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_idU88&alloc_id065&op=click
--
_______________________________________________
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel
