From e317daf081a1048904fdf0b548946fa3ba6593a7 Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Mon, 29 Apr 2019 12:22:05 +0200
Subject: sync with upstream

---
 .../kodi-addon-dev-kit/include/kodi/gui/General.h  | 34 ++++++++++++++++++++--
 .../kodi-addon-dev-kit/include/kodi/gui/Window.h   |  2 +-
 .../include/kodi/gui/definitions.h                 |  1 +
 3 files changed, 34 insertions(+), 3 deletions(-)

(limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/gui')

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h
index 30b6d89..a3b8bcb 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h
@@ -106,7 +106,7 @@ namespace gui
   /// **Example:**
   /// ~~~~~~~~~~~~~{.cpp}
   /// ..
-  /// int wid = kodi::gui::GetCurrentWindowDialogId()
+  /// int wid = kodi::gui::GetCurrentWindowDialogId();
   /// ..
   /// ~~~~~~~~~~~~~
   ///
@@ -130,7 +130,7 @@ namespace gui
   /// **Example:**
   /// ~~~~~~~~~~~~~{.cpp}
   /// ..
-  /// int wid = kodi::gui::GetCurrentWindowId()
+  /// int wid = kodi::gui::GetCurrentWindowId();
   /// ..
   /// ~~~~~~~~~~~~~
   ///
@@ -141,5 +141,35 @@ namespace gui
   }
   //--------------------------------------------------------------------------
 
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui
+  /// \brief To get hardware specific device context interface
+  ///
+  /// \return                        The currently active device context
+  ///
+  /// \warning This function is only be supported under Windows, on all other
+  /// OS it return `nullptr`!
+  ///
+  /// \note Returned Windows class pointer is `ID3D11DeviceContext1`.
+  ///
+  ///
+  ///-------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <d3d11_1.h>
+  /// ..
+  /// ID3D11DeviceContext1* context = static_cast<ID3D11DeviceContext1*>(kodi::gui::GetHWContext());
+  /// ..
+  /// ~~~~~~~~~~~~~
+  ///
+  inline void* GetHWContext()
+  {
+    using namespace ::kodi::addon;
+    return CAddonBase::m_interface->toKodi->kodi_gui->general->get_hw_context(CAddonBase::m_interface->toKodi->kodiBase);
+  }
+  //--------------------------------------------------------------------------
+
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
index f188f34..e7a8a05 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
@@ -14,7 +14,7 @@
 #ifdef BUILD_KODI_ADDON
 #include "../ActionIDs.h"
 #else
-#include "input/ActionIDs.h"
+#include "input/actions/ActionIDs.h"
 #endif
 
 namespace kodi
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
index 770a416..b8b4cbf 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
@@ -26,6 +26,7 @@ typedef struct AddonToKodiFuncTable_kodi_gui_general
   int (*get_video_resolution)(void* kodiBase);
   int (*get_current_window_dialog_id)(void* kodiBase);
   int (*get_current_window_id)(void* kodiBase);
+  void* (*get_hw_context)(void* kodiBase);
 } AddonToKodiFuncTable_kodi_gui_general;
 
 typedef struct AddonToKodiFuncTable_kodi_gui_control_button
-- 
cgit v1.2.3