From 1053d801d6b7293ad1e39e43044e7e2adf492deda6b2c8f7ff041ab5066a1021 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 7 Jun 2010 17:29:46 +0000 Subject: [PATCH 1/3] - mesa-commit-06c72da.diff * intel: Update renderbuffers unconditionally in intelSetTexBuffer2() (bnc #610323) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=108 --- Mesa.changes | 7 +++++++ Mesa.spec | 2 ++ mesa-commit-06c72da.diff | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 mesa-commit-06c72da.diff diff --git a/Mesa.changes b/Mesa.changes index 1d8a8a8..1f22e21 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 04161ef..7284deb 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -48,6 +48,7 @@ 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 @@ -117,6 +118,7 @@ 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 new file mode 100644 index 0000000..c1d92df --- /dev/null +++ b/mesa-commit-06c72da.diff @@ -0,0 +1,20 @@ +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 From cea8a924cd75f1edec8abad56400ba3419672924152b930ccc23f7fdee2bfac3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 9 Jun 2010 14:45:17 +0000 Subject: [PATCH 2/3] Accepting request 41273 from X11:XOrg checked in (request 41273) OBS-URL: https://build.opensuse.org/request/show/41273 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=109 --- Mesa.changes | 7 ------- Mesa.spec | 2 -- mesa-commit-06c72da.diff | 20 -------------------- 3 files changed, 29 deletions(-) delete mode 100644 mesa-commit-06c72da.diff 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 From 9ea7eb1419ef05e026ec1548b7e4778c9931a983b0e8367e9196984ed5623247 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 9 Jun 2010 14:45:18 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/Mesa revision 88.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=398ed9be3905635bdc6defae084db33f --- Mesa.changes | 7 +++++++ Mesa.spec | 4 +++- mesa-commit-06c72da.diff | 20 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 mesa-commit-06c72da.diff diff --git a/Mesa.changes b/Mesa.changes index 1d8a8a8..1f22e21 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 04161ef..813fa05 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -35,7 +35,7 @@ Obsoletes: Mesa-64bit # %define _version 7.8.1 Version: 7.8.1 -Release: 3 +Release: 4 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 @@ -48,6 +48,7 @@ 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 @@ -117,6 +118,7 @@ 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 new file mode 100644 index 0000000..c1d92df --- /dev/null +++ b/mesa-commit-06c72da.diff @@ -0,0 +1,20 @@ +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