From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Tue, 7 Dec 2021 10:35:35 +0000 (+0100)
Subject: osx inline pragma, activate VK_KHR_portability_subset if present
X-Git-Tag: v0.2.0~45
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=fd6cfb02f2f9b445835ec7f61e01118415268718;p=jp%2Fvkvg.git

osx inline pragma, activate VK_KHR_portability_subset if present
---

diff --git a/src/cross_os.h b/src/cross_os.h
index 864d8f9..db2dc78 100644
--- a/src/cross_os.h
+++ b/src/cross_os.h
@@ -32,7 +32,7 @@
 #elif __APPLE__
 	#include <math.h>
 	#define isnanf isnan
-	#define vkvg_inline
+#define vkvg_inline static
 #elif __unix__
 	#include <unistd.h>
 	#include <sys/types.h>
diff --git a/tests/common/vkengine.c b/tests/common/vkengine.c
index d06ed87..ae1cf58 100644
--- a/tests/common/vkengine.c
+++ b/tests/common/vkengine.c
@@ -175,11 +175,15 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
 	enabledExts[enabledExtsCount] = "VK_KHR_swapchain";
 	enabledExtsCount++;
 
-	if (vkh_phyinfo_try_get_extension_properties(pi, "VK_EXT_blend_operation_advanced", NULL)) {
-		enabledExts[enabledExtsCount] = "VK_EXT_blend_operation_advanced";
-		enabledExtsCount++;
-	}
+	if (vkh_phyinfo_try_get_extension_properties(pi, "VK_EXT_blend_operation_advanced", NULL))
+		enabledExts[enabledExtsCount++] = "VK_EXT_blend_operation_advanced";
+
+	if (vkh_phyinfo_try_get_extension_properties(pi, "VK_KHR_get_physical_device_properties2", NULL) &&
+		vkh_phyinfo_try_get_extension_properties(pi, "VK_KHR_portability_subset", NULL)) {
+		enabledExts[enabledExtsCount++] = "VK_KHR_get_physical_device_properties2";
+		enabledExts[enabledExtsCount++] = "VK_KHR_portability_subset";
 
+	}
 	VkPhysicalDeviceFeatures enabledFeatures = {
 		.fillModeNonSolid = true,
 		//.sampleRateShading = true
diff --git a/vkh b/vkh
index b15e2e5..61930b1 160000
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit b15e2e52f6eb74e72f31391dbcf007a9e5ce3815
+Subproject commit 61930b1e9ec4ce9b95ea0e4dd02d9a3e530a312b