- Update mesa to latest git snapshot - drop patches merged upstream
This commit is contained in:
parent
93054d764e
commit
f8d0402a0c
@ -1 +1 @@
|
|||||||
mesa-20080415.tar.bz2
|
mesa-20080612.tar.bz2
|
||||||
|
@ -1,41 +1,6 @@
|
|||||||
diff -up mesa-20080331/src/mesa/x86/read_rgba_span_x86.S.jx mesa-20080331/src/mesa/x86/read_rgba_span_x86.S
|
diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.dricore mesa-20080612/src/mesa/drivers/dri/Makefile
|
||||||
--- mesa-20080331/src/mesa/x86/read_rgba_span_x86.S.jx 2008-03-31 16:58:48.000000000 -0400
|
--- mesa-20080612/src/mesa/drivers/dri/Makefile.dricore 2008-06-12 12:06:50.000000000 +1000
|
||||||
+++ mesa-20080331/src/mesa/x86/read_rgba_span_x86.S 2008-04-10 12:11:31.000000000 -0400
|
+++ mesa-20080612/src/mesa/drivers/dri/Makefile 2008-06-12 13:25:58.000000000 +1000
|
||||||
@@ -77,7 +77,6 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
.globl _generic_read_RGBA_span_BGRA8888_REV_MMX
|
|
||||||
-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
|
|
||||||
.type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
|
|
||||||
_generic_read_RGBA_span_BGRA8888_REV_MMX:
|
|
||||||
pushl %ebx
|
|
||||||
@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
|
|
||||||
*/
|
|
||||||
|
|
||||||
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE
|
|
||||||
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
|
|
||||||
.type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
|
|
||||||
_generic_read_RGBA_span_BGRA8888_REV_SSE:
|
|
||||||
pushl %esi
|
|
||||||
@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
|
|
||||||
|
|
||||||
.text
|
|
||||||
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
|
|
||||||
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
|
|
||||||
.type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
|
|
||||||
_generic_read_RGBA_span_BGRA8888_REV_SSE2:
|
|
||||||
pushl %esi
|
|
||||||
@@ -492,7 +489,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
|
|
||||||
|
|
||||||
.text
|
|
||||||
.globl _generic_read_RGBA_span_RGB565_MMX
|
|
||||||
- .hidden _generic_read_RGBA_span_RGB565_MMX
|
|
||||||
.type _generic_read_RGBA_span_RGB565_MMX, @function
|
|
||||||
|
|
||||||
_generic_read_RGBA_span_RGB565_MMX:
|
|
||||||
diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.jx mesa-20080331/src/mesa/drivers/dri/Makefile
|
|
||||||
--- mesa-20080331/src/mesa/drivers/dri/Makefile.jx 2008-03-31 16:58:48.000000000 -0400
|
|
||||||
+++ mesa-20080331/src/mesa/drivers/dri/Makefile 2008-04-10 12:02:30.000000000 -0400
|
|
||||||
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
|
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
|
||||||
|
|
||||||
|
|
||||||
@ -67,19 +32,19 @@ diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.jx mesa-20080331/src/mesa/d
|
|||||||
fi \
|
fi \
|
||||||
done
|
done
|
||||||
+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
|
+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
|
||||||
+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
|
+ $(INSTALL) -m 755 -d $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
|
||||||
$(TOP)/bin/minstall -d $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
|
$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
|
||||||
$(TOP)/bin/minstall -m 0644 $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
|
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
|
||||||
$(TOP)/bin/minstall -m 0644 $(TOP)/include/GL/internal/dri_sarea.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
|
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_sarea.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
|
||||||
@@ -38,4 +45,5 @@ clean:
|
@@ -38,4 +45,5 @@ clean:
|
||||||
(cd $$dir && $(MAKE) clean) ; \
|
(cd $$dir && $(MAKE) clean) ; \
|
||||||
fi \
|
fi \
|
||||||
done
|
done
|
||||||
+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
|
+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
|
||||||
-rm -f common/*.o
|
-rm -f common/*.o
|
||||||
diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.template.jx mesa-20080331/src/mesa/drivers/dri/Makefile.template
|
diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080612/src/mesa/drivers/dri/Makefile.template
|
||||||
--- mesa-20080331/src/mesa/drivers/dri/Makefile.template.jx 2008-03-31 16:58:48.000000000 -0400
|
--- mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore 2008-06-12 12:06:50.000000000 +1000
|
||||||
+++ mesa-20080331/src/mesa/drivers/dri/Makefile.template 2008-04-10 12:02:30.000000000 -0400
|
+++ mesa-20080612/src/mesa/drivers/dri/Makefile.template 2008-06-12 13:15:34.000000000 +1000
|
||||||
@@ -1,6 +1,6 @@
|
@@ -1,6 +1,6 @@
|
||||||
# -*-makefile-*-
|
# -*-makefile-*-
|
||||||
|
|
||||||
@ -87,8 +52,8 @@ diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.template.jx mesa-20080331/s
|
|||||||
+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
|
+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
|
||||||
|
|
||||||
COMMON_SOURCES = \
|
COMMON_SOURCES = \
|
||||||
../../common/driverfuncs.c \
|
../common/utils.c \
|
||||||
@@ -70,7 +70,9 @@ default: symlinks depend $(LIBNAME) $(TO
|
@@ -69,7 +69,9 @@ default: symlinks depend $(LIBNAME) $(TO
|
||||||
|
|
||||||
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
|
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
|
||||||
$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
|
$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
|
||||||
@ -99,3 +64,38 @@ diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.template.jx mesa-20080331/s
|
|||||||
|
|
||||||
|
|
||||||
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
|
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
|
||||||
|
diff -up mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080612/src/mesa/x86/read_rgba_span_x86.S
|
||||||
|
--- mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-06-12 12:06:50.000000000 +1000
|
||||||
|
+++ mesa-20080612/src/mesa/x86/read_rgba_span_x86.S 2008-06-12 13:15:34.000000000 +1000
|
||||||
|
@@ -77,7 +77,6 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
.globl _generic_read_RGBA_span_BGRA8888_REV_MMX
|
||||||
|
-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
|
||||||
|
.type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
|
||||||
|
_generic_read_RGBA_span_BGRA8888_REV_MMX:
|
||||||
|
pushl %ebx
|
||||||
|
@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
|
||||||
|
*/
|
||||||
|
|
||||||
|
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE
|
||||||
|
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
|
||||||
|
.type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
|
||||||
|
_generic_read_RGBA_span_BGRA8888_REV_SSE:
|
||||||
|
pushl %esi
|
||||||
|
@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
|
||||||
|
|
||||||
|
.text
|
||||||
|
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
|
||||||
|
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
|
||||||
|
.type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
|
||||||
|
_generic_read_RGBA_span_BGRA8888_REV_SSE2:
|
||||||
|
pushl %esi
|
||||||
|
@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
|
||||||
|
|
||||||
|
.text
|
||||||
|
.globl _generic_read_RGBA_span_RGB565_MMX
|
||||||
|
- .hidden _generic_read_RGBA_span_RGB565_MMX
|
||||||
|
.type _generic_read_RGBA_span_RGB565_MMX, @function
|
||||||
|
|
||||||
|
_generic_read_RGBA_span_RGB565_MMX:
|
||||||
|
Loading…
Reference in New Issue
Block a user