diff --git a/Mesa.changes b/Mesa.changes index 4611cd5..6ef29b9 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Mar 7 04:17:18 CET 2009 - sndirsch@suse.de + +- mesa-commit-954dfba.diff + * i965: bump texture limit to 4kx4k (bfo #18100) + * obsoletes i965-GL_MAX_TEXTURE_SIZE-4096.diff +- mesa-commit-88b702e.diff + * i965: Eric Anholt's patch for bumping up texture sizes + (bfo #18100) + ------------------------------------------------------------------- Fri Feb 27 16:58:13 CET 2009 - mhopf@suse.de diff --git a/Mesa.spec b/Mesa.spec index 5dc9b2c..5771ef9 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -33,7 +33,7 @@ Obsoletes: Mesa-64bit %endif # Version: 7.3 -Release: 2 +Release: 3 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL Source: MesaLib-%{version}.tar.bz2 Source1: MesaDemos-%{version}.tar.bz2 @@ -43,7 +43,8 @@ Source5: drirc Patch1: dri_driver_dir.diff Patch6: link-shared.diff Patch7: disable_gem_warning.diff -Patch9: i965-GL_MAX_TEXTURE_SIZE-4096.diff +Patch9: mesa-commit-954dfba.diff +Patch10: mesa-commit-88b702e.diff Patch14: intel_release_static_region.patch Patch15: Mesa_indirect_old_xserver_compatibility.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -136,7 +137,8 @@ sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile ### FIXME #%patch6 %patch7 -p1 -#%patch9 -p1 +%patch9 -p1 +%patch10 -p1 %patch14 -p1 %patch15 -p1 @@ -241,6 +243,13 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/libOSMesa.a %changelog +* Sat Mar 07 2009 sndirsch@suse.de +- mesa-commit-954dfba.diff + * i965: bump texture limit to 4kx4k (bfo #18100) + * obsoletes i965-GL_MAX_TEXTURE_SIZE-4096.diff +- mesa-commit-88b702e.diff + * i965: Eric Anholt's patch for bumping up texture sizes + (bfo #18100) * Fri Feb 27 2009 mhopf@suse.de - Mesa_indirect_old_xserver_compatibility.diff Workaround for enabling indirect rendering to older Xservers diff --git a/i965-GL_MAX_TEXTURE_SIZE-4096.diff b/i965-GL_MAX_TEXTURE_SIZE-4096.diff deleted file mode 100644 index d7c4565..0000000 --- a/i965-GL_MAX_TEXTURE_SIZE-4096.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c -index 1c7ad5c..e2ddb38 100644 ---- a/src/mesa/drivers/dri/i965/brw_context.c -+++ b/src/mesa/drivers/dri/i965/brw_context.c -@@ -130,10 +130,10 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis, - /* Advertise the full hardware capabilities. The new memory - * manager should cope much better with overload situations: - */ -- 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); - - /* ctx->Const.MaxNativeVertexProgramTemps = 32; */ - diff --git a/mesa-commit-88b702e.diff b/mesa-commit-88b702e.diff new file mode 100644 index 0000000..d93605d --- /dev/null +++ b/mesa-commit-88b702e.diff @@ -0,0 +1,50 @@ +commit 88b702e8c47c8930940c396132b2a191d4a3e7ca +Author: Robert Ellison +Date: Fri Feb 13 15:19:04 2009 -0700 + + i965: Eric Anholt's patch for bumping up texture sizes + + I'm committing this because it fixes a conform failure; the failure occurs + on the TextureProxy test, where the test attempts to create proxy textures + at every level, but fails at the last level (border == 1, width == 1, + height == 1) because it's beyond MAX_TEXTURE_LEVELS. + + Eric's original comment was: + + idr said that in his review swrast was ready for it, and the 965 driver is + advertising it already though it has been resulting in many crashes due to + arrays using these defines not being big enough. + +diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h +index c3feffd..9d0cd18 100644 +--- a/src/mesa/main/config.h ++++ b/src/mesa/main/config.h +@@ -101,16 +101,16 @@ + #define MAX_COLOR_TABLE_SIZE 256 + + /** Number of 1D/2D texture mipmap levels */ +-#define MAX_TEXTURE_LEVELS 12 ++#define MAX_TEXTURE_LEVELS 13 + + /** Number of 3D texture mipmap levels */ + #define MAX_3D_TEXTURE_LEVELS 9 + + /** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */ +-#define MAX_CUBE_TEXTURE_LEVELS 12 ++#define MAX_CUBE_TEXTURE_LEVELS 13 + + /** Maximum rectangular texture size - GL_NV_texture_rectangle */ +-#define MAX_TEXTURE_RECT_SIZE 2048 ++#define MAX_TEXTURE_RECT_SIZE 4096 + + /** Maximum number of layers in a 1D or 2D array texture - GL_MESA_texture_array */ + #define MAX_ARRAY_TEXTURE_LAYERS 64 +@@ -166,7 +166,7 @@ + #define MAX_TEXTURE_MAX_ANISOTROPY 16.0 + + /** For GL_EXT_texture_lod_bias (typically MAX_TEXTURE_LEVELS - 1) */ +-#define MAX_TEXTURE_LOD_BIAS 11.0 ++#define MAX_TEXTURE_LOD_BIAS 12.0 + + /** For GL_ARB_vertex_program */ + /*@{*/ diff --git a/mesa-commit-954dfba.diff b/mesa-commit-954dfba.diff new file mode 100644 index 0000000..25dd159 --- /dev/null +++ b/mesa-commit-954dfba.diff @@ -0,0 +1,33 @@ +commit 954dfba12986f578f2d8461818f9e9ac1f8f2b41 +Author: Keith Packard +Date: Fri Jan 30 21:51:32 2009 -0800 + + 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 + +diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c +index d7a2bd9..d66781f 100644 +--- a/src/mesa/drivers/dri/i965/brw_context.c ++++ b/src/mesa/drivers/dri/i965/brw_context.c +@@ -135,13 +135,12 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis, + 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;