[vlc-commits] [Git][videolan/vlc][master] 3 commits: direct3d11: make HAVE_AMF_SCALER a define only in the D3D11 modules

[Felix Paul Kühne (@fkuehne)]

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


Commits:
6078cb98 by Steve Lhomme at 2026-10-10T10:49:33+02:00
direct3d11: make HAVE_AMF_SCALER a define only in the D3D11 modules

Do not share it globally.

In meson when using cdata before this detection it complains we are
writing in cdata after reading it. This is the only module doing that.
We only use the define in one C file, for now. If other platforms support
AMF they can use the same system.

- - - - -
1ad4957f by Steve Lhomme at 2026-10-10T10:49:33+02:00
win32: use a local version of cdata for NSIS/WIX/RC configuration

Modiyfing one also modifies the main cdata, overwriting the data
and potentially writing after the cdata have been read.

- - - - -
69054c83 by Steve Lhomme at 2026-10-10T10:49:33+02:00
meson: move windows_rc definition after most cdata values are set

'src' is still setting some values for process/spawn.

- - - - -


7 changed files:

- config.h.meson
- configure.ac
- extras/package/win32/NSIS/meson.build
- extras/package/win32/msi/meson.build
- meson.build
- modules/video_output/Makefile.am
- modules/video_output/win32/meson.build


Changes:

=====================================
config.h.meson
=====================================
@@ -64,9 +64,6 @@
 /* Define to 1 if you have the `aligned_alloc' function. */
 #mesondefine HAVE_ALIGNED_ALLOC
 
-/* AMD HQScaler supported */
-#mesondefine HAVE_AMF_SCALER
-
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #mesondefine HAVE_ARPA_INET_H
 


=====================================
configure.ac
=====================================
@@ -2500,7 +2500,6 @@ have_amf_scaler="no"
 AS_IF([test "$enable_amf_scaler" != "no"], [
   AC_CHECK_HEADERS([AMF/core/PropertyStorage.h AMF/components/HQScaler.h], [
     have_amf_scaler="yes"
-    AC_DEFINE(HAVE_AMF_SCALER, 1, AMD HQScaler supported)
   ])
 ])
 AM_CONDITIONAL([HAVE_AMF_SCALER], [test "${have_amf_scaler}" != "no"])


=====================================
extras/package/win32/NSIS/meson.build
=====================================
@@ -3,7 +3,8 @@
 nsis_required = get_option('nsis').allowed() and not get_option('nsis').auto()
 makensis = find_program('makensis', required: nsis_required)
 
-nsi_conf = cdata
+nsi_conf = configuration_data()
+nsi_conf.merge_from(cdata)
 nsi_conf.set('BUILD_LUA_TRUE', lua_dep.found() and get_option('lua').allowed() ? '' : '#')
 nsi_conf.set('BUILD_SKINS_TRUE', skins2_feasible ? '' : '#')
 nsi_conf.set('HAVE_WIN64_TRUE',  have_win64 ? '' : '#')


=====================================
extras/package/win32/msi/meson.build
=====================================
@@ -29,7 +29,8 @@ W_MSIBUILDDIR = run_command(cygpath, '-w', meson.current_build_dir(), check: tru
 W_TOPBUILDDIR = run_command(cygpath, '-w', vlc_build_root, check: true).stdout().strip()
 W_PREFIX = run_command(cygpath, '-w', prefix_path / '', check: true).stdout().strip()
 
-wix_conf = cdata
+wix_conf = configuration_data()
+wix_conf.merge_from(cdata)
 wix_conf.set('BUILD_LUA_TRUE', lua_dep.found() and get_option('lua').allowed() ? '' : '#')
 wix_conf.set('BUILD_SKINS_TRUE', skins2_feasible ? '' : '#')
 wix_conf.set('HAVE_NLS_TRUE', wix_conf.get('ENABLE_NLS', 0) == 1 ? '' : '#')


=====================================
meson.build
=====================================
@@ -1077,14 +1077,6 @@ vlc_about = custom_target('vlc_about.h',
                                    '@INPUT2@',
                                    '@OUTPUT@'])
 
-if host_system == 'windows'
-    windows_rc = import('windows')
-    # not quoted values
-    rc_conf = cdata
-    rc_conf.set('VERSION', vlc_version)
-    rc_conf.set('COPYRIGHT_YEARS', vlc_copyright_years)
-endif
-
 # Enable stream outputs
 if get_option('stream_outputs')
     cdata.set('ENABLE_SOUT', 1)
@@ -1174,6 +1166,15 @@ subdir('compat')
 # Headers
 subdir('include')
 
+if host_system == 'windows'
+    windows_rc = import('windows')
+    # not quoted values
+    rc_conf = configuration_data()
+    rc_conf.merge_from(cdata)
+    rc_conf.set('VERSION', vlc_version)
+    rc_conf.set('COPYRIGHT_YEARS', vlc_copyright_years)
+endif
+
 # libvlccore
 subdir('src')
 


=====================================
modules/video_output/Makefile.am
=====================================
@@ -248,6 +248,7 @@ if HAVE_NVDEC
 libdirect3d11_plugin_la_SOURCES += hw/nvdec/nvdec_fmt.h
 endif
 if HAVE_AMF_SCALER
+libdirect3d11_plugin_la_CPPFLAGS += -DHAVE_AMF_SCALER
 libdirect3d11_plugin_la_SOURCES += hw/amf/amf_helper.c hw/amf/amf_helper.h
 endif
 libdirect3d11_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(vout_RPATH)


=====================================
modules/video_output/win32/meson.build
=====================================
@@ -20,10 +20,9 @@ endif
 if get_option('amf_scaler').allowed()
     if cc.check_header('AMF/core/PropertyStorage.h', args: [contrib_inc_args]) \
     and cc.check_header('AMF/components/HQScaler.h', args: [contrib_inc_args])
-        cdata.set('HAVE_AMF_SCALER', 1)
         d3d11_sources += files('../../hw/amf/amf_helper.c')
-        d3d11_cxxargs += contrib_inc_args
-        d3d11_cargs += contrib_inc_args
+        d3d11_cxxargs += [contrib_inc_args, '-DHAVE_AMF_SCALER']
+        d3d11_cargs += [contrib_inc_args, '-DHAVE_AMF_SCALER']
     endif
 endif
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/bd56bb1294cfd15297a4030b7f0a58df7a32fc20...69054c83303c5ee007484023329c871ba2585a42

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/bd56bb1294cfd15297a4030b7f0a58df7a32fc20...69054c83303c5ee007484023329c871ba2585a42
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help