[vlc-commits] vout: vulkan: remove the local pool handling

Steve Lhomme git at videolan.org
Fri Jul 19 15:29:47 CEST 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Jul 17 13:37:29 2019 +0200| [1caad11d91fe1e8c10510b5c13621f950ff4dcea] | committer: Steve Lhomme

vout: vulkan: remove the local pool handling

It's a regular CPU pool similar to default implementation.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1caad11d91fe1e8c10510b5c13621f950ff4dcea
---

 modules/video_output/vulkan/display.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/modules/video_output/vulkan/display.c b/modules/video_output/vulkan/display.c
index 75416e4cde..511446324d 100644
--- a/modules/video_output/vulkan/display.c
+++ b/modules/video_output/vulkan/display.c
@@ -39,14 +39,11 @@
 #include <libplacebo/swapchain.h>
 #include <libplacebo/vulkan.h>
 
-#define VLCVK_MAX_BUFFERS 128
-
 struct vout_display_sys_t
 {
     vlc_vk_t *vk;
     const struct pl_tex *plane_tex[4];
     struct pl_renderer *renderer;
-    picture_pool_t *pool;
 
     // Pool of textures for the subpictures
     struct pl_overlay *overlays;
@@ -74,7 +71,6 @@ struct vout_display_sys_t
 };
 
 // Display callbacks
-static picture_pool_t *Pool(vout_display_t *, unsigned);
 static void PictureRender(vout_display_t *, picture_t *, subpicture_t *, mtime_t);
 static void PictureDisplay(vout_display_t *, picture_t *);
 static int Control(vout_display_t *, int, va_list);
@@ -142,7 +138,6 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
 
     vd->info.subpicture_chromas = subfmts;
 
-    vd->pool = Pool;
     vd->prepare = PictureRender;
     vd->display = PictureDisplay;
     vd->control = Control;
@@ -174,23 +169,10 @@ static void Close(vout_display_t *vd)
     }
 
     pl_renderer_destroy(&sys->renderer);
-    if (sys->pool)
-        picture_pool_Release(sys->pool);
 
     vlc_vk_Release(sys->vk);
 }
 
-static picture_pool_t *Pool(vout_display_t *vd, unsigned requested_count)
-{
-    assert(requested_count <= VLCVK_MAX_BUFFERS);
-    vout_display_sys_t *sys = vd->sys;
-    if (sys->pool)
-        return sys->pool;
-
-    sys->pool = picture_pool_NewFromFormat(&vd->fmt, requested_count);
-    return sys->pool;
-}
-
 static void PictureRender(vout_display_t *vd, picture_t *pic,
                           subpicture_t *subpicture, mtime_t date)
 {



More information about the vlc-commits mailing list