From ea68f486089f037686775ecff03445044f035008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= Date: Thu, 29 Oct 2026 23:38:53 +0300 Subject: [PATCH] willRecreateSurface --- components/render/ios/renderAux.swift | 5 ++++ components/render/ios/view/RenderGLView.swift | 3 --- components/render/mac/renderAux.swift | 4 +++ ogs-blue/dialect.yml | 8 ++++++ ogs-blue/ver-mac/src/dialect.swift | 27 +++++++++++++++++++ 5 files changed, 44 insertions(+), 3 deletions(-) diff --git a/components/render/ios/renderAux.swift b/components/render/ios/renderAux.swift index 431704c..c0bbc31 100644 --- a/components/render/ios/renderAux.swift +++ b/components/render/ios/renderAux.swift @@ -12,3 +12,8 @@ func renderPixelSize(_ view: UIView) -> [Int32] { let h = Int32(max(1, (view.bounds.height * scale).rounded())) return [w, h] } + +func renderRecreateSurface(_ vm: RenderVM) { + eglResetSurface(&vm.glView.st) + eglMakeCurrentContext(&vm.glView.st) +} diff --git a/components/render/ios/view/RenderGLView.swift b/components/render/ios/view/RenderGLView.swift index a7ad397..d054063 100644 --- a/components/render/ios/view/RenderGLView.swift +++ b/components/render/ios/view/RenderGLView.swift @@ -25,9 +25,6 @@ final class RenderGLView: UIView { override func layoutSubviews() { super.layoutSubviews() - if st.surface != nil { - guard eglResetSurface(&st), eglMakeCurrentContext(&st) else { fatalError("ERROR Could not reset EGL surface") } - } let ps = renderPixelSize(self) renderSet(F.reshapePixelSize, ps) } diff --git a/components/render/mac/renderAux.swift b/components/render/mac/renderAux.swift index cd5d82a..abd3e21 100644 --- a/components/render/mac/renderAux.swift +++ b/components/render/mac/renderAux.swift @@ -13,3 +13,7 @@ func renderPixelSize(_ view: NSView) -> [Int32] { let h = Int32(max(1, backing.height)) return [w, h] } + +func renderRecreateSurface(_ vm: RenderVM) { + // No-op on macOS +} diff --git a/ogs-blue/dialect.yml b/ogs-blue/dialect.yml index ece6548..7c28b32 100644 --- a/ogs-blue/dialect.yml +++ b/ogs-blue/dialect.yml @@ -33,6 +33,7 @@ RenderContext: pixelSize: [Int32] reshapePixelSize: [Int32] willDeinit: Bool + willRecreateSurface: Bool RenderComponent: type: component @@ -42,6 +43,7 @@ RenderComponent: - didPrepareGL: renderStartTimer(RenderVM.shared!) - pixelSize: RenderVM.shared!.pixelSize = c.pixelSize - willDeinit: renderDeinit(RenderVM.shared!) + - willRecreateSurface: renderRecreateSurface(RenderVM.shared!) shoulds: didLaunch: 1. Only once during the first setup: @@ -78,3 +80,9 @@ RenderComponent: c.recentField == F.backingPixelSize then: c.pixelSize = c.backingPixelSize + willRecreateSurface: + 1. Upon resize: + if: + c.recentField == F.reshapePixelSize + then: + c.willRecreateSurface = true diff --git a/ogs-blue/ver-mac/src/dialect.swift b/ogs-blue/ver-mac/src/dialect.swift index 411020e..e860d79 100644 --- a/ogs-blue/ver-mac/src/dialect.swift +++ b/ogs-blue/ver-mac/src/dialect.swift @@ -128,6 +128,7 @@ public struct F { public static let pixelSize = "pixelSize" public static let reshapePixelSize = "reshapePixelSize" public static let willDeinit = "willDeinit" + public static let willRecreateSurface = "willRecreateSurface" } public struct BlueContext: DialectContext { @@ -171,6 +172,7 @@ public struct RenderContext: DialectContext { public var pixelSize = [Int32]() public var reshapePixelSize = [Int32]() public var willDeinit = Bool() + public var willRecreateSurface = Bool() public var recentField = "" @@ -202,6 +204,9 @@ public struct RenderContext: DialectContext { else if (name == "willDeinit") { return willDeinit as! T } + else if (name == "willRecreateSurface") { + return willRecreateSurface as! T + } return "unknown-field-name" as! T } @@ -237,6 +242,9 @@ public struct RenderContext: DialectContext { else if (name == "willDeinit") { willDeinit = value as! Bool } + else if (name == "willRecreateSurface") { + willRecreateSurface = value as! Bool + } } } @@ -353,6 +361,23 @@ func renderShouldResetPixelSize(_ c: RenderContext) -> RenderContext { return c } +func renderShouldResetWillRecreateSurface(_ c: RenderContext) -> RenderContext { + var c = c + + /* 1. Upon resize */ + if + c.recentField == F.reshapePixelSize + { + c.willRecreateSurface = true + c.recentField = F.willRecreateSurface + return c + } + + + c.recentField = DIALECT_CONTEXT_RECENT_FIELD_NONE + return c +} + func blueRegisterShoulds(_ ctrl: DialectController) { [ blueShouldResetDidLaunch, @@ -367,6 +392,7 @@ func renderRegisterShoulds(_ ctrl: DialectController) { renderShouldResetDidLaunch, renderShouldResetDidPrepareGL, renderShouldResetPixelSize, + renderShouldResetWillRecreateSurface, ].forEach { f in ctrl.registerFunction { c in f(c as! RenderContext) } @@ -380,6 +406,7 @@ func renderRegisterEffects(_ ctrl: DialectController) { F.didPrepareGL, { (c: RenderContext) in renderStartTimer(RenderVM.shared!) }, F.pixelSize, { (c: RenderContext) in RenderVM.shared!.pixelSize = c.pixelSize }, F.willDeinit, { (c: RenderContext) in renderDeinit(RenderVM.shared!) }, + F.willRecreateSurface, { (c: RenderContext) in renderRecreateSurface(RenderVM.shared!) }, ]) }