Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/mesa.git#e1cab56ec7d88c787b371a0f162133a6b322684e

0001-device-select-layer-update-for-vulkan-1.2.patch

@@ -0,0 +1,33 @@
+From b905acfbdcd63067b017494ea6fb405753de9a23 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Fri, 15 Jan 2021 09:19:03 +1000
+Subject: [PATCH] device-select-layer: update for vulkan 1.2
+
+The vulkan loader doesn't load layers for apps that require a newer
+version of vulkan, so this layer didn't get loaded for vulkan 1.2 apps.
+
+I would like to just stick 1.09 in there but it might be worth
+validating it works at new version of vulkan I suppose and the major
+doesn't revise that often
+
+Fixes: 9bc5b2d169d3 ("vulkan: add initial device selection layer. (v6)")
+---
+ src/vulkan/device-select-layer/VkLayer_MESA_device_select.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/vulkan/device-select-layer/VkLayer_MESA_device_select.json b/src/vulkan/device-select-layer/VkLayer_MESA_device_select.json
+index 1d5fffd0135..361ae9fe74e 100644
+--- a/src/vulkan/device-select-layer/VkLayer_MESA_device_select.json
++++ b/src/vulkan/device-select-layer/VkLayer_MESA_device_select.json
+@@ -4,7 +4,7 @@
+     "name": "VK_LAYER_MESA_device_select",
+     "type": "GLOBAL",
+     "library_path": "libVkLayer_MESA_device_select.so",
+-    "api_version": "1.1.73",
++    "api_version": "1.2.73",
+     "implementation_version": "1",
+     "description": "Linux device selection layer",
+     "functions": {
+-- 
+2.26.2
+

mesa.spec

@@ -52,7 +52,7 @@ Name:           mesa
 Summary:        Mesa graphics libraries
 %global ver 20.3.3
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -62,6 +62,9 @@ Source0:        https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
 Source1:        Mesa-MLAA-License-Clarification-Email.txt
 
+# fix device selection layer
+Patch0: 0001-device-select-layer-update-for-vulkan-1.2.patch
+
 BuildRequires:  meson >= 0.45
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -591,6 +594,9 @@ popd
 %endif
 
 %changelog
+* Fri Jan 15 2021 Dave Airlie <airlied@redhat.com> - 20.3.3-2
+- Fix device selection layer for vulkan 1.2
+
 * Wed Jan 13 2021 Pete Walter <pwalter@fedoraproject.org> - 20.3.3-1
 - Update to 20.3.3