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

Commit fdd8dab6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dispatch properly to either GPDIFP2 or KHR variant" into main

parents d2327da6 0869c133

vulkan/libvulkan/swapchain.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1174,7 +1174,8 @@ VkResult GetPhysicalDeviceSurfaceFormats2KHR( 
                            pSurfaceFormat);



                    if (surfaceCompressionProps &&

                        driver.GetPhysicalDeviceImageFormatProperties2KHR) {

                        (driver.GetPhysicalDeviceImageFormatProperties2KHR ||

                         driver.GetPhysicalDeviceImageFormatProperties2)) {

                        VkPhysicalDeviceImageFormatInfo2 imageFormatInfo = {};

                        imageFormatInfo.sType =

                            VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2;
@@ -1205,7 +1206,7 @@ VkResult GetPhysicalDeviceSurfaceFormats2KHR( 
                        imageFormatProps.pNext = &compressionProps;



                        VkResult compressionRes =

                            driver.GetPhysicalDeviceImageFormatProperties2KHR(

                            GetPhysicalDeviceImageFormatProperties2(

                                physicalDevice, &imageFormatInfo,

                                &imageFormatProps);

                        if (compressionRes == VK_SUCCESS) {