[vlc-commits] [Git][videolan/vlc][master] meson: opengl: implement interop_sw as module

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
bdf9d380 by Johannes Kauffmann at 2023-01-08T14:40:04+00:00
meson: opengl: implement interop_sw as module

Following cf672816a0410117d7bb167c58560f082ca682e1, remove it from the
common gl sources and implement it as a module.

- - - - -


1 changed file:

- modules/video_output/opengl/meson.build


Changes:

=====================================
modules/video_output/opengl/meson.build
=====================================
@@ -7,7 +7,6 @@ gl_common_dep = declare_dependency(
         'gl_util.c',
         'importer.c',
         'interop.c',
-        'interop_sw.c',
         'picture.c',
         'sampler.c',
         ),
@@ -44,3 +43,25 @@ if opengles2_dep.found()
                                      c_args: '-DUSE_OPENGL_ES2')
 endif
 
+# interop_sw
+if ['darwin', 'android'].contains(host_system) or opengl_dep.found() or opengles2_dep.found()
+    interop_sw_deps = []
+    interop_sw_cargs = []
+
+    if have_osx and opengl_dep.found()
+        interop_sw_deps += libvlc_opengl
+    elif ['darwin', 'android'].contains(host_system) and opengles2_dep.found()
+        interop_sw_deps += libvlc_opengles
+    endif
+
+    if opengles2_dep.found()
+        interop_sw_cargs += '-DUSE_OPENGL_ES2'
+    endif
+
+    vlc_modules += {
+        'name' : 'interop_sw',
+        'sources' : files('interop_sw.c'),
+        'dependencies' : interop_sw_deps,
+        'c_args' : interop_sw_cargs,
+    }
+endif



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/bdf9d38088c5071998d4ae92430214bcf4e96ee5

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/bdf9d38088c5071998d4ae92430214bcf4e96ee5
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance