Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ac5897d authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "[vulkan] fix -Wreorder-init-list" am: f6dd9483 am: 1f39e870 

am: c13e33d1

Change-Id: I0b75901af97fc5ce77691005b297ef9f924961c4
parents 62210655 c13e33d1

vulkan/libvulkan/swapchain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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,

vulkan/tools/vkinfo.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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);