From fca31da3383a29eada9d9cb8b8d7024a8fa32b0b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 14 Mar 2015 21:19:37 +0300 Subject: [PATCH] 10.5.1 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + ...-Stash-everything-other-than-PIXEL_T.patch | 47 ------------------- mesa.spec | 14 +++--- sources | 2 +- 4 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 0001-meta-TexSubImage-Stash-everything-other-than-PIXEL_T.patch diff --git a/.gitignore b/.gitignore index dc6259b..76aa151 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ mesa-20100720.tar.bz2 /mesa-c3260f8.tar.xz /mesa-6171131.tar.xz /mesa-20150218.tar.xz +/mesa-20150314.tar.xz diff --git a/0001-meta-TexSubImage-Stash-everything-other-than-PIXEL_T.patch b/0001-meta-TexSubImage-Stash-everything-other-than-PIXEL_T.patch deleted file mode 100644 index 1f8b8c4..0000000 --- a/0001-meta-TexSubImage-Stash-everything-other-than-PIXEL_T.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b1ab02d9c0cc11ba8ef4efaba9452d644b6a0811 Mon Sep 17 00:00:00 2001 -From: Jason Ekstrand -Date: Fri, 27 Feb 2015 12:29:03 -0800 -Subject: [PATCH] meta/TexSubImage: Stash everything other than - PIXEL_TRANSFER/store in meta_begin - -Previously, there were bugs where if the app set a scissor it could affect -the area of the texture that was downloaded. There was also potential that -the framebuffer SRGB state could affect downloads. This ensures that those -will get saved/restored and can't affect the texture download. - -Cc: 10.5 -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89292 -Reviewed-by: Neil Roberts ---- - src/mesa/drivers/common/meta_tex_subimage.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c -index bba2b4f..971ed59 100644 ---- a/src/mesa/drivers/common/meta_tex_subimage.c -+++ b/src/mesa/drivers/common/meta_tex_subimage.c -@@ -193,8 +193,8 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims, - if (allocate_storage) - ctx->Driver.AllocTextureImageBuffer(ctx, tex_image); - -- /* Only stash the current FBO */ -- _mesa_meta_begin(ctx, 0); -+ _mesa_meta_begin(ctx, ~(MESA_META_PIXEL_TRANSFER | -+ MESA_META_PIXEL_STORE)); - - _mesa_GenFramebuffers(2, fbos); - _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, fbos[0]); -@@ -312,8 +312,8 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims, - if (!pbo_tex_image) - return false; - -- /* Only stash the current FBO */ -- _mesa_meta_begin(ctx, 0); -+ _mesa_meta_begin(ctx, ~(MESA_META_PIXEL_TRANSFER | -+ MESA_META_PIXEL_STORE)); - - _mesa_GenFramebuffers(2, fbos); - --- -2.3.1 - diff --git a/mesa.spec b/mesa.spec index 97a67f4..2e2d9b1 100644 --- a/mesa.spec +++ b/mesa.spec @@ -47,14 +47,14 @@ %define _default_patch_fuzz 2 -%define gitdate 20150218 +%define gitdate 20150314 #% define githash 6171131 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}} Summary: Mesa graphics libraries Name: mesa -Version: 10.5.0 -Release: 2.%{git}%{?dist} +Version: 10.5.1 +Release: 1.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -77,10 +77,6 @@ Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch -# Backported from upstream -# https://bugs.freedesktop.org/show_bug.cgi?id=89292 -Patch31: 0001-meta-TexSubImage-Stash-everything-other-than-PIXEL_T.patch - # https://bugs.freedesktop.org/show_bug.cgi?id=73512 Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch @@ -366,7 +362,6 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 %patch15 -p1 -b .hwfloat %patch20 -p1 -b .egbe %patch30 -p1 -b .beassert -%patch31 -p1 -b .transparent-screenshots %if 0%{?with_opencl} %patch99 -p1 -b .icd @@ -715,6 +710,9 @@ rm -rf $RPM_BUILD_ROOT # Generate changelog using: # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)" %changelog +* Sat Mar 14 2015 Igor Gnatenko - 10.5.1-1.20150314 +- 10.5.1 + * Sun Mar 08 2015 Kalev Lember - 10.5.0-2.20150218 - Backport a patch fixing partially transparent screenshots (fdo#89292) diff --git a/sources b/sources index f247b43..7c39423 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b417d3a63446ce36c3d28186d0cbd6ed mesa-20150218.tar.xz +61ebd03f6635a29f4d30e432e48addcf mesa-20150314.tar.xz