AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for x86 builds

Browse Source
This commit is contained in:
Brian Paul
2003-06-10 19:06:20 +00:00
parent 5e04bcf6de
commit 5f3439916b
5 changed files with 82 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Make-config
+57 -57
View File
@@ -150,9 +150,9 @@ freebsd-386:
"CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \
"CXXFLAGS = $(CFLAGS)" \
"APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
X86/x86_cliptest.S"
"ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
x86/x86_cliptest.S"
#special hidden target, to make a shared lib for ONLY Mesa "core"
gcc-mesa-sl:
@@ -414,16 +414,16 @@ linux-x86:
"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
X86/x86_cliptest.S \
X86/mmx_blend.S \
X86/3dnow_xform1.S X86/3dnow_xform2.S \
X86/3dnow_xform3.S X86/3dnow_xform4.S \
X86/3dnow_normal.S \
X86/sse_xform1.S X86/sse_xform2.S \
X86/sse_xform3.S X86/sse_xform4.S \
X86/sse_normal.S"
"ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
x86/x86_cliptest.S \
x86/mmx_blend.S \
x86/3dnow_xform1.S x86/3dnow_xform2.S \
x86/3dnow_xform3.S x86/3dnow_xform4.S \
x86/3dnow_normal.S \
x86/sse_xform1.S x86/sse_xform2.S \
x86/sse_xform3.S x86/sse_xform4.S \
x86/sse_normal.S"
linux-x86-sse:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -439,16 +439,16 @@ linux-x86-sse:
"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
X86/x86_cliptest.S \
X86/mmx_blend.S \
X86/3dnow_xform1.S X86/3dnow_xform2.S \
X86/3dnow_xform3.S X86/3dnow_xform4.S \
X86/3dnow_normal.S \
X86/sse_xform1.S X86/sse_xform2.S \
X86/sse_xform3.S X86/sse_xform4.S \
X86/sse_normal.S"
"ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
x86/x86_cliptest.S \
x86/mmx_blend.S \
x86/3dnow_xform1.S x86/3dnow_xform2.S \
x86/3dnow_xform3.S x86/3dnow_xform4.S \
x86/3dnow_normal.S \
x86/sse_xform1.S x86/sse_xform2.S \
x86/sse_xform3.S x86/sse_xform4.S \
x86/sse_normal.S"
linux-icc:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -464,16 +464,16 @@ linux-icc:
"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
X86/x86_cliptest.S \
X86/mmx_blend.S \
X86/3dnow_xform1.S X86/3dnow_xform2.S \
X86/3dnow_xform3.S X86/3dnow_xform4.S \
X86/3dnow_normal.S \
X86/sse_xform1.S X86/sse_xform2.S \
X86/sse_xform3.S X86/sse_xform4.S \
X86/sse_normal.S"
"ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
x86/x86_cliptest.S \
x86/mmx_blend.S \
x86/3dnow_xform1.S x86/3dnow_xform2.S \
x86/3dnow_xform3.S x86/3dnow_xform4.S \
x86/3dnow_normal.S \
x86/sse_xform1.S x86/sse_xform2.S \
x86/sse_xform3.S x86/sse_xform4.S \
x86/sse_normal.S"
# Contributed by Uwe_Maurer@t-online.de
linux-ggi:
@@ -508,9 +508,9 @@ linux-x86-ggi:
"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
X86/x86_cliptest.S"
"ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
x86/x86_cliptest.S"
linux-glide:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -543,17 +543,17 @@ linux-x86-glide:
"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
X86/x86_cliptest.S \
X86/mmx_blend.S \
X86/3dnow_xform1.S X86/3dnow_xform2.S \
X86/3dnow_xform3.S X86/3dnow_xform4.S \
X86/3dnow_normal.S \
FX/X86/fx_3dnow_fastpath.S \
X86/sse_xform1.S X86/sse_xform2.S \
X86/sse_xform3.S X86/sse_xform4.S \
X86/sse_normal.S "
"ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
x86/x86_cliptest.S \
x86/mmx_blend.S \
x86/3dnow_xform1.S x86/3dnow_xform2.S \
x86/3dnow_xform3.S x86/3dnow_xform4.S \
x86/3dnow_normal.S \
FX/x86/fx_3dnow_fastpath.S \
x86/sse_xform1.S x86/sse_xform2.S \
x86/sse_xform3.S x86/sse_xform4.S \
x86/sse_normal.S "
linux-alpha:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1011,16 +1011,16 @@ linux-x86-debug:
"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
X86/x86_cliptest.S \
X86/mmx_blend.S \
X86/3dnow_xform1.S X86/3dnow_xform2.S \
X86/3dnow_xform3.S X86/3dnow_xform4.S \
X86/3dnow_normal.S \
X86/sse_xform1.S X86/sse_xform2.S \
X86/sse_xform3.S X86/sse_xform4.S \
X86/sse_normal.S"
"ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
x86/x86_cliptest.S \
x86/mmx_blend.S \
x86/3dnow_xform1.S x86/3dnow_xform2.S \
x86/3dnow_xform3.S x86/3dnow_xform4.S \
x86/3dnow_normal.S \
x86/sse_xform1.S x86/sse_xform2.S \
x86/sse_xform3.S x86/sse_xform4.S \
x86/sse_normal.S"
linux-glide-debug:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
src/mesa/Makefile.X11
+15 -15
View File
@@ -208,23 +208,23 @@ INCLUDE_DIRS = \
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
X86/x86.o: X86/x86.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
X86/common_x86.o: X86/common_x86.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
X86/common_x86_asm.o: X86/common_x86_asm.S X86/matypes.h
X86/3dnow.o: X86/3dnow.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
X86/sse.o: X86/sse.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
X86/matypes.h: mtypes.h tnl/t_context.h X86/gen_matypes.c
$(CC) -I. -I$(INCDIR) $(CFLAGS) X86/gen_matypes.c -o X86/gen_matypes
./X86/gen_matypes > X86/matypes.h
rm -f X86/gen_matypes X86/*.o
x86/x86.o: x86/x86.c
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
x86/common_x86.o: x86/common_x86.c
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
x86/common_x86_asm.o: x86/common_x86_asm.S x86/matypes.h
x86/3dnow.o: x86/3dnow.c
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
x86/sse.o: x86/sse.c
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
x86/matypes.h: main/mtypes.h tnl/t_context.h x86/gen_matypes.c
$(CC) $(INCLUDE_DIRS) $(CFLAGS) x86/gen_matypes.c -o x86/gen_matypes
./x86/gen_matypes > x86/matypes.h
rm -f x86/gen_matypes x86/*.o
# We have X86/matypes.h depend on X86/matypes.h so that if ASM_SOURCES
# We have x86/matypes.h depend on x86/matypes.h so that if ASM_SOURCES
# is empty we don't get an invalid Makefile.
$(ASM_SOURCES) X86/matypes.h: X86/matypes.h
$(ASM_SOURCES) x86/matypes.h: x86/matypes.h
##### TARGETS #####
src/mesa/math/m_xform.c
+2 -3
View File
@@ -1,4 +1,3 @@
/*
* Mesa 3-D graphics library
* Version: 5.1
@@ -49,11 +48,11 @@
#endif
#ifdef USE_X86_ASM
#include "X86/common_x86_asm.h"
#include "x86/common_x86_asm.h"
#endif
#ifdef USE_SPARC_ASM
#include "SPARC/sparc.h"
#include "sparc/sparc.h"
#endif
clip_func _mesa_clip_tab[5];
src/mesa/swrast/s_blend.c
+4 -5
View File
@@ -1,9 +1,8 @@
/*
* Mesa 3-D graphics library
* Version: 4.1
* Version: 5.1
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -37,8 +36,8 @@
#if defined(USE_MMX_ASM)
#include "X86/mmx.h"
#include "X86/common_x86_asm.h"
#include "x86/mmx.h"
#include "x86/common_x86_asm.h"
#define _BLENDAPI _ASMAPI
#else
#define _BLENDAPI
src/mesa/x86/gen_matypes.c
+4 -6
View File
@@ -1,10 +1,8 @@
/* $Id: gen_matypes.c,v 1.10 2002/10/29 20:28:58 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 4.1
* Version: 5.1
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -34,8 +32,8 @@
* Mesa, including lighting, clipping, texture image conversion etc.
*/
#include "glheader.h"
#include "mtypes.h"
#include "main/glheader.h"
#include "main/mtypes.h"
#include "tnl/t_context.h"