Skip to content

Commit 351a8df

Browse files
tomnomgoogleukGerrit Code Review
authored andcommitted
Merge "Fix GetPhysicalDeviceSurfaceFormats2KHR for compression control struct handling" into main
2 parents 16fbe77 + 7e7812e commit 351a8df

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

vulkan/libvulkan/swapchain.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1225,8 +1225,15 @@ VkResult GetPhysicalDeviceSurfaceFormats2KHR(
12251225
surfaceCompressionProps
12261226
->imageCompressionFixedRateFlags =
12271227
compressionProps.imageCompressionFixedRateFlags;
1228-
} else {
1228+
} else if (compressionRes ==
1229+
VK_ERROR_OUT_OF_HOST_MEMORY ||
1230+
compressionRes ==
1231+
VK_ERROR_OUT_OF_DEVICE_MEMORY) {
12291232
return compressionRes;
1233+
} else {
1234+
// For any of the *_NOT_SUPPORTED errors we continue
1235+
// onto the next format
1236+
continue;
12301237
}
12311238
}
12321239
} break;

0 commit comments

Comments
 (0)