From 4e46af9c54e64446ed5e373a5d0e58603ab2b87c Mon Sep 17 00:00:00 2001 From: Tony-LunarG Date: Mon, 22 Oct 2018 11:42:03 -0600 Subject: repo: Remove MIR specific code. Still need to remove MIR from scripts/common_codegen.py and from the Vulkan wrapper. Change-Id: Ib00cbe10b3e80878fb5e15c1e628685f33d31331 --- cube/cube.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'cube/cube.c') diff --git a/cube/cube.c b/cube/cube.c index ef54fd34..e88fdc2c 100644 --- a/cube/cube.c +++ b/cube/cube.c @@ -44,10 +44,6 @@ #define APP_NAME_STR_LEN 80 #endif // _WIN32 -#if defined(VK_USE_PLATFORM_MIR_KHR) -#warning "Cube does not have code for Mir at this time" -#endif - #ifdef ANDROID #include "vulkan_wrapper.h" #else @@ -330,7 +326,6 @@ struct demo { struct wl_seat *seat; struct wl_pointer *pointer; struct wl_keyboard *keyboard; -#elif defined(VK_USE_PLATFORM_MIR_KHR) #elif defined(VK_USE_PLATFORM_ANDROID_KHR) struct ANativeWindow *window; #elif (defined(VK_USE_PLATFORM_IOS_MVK) || defined(VK_USE_PLATFORM_MACOS_MVK)) @@ -2331,7 +2326,6 @@ static void demo_cleanup(struct demo *demo) { wl_compositor_destroy(demo->compositor); wl_registry_destroy(demo->registry); wl_display_disconnect(demo->display); -#elif defined(VK_USE_PLATFORM_MIR_KHR) #endif vkDestroyInstance(demo->inst, NULL); @@ -2732,7 +2726,6 @@ static void demo_run(struct demo *demo) { demo->quit = TRUE; } } -#elif defined(VK_USE_PLATFORM_MIR_KHR) #elif defined(VK_USE_PLATFORM_DISPLAY_KHR) static VkResult demo_create_display_surface(struct demo *demo) { VkResult U_ASSERT_ONLY err; @@ -2999,7 +2992,6 @@ static void demo_init_vk(struct demo *demo) { platformSurfaceExtFound = 1; demo->extension_names[demo->enabled_extension_count++] = VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME; } -#elif defined(VK_USE_PLATFORM_MIR_KHR) #elif defined(VK_USE_PLATFORM_DISPLAY_KHR) if (!strcmp(VK_KHR_DISPLAY_EXTENSION_NAME, instance_extensions[i].extensionName)) { platformSurfaceExtFound = 1; @@ -3070,7 +3062,6 @@ static void demo_init_vk(struct demo *demo) { "Do you have a compatible Vulkan installable client driver (ICD) installed?\n" "Please look at the Getting Started guide for additional information.\n", "vkCreateInstance Failure"); -#elif defined(VK_USE_PLATFORM_MIR_KHR) #elif defined(VK_USE_PLATFORM_DISPLAY_KHR) ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find the " VK_KHR_DISPLAY_EXTENSION_NAME " extension.\n\n" @@ -3356,7 +3347,6 @@ static void demo_init_vk_swapchain(struct demo *demo) { createInfo.surface = demo->window; err = vkCreateWaylandSurfaceKHR(demo->inst, &createInfo, NULL, &demo->surface); -#elif defined(VK_USE_PLATFORM_MIR_KHR) #elif defined(VK_USE_PLATFORM_ANDROID_KHR) VkAndroidSurfaceCreateInfoKHR createInfo; createInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR; @@ -3620,7 +3610,6 @@ static void registry_handle_global(void *data, struct wl_registry *registry, uin static void registry_handle_global_remove(void *data UNUSED, struct wl_registry *registry UNUSED, uint32_t name UNUSED) {} static const struct wl_registry_listener registry_listener = {registry_handle_global, registry_handle_global_remove}; -#elif defined(VK_USE_PLATFORM_MIR_KHR) #endif static void demo_init_connection(struct demo *demo) { @@ -3660,7 +3649,6 @@ static void demo_init_connection(struct demo *demo) { demo->registry = wl_display_get_registry(demo->display); wl_registry_add_listener(demo->registry, ®istry_listener, demo); wl_display_dispatch(demo->display); -#elif defined(VK_USE_PLATFORM_MIR_KHR) #endif } @@ -3950,7 +3938,6 @@ int main(int argc, char **argv) { demo_create_xlib_window(&demo); #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) demo_create_window(&demo); -#elif defined(VK_USE_PLATFORM_MIR_KHR) #endif demo_init_vk_swapchain(&demo); @@ -3963,7 +3950,6 @@ int main(int argc, char **argv) { demo_run_xlib(&demo); #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) demo_run(&demo); -#elif defined(VK_USE_PLATFORM_MIR_KHR) #elif defined(VK_USE_PLATFORM_DISPLAY_KHR) demo_run_display(&demo); #endif -- cgit v1.2.3