From: Nataraj Deshpande <nataraj.deshpande@intel.com>
Date: Tue, 28 Apr 2020 00:43:08 +0000 (-0700)
Subject: anv: Limit vulkan version to 1.1 for Android
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a77cf797f1209f70925b2bd3ceffce0ad9c3e963;p=mesa.git

anv: Limit vulkan version to 1.1 for Android

Current Android dessert versions such as Pie, Q reject
vulkan version > 1.1. Clamp the vulkan versions to 1.1
for platforms running these Android desserts.

Fixes android.graphics.cts.VulkanFeaturesTest and
dEQP-VK.api.info.device#properties.

v2: Limit version with '!ANDROID' (Eric Engestrom and Tapani Pälli)

Signed-off-by: Nataraj Deshpande <nataraj.deshpande@intel.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4781>
---

diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py
index 3997974467b..2f33f7592a3 100644
--- a/src/intel/vulkan/anv_extensions.py
+++ b/src/intel/vulkan/anv_extensions.py
@@ -54,7 +54,7 @@ API_PATCH_VERSION = 131
 API_VERSIONS = [
     ApiVersion('1.0',   True),
     ApiVersion('1.1',   True),
-    ApiVersion('1.2',   True),
+    ApiVersion('1.2',   '!ANDROID'),
 ]
 
 MAX_API_VERSION = None # Computed later