[Fix] (Pipe): key the composite resolver's memo on the context as well as the pipeline's GL name - the resolver is a process singleton while GL names are per context, so a make-current released the other context's live composite

2026-09-17 08:38:30 +09:00 · 2026-09-08 15:33:42 -04:00
parent 820d1a60b9
commit ac09e5b37a
3 changed files with 231 additions and 51 deletions
@@ -115,7 +115,14 @@ namespace MobileGL::MG_Pipe {
            // allocator refuses a slot that is not live at that generation.
            if (drawProgram && MGPipeProgramIsPipelineComposite(*drawProgram)) {
                if (const auto& pipeline = ctx.GetBoundProgramPipeline()) {
-                    MGPipeCompositeResolverInstance().Observe(*pipeline, *drawProgram, drawCso);
+                    // THE CONTEXT IS PART OF THE RESOLVER's KEY and this is the only place that
+                    // supplies it: the resolver is a process singleton and a pipeline's GL name
+                    // is per context, so without it a make-current between two contexts holding
+                    // one pipeline name released the other context's LIVE composite.
+                    // GetTextureContextId() is the tree's never-reused per-context id, the same
+                    // one PipeInputs carries and the backends' per-context memos key on.
+                    MGPipeCompositeResolverInstance().Observe(ctx.GetTextureContextId(), *pipeline,
+                                                             *drawProgram, drawCso);
                }
            }
            const MGPipeHandle dispatchCso =