- reset whole place back to 7.3-6 - bad plan

This commit is contained in:
Dave Airlie 2009-02-27 09:41:56 +00:00
parent 170ba7cda8
commit a5cda00fd4
4 changed files with 646 additions and 13306 deletions

View File

@ -1,8 +1,7 @@
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 787c290..be81b65 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -573,11 +573,6 @@ intel_render_texture(GLcontext * ctx,
diff -up Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c
--- Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread 2008-08-25 10:49:40.000000000 -0400
+++ Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c 2008-08-28 14:26:17.000000000 -0400
@@ -633,11 +633,6 @@ intel_render_texture(GLcontext * ctx,
return;
}
@ -14,3 +13,12 @@ index 787c290..be81b65 100644
/* point the renderbufer's region to the texture image region */
intel_image = intel_texture_image(newImage);
if (irb->region != intel_image->mt->region) {
@@ -674,8 +669,6 @@ intel_finish_render_texture(GLcontext *
{
struct intel_renderbuffer *irb = intel_renderbuffer(att->Renderbuffer);
- DBG("End render texture (tid %x) tex %u\n", _glthread_GetID(), att->Texture->Name);
-
if (irb) {
/* just release the region */
intel_region_release(&irb->region);

File diff suppressed because it is too large Load Diff

View File

@ -37,7 +37,6 @@ Source3: make-git-snapshot.sh
Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2
Patch0: mesa-7.1-osmesa-version.patch
Patch1: mesa-7.3-dri-drivers-master.patch
Patch2: mesa-7.1-nukeglthread-debug.patch
Patch3: mesa-no-mach64.patch
@ -47,6 +46,7 @@ Patch7: mesa-7.1-link-shared.patch
Patch9: intel-revert-vbl.patch
Patch12: mesa-7.1-disable-intel-classic-warn.patch
Patch13: mesa-7.3-965-texture-size.patch
BuildRequires: pkgconfig autoconf automake
%if %{with_dri}
@ -168,13 +168,13 @@ This package provides some demo applications for testing Mesa.
%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b1 -b2 -b5
#%setup -q -n mesa-%{gitdate} -b2 -b5
%patch0 -p1 -b .osmesa
%patch1 -p1 -b .mesa-dri-master
%patch2 -p1 -b .intel-glthread
%patch3 -p0 -b .no-mach64
%patch5 -p1 -b .radeon-rewrite
%patch7 -p1 -b .dricore
%patch9 -p1 -b .intel-vbl
%patch12 -p1 -b .intel-nowarn
%patch13 -p1 -b .965-texture
# Hack the demos to use installed data files
sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@ -424,10 +424,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Feb 27 2009 Dave Airlie <airlied@redhat.com> 7.3-8
- mesa-7.3-dri-drivers-master.patch - pull in DRI drivers from master
* Fri Feb 27 2009 Dave Airlie <airlied@redhat.com> 7.3-7
- radeon-dri2-fixes.patch: add some fixes to radeon code
- reset whole place back to 7.3-6 - bad plan
* Tue Feb 24 2009 Adam Jackson <ajax@redhat.com> 7.3-6
- Fix text relocations in OSMesa build. (#475146)

File diff suppressed because it is too large Load Diff