diff --git a/Mesa.changes b/Mesa.changes index 1f22e21..1d8a8a8 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Mon Jun 7 19:27:30 CEST 2010 - sndirsch@suse.de - -- mesa-commit-06c72da.diff - * intel: Update renderbuffers unconditionally in - intelSetTexBuffer2() (bnc #610323) - ------------------------------------------------------------------- Sat May 22 16:00:55 CEST 2010 - sndirsch@suse.de diff --git a/Mesa.spec b/Mesa.spec index 7284deb..04161ef 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -48,7 +48,6 @@ Patch1: dri_driver_dir.diff # to be upstreamed Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff -Patch10: mesa-commit-06c72da.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -118,7 +117,6 @@ sed -i 's/REPLACE/%_lib/g' src/glx/Makefile sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile %patch8 %patch9 -p0 -%patch10 -p1 %build diff --git a/mesa-commit-06c72da.diff b/mesa-commit-06c72da.diff deleted file mode 100644 index c1d92df..0000000 --- a/mesa-commit-06c72da.diff +++ /dev/null @@ -1,20 +0,0 @@ -commit 06c72da97a1bce87bc4b3fb8e7e18bf966926acb -Author: Kristian Høgsberg -Date: Tue May 4 13:35:23 2010 -0400 - - intel: Update renderbuffers unconditionally in intelSetTexBuffer2() - -diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c -index 9db96ac..a0e734b 100644 ---- a/src/mesa/drivers/dri/intel/intel_tex_image.c -+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c -@@ -728,8 +728,7 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, - if (!intelObj) - return; - -- if (dPriv->lastStamp != dPriv->dri2.stamp) -- intel_update_renderbuffers(pDRICtx, dPriv); -+ intel_update_renderbuffers(pDRICtx, dPriv); - - rb = intel_get_renderbuffer(fb, BUFFER_FRONT_LEFT); - /* If the region isn't set, then intel_update_renderbuffers was unable