mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-07 10:03:23 +09:00
[Chore] (MG_Backend, MG_Backend/DirectGLES, MG_Backend/DirectVulkan, MG_Backend/MGPipe, MG_Backend/Record, MG_Benchmark/Buffer, MG_Benchmark/Container, MG_Benchmark/Driver, MG_Benchmark/Program, MG_Benchmark/ShaderCache, MG_Benchmark/Transpile, MG_Gbm, MG_Impl, MG_Impl/CGLImpl, MG_Impl/DyldInterpose, MG_Impl/EGLImpl, MG_Impl/GLImpl, MG_Impl/GLXImpl, MG_Impl/NSOpenGLImpl, MG_Impl/Pipe, MG_Impl/WGLImpl, MG_IntegrationTest, MG_IntegrationTest/Harness, MG_IntegrationTest/Scenarios, MG_Pipe, MG_Remote, MG_Remote/Client, MG_Remote/Protocol, MG_Remote/Server, MG_Remote/Transport, MG_Remote/Wire, MG_State/EGLState, MG_State/GLState, MG_Test, MG_Test/Backend, MG_Test/BackendLoader, MG_Test/Buffer, MG_Test/EGLState, MG_Test/Framebuffer, MG_Test/Gbm, MG_Test/Pipe, MG_Test/Pipeline, MG_Test/Program, MG_Test/Query, MG_Test/SelfTest, MG_Test/ShaderTranspiler, MG_Test/State, MG_Test/Swapchain, MG_Test/Texture, MG_Test/Util, MG_Test/VertexArray, MG_Test/Wire, MG_Util/Async, MG_Util/BackendLoaders, MG_Util/Converters, MG_Util/Damage, MG_Util/Debug, MG_Util/Math, MG_Util/Metrics, MG_Util/SelfTest, MG_Util/ShaderTranspiler, MG_Util/Texture, MG_Util/X11, MobileGL, scripts/data, tools/cts, tools/device_bench, tools/spikes, tools/trace_replay, tools/wgl-smoke): clang-format every C and C++ source
- Layout only: token streams match up to split literals, continuations and using order - The size totals fall, so the structure baseline is lowered
This commit is contained in:
@@ -32,22 +32,32 @@ namespace MobileGL::MG_Remote::Server {
|
||||
|
||||
const char* ServerWindowAcquireName(ServerWindowAcquire result) {
|
||||
switch (result) {
|
||||
case ServerWindowAcquire::Acquired: return "Acquired";
|
||||
case ServerWindowAcquire::NoDisplay: return "NoDisplay";
|
||||
case ServerWindowAcquire::NoWindow: return "NoWindow";
|
||||
case ServerWindowAcquire::Cancelled: return "Cancelled";
|
||||
case ServerWindowAcquire::Interrupted: return "Interrupted";
|
||||
case ServerWindowAcquire::LeasedElsewhere: return "LeasedElsewhere";
|
||||
case ServerWindowAcquire::Acquired:
|
||||
return "Acquired";
|
||||
case ServerWindowAcquire::NoDisplay:
|
||||
return "NoDisplay";
|
||||
case ServerWindowAcquire::NoWindow:
|
||||
return "NoWindow";
|
||||
case ServerWindowAcquire::Cancelled:
|
||||
return "Cancelled";
|
||||
case ServerWindowAcquire::Interrupted:
|
||||
return "Interrupted";
|
||||
case ServerWindowAcquire::LeasedElsewhere:
|
||||
return "LeasedElsewhere";
|
||||
}
|
||||
return "<unknown ServerWindowAcquire>";
|
||||
}
|
||||
|
||||
const char* ServerWindowDetachName(ServerWindowDetach result) {
|
||||
switch (result) {
|
||||
case ServerWindowDetach::NoWindow: return "NoWindow";
|
||||
case ServerWindowDetach::Released: return "Released";
|
||||
case ServerWindowDetach::ReleasedBySession: return "ReleasedBySession";
|
||||
case ServerWindowDetach::TimedOut: return "TimedOut";
|
||||
case ServerWindowDetach::NoWindow:
|
||||
return "NoWindow";
|
||||
case ServerWindowDetach::Released:
|
||||
return "Released";
|
||||
case ServerWindowDetach::ReleasedBySession:
|
||||
return "ReleasedBySession";
|
||||
case ServerWindowDetach::TimedOut:
|
||||
return "TimedOut";
|
||||
}
|
||||
return "<unknown ServerWindowDetach>";
|
||||
}
|
||||
@@ -164,8 +174,8 @@ namespace MobileGL::MG_Remote::Server {
|
||||
m_lostRequested = true;
|
||||
if (m_onLost != nullptr) m_onLost(m_leaseHolder);
|
||||
}
|
||||
const Bool released = m_cv.wait_for(lock, std::chrono::milliseconds(timeoutMs),
|
||||
[this] { return m_leaseHolder == nullptr; });
|
||||
const Bool released =
|
||||
m_cv.wait_for(lock, std::chrono::milliseconds(timeoutMs), [this] { return m_leaseHolder == nullptr; });
|
||||
if (!released) {
|
||||
// NOT RELEASED UNDER IT. The holder may still reference the window (Magma keeps the
|
||||
// raw pointer until the swapchain is built), so the reference stays until it ends
|
||||
@@ -265,11 +275,10 @@ namespace MobileGL::MG_Remote::Server {
|
||||
m_lostRequested = false;
|
||||
m_leaseEnding = false;
|
||||
// A suspended holder that leased a window again waits for no other.
|
||||
m_suspended.erase(std::remove_if(m_suspended.begin(), m_suspended.end(),
|
||||
[holder](const SuspendedHolder& entry) {
|
||||
return entry.holder == holder;
|
||||
}),
|
||||
m_suspended.end());
|
||||
m_suspended.erase(
|
||||
std::remove_if(m_suspended.begin(), m_suspended.end(),
|
||||
[holder](const SuspendedHolder& entry) { return entry.holder == holder; }),
|
||||
m_suspended.end());
|
||||
if (out != nullptr) {
|
||||
out->window = m_window;
|
||||
out->width = m_width;
|
||||
@@ -322,8 +331,7 @@ namespace MobileGL::MG_Remote::Server {
|
||||
void ServerDisplay::ReleaseAfterLease(const ServerDisplayHooks& hooks, const std::vector<void*>& releases) const {
|
||||
for (void* window : releases) {
|
||||
ReleaseOutsideLock(hooks, window);
|
||||
MGLOG_I("MG_Remote server: server window %p released after its session let go (a late Detach)",
|
||||
window);
|
||||
MGLOG_I("MG_Remote server: server window %p released after its session let go (a late Detach)", window);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user