From a7825740f31682cbd6ad177fdfcd506b32f76370 Mon Sep 17 00:00:00 2001 From: "Richard S. Wright Jr" Date: Wed, 6 Jan 2021 16:02:12 -0500 Subject: vkcube: portabilty extension as text so it builds on all platforms --- cube/cube.c | 5 ++--- cube/cube.cpp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cube/cube.c b/cube/cube.c index ed503392..9516fca1 100644 --- a/cube/cube.c +++ b/cube/cube.c @@ -25,7 +25,6 @@ * Author: Bill Hollings */ -#define VK_ENABLE_BETA_EXTENSIONS #define _GNU_SOURCE #include #include @@ -3312,8 +3311,8 @@ static void demo_init_vk(struct demo *demo) { swapchainExtFound = 1; demo->extension_names[demo->enabled_extension_count++] = VK_KHR_SWAPCHAIN_EXTENSION_NAME; } - if (!strcmp(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME, device_extensions[i].extensionName)) { - demo->extension_names[demo->enabled_extension_count++] = VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME; + if (!strcmp("VK_KHR_portability_subset", device_extensions[i].extensionName)) { + demo->extension_names[demo->enabled_extension_count++] = "VK_KHR_portability_subset"; } assert(demo->enabled_extension_count < 64); } diff --git a/cube/cube.cpp b/cube/cube.cpp index 06baecf5..252f880b 100644 --- a/cube/cube.cpp +++ b/cube/cube.cpp @@ -17,7 +17,7 @@ * * Author: Jeremy Hayes */ -#define VK_ENABLE_BETA_EXTENSIONS + #if defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_XCB_KHR) #include #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) @@ -1286,8 +1286,8 @@ void Demo::init_vk() { swapchainExtFound = 1; extension_names[enabled_extension_count++] = VK_KHR_SWAPCHAIN_EXTENSION_NAME; } - if (!strcmp(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME, device_extensions[i].extensionName)) { - extension_names[enabled_extension_count++] = VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME; + if (!strcmp("VK_KHR_portability_subset", device_extensions[i].extensionName)) { + extension_names[enabled_extension_count++] = "VK_KHR_portability_subset"; } assert(enabled_extension_count < 64); } -- cgit v1.2.3