Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
5aaf557055 | ||
|
b6bfc03bc0 | ||
|
6c86eb2c90 | ||
|
5377bdd74c | ||
|
48e097e427 | ||
|
ce859b97c6 | ||
|
4ac3d5dcb5 | ||
|
c39f9a59c9 | ||
|
6fc60624a6 | ||
|
67e3596ed7 | ||
|
e0c4a82815 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -6,3 +6,7 @@ mesa-20100529.tar.bz2
|
||||
mesa-20100612.tar.bz2
|
||||
mesa-20100709.tar.bz2
|
||||
mesa-20100720.tar.bz2
|
||||
/mesa-20101014.tar.bz2
|
||||
/mesa-20101130.tar.bz2
|
||||
/mesa-20101207.tar.bz2
|
||||
/mesa-20101220.tar.bz2
|
||||
|
@ -1,12 +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)
|
||||
$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
|
||||
diff -up mesa-20100922/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20100922/src/mesa/drivers/osmesa/Makefile
|
||||
--- mesa-20100922/src/mesa/drivers/osmesa/Makefile.osmesa 2010-09-22 06:58:24.000000000 +1000
|
||||
+++ mesa-20100922/src/mesa/drivers/osmesa/Makefile 2010-09-22 08:30:40.000000000 +1000
|
||||
@@ -37,7 +37,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 '$(CXX)' -ldflags '$(LDFLAGS)' \
|
||||
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
|
||||
+ -major 6 -minor 5 -patch 3 \
|
||||
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
|
||||
-install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \
|
||||
-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
|
||||
$(OSMESA_LIB_DEPS) $(OBJECTS)
|
||||
$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
|
||||
|
12
mesa-7.11-generic-wmb.patch
Normal file
12
mesa-7.11-generic-wmb.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h
|
||||
--- Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx 2010-12-14 16:43:15.000000000 -0500
|
||||
+++ Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h 2011-09-09 11:47:56.454465358 -0400
|
||||
@@ -405,7 +405,7 @@ struct sis_context
|
||||
#elif defined(__ia64__)
|
||||
#define MMIO_WMB() __asm __volatile("mf" : : : "memory")
|
||||
#else
|
||||
-#error platform needs WMB
|
||||
+#define MMIO_WMB() __sync_synchronize()
|
||||
#endif
|
||||
|
||||
#define mEndPrimitive() \
|
26
mesa-7.9-i915-no-gen3-arbfs.patch
Normal file
26
mesa-7.9-i915-no-gen3-arbfs.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Hooker <sarvatt@ubuntu.com>
|
||||
Date: Wed, 8 Sep 2010 12:33:09 -0400
|
||||
Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default."
|
||||
|
||||
This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d.
|
||||
---
|
||||
src/mesa/drivers/dri/intel/intel_screen.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
|
||||
index 0a542a7..8ae2cd2 100644
|
||||
--- a/src/mesa/drivers/dri/intel/intel_screen.c
|
||||
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
|
||||
@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] =
|
||||
DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).")
|
||||
DRI_CONF_OPT_END
|
||||
|
||||
- DRI_CONF_OPT_BEGIN(fragment_shader, bool, true)
|
||||
+ DRI_CONF_OPT_BEGIN(fragment_shader, bool, false)
|
||||
DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.")
|
||||
DRI_CONF_OPT_END
|
||||
|
||||
--
|
||||
1.7.2
|
||||
|
26
mesa-7.9-i965-fp-crash.patch
Normal file
26
mesa-7.9-i965-fp-crash.patch
Normal file
@ -0,0 +1,26 @@
|
||||
--- a/src/mesa/drivers/dri/i965/brw_wm_glsl.c.orig 2011-07-28 20:09:34.533951464 +0100
|
||||
+++ a/src/mesa/drivers/dri/i965/brw_wm_glsl.c 2011-07-28 20:10:57.856027779 +0100
|
||||
@@ -237,11 +237,12 @@
|
||||
* This is called if we run out of GRF registers. Examine the live intervals
|
||||
* of temp regs in the program and free those which won't be used again.
|
||||
*/
|
||||
+#define REG_ALLOCATE_MAX_PROGRAM_TEMPS ((1<<INST_INDEX_BITS)-1)
|
||||
static void
|
||||
reclaim_temps(struct brw_wm_compile *c)
|
||||
{
|
||||
- GLint intBegin[MAX_PROGRAM_TEMPS];
|
||||
- GLint intEnd[MAX_PROGRAM_TEMPS];
|
||||
+ GLint intBegin[REG_ALLOCATE_MAX_PROGRAM_TEMPS];
|
||||
+ GLint intEnd[REG_ALLOCATE_MAX_PROGRAM_TEMPS];
|
||||
int index;
|
||||
|
||||
/*printf("Reclaim temps:\n");*/
|
||||
@@ -249,7 +250,7 @@
|
||||
_mesa_find_temp_intervals(c->prog_instructions, c->nr_fp_insns,
|
||||
intBegin, intEnd);
|
||||
|
||||
- for (index = 0; index < MAX_PROGRAM_TEMPS; index++) {
|
||||
+ for (index = 0; index < REG_ALLOCATE_MAX_PROGRAM_TEMPS; index++) {
|
||||
if (intEnd[index] != -1 && intEnd[index] < c->cur_inst) {
|
||||
/* program temp[i] can be freed */
|
||||
int component;
|
47
mesa.spec
47
mesa.spec
@ -13,7 +13,7 @@
|
||||
|
||||
%define manpages gl-manpages-1.0.1
|
||||
%define xdriinfo xdriinfo-1.0.3
|
||||
%define gitdate 20100720
|
||||
%define gitdate 20101220
|
||||
%define demosgitdate 20100529
|
||||
#% define snapshot
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
Summary: Mesa graphics libraries
|
||||
Name: mesa
|
||||
Version: 7.9
|
||||
Release: 0.6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: MIT
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.mesa3d.org
|
||||
@ -50,6 +50,9 @@ Patch5: mesa-demos-fix-add-needed.patch
|
||||
#Patch7: mesa-7.1-link-shared.patch
|
||||
|
||||
Patch30: mesa-7.6-hush-vblank-warning.patch
|
||||
Patch31: mesa-7.9-i915-no-gen3-arbfs.patch
|
||||
Patch32: mesa-7.11-generic-wmb.patch
|
||||
Patch33: mesa-7.9-i965-fp-crash.patch
|
||||
|
||||
BuildRequires: pkgconfig autoconf automake libtool
|
||||
%if %{with_hardware}
|
||||
@ -72,6 +75,7 @@ BuildRequires: glew-devel
|
||||
BuildRequires: elfutils
|
||||
BuildRequires: python
|
||||
BuildRequires: libxml2-python
|
||||
BuildRequires: libtalloc-devel
|
||||
|
||||
%description
|
||||
Mesa
|
||||
@ -95,6 +99,7 @@ Mesa libGL runtime library.
|
||||
%package dri-drivers
|
||||
Summary: Mesa-based DRI drivers
|
||||
Group: User Interface/X Hardware Support
|
||||
Requires: libtalloc
|
||||
%description dri-drivers
|
||||
Mesa-based DRI drivers.
|
||||
|
||||
@ -194,6 +199,9 @@ Group: User Interface/X Hardware Support
|
||||
%patch4 -p1 -b .nouveau
|
||||
#%patch7 -p1 -b .dricore
|
||||
%patch30 -p1 -b .vblank-warning
|
||||
%patch31 -p1 -b .arbfs
|
||||
%patch32 -p1 -b .wmb
|
||||
%patch33 -p1 -b .fpcrash
|
||||
|
||||
# Hack the demos to use installed data files
|
||||
cd ../%{demopkg}
|
||||
@ -290,7 +298,7 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
|
||||
install -d $RPM_BUILD_ROOT%{_libdir}/dri
|
||||
#install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null
|
||||
# use gallium r300 driver iff built
|
||||
[ -f %{_lib}/gallium/radeong_dri.so ] && cp %{_lib}/gallium/radeong_dri.so %{_lib}/r300_dri.so
|
||||
[ -f %{_lib}/gallium/r300_dri.so ] && cp %{_lib}/gallium/r300_dri.so %{_lib}/r300_dri.so
|
||||
for f in i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome nouveau_vieux gallium/vmwgfx; do
|
||||
so=%{_lib}/${f}_dri.so
|
||||
test -e $so && echo $so
|
||||
@ -429,6 +437,39 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{demodir}
|
||||
|
||||
%changelog
|
||||
* Wed Nov 09 2011 Adam Jackson <ajax@redhat.com> 7.9-7
|
||||
- mesa-7.9-i965-fp-crash.patch: Fix crash in i965's fragment program
|
||||
compiler (#726496)
|
||||
|
||||
* Thu Sep 15 2011 Adam Jackson <ajax@redhat.com> 7.9-6
|
||||
- mesa-7.11-generic-wmb.patch: Add generic write memory barrier macro for
|
||||
non-PC arches.
|
||||
|
||||
* Mon Dec 20 2010 Dave Airlie <airlied@redhat.com> 7.9-5
|
||||
- fix lightspark GLSL issues + r300/r400 corrupt textures + rs690 textures
|
||||
|
||||
* Tue Dec 07 2010 Dave Airlie <airlied@redhat.com> 7.9-4
|
||||
- fix r300 not working on certain cards (#651972)
|
||||
|
||||
* Tue Nov 30 2010 Dave Airlie <airlied@redhat.com> 7.9-3
|
||||
- 7.9 branch fixes
|
||||
|
||||
* Mon Nov 01 2010 Adam Jackson <ajax@redhat.com> 7.9-2
|
||||
- mesa-7.9-i915-no-gen3-arbfs.patch: Disable ARB_fragment_shader on intel
|
||||
gen3 by default for now (#640375)
|
||||
|
||||
* Thu Oct 14 2010 Dave Airlie <airlied@redhat.com> 7.9-1
|
||||
- 7.9 branch post release + fixes
|
||||
|
||||
* Tue Oct 05 2010 jkeating - 7.9-0.8.1
|
||||
- Rebuilt for gcc bug 634757
|
||||
|
||||
* Thu Sep 23 2010 Dave Airlie <airlied@redhat.com> 7.9-0.8
|
||||
- fixup selecting r300 gallium driver (thanks to Nicolas PENINGUY)
|
||||
|
||||
* Wed Sep 22 2010 Dave Airlie <airlied@redhat.com> 7.9-0.7
|
||||
- update to latest 7.9 prelease snapshot
|
||||
|
||||
* Tue Jul 20 2010 Dave Airlie <airlied@redhat.com> 7.9-0.6
|
||||
- snapshot latest git
|
||||
|
||||
|
2
sources
2
sources
@ -1,4 +1,4 @@
|
||||
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
|
||||
cb304d1ce562ac48b68eedeba38c662f xdriinfo-1.0.3.tar.bz2
|
||||
b4d32564ccc411bbfcfe657f42d3632d mesa-demos-20100529.tar.bz2
|
||||
339f8241ef63673469fcbb05de10ed84 mesa-20100720.tar.bz2
|
||||
fd899bc01f1630302970b1894b51f8c0 mesa-20101220.tar.bz2
|
||||
|
Loading…
Reference in New Issue
Block a user