diff options
| author | Ian Elliott <ianelliott@google.com> | 2015-12-11 15:52:12 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-29 14:42:01 -0700 |
| commit | a7a731c951c0d6ee837ef7d52293a700c4b841f8 (patch) | |
| tree | 2741f90d3e4247a6cbf71bfef5e09744c9a0dce5 | |
| parent | 95ea7dcd62218abb04868b48ed816d520b9e8ef2 (diff) | |
| download | usermoji-a7a731c951c0d6ee837ef7d52293a700c4b841f8.tar.xz | |
demos: Version 217 WSI changes.
| -rw-r--r-- | demos/cube.c | 22 | ||||
| -rw-r--r-- | demos/tri.c | 22 |
2 files changed, 36 insertions, 8 deletions
diff --git a/demos/cube.c b/demos/cube.c index 6230ef26..5a9f6a5a 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -816,8 +816,8 @@ static void demo_prepare_buffers(struct demo *demo) } VkSurfaceTransformFlagsKHR preTransform; - if (surfCapabilities.supportedTransforms & VK_SURFACE_TRANSFORM_NONE_BIT_KHR) { - preTransform = VK_SURFACE_TRANSFORM_NONE_BIT_KHR; + if (surfCapabilities.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) { + preTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR; } else { preTransform = surfCapabilities.currentTransform; } @@ -2449,11 +2449,25 @@ static void demo_init_vk_swapchain(struct demo *demo) // Create a WSI surface for the window: #ifdef _WIN32 - err = vkCreateWin32SurfaceKHR(demo->inst, demo->connection, demo->window, + VkWin32SurfaceCreateInfoKHR createInfo; + createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; + createInfo.pNext = NULL; + createInfo.flags = 0; + createInfo.connection = demo->connection; + createInfo.window = demo->window; + + err = vkCreateWin32SurfaceKHR(demo->inst, &createInfo, NULL, &demo->surface); #else // _WIN32 - err = vkCreateXcbSurfaceKHR(demo->inst, demo->connection, demo->window, + VkXcbSurfaceCreateInfoKHR createInfo; + createInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR; + createInfo.pNext = NULL; + createInfo.flags = 0; + createInfo.connection = demo->connection; + createInfo.window = demo->window; + + err = vkCreateXcbSurfaceKHR(demo->inst, &createInfo, NULL, &demo->surface); #endif // _WIN32 diff --git a/demos/tri.c b/demos/tri.c index 5dd31616..ff78e94d 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -605,8 +605,8 @@ static void demo_prepare_buffers(struct demo *demo) } VkSurfaceTransformFlagsKHR preTransform; - if (surfCapabilities.supportedTransforms & VK_SURFACE_TRANSFORM_NONE_BIT_KHR) { - preTransform = VK_SURFACE_TRANSFORM_NONE_BIT_KHR; + if (surfCapabilities.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) { + preTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR; } else { preTransform = surfCapabilities.currentTransform; } @@ -2011,11 +2011,25 @@ static void demo_init_vk_swapchain(struct demo *demo) // Create a WSI surface for the window: #ifdef _WIN32 - err = vkCreateWin32SurfaceKHR(demo->inst, demo->connection, demo->window, + VkWin32SurfaceCreateInfoKHR createInfo; + createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; + createInfo.pNext = NULL; + createInfo.flags = 0; + createInfo.connection = demo->connection; + createInfo.window = demo->window; + + err = vkCreateWin32SurfaceKHR(demo->inst, &createInfo, NULL, &demo->surface); #else // _WIN32 - err = vkCreateXcbSurfaceKHR(demo->inst, demo->connection, demo->window, + VkXcbSurfaceCreateInfoKHR createInfo; + createInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR; + createInfo.pNext = NULL; + createInfo.flags = 0; + createInfo.connection = demo->connection; + createInfo.window = demo->window; + + err = vkCreateXcbSurfaceKHR(demo->inst, &createInfo, NULL, &demo->surface); #endif // _WIN32 |