windowing/gbm: remove uneeded pointers

3 files changed, 2 insertions, 16 deletions

diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
index 561e61f12e..906b53783d 100644
--- a/xbmc/windowing/gbm/WinSystemGbm.cpp
+++ b/xbmc/windowing/gbm/WinSystemGbm.cpp
@@ -40,8 +40,6 @@
 CWinSystemGbm::CWinSystemGbm() :
   m_DRM(nullptr),
   m_GBM(new CGBMUtils),
-  m_nativeDisplay(nullptr),
-  m_nativeWindow(nullptr),
   m_delayDispReset(false)
 {
   std::string envSink;
@@ -99,8 +97,6 @@ bool CWinSystemGbm::InitWindowSystem()
     return false;
   }
 
-  m_nativeDisplay = m_GBM->m_device;
-
   CLog::Log(LOGDEBUG, "CWinSystemGbm::%s - initialized DRM", __FUNCTION__);
   return CWinSystemBase::InitWindowSystem();
 }
@@ -108,10 +104,7 @@ bool CWinSystemGbm::InitWindowSystem()
 bool CWinSystemGbm::DestroyWindowSystem()
 {
   m_GBM->DestroySurface();
-  m_nativeWindow = nullptr;
-
   m_GBM->DestroyDevice();
-  m_nativeDisplay = nullptr;
 
   CLog::Log(LOGDEBUG, "CWinSystemGbm::%s - deinitialized DRM", __FUNCTION__);
   return true;
@@ -136,8 +129,6 @@ bool CWinSystemGbm::CreateNewWindow(const std::string& name,
     return false;
   }
 
-  m_nativeWindow = reinterpret_cast<EGLNativeWindowType>(m_GBM->m_surface);
-
   CLog::Log(LOGDEBUG, "CWinSystemGbm::%s - initialized GBM", __FUNCTION__);
   return true;
 }
@@ -145,7 +136,6 @@ bool CWinSystemGbm::CreateNewWindow(const std::string& name,
 bool CWinSystemGbm::DestroyWindow()
 {
   m_GBM->DestroySurface();
-  m_nativeWindow = nullptr;
 
   CLog::Log(LOGDEBUG, "CWinSystemGbm::%s - deinitialized GBM", __FUNCTION__);
   return true;
diff --git a/xbmc/windowing/gbm/WinSystemGbm.h b/xbmc/windowing/gbm/WinSystemGbm.h
index 5ad76c273e..87a5afcbae 100644
--- a/xbmc/windowing/gbm/WinSystemGbm.h
+++ b/xbmc/windowing/gbm/WinSystemGbm.h
@@ -26,7 +26,6 @@
 #include "threads/CriticalSection.h"
 #include "windowing/WinSystem.h"
 #include "DRMUtils.h"
-#include "GLContextEGL.h"
 
 class IDispResource;
 
@@ -65,9 +64,6 @@ protected:
 
   std::unique_ptr<CGBMUtils> m_GBM;
 
-  EGLDisplay m_nativeDisplay;
-  EGLNativeWindowType m_nativeWindow;
-
   CCriticalSection m_resourceSection;
   std::vector<IDispResource*>  m_resources;
 
diff --git a/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp b/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp
index 8a3f2432df..b06ae324e5 100644
--- a/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp
+++ b/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp
@@ -50,7 +50,7 @@ bool CWinSystemGbmGLESContext::InitWindowSystem()
     return false;
   }
 
-  if (!m_pGLContext.CreateDisplay(m_nativeDisplay,
+  if (!m_pGLContext.CreateDisplay(m_GBM->m_device,
                                   EGL_OPENGL_ES2_BIT,
                                   EGL_OPENGL_ES_API))
   {
@@ -99,7 +99,7 @@ bool CWinSystemGbmGLESContext::CreateNewWindow(const std::string& name,
     return false;
   }
 
-  if (!m_pGLContext.CreateSurface(m_nativeWindow))
+  if (!m_pGLContext.CreateSurface(reinterpret_cast<EGLNativeWindowType>(m_GBM->m_surface)))
   {
     return false;
   }