From ab02e07c758ed4175a2e954d8d408942fba67fb2ea9f2156384dd6814c6a0dda Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 11 Aug 2008 21:05:30 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=41 --- Mesa.changes | 12 +++++++ Mesa.spec | 35 ++++++++++++------- MesaDemos-7.1-rc1.tar.bz2 | 3 -- MesaDemos-7.1-rc3.tar.bz2 | 3 ++ MesaLib-6befdca.tar.bz2 | 3 -- MesaLib-7.1-rc1.tar.bz2 | 3 -- MesaLib-7.1-rc3.tar.bz2 | 3 ++ commit-c71fa34.diff | 55 ------------------------------ i965-GL_MAX_TEXTURE_SIZE-4096.diff | 17 +++++++++ 9 files changed, 57 insertions(+), 77 deletions(-) delete mode 100644 MesaDemos-7.1-rc1.tar.bz2 create mode 100644 MesaDemos-7.1-rc3.tar.bz2 delete mode 100644 MesaLib-6befdca.tar.bz2 delete mode 100644 MesaLib-7.1-rc1.tar.bz2 create mode 100644 MesaLib-7.1-rc3.tar.bz2 delete mode 100644 commit-c71fa34.diff create mode 100644 i965-GL_MAX_TEXTURE_SIZE-4096.diff diff --git a/Mesa.changes b/Mesa.changes index f1d9b0e..c19b603 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Aug 11 13:49:19 CEST 2008 - sndirsch@suse.de + +- udpated to Mesa 7.1 RC3 + * bugfixes + +------------------------------------------------------------------- +Mon Aug 4 14:52:07 CEST 2008 - sndirsch@suse.de + +- i965-GL_MAX_TEXTURE_SIZE-4096.diff + * sets GL_MAX_TEXTURE_SIZE to 4096 for Intel 965 series + ------------------------------------------------------------------- Fri Aug 1 23:28:45 CEST 2008 - sndirsch@suse.de diff --git a/Mesa.spec b/Mesa.spec index 010273b..5fb63e5 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -2,9 +2,16 @@ # spec file for package Mesa (Version 7.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,18 +27,17 @@ Provides: xorg-x11-Mesa Obsoletes: xorg-x11-Mesa AutoReqProv: on Version: 7.1 -Release: 13 +Release: 20 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL -Source: MesaLib-6befdca.tar.bz2 -Source1: MesaDemos-%{version}-rc1.tar.bz2 -Source2: MesaLib-%{version}-rc1.tar.bz2 +Source: MesaLib-%{version}-rc3.tar.bz2 +Source1: MesaDemos-%{version}-rc3.tar.bz2 Source3: README.updates Source4: manual-pages.tar.bz2 Patch1: dri_driver_dir.diff Patch2: MesaLib-6befdca.diff Patch6: link-shared.diff Patch7: disable_ttm_warning.diff -Patch8: commit-c71fa34.diff +Patch9: i965-GL_MAX_TEXTURE_SIZE-4096.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -103,9 +109,8 @@ Authors: Brian Paul %prep -#%setup -n %{name}-%{version}-rc1 -b1 -b4 -%setup -n mesa -b4 -#rm docs/README.MINGW32.orig +%setup -n %{name}-%{version}-rc3 -b1 -b4 +rm docs/README.MINGW32.orig # make legal department happy (Bug #204110) test -f src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1 test -f progs/ggi/asc-view.c && exit 1 @@ -119,7 +124,7 @@ sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile ### FIXME #%patch6 %patch7 -p1 -%patch8 -p1 +%patch9 -p1 %build @@ -210,8 +215,6 @@ rm -rf $RPM_BUILD_ROOT /usr/include/GL/xmesa_xf86.h /usr/include/GL/internal/dri_interface.h /usr/include/GL/internal/dri_sarea.h -/usr/include/GL/directfbgl.h -/usr/include/GL/miniglx.h /usr/%{_lib}/libGLU.so /usr/%{_lib}/libOSMesa.so /usr/%{_lib}/pkgconfig/dri.pc @@ -226,6 +229,12 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/libOSMesa.a %changelog +* Mon Aug 11 2008 sndirsch@suse.de +- udpated to Mesa 7.1 RC3 + * bugfixes +* Mon Aug 04 2008 sndirsch@suse.de +- i965-GL_MAX_TEXTURE_SIZE-4096.diff + * sets GL_MAX_TEXTURE_SIZE to 4096 for Intel 965 series * Sat Aug 02 2008 sndirsch@suse.de - commit-c71fa34.diff * added null texObj ptr check (bfo #15567, bnc #402687) diff --git a/MesaDemos-7.1-rc1.tar.bz2 b/MesaDemos-7.1-rc1.tar.bz2 deleted file mode 100644 index f73a132..0000000 --- a/MesaDemos-7.1-rc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6056da8321c53e47c1d82bad5a974538d08b21a54e47f5025c4ed78fb91209b -size 1383934 diff --git a/MesaDemos-7.1-rc3.tar.bz2 b/MesaDemos-7.1-rc3.tar.bz2 new file mode 100644 index 0000000..b558438 --- /dev/null +++ b/MesaDemos-7.1-rc3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e8d289de0c86c45eb5112cf98b4c1c4dc91c5be71e1c5d3bc608c233c2ff47c +size 1361409 diff --git a/MesaLib-6befdca.tar.bz2 b/MesaLib-6befdca.tar.bz2 deleted file mode 100644 index aa24b03..0000000 --- a/MesaLib-6befdca.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:816d5e314625b158683d157b3448ec726f6846e1fb3482fff953661dba12fe2f -size 6143564 diff --git a/MesaLib-7.1-rc1.tar.bz2 b/MesaLib-7.1-rc1.tar.bz2 deleted file mode 100644 index 8ec62fd..0000000 --- a/MesaLib-7.1-rc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70c86885761a053ad43ee3550ab318d4c3ebe2e07f25090cacd3e0e888206cef -size 3501547 diff --git a/MesaLib-7.1-rc3.tar.bz2 b/MesaLib-7.1-rc3.tar.bz2 new file mode 100644 index 0000000..f016667 --- /dev/null +++ b/MesaLib-7.1-rc3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66752a0c2978cb855c74bf1e05934aa5de83b5f429f5a785d5e1d5470e05e432 +size 3486718 diff --git a/commit-c71fa34.diff b/commit-c71fa34.diff deleted file mode 100644 index 582d20a..0000000 --- a/commit-c71fa34.diff +++ /dev/null @@ -1,55 +0,0 @@ -commit c71fa34728ef4eddd074aeb2bee49ae6a7acb3d1 -Author: Brian Paul -Date: Tue Jul 8 15:11:23 2008 -0600 - - added null texObj ptr check (bug 15567) - -diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c -index ecace9c..bf7a1de 100644 ---- a/src/mesa/swrast/s_fragprog.c -+++ b/src/mesa/swrast/s_fragprog.c -@@ -44,7 +44,8 @@ fetch_texel_lod( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda, - SWcontext *swrast = SWRAST_CONTEXT(ctx); - const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current; - -- lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod); -+ if (texObj) -+ lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod); - - /* XXX use a float-valued TextureSample routine here!!! */ - swrast->TextureSample[unit](ctx, texObj, 1, (const GLfloat (*)[4]) texcoord, -@@ -68,20 +69,23 @@ fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4], - { - SWcontext *swrast = SWRAST_CONTEXT(ctx); - const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current; -- const struct gl_texture_image *texImg = texObj->Image[0][texObj->BaseLevel]; -- const GLfloat texW = (GLfloat) texImg->WidthScale; -- const GLfloat texH = (GLfloat) texImg->HeightScale; -+ GLfloat lambda; - GLchan rgba[4]; - -- GLfloat lambda -- = _swrast_compute_lambda(texdx[0], texdy[0], /* ds/dx, ds/dy */ -- texdx[1], texdy[1], /* dt/dx, dt/dy */ -- texdx[3], texdy[2], /* dq/dx, dq/dy */ -- texW, texH, -- texcoord[0], texcoord[1], texcoord[3], -- 1.0F / texcoord[3]) + lodBias; -+ if (texObj) { -+ const struct gl_texture_image *texImg = texObj->Image[0][texObj->BaseLevel]; -+ const GLfloat texW = (GLfloat) texImg->WidthScale; -+ const GLfloat texH = (GLfloat) texImg->HeightScale; - -- lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod); -+ lambda = _swrast_compute_lambda(texdx[0], texdy[0], /* ds/dx, ds/dy */ -+ texdx[1], texdy[1], /* dt/dx, dt/dy */ -+ texdx[3], texdy[2], /* dq/dx, dq/dy */ -+ texW, texH, -+ texcoord[0], texcoord[1], texcoord[3], -+ 1.0F / texcoord[3]) + lodBias; -+ -+ lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod); -+ } - - swrast->TextureSample[unit](ctx, texObj, 1, (const GLfloat (*)[4]) texcoord, - &lambda, &rgba); diff --git a/i965-GL_MAX_TEXTURE_SIZE-4096.diff b/i965-GL_MAX_TEXTURE_SIZE-4096.diff new file mode 100644 index 0000000..d376c79 --- /dev/null +++ b/i965-GL_MAX_TEXTURE_SIZE-4096.diff @@ -0,0 +1,17 @@ +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.MaxTextureUnits = BRW_MAX_TEX_UNIT; + + /* ctx->Const.MaxNativeVertexProgramTemps = 32; */