meson: get rid of 'egl-helpers' feature

This was just redundant because it's always present together with 'egl'.

sfan5 committed 2 years ago

Commit a392f911 parent 3679d182 files · +3 −4Browse files

Unified · Split

2 files

filters/user_filters.c +1 −1
meson.build +2 −3

filters/user_filters.c+1−1

@@ -94,7 +94,7 @@ const struct mp_user_filter_entry *vf_list[] = { · 93 unmodified lines
94	94	#if HAVE_D3D_HWACCEL
95	95	&vf_d3d11vpp,
96	96	#endif
97		−#if HAVE_EGL_HELPERS && HAVE_GL && HAVE_EGL
	97	+#if HAVE_GL && HAVE_EGL
98	98	&vf_gpu,
99	99	#endif
100	100	};

meson.build+2−3

@@ -1226,12 +1226,11 @@ if plain_gl.allowed() · 1225 unmodified lines
1226	1226	features += {'gl': true}
1227	1227	endif
1228	1228
1229		−features += {'egl-helpers': features['egl'] or egl_android.found() or egl_angle_win32.allowed()}
1230		−if features['egl-helpers']
	1229	+if features['egl'] or features['egl-android'] or features['egl-angle-win32']
1231	1230	sources += files('video/out/opengl/egl_helpers.c')
1232	1231	endif
1233	1232
1234		−if features['egl'] and features['egl-helpers']
	1233	+if features['gl'] and features['egl']
1235	1234	sources += files('video/filter/vf_gpu.c')
1236	1235	endif
1237	1236