Ian Romanick <[EMAIL PROTECTED]> writes:
> CVSROOT: /cvs/mesa
> Module name: Mesa
> Repository: Mesa/src/mesa/tnl/
> Changes by: [EMAIL PROTECTED] 04/04/12 15:40:55
>
> Log message:
> Conditionally compile code for x86 specific TNL codegen. This fixes problem
> with x86-64 and PowerPC.
>
> Reported by: sublett on #dri-devel.
>
Here are the additional patches needed to get dri building on
x86-64. The mesa linux-x86-64 config is still broken. Also there are
some odd color bugs with r200, some objects turn dark or purple. I see
this with simple programs like glxgears, but not in more complex
things like UT2004.
Index: imports.h
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/main/imports.h,v
retrieving revision 1.34
diff -u -r1.34 imports.h
--- imports.h 11 Apr 2004 22:22:23 -0000 1.34
+++ imports.h 13 Apr 2004 09:46:57 -0000
@@ -222,7 +222,7 @@
*** USE_IEEE: Determine if we're using IEEE floating point
***/
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
- defined(__s390x__) || defined(__powerpc__) || \
+ defined(__s390x__) || defined(__powerpc__) || defined(__AMD64__) || \
( defined(__alpha__) && ( defined(__IEEE_FLOAT) || !defined(VMS) ) )
#define USE_IEEE
#define IEEE_ONE 0x3f800000
Index: host.def
===================================================================
RCS file: /cvs/dri/xc/xc/config/cf/host.def,v
retrieving revision 1.67
diff -u -r1.67 host.def
--- host.def 9 Apr 2004 00:18:44 -0000 1.67
+++ host.def 13 Apr 2004 11:17:17 -0000
@@ -38,6 +38,11 @@
#define XF86CardDrivers tdfx i810 mga ati glint vga sis
#define DriDrivers r200 mga i810 r128 radeon gamma i830 sis tdfx ffb
+#elif defined(AMD64Architecture)
+
+#define XF86CardDrivers tdfx i810 mga ati glint vga sis
+#define DriDrivers r200 mga i810 r128 radeon gamma i830 sis tdfx
+
#else
#define XF86CardDrivers tdfx mga ati glint vga
@@ -66,7 +71,7 @@
* expat.
*/
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) && !defined(AMD64Architecture)
# define ExpatLibrary StaticLibrary($(BUILDLIBDIR),expat)
# define NormalLibExpat YES
#endif
Index: Imakefile.inc
===================================================================
RCS file: /cvs/dri/xc/xc/lib/GL/mesa/tnl/Imakefile.inc,v
retrieving revision 1.5
diff -u -r1.5 Imakefile.inc
--- Imakefile.inc 30 Mar 2004 00:22:49 -0000 1.5
+++ Imakefile.inc 13 Apr 2004 12:44:32 -0000
@@ -76,7 +76,6 @@
#if defined(i386Architecture) && MesaUseX86Asm
#define MesaTnlAsmObjs $(MESATNLBUILDDIR)t_vtx_x86.o \
$(MESATNLBUILDDIR)t_vtx_x86_gcc.o
-#endif
MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \
$(MESATNLBUILDDIR)t_array_import.o \
@@ -100,6 +99,29 @@
$(MESATNLBUILDDIR)t_vtx_exec.o \
MesaTnlAsmObjs \
$(MESATNLBUILDDIR)t_vtx_generic.o
+#else
+ MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \
+ $(MESATNLBUILDDIR)t_array_import.o \
+ $(MESATNLBUILDDIR)t_context.o \
+ $(MESATNLBUILDDIR)t_pipeline.o \
+ $(MESATNLBUILDDIR)t_save_api.o \
+ $(MESATNLBUILDDIR)t_save_loopback.o \
+ $(MESATNLBUILDDIR)t_save_playback.o \
+ $(MESATNLBUILDDIR)t_vb_fog.o \
+ $(MESATNLBUILDDIR)t_vb_light.o \
+ $(MESATNLBUILDDIR)t_vb_normals.o \
+ $(MESATNLBUILDDIR)t_vb_points.o \
+ $(MESATNLBUILDDIR)t_vb_program.o \
+ $(MESATNLBUILDDIR)t_vb_render.o \
+ $(MESATNLBUILDDIR)t_vb_texgen.o \
+ $(MESATNLBUILDDIR)t_vb_texmat.o \
+ $(MESATNLBUILDDIR)t_vb_vertex.o \
+ $(MESATNLBUILDDIR)t_vertex.o \
+ $(MESATNLBUILDDIR)t_vtx_api.o \
+ $(MESATNLBUILDDIR)t_vtx_eval.o \
+ $(MESATNLBUILDDIR)t_vtx_exec.o \
+ $(MESATNLBUILDDIR)t_vtx_generic.o
+#endif
#if defined(DoSharedLib) && DoSharedLib
#if defined(i386Architecture) && MesaUseX86Asm
--
Ronny V. Vindenes <[EMAIL PROTECTED]>
