diff options
Diffstat (limited to 'xc/extras/Mesa/src/X86')
| -rw-r--r-- | xc/extras/Mesa/src/X86/Makefile.am | 41 | ||||
| -rw-r--r-- | xc/extras/Mesa/src/X86/common_x86_asm.S | 7 |
2 files changed, 33 insertions, 15 deletions
diff --git a/xc/extras/Mesa/src/X86/Makefile.am b/xc/extras/Mesa/src/X86/Makefile.am index 96c377198..ffabb1fbf 100644 --- a/xc/extras/Mesa/src/X86/Makefile.am +++ b/xc/extras/Mesa/src/X86/Makefile.am @@ -2,6 +2,28 @@ #AUTOMAKE_OPTIONS = no-dependencies + + +x86_files = \ + assyntax.h \ + common_x86.c \ + common_x86_asm.S \ + common_x86_asm.h \ + common_x86_features.h \ + glapi_x86.S \ + x86.c \ + x86.h \ + x86_cliptest.S \ + clip_args.h \ + x86_vertex.S \ + x86_xform_masked2.S \ + xform_args.h \ + x86_xform_masked3.S \ + x86_xform_masked4.S \ + x86_xform_raw2.S \ + x86_xform_raw3.S \ + x86_xform_raw4.S + x3dnow_files = \ 3dnow.c \ 3dnow.h \ @@ -14,7 +36,7 @@ x3dnow_files = \ 3dnow_xform_raw2.S \ 3dnow_xform_raw3.S \ 3dnow_xform_raw4.S \ - vertex_3dnow.S + 3dnow_vertex.S katmai_files = \ katmai.c \ @@ -28,7 +50,7 @@ katmai_files = \ katmai_xform_masked3.S \ katmai_xform_raw4.S \ katmai_xform_masked4.S \ - vertex_katmai.S + katmai_vertex.S mmx_files = mmx.h mmx_blend.S @@ -50,21 +72,12 @@ endif if HAVE_X86 # Build a libtool convenience library. noinst_LTLIBRARIES = libMesaX86.la +x86_sources = $(x86_files) CFLAGS_X86 = -DUSE_X86_ASM endif -libMesaX86_la_SOURCES = x86a.S assyntax.h \ - common_x86.c common_x86_asm.S common_x86_asm.h \ - common_x86_features.h glapi_x86.S \ - x86.c x86.h vertex.S $(mmx_sources) $(x3dnow_sources) $(katmai_sources) +libMesaX86_la_SOURCES = $(x86_sources) $(mmx_sources) $(x3dnow_sources) $(katmai_sources) INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src $(CFLAGS_X86) $(CFLAGS_MMX) $(CFLAGS_3DNOW) $(CFLAGS_KATMAI) -EXTRA_DIST = x86flatregs.m4 x86a.S.m4 $(x3dnow_files) $(mmx_files) $(katmai_files) - -x86a.S: $(srcdir)/x86flatregs.m4 -x86a.S: $(srcdir)/x86a.S.m4 - m4 $< >$@ - -x86a.asm: x86a.S - gcc -E -P -DNASM_ASSEMBLER $< >$@ +EXTRA_DIST = $(x3dnow_files) $(mmx_files) $(katmai_files) diff --git a/xc/extras/Mesa/src/X86/common_x86_asm.S b/xc/extras/Mesa/src/X86/common_x86_asm.S index f55e9b198..440aae749 100644 --- a/xc/extras/Mesa/src/X86/common_x86_asm.S +++ b/xc/extras/Mesa/src/X86/common_x86_asm.S @@ -32,7 +32,7 @@ * * Cleaned up and simplified by Gareth Hughes <gareth@valinux.com> */ -/* $XFree86: xc/extras/Mesa/src/X86/common_x86_asm.S,v 1.6 2001/01/17 12:50:11 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/X86/common_x86_asm.S,v 1.8 2001/03/21 02:48:58 dawes Exp $ */ #include "assyntax.h" #include "common_x86_features.h" @@ -58,8 +58,10 @@ GLNAME( found_intel ): STRING( "Genuine Intel processor found\n\0" ) GLNAME( found_amd ): STRING( "Authentic AMD processor found\n\0" ) +#ifdef USE_KATMAI_ASM GLNAME( katmai_test_dummy ): D_LONG 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000 +#endif SEG_TEXT @@ -155,6 +157,7 @@ LLBL ( cpuid_done ): RET +#ifdef USE_KATMAI_ASM /* Execute an SSE instruction to see if the operating system correctly * supports SSE. A signal handler for SIGILL should have been set * before calling this function, otherwise this could kill the client @@ -203,3 +206,5 @@ GLNAME( gl_test_os_katmai_exception_support ): LEAVE RET + +#endif |