Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Mon Nov 8 12:50:07 CET 2010. -------- --- Mesa/Mesa.changes 2010-11-03 22:13:03.000000000 +0100 +++ Mesa/Mesa.changes 2010-11-06 09:50:47.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Nov 6 08:36:11 UTC 2010 - sndirsch@novell.com + +- 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch + * Fix crash in swrast when setting a texture for a pixmap + (bnc #641297) +- readd swrastg DRI driver + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.SHiPkQ/_old 2010-11-08 12:49:46.000000000 +0100 +++ /var/tmp/diff_new_pack.SHiPkQ/_new 2010-11-08 12:49:46.000000000 +0100 @@ -22,7 +22,7 @@ %define _version 7.9 Version: 7.9 -Release: 5 +Release: 6 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel @@ -54,6 +54,7 @@ # to be upstreamed Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff +Patch11: 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch # already upstream Patch10: commit-d316391.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -148,6 +149,7 @@ %patch8 %patch9 -p0 %patch10 -p1 +%patch11 -p2 %build @@ -218,7 +220,6 @@ %if 0%{?suse_version} > 1020 %fdupes -s $RPM_BUILD_ROOT/%_mandir %endif -rm $RPM_BUILD_ROOT/%{_libdir}/dri/swrastg_dri.so %clean rm -rf $RPM_BUILD_ROOT ++++++ 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch ++++++
From 761ca4b98dfe7440402aa8e24defc2c881975f07 Mon Sep 17 00:00:00 2001 From: Egbert Eich
Date: Fri, 5 Nov 2010 08:00:12 +0100 Subject: [PATCH] Fix crash in swrast when setting a texture for a pixmap.
When getImage() is called in swrastSetTexBuffer2() there will be a crash somewhere down the line since texImage->Data isn't initialized which holds a pointer to the destination. To initialize texImage->Data we call ctx->Driver.TexImage2D(). --- Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c b/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c index ff53ffd..233f225 100644 --- a/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c +++ b/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c @@ -62,6 +62,7 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format, __DRIdrawable *dPriv) { + GET_CURRENT_CONTEXT(ctx); struct dri_context *dri_ctx; int x, y, w, h; __DRIscreen *sPriv = dPriv->driScreenPriv; @@ -92,6 +93,10 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, _mesa_set_fetch_functions(texImage, 2); + ctx->Driver.TexImage2D(ctx, target, 0, internalFormat, + w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8, + NULL, &ctx->Unpack, texObj, texImage); + sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data, dPriv->loaderPrivate); -- 1.7.3.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de