optimize vulkan render surfaces

ardera · ardera · commit e6aa20b73864 · 2023-07-17T12:38:11.000+02:00
- use optimal tiling for vulkan render surfaces
- specify valid values for the vulkan image layout
- remove old opaque fb casting workaround in vulkan render surface
- call vkDeviceWaitIdle before present fb bc apparently on intel, something doesn't work with synchronization
diff --git a/src/vk_gbm_render_surface.c b/src/vk_gbm_render_surface.c
@@ -186,7 +186,7 @@ static VkFormat srgb_to_unorm_format(VkFormat vk_format) {
     }
 }
 
-static int fb_init(struct fb *fb, struct gbm_device *gbm_device, struct vk_renderer *renderer, int width, int height, enum pixfmt pixel_format, uint64_t drm_modifier) {
+static int fb_init(struct fb *fb, struct gbm_device *gbm_device, struct vk_renderer *renderer, int width, int height, enum pixfmt pixel_format) {
     PFN_vkGetMemoryFdPropertiesKHR get_memory_fd_props;
     VkSubresourceLayout layout;
     VkDeviceMemory img_device_memory;
@@ -212,6 +212,17 @@ static int fb_init(struct fb *fb, struct gbm_device *gbm_device, struct vk_rende
         vk_format = srgb_to_unorm_format(vk_format);
     }
 
+    bo = gbm_bo_create(
+        gbm_device,
+        width, height,
+        get_pixfmt_info(pixel_format)->gbm_format,
+        GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT
+    );
+    if (bo == NULL) {
+        LOG_ERROR("Could not create GBM BO. gbm_bo_create: %s\n", strerror(errno));
+        goto fail_destroy_image;
+    }
+
     ok = vkCreateImage(
         device,
         &(VkImageCreateInfo){
@@ -241,14 +252,14 @@ static int fb_init(struct fb *fb, struct gbm_device *gbm_device, struct vk_rende
                         &(VkImageDrmFormatModifierExplicitCreateInfoEXT){
                             .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT,
                             .drmFormatModifierPlaneCount = 1,
-                            .drmFormatModifier = drm_modifier,
+                            .drmFormatModifier = gbm_bo_get_modifier(bo),
                             .pPlaneLayouts =
                                 (VkSubresourceLayout[1]){
                                     {
                                         /// These are just dummy values, but they need to be there AFAIK
-                                        .offset = 0,
-                                        .size = 0,
-                                        .rowPitch = 0,
+                                        .offset = gbm_bo_get_offset(bo, 0),
+                                        .size = gbm_bo_get_stride_for_plane(bo, 0) * gbm_bo_get_height(bo) + gbm_bo_get_offset(bo, 0),
+                                        .rowPitch = gbm_bo_get_stride_for_plane(bo, 0),
                                         .arrayPitch = 0,
                                         .depthPitch = 0,
                                     },
@@ -277,20 +288,6 @@ static int fb_init(struct fb *fb, struct gbm_device *gbm_device, struct vk_rende
         &layout
     );
 
-    // Create a GBM BO with the actual memory we're going to use
-    bo = gbm_bo_create_with_modifiers(
-        gbm_device,
-        width,
-        height,
-        get_pixfmt_info(pixel_format)->gbm_format,
-        &drm_modifier,
-        1
-    );
-    if (bo == NULL) {
-        LOG_ERROR("Could not create GBM BO. gbm_bo_create_with_modifiers: %s\n", strerror(errno));
-        goto fail_destroy_image;
-    }
-
     // Just some paranoid checks that the layout matches (had some issues with that initially)
     if (gbm_bo_get_offset(bo, 0) != layout.offset) {
         LOG_ERROR("GBM BO layout doesn't match image layout. This is probably a driver / kernel bug.\n");
@@ -428,11 +425,11 @@ static int fb_init(struct fb *fb, struct gbm_device *gbm_device, struct vk_rende
     fail_close_fd:
     close(fd);
 
-    fail_destroy_bo:
-    gbm_bo_destroy(bo);
-
     fail_destroy_image:
     vkDestroyImage(device, vkimg, NULL);
+
+    fail_destroy_bo:
+    gbm_bo_destroy(bo);
     return EIO;
 }
 
@@ -460,7 +457,7 @@ int vk_gbm_render_surface_init(
     }
 
     for (int i = 0; i < ARRAY_SIZE(surface->fbs); i++) {
-        ok = fb_init(surface->fbs + i, gbm_device, renderer, (int) size.x, (int) size.y, pixel_format, DRM_FORMAT_MOD_LINEAR);
+        ok = fb_init(surface->fbs + i, gbm_device, renderer, (int) size.x, (int) size.y, pixel_format);
         if (ok != 0) {
             LOG_ERROR("Could not initialize vulkan GBM framebuffer.\n");
             goto fail_deinit_previous_fbs;
@@ -551,9 +548,6 @@ void vk_gbm_render_surface_deinit(struct surface *s) {
 struct gbm_bo_meta {
     struct drmdev *drmdev;
     uint32_t fb_id;
-    bool has_opaque_fb;
-    enum pixfmt opaque_pixel_format;
-    uint32_t opaque_fb_id;
 };
 
 static void on_destroy_gbm_bo_meta(struct gbm_bo *bo, void *meta_void) {
@@ -569,13 +563,6 @@ static void on_destroy_gbm_bo_meta(struct gbm_bo *bo, void *meta_void) {
         LOG_ERROR("Couldn't remove DRM framebuffer.\n");
     }
 
-    if (meta->has_opaque_fb && meta->opaque_fb_id != meta->fb_id) {
-        ok = drmdev_rm_fb(meta->drmdev, meta->opaque_fb_id);
-        if (ok != 0) {
-            LOG_ERROR("Couldn't remove DRM framebuffer.\n");
-        }
-    }
-
     drmdev_unref(meta->drmdev);
     free(meta);
 }
@@ -600,8 +587,8 @@ static int vk_gbm_render_surface_present_kms(struct surface *s, const struct fl_
     struct gbm_bo_meta *meta;
     struct drmdev *drmdev;
     struct gbm_bo *bo;
-    enum pixfmt pixel_format, opaque_pixel_format;
-    uint32_t fb_id, opaque_fb_id;
+    enum pixfmt pixel_format;
+    uint32_t fb_id;
     int ok;
 
     vk_surface = CAST_THIS(s);
@@ -618,8 +605,6 @@ static int vk_gbm_render_surface_present_kms(struct surface *s, const struct fl_
     bo = vk_surface->front_fb->fb->bo;
     meta = gbm_bo_get_user_data(bo);
     if (meta == NULL) {
-        bool has_opaque_fb;
-
         meta = malloc(sizeof *meta);
         if (meta == NULL) {
             ok = ENOMEM;
@@ -638,8 +623,7 @@ static int vk_gbm_render_surface_present_kms(struct surface *s, const struct fl_
             gbm_bo_get_handle(bo).u32,
             gbm_bo_get_stride(bo),
             gbm_bo_get_offset(bo, 0),
-            true, gbm_bo_get_modifier(bo),
-            0
+            true, gbm_bo_get_modifier(bo)
         );
         TRACER_END(vk_surface->surface.tracer, "drmdev_add_fb (non-opaque)");
 
@@ -649,40 +633,8 @@ static int vk_gbm_render_surface_present_kms(struct surface *s, const struct fl_
             goto fail_free_meta;
         }
 
-        if (get_pixfmt_info(vk_surface->pixel_format)->is_opaque == false) {
-            has_opaque_fb = false;
-            opaque_pixel_format = pixfmt_opaque(vk_surface->pixel_format);
-            if (get_pixfmt_info(opaque_pixel_format)->is_opaque) {
-
-                TRACER_BEGIN(vk_surface->surface.tracer, "drmdev_add_fb (opaque)");
-                opaque_fb_id = drmdev_add_fb(
-                    drmdev,
-                    gbm_bo_get_width(bo),
-                    gbm_bo_get_height(bo),
-                    opaque_pixel_format,
-                    gbm_bo_get_handle(bo).u32,
-                    gbm_bo_get_stride(bo),
-                    gbm_bo_get_offset(bo, 0),
-                    true, gbm_bo_get_modifier(bo),
-                    0
-                );
-                TRACER_END(vk_surface->surface.tracer, "drmdev_add_fb (opaque)");
-
-                if (opaque_fb_id != 0) {
-                    has_opaque_fb = true;
-                }
-            }
-        } else {
-            has_opaque_fb = true;
-            opaque_fb_id = fb_id;
-            opaque_pixel_format = vk_surface->pixel_format;
-        }
-
         meta->drmdev = drmdev_ref(drmdev);
         meta->fb_id = fb_id;
-        meta->has_opaque_fb = has_opaque_fb;
-        meta->opaque_pixel_format = opaque_pixel_format;
-        meta->opaque_fb_id = opaque_fb_id;
         gbm_bo_set_user_data(bo, meta, on_destroy_gbm_bo_meta);
     } else {
         // We can only add this GBM BO to a single KMS device as an fb right now.
@@ -708,29 +660,19 @@ static int vk_gbm_render_surface_present_kms(struct surface *s, const struct fl_
     // For example, on Pi 4, even though ARGB8888 is listed as supported for the primary plane,
     // rendering is completely off.
     // So we just cast our fb to an XRGB8888 framebuffer and scanout that instead.
-    if (kms_req_builder_prefer_next_layer_opaque(builder)) {
-        if (meta->has_opaque_fb) {
-            fb_id = meta->opaque_fb_id;
-            pixel_format = meta->opaque_pixel_format;
-        } else {
-            LOG_DEBUG("Bottom-most framebuffer layer should be opaque, but an opaque framebuffer couldn't be created.\n");
-            LOG_DEBUG("Using non-opaque framebuffer instead, which can result in visual glitches.\n");
-            fb_id = meta->fb_id;
-            pixel_format = vk_surface->pixel_format;
-        }
-    } else {
-        fb_id = meta->fb_id;
-        pixel_format = vk_surface->pixel_format;
-    }
+    fb_id = meta->fb_id;
+    pixel_format = vk_surface->pixel_format;
+
+    vkDeviceWaitIdle(vk_renderer_get_device(vk_surface->renderer));
 
     TRACER_BEGIN(vk_surface->surface.tracer, "kms_req_builder_push_fb_layer");
     ok = kms_req_builder_push_fb_layer(
         builder,
         &(const struct kms_fb_layer) {
             .drm_fb_id = fb_id,
             .format = pixel_format,
-            .has_modifier = false,
-            .modifier = 0,
+            .has_modifier = true,
+            .modifier = gbm_bo_get_modifier(bo),
 
             .dst_x = (int32_t) props->aa_rect.offset.x,
             .dst_y = (int32_t) props->aa_rect.offset.y,
