fix(uno): Ensure that the canvas' context is active when rendering (#…

…2559)
mono · Aug 17, 2023 · d5bcfdf · d5bcfdf
1 parent 86e79cb
commit d5bcfdf
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...kiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js b/...kiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js
@@ -106,6 +106,9 @@
                     this.currentRequest = window.requestAnimationFrame(() => {
 
                         if (this.requestRender) {
+                            // make current for this canvas instance
+                            GL.makeContextCurrent(this.glCtx);
+
                             this.requestRender();
                         }
 
@@ -178,12 +181,12 @@
                             throw `No <canvas> with id ${canvasOrCanvasId} was found`;
                     }
 
-                    var ctx = SKSwapChainPanel.createWebGLContext(canvas);
-                    if (!ctx || ctx < 0)
+                    this.glCtx = SKSwapChainPanel.createWebGLContext(canvas);
+                    if (!this.glCtx || this.glCtx < 0)
                         throw `Failed to create WebGL context: err ${ctx}`;
 
                     // make current
-                    GL.makeContextCurrent(ctx);
+                    GL.makeContextCurrent(this.glCtx);
 
                     // Starting from .NET 7 the GLctx is defined in an inaccessible scope
                     // when the current GL context changes. We need to pick it up from the
@@ -196,7 +199,7 @@
                     // read values
                     this.canvas = canvas;
                     return {
-                        ctx: ctx,
+                        ctx: this.glCtx,
                         fbo: currentGLctx.getParameter(currentGLctx.FRAMEBUFFER_BINDING),
                         stencil: currentGLctx.getParameter(currentGLctx.STENCIL_BITS),
                         sample: 0, // TODO: currentGLctx.getParameter(GLctx.SAMPLES)