zink: ralloc screen objects
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Tue, 9 Feb 2021 20:49:21 +0000 (15:49 -0500)
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Mon, 15 Mar 2021 13:42:30 +0000 (09:42 -0400)
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9541>

src/gallium/drivers/zink/zink_screen.c

index 55a677c..504f7a7 100644 (file)
@@ -865,7 +865,7 @@ zink_destroy_screen(struct pipe_screen *pscreen)
    vkDestroyInstance(screen->instance, NULL);
 
    slab_destroy_parent(&screen->transfer_pool);
-   FREE(screen);
+   ralloc_free(screen);
 }
 
 static void
@@ -1275,7 +1275,7 @@ pre_hash_descriptor_states(struct zink_screen *screen)
 static struct zink_screen *
 zink_internal_create_screen(const struct pipe_screen_config *config)
 {
-   struct zink_screen *screen = CALLOC_STRUCT(zink_screen);
+   struct zink_screen *screen = rzalloc(NULL, struct zink_screen);
    if (!screen)
       return NULL;
 
@@ -1371,7 +1371,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
    return screen;
 
 fail:
-   FREE(screen);
+   ralloc_free(screen);
    return NULL;
 }