jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9381 from heitbaum/kodi-fix

Browse Source 
kodi: rebase temp revert fences patch for kodi ed8f18b
This commit is contained in:
Jernej Škrabec 2024-10-10 18:26:50 +02:00 committed by GitHub
commit ba2840c276
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
projects/Allwinner/patches/kodi/000-temp-revert-fences.patch
View File

@ -17,7 +17,7 @@ index 9d0065bdaf..535e3bce31 100644
} }
void CEGLFence::CreateFence() void CEGLFence::CreateFence()
@@ -79,65 +71,3 @@ bool CEGLFence::IsSignaled() @@ -79,61 +71,3 @@ bool CEGLFence::IsSignaled()
return false; return false;
} }
@ -75,12 +75,8 @@ index 9d0065bdaf..535e3bce31 100644
- if (!m_kmsFence) - if (!m_kmsFence)
- return; - return;
- -
- EGLint status{EGL_FALSE}; - if (m_eglClientWaitSyncKHR(m_display, m_kmsFence, 0, EGL_FOREVER_KHR) != EGL_FALSE)
- - m_eglDestroySyncKHR(m_display, m_kmsFence);
- while (status != EGL_CONDITION_SATISFIED_KHR)
- status = m_eglClientWaitSyncKHR(m_display, m_kmsFence, 0, EGL_FOREVER_KHR);
-
- m_eglDestroySyncKHR(m_display, m_kmsFence);
-} -}
-#endif -#endif
diff --git a/xbmc/utils/EGLFence.h b/xbmc/utils/EGLFence.h diff --git a/xbmc/utils/EGLFence.h b/xbmc/utils/EGLFence.h
@ -417,11 +413,13 @@ index f92f716fc4..5327e35570 100644
virtual bool SetVideoMode(const RESOLUTION_INFO& res, struct gbm_bo* bo) { return false; } virtual bool SetVideoMode(const RESOLUTION_INFO& res, struct gbm_bo* bo) { return false; }
virtual bool SetActive(bool active) { return false; } virtual bool SetActive(bool active) { return false; }
virtual bool InitDrm(); virtual bool InitDrm();
@@ -63,13 +62,6 @@ public: @@ -63,15 +62,8 @@ public:
static uint32_t FourCCWithAlpha(uint32_t fourcc); static uint32_t FourCCWithAlpha(uint32_t fourcc);
static uint32_t FourCCWithoutAlpha(uint32_t fourcc); static uint32_t FourCCWithoutAlpha(uint32_t fourcc);
- void SetInFenceFd(int fd) { m_inFenceFd = fd; } - void SetInFenceFd(int fd) { m_inFenceFd = fd; }
bool FindVideoPlane(uint32_t format, uint64_t modifier);
bool FindGuiPlane();
- int TakeOutFenceFd() - int TakeOutFenceFd()
- { - {
- int fd{-1}; - int fd{-1};
@ -438,9 +436,9 @@ index f92f716fc4..5327e35570 100644
- int m_inFenceFd{-1}; - int m_inFenceFd{-1};
- int m_outFenceFd{-1}; - int m_outFenceFd{-1};
- -
std::vector<std::unique_ptr<CDRMCrtc>> m_crtcs;
std::vector<std::unique_ptr<CDRMPlane>> m_planes; std::vector<std::unique_ptr<CDRMPlane>> m_planes;
private:
diff --git a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h b/xbmc/windowing/gbm/drm/OffScreenModeSetting.h diff --git a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h b/xbmc/windowing/gbm/drm/OffScreenModeSetting.h
index bba0db9a53..4270d4ecb2 100644 index bba0db9a53..4270d4ecb2 100644
--- a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h --- a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h

16
projects/Amlogic/patches/kodi/000-temp-revert-fences.patch
View File

@ -17,7 +17,7 @@ index 9d0065bdaf..535e3bce31 100644
} }
void CEGLFence::CreateFence() void CEGLFence::CreateFence()
@@ -79,65 +71,3 @@ bool CEGLFence::IsSignaled() @@ -79,61 +71,3 @@ bool CEGLFence::IsSignaled()
return false; return false;
} }
@ -75,12 +75,8 @@ index 9d0065bdaf..535e3bce31 100644
- if (!m_kmsFence) - if (!m_kmsFence)
- return; - return;
- -
- EGLint status{EGL_FALSE}; - if (m_eglClientWaitSyncKHR(m_display, m_kmsFence, 0, EGL_FOREVER_KHR) != EGL_FALSE)
- - m_eglDestroySyncKHR(m_display, m_kmsFence);
- while (status != EGL_CONDITION_SATISFIED_KHR)
- status = m_eglClientWaitSyncKHR(m_display, m_kmsFence, 0, EGL_FOREVER_KHR);
-
- m_eglDestroySyncKHR(m_display, m_kmsFence);
-} -}
-#endif -#endif
diff --git a/xbmc/utils/EGLFence.h b/xbmc/utils/EGLFence.h diff --git a/xbmc/utils/EGLFence.h b/xbmc/utils/EGLFence.h
@ -417,11 +413,13 @@ index f92f716fc4..5327e35570 100644
virtual bool SetVideoMode(const RESOLUTION_INFO& res, struct gbm_bo* bo) { return false; } virtual bool SetVideoMode(const RESOLUTION_INFO& res, struct gbm_bo* bo) { return false; }
virtual bool SetActive(bool active) { return false; } virtual bool SetActive(bool active) { return false; }
virtual bool InitDrm(); virtual bool InitDrm();
@@ -63,13 +62,6 @@ public: @@ -63,15 +62,8 @@ public:
static uint32_t FourCCWithAlpha(uint32_t fourcc); static uint32_t FourCCWithAlpha(uint32_t fourcc);
static uint32_t FourCCWithoutAlpha(uint32_t fourcc); static uint32_t FourCCWithoutAlpha(uint32_t fourcc);
- void SetInFenceFd(int fd) { m_inFenceFd = fd; } - void SetInFenceFd(int fd) { m_inFenceFd = fd; }
bool FindVideoPlane(uint32_t format, uint64_t modifier);
bool FindGuiPlane();
- int TakeOutFenceFd() - int TakeOutFenceFd()
- { - {
- int fd{-1}; - int fd{-1};
@ -438,9 +436,9 @@ index f92f716fc4..5327e35570 100644
- int m_inFenceFd{-1}; - int m_inFenceFd{-1};
- int m_outFenceFd{-1}; - int m_outFenceFd{-1};
- -
std::vector<std::unique_ptr<CDRMCrtc>> m_crtcs;
std::vector<std::unique_ptr<CDRMPlane>> m_planes; std::vector<std::unique_ptr<CDRMPlane>> m_planes;
private:
diff --git a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h b/xbmc/windowing/gbm/drm/OffScreenModeSetting.h diff --git a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h b/xbmc/windowing/gbm/drm/OffScreenModeSetting.h
index bba0db9a53..4270d4ecb2 100644 index bba0db9a53..4270d4ecb2 100644
--- a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h --- a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h

16
projects/RPi/patches/kodi/000-temp-revert-fences.patch
View File

@ -17,7 +17,7 @@ index 9d0065bdaf..535e3bce31 100644
} }
void CEGLFence::CreateFence() void CEGLFence::CreateFence()
@@ -79,65 +71,3 @@ bool CEGLFence::IsSignaled() @@ -79,61 +71,3 @@ bool CEGLFence::IsSignaled()
return false; return false;
} }
@ -75,12 +75,8 @@ index 9d0065bdaf..535e3bce31 100644
- if (!m_kmsFence) - if (!m_kmsFence)
- return; - return;
- -
- EGLint status{EGL_FALSE}; - if (m_eglClientWaitSyncKHR(m_display, m_kmsFence, 0, EGL_FOREVER_KHR) != EGL_FALSE)
- - m_eglDestroySyncKHR(m_display, m_kmsFence);
- while (status != EGL_CONDITION_SATISFIED_KHR)
- status = m_eglClientWaitSyncKHR(m_display, m_kmsFence, 0, EGL_FOREVER_KHR);
-
- m_eglDestroySyncKHR(m_display, m_kmsFence);
-} -}
-#endif -#endif
diff --git a/xbmc/utils/EGLFence.h b/xbmc/utils/EGLFence.h diff --git a/xbmc/utils/EGLFence.h b/xbmc/utils/EGLFence.h
@ -417,11 +413,13 @@ index f92f716fc4..5327e35570 100644
virtual bool SetVideoMode(const RESOLUTION_INFO& res, struct gbm_bo* bo) { return false; } virtual bool SetVideoMode(const RESOLUTION_INFO& res, struct gbm_bo* bo) { return false; }
virtual bool SetActive(bool active) { return false; } virtual bool SetActive(bool active) { return false; }
virtual bool InitDrm(); virtual bool InitDrm();
@@ -63,13 +62,6 @@ public: @@ -63,15 +62,8 @@ public:
static uint32_t FourCCWithAlpha(uint32_t fourcc); static uint32_t FourCCWithAlpha(uint32_t fourcc);
static uint32_t FourCCWithoutAlpha(uint32_t fourcc); static uint32_t FourCCWithoutAlpha(uint32_t fourcc);
- void SetInFenceFd(int fd) { m_inFenceFd = fd; } - void SetInFenceFd(int fd) { m_inFenceFd = fd; }
bool FindVideoPlane(uint32_t format, uint64_t modifier);
bool FindGuiPlane();
- int TakeOutFenceFd() - int TakeOutFenceFd()
- { - {
- int fd{-1}; - int fd{-1};
@ -438,9 +436,9 @@ index f92f716fc4..5327e35570 100644
- int m_inFenceFd{-1}; - int m_inFenceFd{-1};
- int m_outFenceFd{-1}; - int m_outFenceFd{-1};
- -
std::vector<std::unique_ptr<CDRMCrtc>> m_crtcs;
std::vector<std::unique_ptr<CDRMPlane>> m_planes; std::vector<std::unique_ptr<CDRMPlane>> m_planes;
private:
diff --git a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h b/xbmc/windowing/gbm/drm/OffScreenModeSetting.h diff --git a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h b/xbmc/windowing/gbm/drm/OffScreenModeSetting.h
index bba0db9a53..4270d4ecb2 100644 index bba0db9a53..4270d4ecb2 100644
--- a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h --- a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h

16
projects/Rockchip/patches/kodi/000-temp-revert-fences.patch
View File

@ -17,7 +17,7 @@ index 9d0065bdaf..535e3bce31 100644
} }
void CEGLFence::CreateFence() void CEGLFence::CreateFence()
@@ -79,65 +71,3 @@ bool CEGLFence::IsSignaled() @@ -79,61 +71,3 @@ bool CEGLFence::IsSignaled()
return false; return false;
} }
@ -75,12 +75,8 @@ index 9d0065bdaf..535e3bce31 100644
- if (!m_kmsFence) - if (!m_kmsFence)
- return; - return;
- -
- EGLint status{EGL_FALSE}; - if (m_eglClientWaitSyncKHR(m_display, m_kmsFence, 0, EGL_FOREVER_KHR) != EGL_FALSE)
- - m_eglDestroySyncKHR(m_display, m_kmsFence);
- while (status != EGL_CONDITION_SATISFIED_KHR)
- status = m_eglClientWaitSyncKHR(m_display, m_kmsFence, 0, EGL_FOREVER_KHR);
-
- m_eglDestroySyncKHR(m_display, m_kmsFence);
-} -}
-#endif -#endif
diff --git a/xbmc/utils/EGLFence.h b/xbmc/utils/EGLFence.h diff --git a/xbmc/utils/EGLFence.h b/xbmc/utils/EGLFence.h
@ -417,11 +413,13 @@ index f92f716fc4..5327e35570 100644
virtual bool SetVideoMode(const RESOLUTION_INFO& res, struct gbm_bo* bo) { return false; } virtual bool SetVideoMode(const RESOLUTION_INFO& res, struct gbm_bo* bo) { return false; }
virtual bool SetActive(bool active) { return false; } virtual bool SetActive(bool active) { return false; }
virtual bool InitDrm(); virtual bool InitDrm();
@@ -63,13 +62,6 @@ public: @@ -63,15 +62,8 @@ public:
static uint32_t FourCCWithAlpha(uint32_t fourcc); static uint32_t FourCCWithAlpha(uint32_t fourcc);
static uint32_t FourCCWithoutAlpha(uint32_t fourcc); static uint32_t FourCCWithoutAlpha(uint32_t fourcc);
- void SetInFenceFd(int fd) { m_inFenceFd = fd; } - void SetInFenceFd(int fd) { m_inFenceFd = fd; }
bool FindVideoPlane(uint32_t format, uint64_t modifier);
bool FindGuiPlane();
- int TakeOutFenceFd() - int TakeOutFenceFd()
- { - {
- int fd{-1}; - int fd{-1};
@ -438,9 +436,9 @@ index f92f716fc4..5327e35570 100644
- int m_inFenceFd{-1}; - int m_inFenceFd{-1};
- int m_outFenceFd{-1}; - int m_outFenceFd{-1};
- -
std::vector<std::unique_ptr<CDRMCrtc>> m_crtcs;
std::vector<std::unique_ptr<CDRMPlane>> m_planes; std::vector<std::unique_ptr<CDRMPlane>> m_planes;
private:
diff --git a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h b/xbmc/windowing/gbm/drm/OffScreenModeSetting.h diff --git a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h b/xbmc/windowing/gbm/drm/OffScreenModeSetting.h
index bba0db9a53..4270d4ecb2 100644 index bba0db9a53..4270d4ecb2 100644
--- a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h --- a/xbmc/windowing/gbm/drm/OffScreenModeSetting.h