From d0b5f9d6dcd728e3201197b93cd6bfd5ae2da46b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 25 Oct 2011 13:22:29 -0400 Subject: [PATCH] 0001-nv50-fix-max-texture-levels.patch: Fix maximum texture size on nouveau (and thus, gnome-shell init on wide display setups) (#748540) --- 0001-nv50-fix-max-texture-levels.patch | 18 ++++++++++++++++++ mesa.spec | 8 +++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 0001-nv50-fix-max-texture-levels.patch diff --git a/0001-nv50-fix-max-texture-levels.patch b/0001-nv50-fix-max-texture-levels.patch new file mode 100644 index 0000000..7f7783d --- /dev/null +++ b/0001-nv50-fix-max-texture-levels.patch @@ -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: diff --git a/mesa.spec b/mesa.spec index 2e2c766..650dd12 100644 --- a/mesa.spec +++ b/mesa.spec @@ -26,7 +26,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -49,6 +49,7 @@ Patch30: mesa-7.6-hush-vblank-warning.patch Patch31: mesa-7.10-swrastg.patch Patch32: mesa-7.11-generic-wmb.patch Patch33: mesa-7.11-drisw-glx13.patch +Patch34: 0001-nv50-fix-max-texture-levels.patch BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} @@ -224,6 +225,7 @@ Mesa offscreen rendering development package #patch31 -p1 -b .swrastg %patch32 -p1 -b .wmb %patch33 -p1 -b .glx13 +%patch34 -p1 -b .nv50-texlevel %build @@ -462,6 +464,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/osmesa.pc %changelog +* Mon Oct 24 2011 Adam Jackson 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 7.11-5 - mesa-7.11-drisw-glx13.patch: Fix GLX 1.3 ctors with swrast (#747276)