diff -u mesa-7.3/debian/changelog mesa-7.3/debian/changelog --- mesa-7.3/debian/changelog +++ mesa-7.3/debian/changelog @@ -1,3 +1,10 @@ +mesa (7.3-1ubuntu5~ppa1) jaunty; urgency=low + + * Backport 05_texture_size.patch from mesa git. + - i965: bump texture limit to 4kx4k (LP: #146298) + + -- Ludovico Cavedon Sun, 29 Mar 2009 13:43:02 -0700 + mesa (7.3-1ubuntu4) jaunty; urgency=low * Backport 104_swrast_fbconfigs.patch from mesa git. diff -u mesa-7.3/debian/patches/series mesa-7.3/debian/patches/series --- mesa-7.3/debian/patches/series +++ mesa-7.3/debian/patches/series @@ -1,6 +1,7 @@ 02_use-ieee-fp-on-s390-and-m68k.patch 03_optional-progs-and-install.patch 04_osmesa_version.diff +05_texture_size.patch 101_ubuntu_hidden_glname.patch 102_dont_vblank.diff 103_rs600_support.patch only in patch2: unchanged: --- mesa-7.3.orig/debian/patches/05_texture_size.patch +++ mesa-7.3/debian/patches/05_texture_size.patch @@ -0,0 +1,32 @@ +From 954dfba12986f578f2d8461818f9e9ac1f8f2b41 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Sat, 31 Jan 2009 05:51:32 +0000 +Subject: i965: bump texture limit to 4kx4k + +Rendering and textures are limited to 8kx8k, but mesa limits things to +4kx4k, and magic guard band stuff may break on 8kx8k drawing. This is safe +though, and makes compiz work on bigger screens. + +Signed-off-by: Keith Packard +--- +Index: mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c +=================================================================== +--- mesa-7.3.orig/src/mesa/drivers/dri/i965/brw_context.c 2009-01-21 07:55:47.000000000 -0800 ++++ mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c 2009-03-29 13:48:30.000000000 -0700 +@@ -135,13 +135,12 @@ + ctx->Const.MaxTextureImageUnits); + ctx->Const.MaxVertexTextureImageUnits = 0; /* no vertex shader textures */ + +- /* Advertise the full hardware capabilities. The new memory +- * manager should cope much better with overload situations: ++ /* Mesa limits textures to 4kx4k; it would be nice to fix that someday + */ +- ctx->Const.MaxTextureLevels = 12; ++ ctx->Const.MaxTextureLevels = 13; + ctx->Const.Max3DTextureLevels = 9; + ctx->Const.MaxCubeTextureLevels = 12; +- ctx->Const.MaxTextureRectSize = (1<<11); ++ ctx->Const.MaxTextureRectSize = (1<<12); + + /* if conformance mode is set, swrast can handle any size AA point */ + ctx->Const.MaxPointSizeAA = 255.0;