fix sdf multiple text issue

pixijs · May 22, 2024 · 0997370 · 0997370
1 parent b3eb12a
commit 0997370
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/scene/text-bitmap/BitmapTextPipe.ts b/src/scene/text-bitmap/BitmapTextPipe.ts
@@ -27,7 +27,7 @@ export class BitmapTextPipe implements RenderPipe<BitmapText>
 
     private _renderer: Renderer;
     private _gpuBitmapText: Record<number, Graphics> = {};
-    private _sdfShader: SdfShader;
+    // private _sdfShader: SdfShader;
 
     constructor(renderer: Renderer)
     {
@@ -81,6 +81,15 @@ export class BitmapTextPipe implements RenderPipe<BitmapText>
 
     private _destroyRenderableByUid(renderableUid: number)
     {
+        const context = this._gpuBitmapText[renderableUid].context;
+
+        if (context.customShader)
+        {
+            BigPool.return(context.customShader as PoolItem);
+
+            context.customShader = null;
+        }
+
         BigPool.return(this._gpuBitmapText[renderableUid] as PoolItem);
         this._gpuBitmapText[renderableUid] = null;
     }
@@ -112,12 +121,7 @@ export class BitmapTextPipe implements RenderPipe<BitmapText>
         {
             if (!context.customShader)
             {
-                if (!this._sdfShader)
-                {
-                    this._sdfShader = new SdfShader();
-                }
-
-                context.customShader = this._sdfShader;
+                context.customShader = BigPool.get(SdfShader);
             }
         }
 
@@ -221,9 +225,6 @@ export class BitmapTextPipe implements RenderPipe<BitmapText>
 
         this._gpuBitmapText = null;
 
-        this._sdfShader?.destroy(true);
-        this._sdfShader = null;
-
         this._renderer = null;
     }
 }

diff --git a/src/scene/text/sdfShader/SdfShader.ts b/src/scene/text/sdfShader/SdfShader.ts
@@ -16,6 +16,11 @@ import { maxRecommendedTextures } from '../../../rendering/renderers/shared/text
 import { localUniformMSDFBit, localUniformMSDFBitGl } from './shader-bits/localUniformMSDFBit';
 import { mSDFBit, mSDFBitGl } from './shader-bits/mSDFBit';
 
+import type { GlProgram, GpuProgram } from '../../../rendering';
+
+let gpuProgram: GpuProgram;
+let glProgram: GlProgram;
+
 export class SdfShader extends Shader
 {
     constructor()
@@ -29,7 +34,7 @@ export class SdfShader extends Shader
 
         const maxTextures = maxRecommendedTextures();
 
-        const gpuProgram = compileHighShaderGpuProgram({
+        gpuProgram ??= compileHighShaderGpuProgram({
             name: 'sdf-shader',
             bits: [
                 colorBit,
@@ -40,7 +45,7 @@ export class SdfShader extends Shader
             ]
         });
 
-        const glProgram = compileHighShaderGlProgram({
+        glProgram ??= compileHighShaderGlProgram({
             name: 'sdf-shader',
             bits: [
                 colorBitGl,