vkcube: portabilty extension as text so it builds on all platforms

diff --git a/cube/cube.c b/cube/cube.c
index ed50339..9516fca 100644 (file)
--- a/cube/cube.c
+++ b/cube/cube.c
@@ -25,7 +25,6 @@
  * Author: Bill Hollings <bill.hollings@brenwill.com>
  */
 
-#define VK_ENABLE_BETA_EXTENSIONS
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdarg.h>
@@ -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 06baecf..252f880 100644 (file)
--- a/cube/cube.cpp
+++ b/cube/cube.cpp
@@ -17,7 +17,7 @@
  *
  * Author: Jeremy Hayes <jeremy@lunarg.com>
  */
-#define VK_ENABLE_BETA_EXTENSIONS
+
 #if defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_XCB_KHR)
 #include <X11/Xutil.h>
 #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);
         }