diff options
| author | Andre Werthmann <wertmann@cs.uni-potsdam.de> | 1999-11-18 09:20:50 +0000 |
|---|---|---|
| committer | Andre Werthmann <wertmann@cs.uni-potsdam.de> | 1999-11-18 09:20:50 +0000 |
| commit | 6630e2be01f41fb3b0fdf815e00a82d8e980f116 (patch) | |
| tree | 8d12988868fd05fec399316cf4f1487c2d41ccab /src/mesa | |
| parent | 36d8d7ae815dc78e56ab64379d86f9e85b4d1c63 (diff) | |
checked in the first new PIII vertex-transformation code
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile.X11 | 8 | ||||
| -rw-r--r-- | src/mesa/main/Makefile.X11 | 8 | ||||
| -rw-r--r-- | src/mesa/x86/common_x86.c | 19 |
3 files changed, 27 insertions, 8 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index f5e73514d3..1541f722f5 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.8 1999/11/16 15:49:12 brianp Exp $ +# $Id: Makefile.X11,v 1.9 1999/11/18 09:20:51 wertmann Exp $ # Mesa 3-D graphics library # Version: 3.3 @@ -93,7 +93,8 @@ CORE_SOURCES = \ zoom.c \ X86/x86.c \ X86/common_x86.c \ - X86/3dnow.c + X86/3dnow.c \ + X86/katmai.c DRIVER_SOURCES = \ X/glxapi.c \ @@ -206,7 +207,8 @@ X86/common_x86.o: X86/common_x86.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ X86/3dnow.o: X86/3dnow.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ - +X86/katmai.o: X86/katmai.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ ##### TARGETS ##### diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11 index f5e73514d3..1541f722f5 100644 --- a/src/mesa/main/Makefile.X11 +++ b/src/mesa/main/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.8 1999/11/16 15:49:12 brianp Exp $ +# $Id: Makefile.X11,v 1.9 1999/11/18 09:20:51 wertmann Exp $ # Mesa 3-D graphics library # Version: 3.3 @@ -93,7 +93,8 @@ CORE_SOURCES = \ zoom.c \ X86/x86.c \ X86/common_x86.c \ - X86/3dnow.c + X86/3dnow.c \ + X86/katmai.c DRIVER_SOURCES = \ X/glxapi.c \ @@ -206,7 +207,8 @@ X86/common_x86.o: X86/common_x86.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ X86/3dnow.o: X86/3dnow.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ - +X86/katmai.o: X86/katmai.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ ##### TARGETS ##### diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c index 94a9c1caf1..5342d85854 100644 --- a/src/mesa/x86/common_x86.c +++ b/src/mesa/x86/common_x86.c @@ -29,6 +29,8 @@ * processor. * * Written by Holger Waechtler <holger@akaflieg.extern.tu-berlin.de> + * Changed by Andre Werthmann <wertmann@cs.uni-potsdam.de> for using the + * new Katmai functions */ #include <stdlib.h> @@ -40,6 +42,7 @@ int gl_x86_cpu_features = 0; void gl_init_all_x86_asm (void) { + #ifdef USE_X86_ASM gl_x86_cpu_features = gl_identify_x86_cpu_features (); gl_x86_cpu_features |= GL_CPU_AnyX86; @@ -52,7 +55,7 @@ void gl_init_all_x86_asm (void) } if (gl_x86_cpu_features) { - gl_init_x86_asm_transforms (); + gl_init_x86_asm_transforms (); } #ifdef USE_MMX_ASM @@ -66,7 +69,6 @@ void gl_init_all_x86_asm (void) } #endif - #ifdef USE_3DNOW_ASM if (gl_x86_cpu_features & GL_CPU_3Dnow) { char *s = getenv( "MESA_NO_3DNOW" ); @@ -79,6 +81,19 @@ void gl_init_all_x86_asm (void) } #endif + +#ifdef USE_KATMAI_ASM + if (gl_x86_cpu_features & GL_CPU_Katmai) { + char *s = getenv( "MESA_NO_KATMAI" ); + if (s == NULL) { + fprintf (stderr, "Katmai cpu detected.\n"); + gl_init_katmai_asm_transforms (); + } else { + gl_x86_cpu_features &= (~GL_CPU_Katmai); + } + } +#endif + #endif } |