vlc | branch: master | Steve Lhomme <[email protected]> | Tue Jun 25 14:44:11 2019 +0200| [94d468c48100dfc800d1378dc2994efc86efcb29] | committer: Steve Lhomme
opengl: don't create a pool internally if it's just a default software pool > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=94d468c48100dfc800d1378dc2994efc86efcb29 --- modules/video_output/caopengllayer.m | 2 +- modules/video_output/ios.m | 2 +- modules/video_output/macosx.m | 2 +- modules/video_output/opengl/display.c | 2 +- modules/video_output/win32/glwin32.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m index 8a41fd6b61..f328657655 100644 --- a/modules/video_output/caopengllayer.m +++ b/modules/video_output/caopengllayer.m @@ -198,7 +198,7 @@ static int Open (vout_display_t *vd, const vout_display_cfg_t *cfg, /* setup vout display */ vd->info.subpicture_chromas = subpicture_chromas; - vd->pool = Pool; + vd->pool = vout_display_opengl_HasPool(sys->vgl) ? Pool : NULL; vd->prepare = PictureRender; vd->display = PictureDisplay; vd->control = Control; diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m index 1971f3bd8f..d394e8a92a 100644 --- a/modules/video_output/ios.m +++ b/modules/video_output/ios.m @@ -208,7 +208,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, /* Setup vout_display_t once everything is fine */ vd->info.subpicture_chromas = subpicture_chromas; - vd->pool = PicturePool; + vd->pool = vout_display_opengl_HasPool(vgl) ? PicturePool : NULL; vd->prepare = PictureRender; vd->display = PictureDisplay; vd->control = Control; diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m index 2d69c0a08a..12043a9141 100644 --- a/modules/video_output/macosx.m +++ b/modules/video_output/macosx.m @@ -240,7 +240,7 @@ static int Open (vout_display_t *vd, const vout_display_cfg_t *cfg, /* Setup vout_display_t once everything is fine */ vd->info.subpicture_chromas = subpicture_chromas; - vd->pool = Pool; + vd->pool = vout_display_opengl_HasPool(sys->vgl) ? Pool : NULL; vd->prepare = PictureRender; vd->display = PictureDisplay; vd->control = Control; diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c index e126054739..69e45e744d 100644 --- a/modules/video_output/opengl/display.c +++ b/modules/video_output/opengl/display.c @@ -145,7 +145,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, vd->sys = sys; vd->info.subpicture_chromas = spu_chromas; - vd->pool = Pool; + vd->pool = vout_display_opengl_HasPool(sys->vgl) ? Pool : NULL; vd->prepare = PictureRender; vd->display = PictureDisplay; vd->control = Control; diff --git a/modules/video_output/win32/glwin32.c b/modules/video_output/win32/glwin32.c index 247baea475..a10a740709 100644 --- a/modules/video_output/win32/glwin32.c +++ b/modules/video_output/win32/glwin32.c @@ -163,7 +163,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, *fmtp = fmt; - vd->pool = Pool; + vd->pool = vout_display_opengl_HasPool(sys->vgl) ? Pool : NULL; vd->prepare = Prepare; vd->display = Display; vd->control = Control; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
