1 files changed, 8 insertions, 9 deletions

diff --git a/tests/common/test_vulkan.c b/tests/common/test_vulkan.c
index b12256a..4633d55 100644
--- a/tests/common/test_vulkan.c
+++ b/tests/common/test_vulkan.c
@@ -41,30 +41,29 @@ static int run_test(enum yasl_backend backend)
     VkSemaphore acquired = VK_NULL_HANDLE, rendered = VK_NULL_HANDLE;
     VkCommandBuffer command = VK_NULL_HANDLE;
 
-    if ((yasl_init(&(struct yasl_options){.backend=backend}) < 0)) {
+    if (yasl_init(backend, NULL) < 0) {
         fprintf(stderr, "vulkan integration: cannot select requested backend %d (YASL error %d)\n",
                 backend, errno);
         goto cleanup;
     }
-    if ((yasl_vulkan_init(vkGetInstanceProcAddr) < 0)) {
+    struct yasl_vulkan_requirements requirements;
+    if (yasl_vulkan_init(vkGetInstanceProcAddr, &requirements) < 0) {
         fprintf(stderr, "vulkan integration: loader initialization failed (YASL error %d)\n",
                 errno);
         goto cleanup;
     }
-    surface = yasl_surface_create(&(struct yasl_surface_options){.title="yasl Vulkan WSI integration", .width=256, .height=192, .type=YASL_SURFACE_NATIVE, .flags=0});
+    surface = yasl_surface_create(&(struct yasl_surface_options){.title="yasl Vulkan WSI integration", .width=256, .height=192, .type=YASL_SURFACE_NATIVE});
     if (!surface) {
         fprintf(stderr, "vulkan integration: surface creation failed (YASL error %d)\n",
                 errno);
         goto cleanup;
     }
-    if (!(yasl_surface_get_features(surface) & YASL_CAP_VULKAN)) {
+    if (!(yasl_get_features() & YASL_FEATURE_VULKAN)) {
         fprintf(stderr, "vulkan integration: requested backend does not advertise Vulkan WSI\n");
         goto cleanup;
     }
 
     uint32_t extension_count = 0;
-    struct yasl_vulkan_requirements requirements;
-    if (yasl_vulkan_get_requirements(surface, &requirements) < 0) goto cleanup;
     extension_count = requirements.extension_count;
     const char *const *required = requirements.extensions;
     if (!required || !extension_count) {
@@ -114,7 +113,7 @@ static int run_test(enum yasl_backend backend)
     VkSurfaceKHR duplicate = VK_NULL_HANDLE;
     if (yasl_vulkan_create_surface(surface, instance, NULL, &duplicate) != VK_ERROR_NATIVE_WINDOW_IN_USE_KHR ||
         duplicate != VK_NULL_HANDLE || yasl_surface_destroy(surface) != -EBUSY ||
-        yasl_shutdown() != -EBUSY || yasl_vulkan_init(vkGetInstanceProcAddr) != -EBUSY) {
+        yasl_shutdown() != -EBUSY || yasl_vulkan_init(vkGetInstanceProcAddr, &requirements) != -EBUSY) {
         fprintf(stderr, "vulkan integration: live WSI ownership was not enforced\n");
         goto cleanup;
     }
@@ -191,8 +190,8 @@ static int run_test(enum yasl_backend backend)
 
     VkExtent2D extent = capabilities.currentExtent;
     if (extent.width == UINT32_MAX) {
-        int width = 0, height = 0;
-        yasl_surface_get_framebuffer_size(surface, &width, &height);
+        int width = yasl_surface_get_info(surface).pixel_width;
+        int height = yasl_surface_get_info(surface).pixel_height;
         if (width <= 0 || height <= 0) {
             fprintf(stderr, "vulkan integration: surface has no drawable framebuffer extent\n");
             goto cleanup;