fixup! windowing/gbm: move to OO structure

xbmc · Dec 12, 2017 · d20e7eb · d20e7eb
1 parent cfa487f
commit d20e7eb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/xbmc/windowing/gbm/DRMUtils.cpp b/xbmc/windowing/gbm/DRMUtils.cpp
@@ -35,8 +35,14 @@
 
 #include "DRMUtils.h"
 
-static drmModeResPtr m_drm_resources = nullptr;
-static drmModeCrtcPtr m_orig_crtc = nullptr;
+CDRMUtils::CDRMUtils()
+  : m_connector(new connector)
+  , m_encoder(new encoder)
+  , m_crtc(new crtc)
+  , m_primary_plane(new plane)
+  , m_overlay_plane(new plane)
+{
+}
 
 void CDRMUtils::WaitVBlank()
 {
@@ -451,12 +457,6 @@ int CDRMUtils::Open(const char* device)
 
 bool CDRMUtils::InitDrm()
 {
-  m_connector = new connector;
-  m_encoder = new encoder;
-  m_crtc = new crtc;
-  m_primary_plane = new plane;
-  m_overlay_plane = new plane;
-
   for(int i = 0; i < 10; ++i)
   {
     if (m_fd >= 0)
@@ -507,6 +507,7 @@ bool CDRMUtils::InitDrm()
   }
 
   drmModeFreeResources(m_drm_resources);
+  m_drm_resources = nullptr;
 
   if(m_fd < 0)
   {
@@ -562,17 +563,17 @@ void CDRMUtils::DestroyDrm()
   if (m_drm_resources)
   {
     drmModeFreeResources(m_drm_resources);
+    m_drm_resources = nullptr;
   }
 
   drmDropMaster(m_fd);
   close(m_fd);
 
-  m_drm_resources = nullptr;
-
-  m_primary_plane = nullptr;
-  m_overlay_plane = nullptr;
   m_connector = nullptr;
+  m_encoder = nullptr;
   m_crtc = nullptr;
+  m_primary_plane = nullptr;
+  m_overlay_plane = nullptr;
   m_fd = -1;
   m_mode = nullptr;
 }

diff --git a/xbmc/windowing/gbm/DRMUtils.h b/xbmc/windowing/gbm/DRMUtils.h
@@ -64,7 +64,7 @@ struct drm_fb
 class CDRMUtils
 {
 public:
-  CDRMUtils() = default;
+  CDRMUtils();
   virtual ~CDRMUtils() = default;
   virtual void FlipPage(struct gbm_bo *bo) {};
   virtual bool SetVideoMode(RESOLUTION_INFO res, struct gbm_bo *bo) { return false; };
@@ -76,11 +76,12 @@ class CDRMUtils
   void WaitVBlank();
 
   int m_fd;
-  struct plane *m_primary_plane = nullptr;
-  struct plane *m_overlay_plane = nullptr;
+
   struct connector *m_connector = nullptr;
   struct encoder *m_encoder = nullptr;
   struct crtc *m_crtc = nullptr;
+  struct plane *m_primary_plane = nullptr;
+  struct plane *m_overlay_plane = nullptr;
   drmModeModeInfo *m_mode = nullptr;
 
 protected:
@@ -98,4 +99,6 @@ class CDRMUtils
   static void DrmFbDestroyCallback(struct gbm_bo *bo, void *data);
 
   int m_crtc_index;
+  drmModeResPtr m_drm_resources = nullptr;
+  drmModeCrtcPtr m_orig_crtc = nullptr;
 };