Hello community,
here is the log from the commit of package Mesa
checked in at Sat Aug 2 04:48:22 CEST 2008.
--------
--- Mesa/Mesa.changes 2008-07-10 23:11:16.000000000 +0200
+++ Mesa/Mesa.changes 2008-08-01 23:29:26.031358663 +0200
@@ -1,0 +2,6 @@
+Fri Aug 1 23:28:45 CEST 2008 - sndirsch@suse.de
+
+- commit-c71fa34.diff
+ * added null texObj ptr check (bfo #15567, bnc #402687)
+
+-------------------------------------------------------------------
New:
----
commit-c71fa34.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.i25955/_old 2008-08-02 04:47:45.000000000 +0200
+++ /var/tmp/diff_new_pack.i25955/_new 2008-08-02 04:47:45.000000000 +0200
@@ -20,7 +20,7 @@
Obsoletes: xorg-x11-Mesa
AutoReqProv: on
Version: 7.1
-Release: 5
+Release: 13
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
@@ -31,6 +31,7 @@
Patch2: MesaLib-6befdca.diff
Patch6: link-shared.diff
Patch7: disable_ttm_warning.diff
+Patch8: commit-c71fa34.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -118,6 +119,7 @@
### FIXME
#%patch6
%patch7 -p1
+%patch8 -p1
%build
@@ -224,6 +226,9 @@
/usr/%{_lib}/libOSMesa.a
%changelog
+* Sat Aug 02 2008 sndirsch@suse.de
+- commit-c71fa34.diff
+ * added null texObj ptr check (bfo #15567, bnc #402687)
* Fri Jul 11 2008 sndirsch@suse.de
- even s390(x) needs swrast DRI driver now
- specfile cleanup
++++++ commit-c71fa34.diff ++++++
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);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org