Attachment 3222 Details for Bug 4415 – use ASM_API

[patch] use ASM_API

mesa-asm_api.patch (text/plain), 9.98 KB, created by George - on 2005-09-10 14:31:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2005-09-10 14:31:46 UTC

Size: 9.98 KB

patch

obsolete

>Index: configs/beos
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/beos,v
>retrieving revision 1.5
>diff -u -r1.5 beos
>--- configs/beos	13 Sep 2004 21:04:48 -0000	1.5
>+++ configs/beos	10 Sep 2005 20:59:51 -0000
>@@ -26,7 +26,8 @@
> 		-DUSE_3DNOW_ASM \
> 		-DUSE_SSE_ASM
> 	
>-	ASM_SOURCES = $(X86_SOURCES) $(X86_API)
>+	ASM_SOURCES = $(X86_SOURCES)
>+	ASM_API = $(X86_API)
> 
> 	CC = gcc
> 	CXX = g++
>Index: configs/freebsd-dri-amd64
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/freebsd-dri-amd64,v
>retrieving revision 1.2
>diff -u -r1.2 freebsd-dri-amd64
>--- configs/freebsd-dri-amd64	2 Jul 2005 08:29:57 -0000	1.2
>+++ configs/freebsd-dri-amd64	10 Sep 2005 20:59:51 -0000
>@@ -6,4 +6,5 @@
> CONFIG_NAME = freebsd-dri-x86-64
> 
> ASM_FLAGS = -DUSE_X86_64_ASM
>-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
>+ASM_SOURCES = $(X86-64_SOURCES)
>+ASM_API = $(X86-64_API)
>Index: configs/freebsd-dri-x86
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/freebsd-dri-x86,v
>retrieving revision 1.1
>diff -u -r1.1 freebsd-dri-x86
>--- configs/freebsd-dri-x86	28 Oct 2004 00:19:21 -0000	1.1
>+++ configs/freebsd-dri-x86	10 Sep 2005 20:59:51 -0000
>@@ -10,3 +10,4 @@
> 
> ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
> ASM_SOURCES = $(X86_SOURCES)
>+ASM_API = $(X86_API)
>Index: configs/linux-directfb
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-directfb,v
>retrieving revision 1.1
>diff -u -r1.1 linux-directfb
>--- configs/linux-directfb	3 Jan 2005 15:35:01 -0000	1.1
>+++ configs/linux-directfb	10 Sep 2005 20:59:51 -0000
>@@ -17,7 +17,8 @@
> ifeq ($(HAVE_X86), yes)
>      CFLAGS   += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
>      CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
>-     ASM_SOURCES = $(X86_SOURCES) $(X86_API)
>+     ASM_SOURCES = $(X86_SOURCES)
>+     ASM_API = $(X86_API)
> endif
> 
> # Directories
>Index: configs/linux-dri-x86
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-dri-x86,v
>retrieving revision 1.11
>diff -u -r1.11 linux-dri-x86
>--- configs/linux-dri-x86	15 Jul 2005 14:31:31 -0000	1.11
>+++ configs/linux-dri-x86	10 Sep 2005 20:59:51 -0000
>@@ -13,4 +13,5 @@
> 
> ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
> ASM_SOURCES = $(X86_SOURCES)
>+ASM_API = $(X86_API)
> 
>Index: configs/linux-dri-x86-64
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-dri-x86-64,v
>retrieving revision 1.18
>diff -u -r1.18 linux-dri-x86-64
>--- configs/linux-dri-x86-64	19 Aug 2005 20:20:03 -0000	1.18
>+++ configs/linux-dri-x86-64	10 Sep 2005 20:59:51 -0000
>@@ -8,7 +8,8 @@
> ARCH_FLAGS = -m64
> 
> ASM_FLAGS = -DUSE_X86_64_ASM
>-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
>+ASM_SOURCES = $(X86-64_SOURCES)
>+ASM_API = $(X86-64_API)
> 
> LIB_DIR = $(TOP)/lib64
> 
>Index: configs/linux-icc
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-icc,v
>retrieving revision 1.3
>diff -u -r1.3 linux-icc
>--- configs/linux-icc	13 Sep 2004 21:04:48 -0000	1.3
>+++ configs/linux-icc	10 Sep 2005 20:59:51 -0000
>@@ -16,6 +16,7 @@
> GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
> APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
> 
>-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
>+ASM_SOURCES = $(X86_SOURCES)
>+ASM_API = $(X86_API)
> 
> 
>Index: configs/linux-icc-static
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-icc-static,v
>retrieving revision 1.3
>diff -u -r1.3 linux-icc-static
>--- configs/linux-icc-static	13 Sep 2004 21:04:48 -0000	1.3
>+++ configs/linux-icc-static	10 Sep 2005 20:59:51 -0000
>@@ -24,6 +24,7 @@
> APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
> MKLIB_OPTIONS = -arch icc
> 
>-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
>+ASM_SOURCES = $(X86_SOURCES)
>+ASM_API = $(X86_API)
> 
> 
>Index: configs/linux-solo-x86
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-solo-x86,v
>retrieving revision 1.8
>diff -u -r1.8 linux-solo-x86
>--- configs/linux-solo-x86	26 May 2005 03:47:34 -0000	1.8
>+++ configs/linux-solo-x86	10 Sep 2005 20:59:51 -0000
>@@ -10,3 +10,4 @@
> 
> ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
> ASM_SOURCES = $(X86_SOURCES)
>+ASM_API = $(X86_API)
>Index: configs/linux-x86
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-x86,v
>retrieving revision 1.6
>diff -u -r1.6 linux-x86
>--- configs/linux-x86	2 Jul 2005 07:38:40 -0000	1.6
>+++ configs/linux-x86	10 Sep 2005 20:59:51 -0000
>@@ -5,4 +5,5 @@
> CONFIG_NAME = linux-x86
> 
> ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
>-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
>+ASM_SOURCES = $(X86_SOURCES)
>+ASM_API = $(X86_API)
>Index: configs/linux-x86-64
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-x86-64,v
>retrieving revision 1.9
>diff -u -r1.9 linux-x86-64
>--- configs/linux-x86-64	2 Jul 2005 08:29:57 -0000	1.9
>+++ configs/linux-x86-64	10 Sep 2005 20:59:51 -0000
>@@ -6,7 +6,8 @@
> 
> ARCH_FLAGS = -m64
> 
>-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
>+ASM_SOURCES = $(X86-64_SOURCES)
>+ASM_API = $(X86-64_API)
> ASM_FLAGS = -DUSE_X86_64_ASM
> 
> LIB_DIR = $(TOP)/lib64
>Index: configs/linux-x86-glide
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-x86-glide,v
>retrieving revision 1.4
>diff -u -r1.4 linux-x86-glide
>--- configs/linux-x86-glide	13 Sep 2004 21:04:48 -0000	1.4
>+++ configs/linux-x86-glide	10 Sep 2005 20:59:51 -0000
>@@ -15,7 +15,8 @@
> GLUT_CFLAGS = -fexceptions
> 
> 
>-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
>+ASM_SOURCES = $(X86_SOURCES)
>+ASM_API = $(X86_API)
> 
> # Library/program dependencies
> GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
>Index: configs/linux-x86-xcb
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/linux-x86-xcb,v
>retrieving revision 1.1
>diff -u -r1.1 linux-x86-xcb
>--- configs/linux-x86-xcb	7 May 2005 17:21:11 -0000	1.1
>+++ configs/linux-x86-xcb	10 Sep 2005 20:59:51 -0000
>@@ -15,7 +15,8 @@
> GLUT_CFLAGS = -fexceptions
> 
> 
>-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
>+ASM_SOURCES = $(X86_SOURCES)
>+ASM_API = $(X86_API)
> 
> # Library/program dependencies
> GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lXCB
>Index: configs/sunos5-gcc
>===================================================================
>RCS file: /cvs/mesa/Mesa/configs/sunos5-gcc,v
>retrieving revision 1.4
>diff -u -r1.4 sunos5-gcc
>--- configs/sunos5-gcc	28 Jul 2005 00:11:10 -0000	1.4
>+++ configs/sunos5-gcc	10 Sep 2005 20:59:51 -0000
>@@ -16,7 +16,8 @@
> 
> DEFINES = -D_REENTRANT -DUSE_XSHM
> 
>-ASM_SOURCES = $(SPARC_SOURCES) $(SPARC_API)
>+ASM_SOURCES = $(SPARC_SOURCES)
>+ASM_API = $(SPARC_API)
> ASM_FLAGS = -DUSE_SPARC_ASM
> 
> CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
>Index: src/glx/x11/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glx/x11/Makefile,v
>retrieving revision 1.20
>diff -u -r1.20 Makefile
>--- src/glx/x11/Makefile	19 Aug 2005 20:20:03 -0000	1.20
>+++ src/glx/x11/Makefile	10 Sep 2005 20:59:53 -0000
>@@ -3,10 +3,7 @@
> 
> DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
> 
>-C_SOURCES = \
>-	  $(TOP)/src/mesa/glapi/glapi.c \
>-	  $(TOP)/src/mesa/glapi/glthread.c \
>-	  $(TOP)/src/mesa/main/dispatch.c \
>+SOURCES = \
> 	  glcontextmodes.c \
> 	  clientattrib.c \
> 	  compsize.c \
>@@ -33,15 +30,15 @@
> 	  glx_query.c \
> 	  glx_texture_compression.c \
> 	  dri_glx.c \
>-	  XF86dri.c \
>+	  XF86dri.c
> 
>-X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S
>-X86-64_SOURCES = $(TOP)/src/mesa/x86-64/glapi_x86-64.S
>+include $(TOP)/src/mesa/sources
> 
>-# ASM_SOURCES = $(X86_SOURCES)
>+MESA_ASM_API = $(addprefix $(TOP)/src/mesa/, $(ASM_API))
>+MESA_GLAPI_SOURCES = $(addprefix $(TOP)/src/mesa/, $(GLAPI_SOURCES))
>+MESA_GLAPI_OBJECTS = $(addprefix $(TOP)/src/mesa/, $(GLAPI_OBJECTS))
> 
>-OBJECTS = $(C_SOURCES:.c=.o) \
>-	  $(ASM_SOURCES:.S=.o)
>+OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS)
> 
> INCLUDES = -I. \
> 	-I$(TOP)/include \
>@@ -75,9 +72,10 @@
> 		-install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
> 
> 
>-depend: $(C_SOURCES) $(ASM_SOURCES) Makefile
>+depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
> 	touch depend
>-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) 
>+	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) \
>+		$(MESA_GLAPI_SOURCES) $(MESA_ASM_API) 
> 
> 
> # Emacs tags
>Index: src/mesa/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/Makefile,v
>retrieving revision 1.32
>diff -u -r1.32 Makefile
>--- src/mesa/Makefile	10 Sep 2005 16:41:17 -0000	1.32
>+++ src/mesa/Makefile	10 Sep 2005 20:59:53 -0000
>@@ -57,7 +57,7 @@
> 		mimeset -f "$@" ; \
> 	fi
> 
>-linux-solo: depend subdirs mesa.a
>+linux-solo: depend subdirs libmesa.a
> 	cd drivers/dri ; $(MAKE)
> 
> 
>Index: src/mesa/sources
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/sources,v
>retrieving revision 1.48
>diff -u -r1.48 sources
>--- src/mesa/sources	10 Sep 2005 16:41:17 -0000	1.48
>+++ src/mesa/sources	10 Sep 2005 20:59:54 -0000
>@@ -16,7 +16,6 @@
> 	main/convolve.c \
> 	main/debug.c \
> 	main/depth.c \
>-	main/dispatch.c \
> 	main/dlist.c \
> 	main/drawpix.c \
> 	main/enable.c \
>@@ -59,6 +58,7 @@
> 	main/vtxfmt.c
> 
> GLAPI_SOURCES = \
>+	main/dispatch.c \
> 	glapi/glapi.c \
> 	glapi/glthread.c
> 
>@@ -302,6 +302,10 @@
> 
> #	$(SLANG_C_SOURCES)
> 
>+CORE_SOURCES = \
>+	$(GLAPI_SOURCES)	\
>+	$(SOLO_SOURCES)
>+
> 
> ### Object files
> 
>@@ -311,7 +315,7 @@
> 
> GLAPI_OBJECTS = \
> 	$(GLAPI_SOURCES:.c=.o) \
>-	$(ASM_API_SOURCES:.S=.o)
>+	$(ASM_API:.S=.o)
> 
> CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
>

Actions: View | Splinter Review

Attachments on bug 4415: 3222

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.