diff options
| author | 2019-10-18 21:37:31 +0000 | |
|---|---|---|
| committer | 2019-10-18 21:37:31 +0000 | |
| commit | f6dd948369a04f40be0f7acb278fa7d1730ee80c (patch) | |
| tree | f03709de2f9d34eb4efea5116fb5bcbf9fdaf409 | |
| parent | c875ac80dcdab824cf9e8ad15bbe81b728558b96 (diff) | |
| parent | d04f4ed28d67b76e83664773a3ccaa934877277e (diff) | |
Merge "[vulkan] fix -Wreorder-init-list"
| -rw-r--r-- | vulkan/libvulkan/swapchain.cpp | 2 | ||||
| -rw-r--r-- | vulkan/tools/vkinfo.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index 5f4c6b1305..cc0df08835 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp @@ -1280,6 +1280,7 @@ VkResult CreateSwapchainKHR(VkDevice device, VkImageCreateInfo image_create = { .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .pNext = &image_native_buffer, + .flags = createProtectedSwapchain ? VK_IMAGE_CREATE_PROTECTED_BIT : 0u, .imageType = VK_IMAGE_TYPE_2D, .format = create_info->imageFormat, .extent = {0, 0, 1}, @@ -1288,7 +1289,6 @@ VkResult CreateSwapchainKHR(VkDevice device, .samples = VK_SAMPLE_COUNT_1_BIT, .tiling = VK_IMAGE_TILING_OPTIMAL, .usage = create_info->imageUsage, - .flags = createProtectedSwapchain ? VK_IMAGE_CREATE_PROTECTED_BIT : 0u, .sharingMode = create_info->imageSharingMode, .queueFamilyIndexCount = create_info->queueFamilyIndexCount, .pQueueFamilyIndices = create_info->pQueueFamilyIndices, diff --git a/vulkan/tools/vkinfo.cpp b/vulkan/tools/vkinfo.cpp index 89bc926aa6..f9e4916722 100644 --- a/vulkan/tools/vkinfo.cpp +++ b/vulkan/tools/vkinfo.cpp @@ -195,10 +195,10 @@ void GatherGpuInfo(VkPhysicalDevice gpu, .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .queueCreateInfoCount = 1, .pQueueCreateInfos = &queue_create_info, - .enabledExtensionCount = num_extensions, - .ppEnabledExtensionNames = extensions, .enabledLayerCount = (options.validate) ? num_layers : 0, .ppEnabledLayerNames = kValidationLayers, + .enabledExtensionCount = num_extensions, + .ppEnabledExtensionNames = extensions, .pEnabledFeatures = &info.features, }; result = vkCreateDevice(gpu, &create_info, nullptr, &device); @@ -272,10 +272,10 @@ void GatherInfo(VulkanInfo* info, const Options& options) { const VkInstanceCreateInfo create_info = { .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pApplicationInfo = &application_info, - .enabledExtensionCount = num_extensions, - .ppEnabledExtensionNames = extensions, .enabledLayerCount = (options.validate) ? num_layers : 0, .ppEnabledLayerNames = kValidationLayers, + .enabledExtensionCount = num_extensions, + .ppEnabledExtensionNames = extensions, }; VkInstance instance; result = vkCreateInstance(&create_info, nullptr, &instance); |