[vlc-commits] [Git][videolan/vlc][master] opengl: move vout-specific files to vout modules

[Romain Vimont (@rom1v)]

Romain Vimont pushed to branch master at VideoLAN / VLC


Commits:
163fb486 by Romain Vimont at 2021-08-24T08:50:55+00:00
opengl: move vout-specific files to vout modules

Some OpenGL vout-specific source files where included into all OpenGL
modules. They were not necessary for OpenGL filters modules for example.

- - - - -


3 changed files:

- modules/video_output/Makefile.am
- modules/video_output/opengl/Makefile.am
- modules/video_output/opengl/filters.c


Changes:

=====================================
modules/video_output/Makefile.am
=====================================
@@ -33,13 +33,15 @@ libglinterop_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 	-Wl,-framework,Foundation,-framework,CoreVideo
 
 if HAVE_OSX
-libvout_macosx_plugin_la_SOURCES = video_output/macosx.m
+libvout_macosx_plugin_la_SOURCES = video_output/macosx.m \
+	$(OPENGL_VOUT_COMMONSOURCES)
 libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_GL_CORE_SYMBOLS
 libvout_macosx_plugin_la_LIBADD = libvlc_opengl.la
 libvout_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 	-Wl,-framework,OpenGL,-framework,Cocoa
 
-libcaopengllayer_plugin_la_SOURCES = video_output/caopengllayer.m
+libcaopengllayer_plugin_la_SOURCES = video_output/caopengllayer.m \
+	$(OPENGL_VOUT_COMMONSOURCES)
 libcaopengllayer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)  -DHAVE_GL_CORE_SYMBOLS
 libcaopengllayer_plugin_la_LIBADD = libvlc_opengl.la
 libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
@@ -160,7 +162,7 @@ libdirect3d11_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect3d11)
 EXTRA_LTLIBRARIES += libdirect3d11_plugin.la
 
-libglwin32_plugin_la_SOURCES = \
+libglwin32_plugin_la_SOURCES = $(OPENGL_VOUT_COMMONSOURCES) \
 	video_output/win32/glwin32.c \
 	video_output/win32/common.c video_output/win32/common.h \
 	video_output/win32/events.c video_output/win32/events.h \


=====================================
modules/video_output/opengl/Makefile.am
=====================================
@@ -1,4 +1,4 @@
-OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \
+OPENGL_COMMONSOURCES = \
        video_output/opengl/filter.c \
        video_output/opengl/filter.h \
        video_output/opengl/filter_draw.c \
@@ -13,16 +13,11 @@ OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \
        video_output/opengl/gl_util.c \
        video_output/opengl/gl_util.h \
        video_output/opengl/interop.h \
-       video_output/opengl/vout_helper.h \
        video_output/opengl/internal.h \
        video_output/opengl/interop.c video_output/opengl/interop_sw.c \
-       video_output/opengl/renderer.c \
-       video_output/opengl/renderer.h \
        video_output/opengl/sampler.c \
        video_output/opengl/sampler.h \
-       video_output/opengl/sampler_priv.h \
-       video_output/opengl/sub_renderer.c \
-       video_output/opengl/sub_renderer.h
+       video_output/opengl/sampler_priv.h
 
 OPENGL_COMMONCFLAGS = $(LIBPLACEBO_CFLAGS)
 OPENGL_COMMONLIBS = $(LIBPLACEBO_LIBS)
@@ -31,6 +26,14 @@ if HAVE_LIBPLACEBO
 OPENGL_COMMONLIBS += libplacebo_utils.la
 endif
 
+OPENGL_VOUT_COMMONSOURCES = \
+    video_output/opengl/renderer.c \
+    video_output/opengl/renderer.h \
+    video_output/opengl/sub_renderer.c \
+    video_output/opengl/sub_renderer.h \
+    video_output/opengl/vout_helper.c \
+    video_output/opengl/vout_helper.h
+
 # Convenience library for OpenGL components -- OpenGL only
 libvlc_opengl_la_SOURCES = $(OPENGL_COMMONSOURCES)
 libvlc_opengl_la_CFLAGS = $(OPENGL_COMMONCFLAGS)
@@ -54,7 +57,8 @@ noinst_LTLIBRARIES += libvlc_opengles.la
 endif
 
 ### OpenGL ###
-libgles2_plugin_la_SOURCES = video_output/opengl/display.c
+libgles2_plugin_la_SOURCES = video_output/opengl/display.c \
+    $(OPENGL_VOUT_COMMONSOURCES)
 libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2
 libgles2_plugin_la_LIBADD = libvlc_opengles.la
 libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
@@ -62,7 +66,8 @@ if HAVE_GLES2
 vout_LTLIBRARIES += libgles2_plugin.la
 endif
 
-libgl_plugin_la_SOURCES = video_output/opengl/display.c
+libgl_plugin_la_SOURCES = video_output/opengl/display.c \
+    $(OPENGL_VOUT_COMMONSOURCES)
 libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCFLAGS)
 libgl_plugin_la_LIBADD = libvlc_opengl.la
 


=====================================
modules/video_output/opengl/filters.c
=====================================
@@ -29,7 +29,6 @@
 #include <vlc_list.h>
 
 #include "filter_priv.h"
-#include "renderer.h"
 #include "sampler_priv.h"
 
 /* The filter chain contains the sequential list of filters.



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

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