Merge remote-tracking branch 'origin/f16' into f15
Conflicts: .gitignore
This commit is contained in:
Adam Jackson
commit
4631d3b19b
|
|
@ -22,7 +22,6 @@ mesa-20100720.tar.bz2
|
|||
/mesa-20110330.tar.xz
|
||||
/mesa-20110401.tar.xz
|
||||
/mesa-20110412.tar.xz
|
||||
<<<<<<< HEAD
|
||||
/mesa-20110506.tar.xz
|
||||
/mesa-20110509.tar.xz
|
||||
/mesa-20110525.tar.xz
|
||||
|
|
@ -31,8 +30,5 @@ mesa-20100720.tar.bz2
|
|||
/mesa-20110709.tar.xz
|
||||
/mesa-20110729.tar.xz
|
||||
/mesa-20110730.tar.xz
|
||||
=======
|
||||
/mesa-20110620.tar.xz
|
||||
/mesa-20110730.tar.xz
|
||||
/MesaLib-7.11.tar.bz2
|
||||
>>>>>>> f16
|
||||
/mesa-20111103.tar.xz
|
||||
/MesaLib-7.11.2.tar.bz2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
diff -up Mesa-7.11/src/gallium/drivers/nv50/nv50_screen.c.jx Mesa-7.11/src/gallium/drivers/nv50/nv50_screen.c
|
||||
--- Mesa-7.11/src/gallium/drivers/nv50/nv50_screen.c.jx 2011-07-08 21:37:09.000000000 -0400
|
||||
+++ Mesa-7.11/src/gallium/drivers/nv50/nv50_screen.c 2011-10-25 13:20:36.605408094 -0400
|
||||
@@ -76,11 +76,11 @@ nv50_screen_get_param(struct pipe_screen
|
||||
case PIPE_CAP_MAX_COMBINED_SAMPLERS:
|
||||
return 64;
|
||||
case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
|
||||
- return 13;
|
||||
+ return 14;
|
||||
case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
|
||||
- return 10;
|
||||
+ return 12;
|
||||
case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
|
||||
- return 13;
|
||||
+ return 14;
|
||||
case PIPE_CAP_ARRAY_TEXTURES: /* shader support missing */
|
||||
return 0;
|
||||
case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
From 4258e9b3a5eeaa90f2a0485576d7d17d6d8e4d6f Mon Sep 17 00:00:00 2001
|
||||
From: Marc Pignat <marc@pignat.org>
|
||||
Date: Tue, 28 Jun 2011 13:21:58 +0000
|
||||
Subject: drisw: Fix 24bpp software rendering, take 2
|
||||
|
||||
This patch add the support for 24bpp in the dri/swrast implementation.
|
||||
See http://bugs.freedesktop.org/show_bug.cgi?id=23525
|
||||
|
||||
Signed-off-by: Marc Pignat <marc at pignat.org>
|
||||
Signed-off-by: Brian Paul <brianp@vmware.com>
|
||||
(cherry picked from commit cfec000e7514342fd51859906e173ba2d474a55c)
|
||||
---
|
||||
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
|
||||
index 07d4955..a57b327 100644
|
||||
--- a/src/glx/drisw_glx.c
|
||||
+++ b/src/glx/drisw_glx.c
|
||||
@@ -100,6 +100,13 @@ XCreateDrawable(struct drisw_drawable * pdp,
|
||||
32, /* bitmap_pad */
|
||||
0); /* bytes_per_line */
|
||||
|
||||
+ /**
|
||||
+ * swrast does not handle 24-bit depth with 24 bpp, so let X do the
|
||||
+ * the conversion for us.
|
||||
+ */
|
||||
+ if (pdp->ximage->bits_per_pixel == 24)
|
||||
+ pdp->ximage->bits_per_pixel = 32;
|
||||
+
|
||||
return True;
|
||||
}
|
||||
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
35
mesa.spec
35
mesa.spec
|
|
@ -20,13 +20,13 @@
|
|||
%define _default_patch_fuzz 2
|
||||
|
||||
%define manpages gl-manpages-1.0.1
|
||||
#define gitdate 20110730
|
||||
#define gitdate 20111103
|
||||
#% define snapshot
|
||||
|
||||
Summary: Mesa graphics libraries
|
||||
Name: mesa
|
||||
Version: 7.11
|
||||
Release: 4%{?dist}
|
||||
Version: 7.11.2
|
||||
Release: 1%{?dist}
|
||||
License: MIT
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.mesa3d.org
|
||||
|
|
@ -48,6 +48,7 @@ Patch8: mesa-7.10-llvmcore.patch
|
|||
Patch30: mesa-7.6-hush-vblank-warning.patch
|
||||
Patch31: mesa-7.10-swrastg.patch
|
||||
Patch32: mesa-7.11-generic-wmb.patch
|
||||
Patch34: 0001-nv50-fix-max-texture-levels.patch
|
||||
|
||||
BuildRequires: pkgconfig autoconf automake libtool
|
||||
%if %{with_hardware}
|
||||
|
|
@ -83,6 +84,7 @@ Requires(post): /sbin/ldconfig
|
|||
Requires(postun): /sbin/ldconfig
|
||||
Provides: libGL
|
||||
Requires: libdrm%{?isa} >= 2.4.23-1
|
||||
Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
|
||||
%if %{with_hardware}
|
||||
Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
|
||||
%endif
|
||||
|
|
@ -123,7 +125,7 @@ Summary: Mesa-based DRI drivers
|
|||
Group: User Interface/X Hardware Support
|
||||
Requires: mesa-dri-filesystem%{?_isa}
|
||||
Obsoletes: mesa-dri-drivers-experimental < 0:7.10-0.24
|
||||
Obsoletes: mesa-dri-llvmcore <= 7.11-0.8
|
||||
Obsoletes: mesa-dri-llvmcore <= 7.12
|
||||
%description dri-drivers
|
||||
Mesa-based DRI drivers.
|
||||
|
||||
|
|
@ -222,6 +224,7 @@ Mesa offscreen rendering development package
|
|||
%patch30 -p1 -b .vblank-warning
|
||||
#patch31 -p1 -b .swrastg
|
||||
%patch32 -p1 -b .wmb
|
||||
%patch34 -p1 -b .nv50-texlevel
|
||||
|
||||
%build
|
||||
|
||||
|
|
@ -460,6 +463,30 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_libdir}/pkgconfig/osmesa.pc
|
||||
|
||||
%changelog
|
||||
* Mon Nov 28 2011 Adam Jackson <ajax@redhat.com> 7.11.2-1
|
||||
- Mesa 7.11.2
|
||||
- Pull in archful -dri-drivers for libGL to pacify wine (#757464)
|
||||
|
||||
* Wed Nov 09 2011 Adam Jackson <ajax@redhat.com> 7.11-11
|
||||
- Obsolete more -llvmcore (#752152)
|
||||
|
||||
* Thu Nov 03 2011 Dave Airlie <airlied@redhat.com> 7.11-10
|
||||
- snapshot latest mesa 7.11 stable branch (what will be 7.11.1)
|
||||
|
||||
* Thu Nov 03 2011 Adam Jackson <ajax@redhat.com> 7.11-9
|
||||
- mesa-7.11-fix-sw-24bpp.patch: Fix software rendering in 24bpp.
|
||||
|
||||
* Fri Oct 28 2011 Adam Jackson <ajax@redhat.com> 7.11-8
|
||||
- mesa-7.11-intel-swap-event.patch: Disable GLX_INTEL_swap_event by default;
|
||||
DRI2 enables it explicitly, but swrast doesn't and oughtn't. (#748747)
|
||||
|
||||
* Mon Oct 24 2011 Adam Jackson <ajax@redhat.com> 7.11-6
|
||||
- 0001-nv50-fix-max-texture-levels.patch: Fix maximum texture size on
|
||||
nouveau (and thus, gnome-shell init on wide display setups) (#748540)
|
||||
|
||||
* Mon Oct 24 2011 Adam Jackson <ajax@redhat.com> 7.11-5
|
||||
- mesa-7.11-drisw-glx13.patch: Fix GLX 1.3 ctors with swrast (#747276)
|
||||
|
||||
* Fri Sep 09 2011 Adam Jackson <ajax@redhat.com> 7.11-4
|
||||
- mesa-7.11-generic-wmb.patch: Add generic write memory barrier macro for
|
||||
non-PC arches.
|
||||
|
|
|
|||
Loading…
Reference in New Issue