diff options
| author | Ian Elliott <ian@lunarg.com> | 2015-11-17 17:29:40 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-01 10:18:23 -0700 |
| commit | f4a4e44ff92cab960649a1f9b62def978823469f (patch) | |
| tree | da92258ece1dcc1f3128ee91366ce29460deb1be /loader | |
| parent | d4bfa782d4b60f42d2bacd8c3e84ebd4c09db9b9 (diff) | |
| download | usermoji-f4a4e44ff92cab960649a1f9b62def978823469f.tar.xz | |
WSI: sed-generated changes to WSI code (not all that's needed).
Conflicts:
demos/cube.c
demos/tri.c
demos/vulkaninfo.c
icd/common/icd.h
loader/loader.h
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.h | 3 | ||||
| -rw-r--r-- | loader/table_ops.h | 6 | ||||
| -rw-r--r-- | loader/wsi_swapchain.c | 6 | ||||
| -rw-r--r-- | loader/wsi_swapchain.h | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/loader/loader.h b/loader/loader.h index 40dcbd50..60e7d131 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -34,8 +34,9 @@ #include <vulkan/vulkan.h> #include <vk_loader_platform.h> + #include <vulkan/vk_lunarg_debug_report.h> -#include <vulkan/vk_ext_khr_swapchain.h> +#include <vulkan/VK_KHR_surface.h> #include <vulkan/vk_layer.h> #include <vulkan/vk_icd.h> #include <assert.h> diff --git a/loader/table_ops.h b/loader/table_ops.h index e468b0d9..d7f5bfd8 100644 --- a/loader/table_ops.h +++ b/loader/table_ops.h @@ -175,9 +175,9 @@ static inline void loader_init_device_dispatch_table(struct loader_dev_dispatch_ table->AcquireNextImageKHR = (PFN_vkAcquireNextImageKHR) gpa(dev, "vkAcquireNextImageKHR"); table->CreateSwapchainKHR = (PFN_vkCreateSwapchainKHR) gpa(dev, "vkCreateSwapchainKHR"); table->DestroySwapchainKHR = (PFN_vkDestroySwapchainKHR) gpa(dev, "vkDestroySwapchainKHR"); - table->GetSurfacePropertiesKHR = (PFN_vkGetSurfacePropertiesKHR) gpa(dev, "vkGetSurfacePropertiesKHR"); - table->GetSurfaceFormatsKHR = (PFN_vkGetSurfaceFormatsKHR) gpa(dev, "vkGetSurfaceFormatsKHR"); - table->GetSurfacePresentModesKHR = (PFN_vkGetSurfacePresentModesKHR) gpa(dev, "vkGetSurfacePresentModesKHR"); + table->GetPhysicalDeviceSurfaceCapabilitiesKHR = (PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR) gpa(dev, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR"); + table->GetPhysicalDeviceSurfaceFormatsKHR = (PFN_vkGetPhysicalDeviceSurfaceFormatsKHR) gpa(dev, "vkGetPhysicalDeviceSurfaceFormatsKHR"); + table->GetPhysicalDeviceSurfacePresentModesKHR = (PFN_vkGetPhysicalDeviceSurfacePresentModesKHR) gpa(dev, "vkGetPhysicalDeviceSurfacePresentModesKHR"); table->GetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR) gpa(dev, "vkGetSwapchainImagesKHR"); table->QueuePresentKHR = (PFN_vkQueuePresentKHR) gpa(dev, "vkQueuePresentKHR"); } diff --git a/loader/wsi_swapchain.c b/loader/wsi_swapchain.c index 9070657a..d35b2979 100644 --- a/loader/wsi_swapchain.c +++ b/loader/wsi_swapchain.c @@ -33,8 +33,8 @@ #include "wsi_swapchain.h" static const VkExtensionProperties wsi_swapchain_extension_info = { - .extensionName = VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME, - .specVersion = VK_EXT_KHR_SWAPCHAIN_REVISION, + .extensionName = VK_KHR_SURFACE_EXTENSION_NAME, + .specVersion = VK_KHR_SURFACE_REVISION, }; void wsi_swapchain_add_instance_extensions( @@ -51,7 +51,7 @@ void wsi_swapchain_create_instance( ptr_instance->wsi_swapchain_enabled = false; for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) { - if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) { + if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SURFACE_EXTENSION_NAME) == 0) { ptr_instance->wsi_swapchain_enabled = true; return; } diff --git a/loader/wsi_swapchain.h b/loader/wsi_swapchain.h index 416d659f..a225bc89 100644 --- a/loader/wsi_swapchain.h +++ b/loader/wsi_swapchain.h @@ -26,7 +26,7 @@ #include "vk_loader_platform.h" #include "loader.h" -#include "vulkan/vk_ext_khr_swapchain.h" +#include "vulkan/VK_KHR_surface.h" bool wsi_swapchain_instance_gpa(struct loader_instance *ptr_instance, const char* name, void **addr); |