10.5.1
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
This commit is contained in:
parent
056237b029
commit
fca31da338
1
.gitignore
vendored
1
.gitignore
vendored
@ -104,3 +104,4 @@ mesa-20100720.tar.bz2
|
|||||||
/mesa-c3260f8.tar.xz
|
/mesa-c3260f8.tar.xz
|
||||||
/mesa-6171131.tar.xz
|
/mesa-6171131.tar.xz
|
||||||
/mesa-20150218.tar.xz
|
/mesa-20150218.tar.xz
|
||||||
|
/mesa-20150314.tar.xz
|
||||||
|
@ -1,47 +0,0 @@
|
|||||||
From b1ab02d9c0cc11ba8ef4efaba9452d644b6a0811 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jason Ekstrand <jason.ekstrand@intel.com>
|
|
||||||
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 <mesa-stable@lists.freedesktop.org>
|
|
||||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89292
|
|
||||||
Reviewed-by: Neil Roberts <neil@linux.intel.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
14
mesa.spec
14
mesa.spec
@ -47,14 +47,14 @@
|
|||||||
|
|
||||||
%define _default_patch_fuzz 2
|
%define _default_patch_fuzz 2
|
||||||
|
|
||||||
%define gitdate 20150218
|
%define gitdate 20150314
|
||||||
#% define githash 6171131
|
#% define githash 6171131
|
||||||
%define git %{?githash:%{githash}}%{!?githash:%{gitdate}}
|
%define git %{?githash:%{githash}}%{!?githash:%{gitdate}}
|
||||||
|
|
||||||
Summary: Mesa graphics libraries
|
Summary: Mesa graphics libraries
|
||||||
Name: mesa
|
Name: mesa
|
||||||
Version: 10.5.0
|
Version: 10.5.1
|
||||||
Release: 2.%{git}%{?dist}
|
Release: 1.%{git}%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.mesa3d.org
|
URL: http://www.mesa3d.org
|
||||||
@ -77,10 +77,6 @@ Patch15: mesa-9.2-hardware-float.patch
|
|||||||
Patch20: mesa-10.2-evergreen-big-endian.patch
|
Patch20: mesa-10.2-evergreen-big-endian.patch
|
||||||
Patch30: mesa-10.3-bigendian-assert.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
|
# https://bugs.freedesktop.org/show_bug.cgi?id=73512
|
||||||
Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch
|
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
|
%patch15 -p1 -b .hwfloat
|
||||||
%patch20 -p1 -b .egbe
|
%patch20 -p1 -b .egbe
|
||||||
%patch30 -p1 -b .beassert
|
%patch30 -p1 -b .beassert
|
||||||
%patch31 -p1 -b .transparent-screenshots
|
|
||||||
|
|
||||||
%if 0%{?with_opencl}
|
%if 0%{?with_opencl}
|
||||||
%patch99 -p1 -b .icd
|
%patch99 -p1 -b .icd
|
||||||
@ -715,6 +710,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
# Generate changelog using:
|
# Generate changelog using:
|
||||||
# git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
|
# git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Mar 14 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.5.1-1.20150314
|
||||||
|
- 10.5.1
|
||||||
|
|
||||||
* Sun Mar 08 2015 Kalev Lember <kalevlember@gmail.com> - 10.5.0-2.20150218
|
* Sun Mar 08 2015 Kalev Lember <kalevlember@gmail.com> - 10.5.0-2.20150218
|
||||||
- Backport a patch fixing partially transparent screenshots (fdo#89292)
|
- Backport a patch fixing partially transparent screenshots (fdo#89292)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user