swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-13 14:48:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (MG_State/EGLState, MG_Backend): defer current EGL surface destruction

Browse Source
This commit is contained in:
swung0x48
2026-07-03 10:14:26 +08:00
parent ce2b5a793f
commit 6418561d3c
9 changed files with 114 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_State/EGLState/Core.cpp
+28 -16
View File
@@ -224,6 +224,8 @@ namespace MobileGL {
return;
}
const EGLSurfaceHandle drawSurface = currentIt->second.DrawSurface;
const EGLSurfaceHandle readSurface = currentIt->second.ReadSurface;
const EGLContextHandle context = currentIt->second.Context;
if (context != nullptr) {
auto ownerIt = m_contextOwners.find(context);
@@ -232,6 +234,29 @@ namespace MobileGL {
}
}
m_threadCurrents.erase(currentIt);
DestroyPendingSurfaceIfUnused(drawSurface);
DestroyPendingSurfaceIfUnused(readSurface);
}
Bool EGLContext::IsSurfaceCurrentUnlocked(EGLSurfaceHandle surface) const {
if (surface == EGL_NO_SURFACE) {
return false;
}
for (const auto& current : m_threadCurrents) {
if (current.second.DrawSurface == surface || current.second.ReadSurface == surface) {
return true;
}
}
return false;
}
void EGLContext::DestroyPendingSurfaceIfUnused(EGLSurfaceHandle surface) {
auto surfaceIt = m_surfaces.find(surface);
if (surfaceIt == m_surfaces.end() || !surfaceIt->second.DestroyPending ||
IsSurfaceCurrentUnlocked(surface)) {
return;
}
m_surfaces.erase(surfaceIt);
}
void EGLContext::ReleaseDisplayObjects(EGLDisplayHandle display) {
@@ -972,22 +997,9 @@ namespace MobileGL {
return false;
}
for (auto currentIt = m_threadCurrents.begin(); currentIt != m_threadCurrents.end();) {
if (currentIt->second.DrawSurface == surface) {
currentIt->second.DrawSurface = EGL_NO_SURFACE;
}
if (currentIt->second.ReadSurface == surface) {
currentIt->second.ReadSurface = EGL_NO_SURFACE;
}
const Bool emptyCurrent = currentIt->second.Context == nullptr &&
currentIt->second.DrawSurface == EGL_NO_SURFACE &&
currentIt->second.ReadSurface == EGL_NO_SURFACE;
if (emptyCurrent) {
currentIt = m_threadCurrents.erase(currentIt);
continue;
}
++currentIt;
if (IsSurfaceCurrentUnlocked(surface)) {
surfaceIt->second.DestroyPending = true;
return true;
}
m_surfaces.erase(surfaceIt);
return true;
MobileGL/MG_State/EGLState/Core.h
+3
View File
@@ -169,6 +169,7 @@ namespace MobileGL {
EGLDisplayHandle Display = EGL_NO_DISPLAY;
EGLConfigHandle Config = nullptr;
SurfaceType Type = SurfaceType::Window;
Bool DestroyPending = false;
Uint64 NativeHandleKey = 0;
EGLClientBuffer ClientBuffer = nullptr;
EGLenum BufferType = EGL_NONE;
@@ -232,6 +233,8 @@ namespace MobileGL {
void ReleaseDisplayObjects(EGLDisplayHandle display);
void ReleaseThreadUnlocked(const std::thread::id& threadKey);
Bool IsSurfaceCurrentUnlocked(EGLSurfaceHandle surface) const;
void DestroyPendingSurfaceIfUnused(EGLSurfaceHandle surface);
private:
mutable std::recursive_mutex m_mutex;