RetroPlayer: Video Shaders

garbear · Jul 3, 2023 · b017af1 · b017af1
1 parent 626d5ea
commit b017af1
Show file tree

Hide file tree

Showing 67 changed files with 3,976 additions and 276 deletions.
diff --git a/.gitignore b/.gitignore
@@ -134,6 +134,7 @@ cmake_install.cmake
 /addons/kodi.binary.instance.inputstream/addon.xml
 /addons/kodi.binary.instance.peripheral/addon.xml
 /addons/kodi.binary.instance.pvr/addon.xml
+/addons/kodi.binary.instance.shaderpreset/addon.xml
 /addons/kodi.binary.instance.screensaver/addon.xml
 /addons/kodi.binary.instance.vfs/addon.xml
 /addons/kodi.binary.instance.videocodec/addon.xml

diff --git a/addons/kodi.binary.instance.shaderpreset/addon.xml.in b/addons/kodi.binary.instance.shaderpreset/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.shaderpreset" version="@ADDON_INSTANCE_VERSION_SHADERPRESET@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_SHADERPRESET_MIN@"/>
+	<requires>
+		<import addon="xbmc.core" version="0.1.0"/>
+	</requires>
+</addon>
diff --git a/cmake/treedata/common/retroplayer.txt b/cmake/treedata/common/retroplayer.txt
@@ -11,7 +11,7 @@ xbmc/cores/RetroPlayer/playback                                 cores/RetroPlaye
 xbmc/cores/RetroPlayer/process                                  cores/RetroPlayer/process
 xbmc/cores/RetroPlayer/rendering                                cores/RetroPlayer/rendering
 xbmc/cores/RetroPlayer/rendering/VideoRenderers                 cores/RetroPlayer/rendering/VideoRenderers
-xbmc/cores/RetroPlayer/rendering/VideoShaders                   cores/RetroPlayer/rendering/VideoShaders
 xbmc/cores/RetroPlayer/savestates                               cores/RetroPlayer/savestates
+xbmc/cores/RetroPlayer/shaders                                  cores/RetroPlayer/shaders
 xbmc/cores/RetroPlayer/streams                                  cores/RetroPlayer/streams
 xbmc/cores/RetroPlayer/streams/memory                           cores/RetroPlayer/streams/memory
diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt
@@ -1,5 +1,5 @@
 xbmc/cores/RetroPlayer/process/windows cores/RetroPlayer/process/windows
-xbmc/cores/RetroPlayer/rendering/VideoShaders/windows cores/RetroPlayer/rendering/VideoShaders/windows
+xbmc/cores/RetroPlayer/shaders/windows cores/RetroPlayer/shaders/windows
 xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows
 xbmc/cores/VideoPlayer/VideoRenderers/windows cores/VideoPlayer/VideoRenderers/windows
 xbmc/input/touch                       input/touch

diff --git a/project/Win32BuildSetup/genNsisIncludes.bat b/project/Win32BuildSetup/genNsisIncludes.bat
@@ -40,6 +40,16 @@ IF EXIST BUILD_WIN32\addons\game.libretro.* (
       SET /A Counter = !Counter! + 1
       )
     )
+  FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\game.shader.*') DO (
+    FOR /f "delims=<" %%N in ('powershell.exe -ExecutionPolicy Unrestricted -command "& {[xml]$a = get-content BUILD_WIN32\addons\%%P\addon.xml;$a.addon.name}"') do (
+      ECHO Section "%%N" SecGameAddons!Counter! >> game-addons.nsi
+      ECHO SectionIn 1 2 >> game-addons.nsi
+      ECHO SetOutPath "$INSTDIR\addons\%%P" >> game-addons.nsi
+      ECHO File /r "${app_root}\addons\%%P\*.*" >> game-addons.nsi
+      ECHO SectionEnd >> game-addons.nsi
+      SET /A Counter = !Counter! + 1
+      )
+    )
   ECHO SectionGroupEnd >> game-addons.nsi
 )
 

diff --git a/system/addon-manifest.xml b/system/addon-manifest.xml
@@ -20,6 +20,7 @@
   <addon>kodi.binary.instance.peripheral</addon>
   <addon>kodi.binary.instance.pvr</addon>
   <addon>kodi.binary.instance.screensaver</addon>
+  <addon>kodi.binary.instance.shaderpreset</addon>
   <addon>kodi.binary.instance.vfs</addon>
   <addon>kodi.binary.instance.videocodec</addon>
   <addon>kodi.binary.instance.visualization</addon>
@@ -53,6 +54,7 @@
   <addon>xbmc.metadata</addon>
   <addon>xbmc.python</addon>
   <addon>xbmc.webinterface</addon>
+  <addon optional="true">game.shader.presets</addon>
   <addon optional="true">inputstream.adaptive</addon>
   <addon optional="true">peripheral.joystick</addon>
   <addon optional="true">repository.chrisism.dev</addon>

diff --git a/xbmc/ServiceManager.cpp b/xbmc/ServiceManager.cpp
@@ -195,9 +195,9 @@ bool CServiceManager::InitStageThree(const std::shared_ptr<CProfileManager>& pro
   // Peripherals depends on strings being loaded before stage 3
   m_peripherals->Initialise();
 
-  m_gameServices =
-      std::make_unique<GAME::CGameServices>(*m_gameControllerManager, *m_gameRenderManager,
-                                            *m_peripherals, *profileManager, *m_inputManager);
+  m_gameServices = std::make_unique<GAME::CGameServices>(
+      *m_gameControllerManager, *m_gameRenderManager, *m_peripherals, *profileManager,
+      *m_inputManager, *m_addonMgr);
 
   m_contextMenuManager->Init();
 

diff --git a/xbmc/addons/AddonBuilder.cpp b/xbmc/addons/AddonBuilder.cpp
@@ -74,6 +74,8 @@ AddonPtr CAddonBuilder::Generate(const AddonInfoPtr& info, AddonType type)
       return std::make_shared<CAddonDll>(info, type);
     case AddonType::GAMEDLL:
       return std::make_shared<GAME::CGameClient>(info);
+    case AddonType::SHADERDLL:
+      return std::make_shared<CAddonDll>(info, type);
     case AddonType::PLUGIN:
     case AddonType::SCRIPT:
       return std::make_shared<CPluginSource>(info, type);

diff --git a/xbmc/addons/BinaryAddonCache.cpp b/xbmc/addons/BinaryAddonCache.cpp
@@ -18,7 +18,7 @@
 namespace ADDON
 {
 
-const std::vector<AddonType> ADDONS_TO_CACHE = {AddonType::GAMEDLL};
+const std::vector<AddonType> ADDONS_TO_CACHE = {AddonType::GAMEDLL, AddonType::SHADERDLL};
 
 CBinaryAddonCache::~CBinaryAddonCache()
 {

diff --git a/xbmc/addons/CMakeLists.txt b/xbmc/addons/CMakeLists.txt
@@ -25,6 +25,7 @@ set(SOURCES Addon.cpp
             Scraper.cpp
             ScreenSaver.cpp
             Service.cpp
+            ShaderPreset.cpp
             Skin.cpp
             UISoundsResource.cpp
             VFSEntry.cpp
@@ -65,6 +66,7 @@ set(HEADERS Addon.h
             Scraper.h
             ScreenSaver.h
             Service.h
+            ShaderPreset.h
             Skin.h
             UISoundsResource.h
             VFSEntry.h