From 59a92b134dea9f9e6df10f2998aa6a8c5145976e Mon Sep 17 00:00:00 2001 From: "Ybalrid (Arthur Brainville)" Date: Mon, 23 Oct 2023 04:32:21 +0200 Subject: [PATCH 1/4] Fix build error (with Qt 5.15.2+clang) ambiguous cast with QVariant constructor --- VulkanDeviceInfoExtensions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VulkanDeviceInfoExtensions.cpp b/VulkanDeviceInfoExtensions.cpp index 1d5be20..5c0fd37 100644 --- a/VulkanDeviceInfoExtensions.cpp +++ b/VulkanDeviceInfoExtensions.cpp @@ -109,7 +109,7 @@ void VulkanDeviceInfoExtensions::readPhysicalProperties_ARM() { VkPhysicalDeviceSchedulingControlsPropertiesARM extProps { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM }; VkPhysicalDeviceProperties2 deviceProps2(initDeviceProperties2(&extProps)); vulkanContext.vkGetPhysicalDeviceProperties2KHR(device, &deviceProps2); - pushProperty2(extension, "schedulingControlsFlags", QVariant(extProps.schedulingControlsFlags)); + pushProperty2(extension, "schedulingControlsFlags", QVariant((qulonglong)extProps.schedulingControlsFlags)); } if (extensionSupported("VK_ARM_shader_core_builtins")) { const char* extension("VK_ARM_shader_core_builtins"); From 7fade329324b299ce0c422e806339cc3009d8136 Mon Sep 17 00:00:00 2001 From: "Ybalrid (Arthur Brainville)" Date: Mon, 23 Oct 2023 04:33:11 +0200 Subject: [PATCH 2/4] Lower Android SDK target/minimum to 29 (Android 10. Devices like Pico 4 XR headset...) --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f37c0f3..ff3e6dc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -71,7 +71,7 @@ android { defaultConfig { resConfig "en" - minSdkVersion = "31" - targetSdkVersion = "33" + minSdkVersion = "29" + targetSdkVersion = "29" } } From 5dc3f58f2c55fdd593be6484face632d93098d60 Mon Sep 17 00:00:00 2001 From: "Ybalrid (Arthur Brainville)" Date: Wed, 25 Oct 2023 21:59:44 +0200 Subject: [PATCH 3/4] Raise back the target sdk version to 33 because of playstore rules --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index ff3e6dc..ac8e0b4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -72,6 +72,6 @@ android { defaultConfig { resConfig "en" minSdkVersion = "29" - targetSdkVersion = "29" + targetSdkVersion = "33" } } From 66c0a07b393616be2ea8e3248010472a01f233ba Mon Sep 17 00:00:00 2001 From: "Ybalrid (Arthur Brainville)" Date: Wed, 25 Oct 2023 22:04:14 +0200 Subject: [PATCH 4/4] Revert "Fix build error (with Qt 5.15.2+clang) ambiguous cast with QVariant constructor" This reverts commit 59a92b134dea9f9e6df10f2998aa6a8c5145976e. --- VulkanDeviceInfoExtensions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VulkanDeviceInfoExtensions.cpp b/VulkanDeviceInfoExtensions.cpp index 5c0fd37..1d5be20 100644 --- a/VulkanDeviceInfoExtensions.cpp +++ b/VulkanDeviceInfoExtensions.cpp @@ -109,7 +109,7 @@ void VulkanDeviceInfoExtensions::readPhysicalProperties_ARM() { VkPhysicalDeviceSchedulingControlsPropertiesARM extProps { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM }; VkPhysicalDeviceProperties2 deviceProps2(initDeviceProperties2(&extProps)); vulkanContext.vkGetPhysicalDeviceProperties2KHR(device, &deviceProps2); - pushProperty2(extension, "schedulingControlsFlags", QVariant((qulonglong)extProps.schedulingControlsFlags)); + pushProperty2(extension, "schedulingControlsFlags", QVariant(extProps.schedulingControlsFlags)); } if (extensionSupported("VK_ARM_shader_core_builtins")) { const char* extension("VK_ARM_shader_core_builtins");