Update to 19.0.0~rc4
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko
parent
bfa55eb65c
commit
9dcda4b1fa
@ -1,133 +0,0 @@
|
|||||||
From 129a9f4937b8f2adb4d37999677d748d816d611c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
|
|
||||||
Date: Mon, 11 Feb 2019 10:17:52 +0100
|
|
||||||
Subject: [PATCH] radv: fix compiler issues with GCC 9
|
|
||||||
|
|
||||||
"The C standard says that compound literals which occur inside of
|
|
||||||
the body of a function have automatic storage duration associated
|
|
||||||
with the enclosing block. Older GCC releases were putting such
|
|
||||||
compound literals into the scope of the whole function, so their
|
|
||||||
lifetime actually ended at the end of containing function. This
|
|
||||||
has been fixed in GCC 9. Code that relied on this extended lifetime
|
|
||||||
needs to be fixed, move the compound literals to whatever scope
|
|
||||||
they need to accessible in."
|
|
||||||
|
|
||||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109543
|
|
||||||
Cc: <mesa-stable@lists.freedesktop.org>
|
|
||||||
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
|
|
||||||
Reviewed-by: Gustaw Smolarczyk <wielkiegie@gmail.com>
|
|
||||||
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
|
|
||||||
---
|
|
||||||
src/amd/vulkan/radv_meta_blit.c | 90 ++++++++++++++++++---------------
|
|
||||||
1 file changed, 48 insertions(+), 42 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/radv_meta_blit.c
|
|
||||||
index a2ba7e45022..5af9c4a303f 100644
|
|
||||||
--- a/src/amd/vulkan/radv_meta_blit.c
|
|
||||||
+++ b/src/amd/vulkan/radv_meta_blit.c
|
|
||||||
@@ -849,54 +849,60 @@ build_pipeline(struct radv_device *device,
|
|
||||||
.subpass = 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
- switch(aspect) {
|
|
||||||
- case VK_IMAGE_ASPECT_COLOR_BIT:
|
|
||||||
- vk_pipeline_info.pColorBlendState = &(VkPipelineColorBlendStateCreateInfo) {
|
|
||||||
- .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO,
|
|
||||||
- .attachmentCount = 1,
|
|
||||||
- .pAttachments = (VkPipelineColorBlendAttachmentState []) {
|
|
||||||
- { .colorWriteMask =
|
|
||||||
- VK_COLOR_COMPONENT_A_BIT |
|
|
||||||
- VK_COLOR_COMPONENT_R_BIT |
|
|
||||||
- VK_COLOR_COMPONENT_G_BIT |
|
|
||||||
- VK_COLOR_COMPONENT_B_BIT },
|
|
||||||
+ VkPipelineColorBlendStateCreateInfo color_blend_info = {
|
|
||||||
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO,
|
|
||||||
+ .attachmentCount = 1,
|
|
||||||
+ .pAttachments = (VkPipelineColorBlendAttachmentState []) {
|
|
||||||
+ {
|
|
||||||
+ .colorWriteMask = VK_COLOR_COMPONENT_A_BIT |
|
|
||||||
+ VK_COLOR_COMPONENT_R_BIT |
|
|
||||||
+ VK_COLOR_COMPONENT_G_BIT |
|
|
||||||
+ VK_COLOR_COMPONENT_B_BIT },
|
|
||||||
}
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+ VkPipelineDepthStencilStateCreateInfo depth_info = {
|
|
||||||
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
|
|
||||||
+ .depthTestEnable = true,
|
|
||||||
+ .depthWriteEnable = true,
|
|
||||||
+ .depthCompareOp = VK_COMPARE_OP_ALWAYS,
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ VkPipelineDepthStencilStateCreateInfo stencil_info = {
|
|
||||||
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
|
|
||||||
+ .depthTestEnable = false,
|
|
||||||
+ .depthWriteEnable = false,
|
|
||||||
+ .stencilTestEnable = true,
|
|
||||||
+ .front = {
|
|
||||||
+ .failOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
+ .passOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
+ .depthFailOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
+ .compareOp = VK_COMPARE_OP_ALWAYS,
|
|
||||||
+ .compareMask = 0xff,
|
|
||||||
+ .writeMask = 0xff,
|
|
||||||
+ .reference = 0
|
|
||||||
+ },
|
|
||||||
+ .back = {
|
|
||||||
+ .failOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
+ .passOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
+ .depthFailOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
+ .compareOp = VK_COMPARE_OP_ALWAYS,
|
|
||||||
+ .compareMask = 0xff,
|
|
||||||
+ .writeMask = 0xff,
|
|
||||||
+ .reference = 0
|
|
||||||
+ },
|
|
||||||
+ .depthCompareOp = VK_COMPARE_OP_ALWAYS,
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ switch(aspect) {
|
|
||||||
+ case VK_IMAGE_ASPECT_COLOR_BIT:
|
|
||||||
+ vk_pipeline_info.pColorBlendState = &color_blend_info;
|
|
||||||
break;
|
|
||||||
case VK_IMAGE_ASPECT_DEPTH_BIT:
|
|
||||||
- vk_pipeline_info.pDepthStencilState = &(VkPipelineDepthStencilStateCreateInfo) {
|
|
||||||
- .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
|
|
||||||
- .depthTestEnable = true,
|
|
||||||
- .depthWriteEnable = true,
|
|
||||||
- .depthCompareOp = VK_COMPARE_OP_ALWAYS,
|
|
||||||
- };
|
|
||||||
+ vk_pipeline_info.pDepthStencilState = &depth_info;
|
|
||||||
break;
|
|
||||||
case VK_IMAGE_ASPECT_STENCIL_BIT:
|
|
||||||
- vk_pipeline_info.pDepthStencilState = &(VkPipelineDepthStencilStateCreateInfo) {
|
|
||||||
- .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
|
|
||||||
- .depthTestEnable = false,
|
|
||||||
- .depthWriteEnable = false,
|
|
||||||
- .stencilTestEnable = true,
|
|
||||||
- .front = {
|
|
||||||
- .failOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
- .passOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
- .depthFailOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
- .compareOp = VK_COMPARE_OP_ALWAYS,
|
|
||||||
- .compareMask = 0xff,
|
|
||||||
- .writeMask = 0xff,
|
|
||||||
- .reference = 0
|
|
||||||
- },
|
|
||||||
- .back = {
|
|
||||||
- .failOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
- .passOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
- .depthFailOp = VK_STENCIL_OP_REPLACE,
|
|
||||||
- .compareOp = VK_COMPARE_OP_ALWAYS,
|
|
||||||
- .compareMask = 0xff,
|
|
||||||
- .writeMask = 0xff,
|
|
||||||
- .reference = 0
|
|
||||||
- },
|
|
||||||
- .depthCompareOp = VK_COMPARE_OP_ALWAYS,
|
|
||||||
- };
|
|
||||||
+ vk_pipeline_info.pDepthStencilState = &stencil_info;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
unreachable("Unhandled aspect");
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
2
Makefile
2
Makefile
@ -1,4 +1,4 @@
|
|||||||
VERSION ?= 19.0.0-rc2
|
VERSION ?= 19.0.0-rc4
|
||||||
SANITIZE ?= 1
|
SANITIZE ?= 1
|
||||||
|
|
||||||
DIRNAME = mesa-${VERSION}
|
DIRNAME = mesa-${VERSION}
|
||||||
|
|||||||
10
mesa.spec
10
mesa.spec
@ -48,9 +48,9 @@
|
|||||||
|
|
||||||
Name: mesa
|
Name: mesa
|
||||||
Summary: Mesa graphics libraries
|
Summary: Mesa graphics libraries
|
||||||
%global ver 19.0.0-rc2
|
%global ver 19.0.0-rc4
|
||||||
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
|
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://www.mesa3d.org
|
URL: http://www.mesa3d.org
|
||||||
|
|
||||||
@ -74,9 +74,6 @@ Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch
|
|||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1650929
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1650929
|
||||||
Patch10: 0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch
|
Patch10: 0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch
|
||||||
|
|
||||||
# https://gitlab.freedesktop.org/mesa/mesa/commit/129a9f4937b8f2adb4d37999677d748d816d611c
|
|
||||||
Patch20: 0001-radv-fix-compiler-issues-with-GCC-9.patch
|
|
||||||
|
|
||||||
BuildRequires: meson >= 0.45
|
BuildRequires: meson >= 0.45
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -640,6 +637,9 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 14 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 19.0.0~rc4-1
|
||||||
|
- Update to 19.0.0~rc4
|
||||||
|
|
||||||
* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 19.0.0~rc2-3
|
* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 19.0.0~rc2-3
|
||||||
- Fix radv vulkan
|
- Fix radv vulkan
|
||||||
|
|
||||||
|
|||||||
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (mesa-19.0.0-rc2.tar.xz) = 28880b941ed978944298eecb7fdb2e6fb23a2f86a26d9603c5aed9394470e3fe62dac99e62217cc6791eb7a9020f531e815123e07efce3e5c09ceb00ce561c13
|
SHA512 (mesa-19.0.0-rc4.tar.xz) = b4a4d8e635dde19f08db1fcfe46c01083649fa5bdc60403bb9d691fbd142c558eeeb5cf0f3fd165f746c8f5ad39c80bd3c1c95a6d0420032405fd51bdc54a5d3
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user