gfx: GPU video interop layer (from #2109)

CMakeLists.txt

@@ -329,6 +329,10 @@ endif()
 
 add_subdirectory(src)
 
+if(SCORE_STATIC_PLUGINS AND TARGET EncoderTester)
+  target_link_libraries(EncoderTester PRIVATE ${SCORE_PLUGINS_LIST})
+endif()
+
 include(cmake/ScoreFeatureCheck.cmake)
 
 if(EXISTS Documentation/Models/score.qmodel)

cmake/ScoreAvndHelper.cmake

@@ -22,42 +22,54 @@ endfunction()
 function(avnd_score_plugin_finalize)
   cmake_parse_arguments(AVND "CUSTOM_PLUGIN;MODULE" "BASE_TARGET;PLUGIN_VERSION;PLUGIN_UUID" "" ${ARGN})
 
+  # Each addon's generated files live in their own directory, exposed only to
+  # targets that link the addon. score_static_plugins.hpp registers plug-ins
+  # behind `#if __has_include(<score_addon_foo.hpp>)`, so a header sitting in
+  # CMAKE_BINARY_DIR -- which is on every target's include path -- makes that
+  # guard true everywhere, and any target compiling that header then references
+  # a constructor it does not link. Small unit tests are the ones that break.
+  set(AVND_GEN_DIR "${CMAKE_BINARY_DIR}/score_addons/${AVND_BASE_TARGET}")
+
   if(NOT AVND_CUSTOM_PLUGIN)
     # Generate the score_plugin_foo.{h,c}pp
     configure_file(
       "${SCORE_AVND_SOURCE_DIR}/plugin_prototype.hpp.in"
-      "${CMAKE_BINARY_DIR}/${AVND_BASE_TARGET}.hpp"
+      "${AVND_GEN_DIR}/${AVND_BASE_TARGET}.hpp"
       @ONLY
       NEWLINE_STYLE LF
     )
     if(AVND_MODULE)
       configure_file(
         "${SCORE_AVND_SOURCE_DIR}/module_plugin_prototype.cpp.in"
-        "${CMAKE_BINARY_DIR}/${AVND_BASE_TARGET}.cpp"
+        "${AVND_GEN_DIR}/${AVND_BASE_TARGET}.cpp"
         @ONLY
         NEWLINE_STYLE LF
       )
       target_sources(${AVND_BASE_TARGET} PRIVATE FILE_SET CXX_MODULES FILES
-        "${CMAKE_BINARY_DIR}/${AVND_BASE_TARGET}.cpp"
+        "${AVND_GEN_DIR}/${AVND_BASE_TARGET}.cpp"
       )
     else()
       configure_file(
         "${SCORE_AVND_SOURCE_DIR}/plugin_prototype.cpp.in"
-        "${CMAKE_BINARY_DIR}/${AVND_BASE_TARGET}.cpp"
+        "${AVND_GEN_DIR}/${AVND_BASE_TARGET}.cpp"
         @ONLY
         NEWLINE_STYLE LF
       )
       target_sources(${AVND_BASE_TARGET} PRIVATE
-        "${CMAKE_BINARY_DIR}/${AVND_BASE_TARGET}.cpp"
+        "${AVND_GEN_DIR}/${AVND_BASE_TARGET}.cpp"
       )
     endif()
   else()
     file(CONFIGURE OUTPUT
-         "${CMAKE_BINARY_DIR}/include.${AVND_BASE_TARGET}.cpp"
+         "${AVND_GEN_DIR}/include.${AVND_BASE_TARGET}.cpp"
          CONTENT "${AVND_ADDITIONAL_CLASSES}\nstatic void all_custom_factories(auto& fx, auto& ctx, auto& key) { ${AVND_CUSTOM_FACTORIES} }\n"
          NEWLINE_STYLE LF)
   endif()
 
+  # PUBLIC: the addon's own generated .cpp includes the header, and so must the
+  # app that links it -- but nothing else.
+  target_include_directories(${AVND_BASE_TARGET} PUBLIC "${AVND_GEN_DIR}")
+
   setup_score_plugin(${AVND_BASE_TARGET})
   target_link_libraries(${AVND_BASE_TARGET} PUBLIC score_plugin_engine score_plugin_avnd)
 

src/app/main.cpp

@@ -274,8 +274,12 @@ static void setup_x11(int argc, char** argv)
         helper_dylibs.run_under_x11 = true;
         helper_dylibs.xwayland = wayland;
 
-        // EGL is the only way to get zero-copy with dma-buf import
-        qputenv("QT_XCB_GL_INTEGRATION", "xcb_egl");
+        // EGL is the only way to get zero-copy with dma-buf import, so it is
+        // the default -- but NVIDIA's GPUDirect-for-Video (libdvp) interops
+        // only with GLX, so a user who needs DVP must be able to ask for
+        // xcb_glx and have it stick.
+        if(qEnvironmentVariableIsEmpty("QT_XCB_GL_INTEGRATION"))
+          qputenv("QT_XCB_GL_INTEGRATION", "xcb_egl");
       }
     }
   };

src/plugins/score-plugin-gfx/3rdparty/nv-dvp-bridge/CMakeLists.txt

@@ -0,0 +1,70 @@
+# nv-dvp-bridge: NVIDIA "GPUDirect for Video" runtime-loaded shim +
+# C API wrapper. Cross-platform: Windows uses dvp.dll; Linux uses
+# libdvp.so.1. Consumers (AJA, planned DeckLink) link this target via
+# its score-plugin-gfx parent.
+#
+# The bridge itself has no NVIDIA-SDK headers as a build dependency —
+# all DVP entry points are dlsym'd at runtime from the NVIDIA library.
+
+add_library(score_nv_dvp_bridge STATIC
+  "${CMAKE_CURRENT_SOURCE_DIR}/nv_dvp_bridge.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/nv_dvp_bridge.h"
+  "${CMAKE_CURRENT_SOURCE_DIR}/dvpapi_shim.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/dvpapi_shim.h"
+)
+
+target_include_directories(score_nv_dvp_bridge
+  PUBLIC
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+# Qt is used to identify the current GL context: libdvp's GL entry points
+# only exist for GLX, and QNativeInterface::QGLXContext is the reliable way
+# to know whether that is what we have.
+target_link_libraries(score_nv_dvp_bridge PRIVATE ${QT_PREFIX}::Gui)
+
+if(WIN32)
+  # D3D11 path uses ID3D11Device / ID3D11Texture2D via d3d11.h.
+  target_link_libraries(score_nv_dvp_bridge PRIVATE d3d11)
+else()
+  # Linux dlopen path needs libdl.
+  target_link_libraries(score_nv_dvp_bridge PRIVATE ${CMAKE_DL_LIBS})
+endif()
+
+target_compile_definitions(score_nv_dvp_bridge PUBLIC
+  SCORE_HAS_NV_DVP_BRIDGE=1
+  # Bridge is built as a STATIC lib and linked into the consumer. The
+  # INLINE define makes NV_DVP_API empty (no dllexport/dllimport
+  # decoration) for both the bridge build and its consumers on Windows.
+  NV_DVP_BRIDGE_INLINE=1
+)
+
+set_property(TARGET score_nv_dvp_bridge PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+# Optional dvp.dll fetch on Windows. Mirrors the previous AJA addon's
+# SCORE_FETCH_DVP_DLL option so existing build invocations keep working.
+if(WIN32 AND SCORE_FETCH_DVP_DLL)
+  set(_dvp_dll "${CMAKE_BINARY_DIR}/3rdparty/dvp/dvp.dll")
+  if(NOT EXISTS "${_dvp_dll}")
+    file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/dvp")
+    message(STATUS "nv-dvp-bridge: fetching dvp.dll v1.70 from PlusToolkit/PlusLib")
+    file(DOWNLOAD
+      "https://github.com/PlusToolkit/PlusLib/raw/master/Tools/NVidia/dvp170/bin/x64/dvp.dll"
+      "${_dvp_dll}"
+      EXPECTED_HASH SHA256=602f2cefecb9b7c67d4ffebb3b15e11291bacf5a7342fcec6d52dd0118cbaddd
+      STATUS _dvp_dl_status
+      SHOW_PROGRESS)
+    list(GET _dvp_dl_status 0 _dvp_dl_rc)
+    if(NOT _dvp_dl_rc EQUAL 0)
+      message(WARNING "nv-dvp-bridge: dvp.dll download failed: ${_dvp_dl_status}")
+    endif()
+  endif()
+  if(EXISTS "${_dvp_dll}")
+    # Expose path so the consuming addon can copy_if_different next to its DLL.
+    set(SCORE_NV_DVP_DLL "${_dvp_dll}" CACHE INTERNAL "Fetched dvp.dll path")
+  endif()
+elseif(WIN32 AND AJA_DVP_DLL AND EXISTS "${AJA_DVP_DLL}")
+  set(SCORE_NV_DVP_DLL "${AJA_DVP_DLL}" CACHE INTERNAL "User-supplied dvp.dll path")
+endif()
+
+message(STATUS "score-plugin-gfx: nv-dvp-bridge enabled")