- rebase mesa to latest git snapshot - fixes a lot of radeon issues
This commit is contained in:
Dave Airlie
parent
6e828bbd36
commit
3126ab66e1
|
|
@ -4,3 +4,4 @@ MesaDemos-7.3.tar.bz2
|
|||
MesaLib-7.3.tar.bz2
|
||||
mesa-20090322.tar.bz2
|
||||
mesa-20090428.tar.bz2
|
||||
mesa-20090612.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,21 +1,12 @@
|
|||
diff -up Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx Mesa-7.1/src/mesa/drivers/osmesa/Makefile
|
||||
--- Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx 2008-08-28 14:05:47.000000000 -0400
|
||||
+++ Mesa-7.1/src/mesa/drivers/osmesa/Makefile 2008-08-28 14:07:13.000000000 -0400
|
||||
@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
|
||||
|
||||
$(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
|
||||
diff -up mesa-20090612/src/mesa/drivers/osmesa/Makefile.dma mesa-20090612/src/mesa/drivers/osmesa/Makefile
|
||||
--- mesa-20090612/src/mesa/drivers/osmesa/Makefile.dma 2009-06-12 13:57:29.000000000 +1000
|
||||
+++ mesa-20090612/src/mesa/drivers/osmesa/Makefile 2009-06-12 13:57:42.000000000 +1000
|
||||
@@ -39,7 +39,7 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_
|
||||
# -DCHAN_BITS=16/32.
|
||||
$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
|
||||
$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
|
||||
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
|
||||
+ -major 6 -minor 5 -patch 3 \
|
||||
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
|
||||
-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
|
||||
$(OSMESA_LIB_DEPS) $(OBJECTS)
|
||||
@@ -58,7 +58,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS
|
||||
# with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
|
||||
osmesa16: $(OBJECTS) $(CORE_MESA)
|
||||
$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
|
||||
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
|
||||
+ -major 6 -minor 5 -patch 3 \
|
||||
+ -major 6 -minor 5 -patch 4 \
|
||||
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
|
||||
-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
|
||||
$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up mesa-20090428/src/mesa/drivers/dri/r300/r300_cmdbuf.c.jx mesa-20090428/src/mesa/drivers/dri/r300/r300_cmdbuf.c
|
||||
--- mesa-20090428/src/mesa/drivers/dri/r300/r300_cmdbuf.c.jx 2009-05-18 11:17:36.000000000 -0400
|
||||
+++ mesa-20090428/src/mesa/drivers/dri/r300/r300_cmdbuf.c 2009-05-21 16:32:32.000000000 -0400
|
||||
@@ -251,7 +251,7 @@ static void emit_cb_offset(GLcontext *ct
|
||||
OUT_BATCH(((rrb->width - 1) << R300_SCISSORS_X_SHIFT) |
|
||||
((rrb->height - 1) << R300_SCISSORS_Y_SHIFT));
|
||||
END_BATCH();
|
||||
- BEGIN_BATCH_NO_AUTOSTATE(16);
|
||||
+ BEGIN_BATCH_NO_AUTOSTATE(7);
|
||||
for (i = 0; i < 1; i++) {
|
||||
OUT_BATCH_REGSEQ(R300_SC_CLIPRECT_TL_0 + (i * 8), 2);
|
||||
OUT_BATCH((0 << R300_CLIPRECT_X_SHIFT) | (0 << R300_CLIPRECT_Y_SHIFT));
|
||||
17
mesa.spec
17
mesa.spec
|
|
@ -14,15 +14,15 @@
|
|||
|
||||
%define manpages gl-manpages-1.0.1
|
||||
%define xdriinfo xdriinfo-1.0.2
|
||||
%define gitdate 20090428
|
||||
%define gitdate 20090612
|
||||
#% define snapshot
|
||||
|
||||
%define demodir %{_libdir}/mesa
|
||||
|
||||
Summary: Mesa graphics libraries
|
||||
Name: mesa
|
||||
Version: 7.5
|
||||
Release: 0.16%{?dist}
|
||||
Version: 7.6
|
||||
Release: 0.1%{?dist}
|
||||
License: MIT
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.mesa3d.org
|
||||
|
|
@ -42,17 +42,12 @@ Patch1: mesa-7.1-osmesa-version.patch
|
|||
Patch2: mesa-7.1-nukeglthread-debug.patch
|
||||
Patch3: mesa-no-mach64.patch
|
||||
|
||||
Patch6: radeon-rewrite.patch
|
||||
|
||||
Patch7: mesa-7.1-link-shared.patch
|
||||
Patch9: intel-revert-vbl.patch
|
||||
|
||||
Patch12: mesa-7.1-disable-intel-classic-warn.patch
|
||||
Patch13: mesa-7.5-sparc64.patch
|
||||
|
||||
Patch15: radeon-rewrite-emit1clip.patch
|
||||
Patch16: mesa-7.5-r300-batch-accounting.patch
|
||||
|
||||
BuildRequires: pkgconfig autoconf automake
|
||||
%if %{with_dri}
|
||||
BuildRequires: libdrm-devel >= 2.4.5-1
|
||||
|
|
@ -175,13 +170,10 @@ This package provides some demo applications for testing Mesa.
|
|||
%patch1 -p1 -b .osmesa
|
||||
%patch2 -p1 -b .intel-glthread
|
||||
%patch3 -p0 -b .no-mach64
|
||||
%patch6 -p1 -b .radeon-rewrite
|
||||
%patch7 -p1 -b .dricore
|
||||
%patch9 -p1 -b .intel-vbl
|
||||
%patch12 -p1 -b .intel-nowarn
|
||||
%patch13 -p1 -b .sparc64
|
||||
%patch15 -p1 -b .fix-clip
|
||||
%patch16 -p1 -b .r300-accounting
|
||||
|
||||
# Hack the demos to use installed data files
|
||||
sed -i 's,../images,%{_libdir}/mesa,' progs/demos/*.c
|
||||
|
|
@ -382,6 +374,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{demodir}
|
||||
|
||||
%changelog
|
||||
* Fri Jun 12 2009 Dave Airlie <airlied@redhat.com> 7.6-0.1
|
||||
- rebase mesa to latest git snapshot - fixes a lot of radeon issues
|
||||
|
||||
* Thu Jun 11 2009 Adam Jackson <ajax@redhat.com> 7.5-0.16
|
||||
- Install demos to %%{_libdir}/mesa
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
|
||||
index afca0e2..a006e8f 100644
|
||||
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
|
||||
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
|
||||
@@ -252,7 +252,7 @@ static void emit_cb_offset(GLcontext *ctx, struct radeon_state_atom * atom)
|
||||
((rrb->height - 1) << R300_SCISSORS_Y_SHIFT));
|
||||
END_BATCH();
|
||||
BEGIN_BATCH_NO_AUTOSTATE(16);
|
||||
- for (i = 0; i < 4; i++) {
|
||||
+ for (i = 0; i < 1; i++) {
|
||||
OUT_BATCH_REGSEQ(R300_SC_CLIPRECT_TL_0 + (i * 8), 2);
|
||||
OUT_BATCH((0 << R300_CLIPRECT_X_SHIFT) | (0 << R300_CLIPRECT_Y_SHIFT));
|
||||
OUT_BATCH(((rrb->width - 1) << R300_CLIPRECT_X_SHIFT) | ((rrb->height - 1) << R300_CLIPRECT_Y_SHIFT));
|
||||
40231
radeon-rewrite.patch
40231
radeon-rewrite.patch
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue