galacean · GuoLei1990 · Dec 11, 2024 · Oct 23, 2024 · Oct 30, 2024 · Dec 10, 2024
diff --git a/packages/shader-lab/src/ShaderLab.ts b/packages/shader-lab/src/ShaderLab.ts
@@ -44,7 +44,7 @@ export class ShaderLab implements IShaderLab {
 
   // #if _VERBOSE
   /** Retrieve the compilation errors */
-  readonly errors: GSError[] = [];
+  readonly errors: Error[] = [];
   // #endif
 
   _parseShaderPass(

diff --git a/packages/shader-lab/src/TempArray.ts b/packages/shader-lab/src/TempArray.ts
@@ -0,0 +1,9 @@
+import { IPoolElement } from "@galacean/engine";
+
+export class TempArray<T> implements IPoolElement {
+  array: Array<T> = new Array();
+
+  dispose(): void {
+    this.array.length = 0;
+  }
+}
diff --git a/packages/shader-lab/src/codeGen/CodeGenVisitor.ts b/packages/shader-lab/src/codeGen/CodeGenVisitor.ts
@@ -11,26 +11,33 @@
 // #if _VERBOSE
 import { GSError } from "../GSError";
 // #endif
+import { ShaderLabUtils } from "../ShaderLabUtils";
+import { Logger, ReturnableObjectPool } from "@galacean/engine";
+import { TempArray } from "../TempArray";
 
 /**
  * @internal
  * The code generator
  */
-export class CodeGenVisitor {
+export abstract class CodeGenVisitor {
   // #if _VERBOSE
-  readonly errors: GSError[] = [];
+  readonly errors: Error[] = [];
   // #endif
+  protected static _tmpArrayPool = new ReturnableObjectPool(TempArray<string>, 10);
 
   defaultCodeGen(children: NodeChild[]) {
-    let ret: string[] = [];
+    const pool = CodeGenVisitor._tmpArrayPool;
+    let ret = pool.get();
+    ret.dispose();
     for (const child of children) {
       if (child instanceof Token) {
-        ret.push(child.lexeme);
+        ret.array.push(child.lexeme);
       } else {
-        ret.push(child.codeGen(this));
+        ret.array.push(child.codeGen(this));
       }
     }
-    return ret.join(" ");
+    pool.return(ret);
+    return ret.array.join(" ");
   }
 
   visitPostfixExpression(node: ASTNode.PostfixExpression) {
@@ -195,7 +202,7 @@
     // #if _VERBOSE
     this.errors.push(new GSError(GSErrorName.CompilationError, message, loc, ShaderLab._processingPassText));
     // #else
-    throw new Error(message);
+    Logger.error(message);
     // #endif
   }
 }
diff --git a/packages/shader-lab/src/common/BaseScanner.ts b/packages/shader-lab/src/common/BaseScanner.ts
@@ -3,6 +3,7 @@
 import { ShaderLab } from "../ShaderLab";
 import { BaseToken } from "./BaseToken";
 import { ShaderLabUtils } from "../ShaderLabUtils";
+import { Logger } from "@galacean/engine";
 
 export type  BaseToken, scanner: BaseScanner) => void;
 
@@ -73,17 +74,21 @@
     return this._source[this._currentIndex];
   }
 
+  getCurCharCode(): number {
+    return this._source.charCodeAt(this._currentIndex);
+  }
+
   advance(count = 1): void {
+    // #if _VERBOSE
     for (let i = 0; i < count; i++) {
       this._advance();
     }
+    // #else
+    this._currentIndex += count;
+    // #endif
   }
 
   _advance(): void {
-    if (this.isEnd()) {
-      return;
-    }
-
     // #if _VERBOSE
     if (this.getCurChar() === "\n") {
       this._line += 1;
@@ -142,6 +147,9 @@
 
   throwError(pos: ShaderPosition | ShaderRange, ...msgs: any[]) {
     const error = ShaderLabUtils.createGSError(msgs.join(" "), GSErrorName.ScannerError, this._source, pos);
+    // #if _VERBOSE
+    Logger.error(error.toString());
+    // #endif
     throw error;
   }
 

diff --git a/packages/shader-lab/src/contentParser/ShaderContentParser.ts b/packages/shader-lab/src/contentParser/ShaderContentParser.ts
@@ -222,6 +222,10 @@ export class ShaderContentParser {
     this._symbolTable.newScope(symbolTable);
   }
 
+  private static _dropScope() {
+    this._symbolTable.dropScope();
+  }
+
   private static _parseRenderStatePropList(state: string, scanner: Scanner): IRenderStates {
     const ret: IRenderStates = { constantMap: {}, variableMap: {} };
     while (scanner.getCurChar() !== "}") {
@@ -402,7 +406,7 @@ export class ShaderContentParser {
             braceLevel -= 1;
             if (braceLevel === 0) {
               this._addGlobalStatement(ret, scanner, start, word.lexeme.length);
-              this._symbolTable.dropScope();
+              this._dropScope();
               return ret;
             }
           }
@@ -501,7 +505,7 @@ export class ShaderContentParser {
             braceLevel -= 1;
             if (braceLevel === 0) {
         
3372
      this._addGlobalStatement(ret, scanner, start, word.lexeme.length);
-              this._symbolTable.dropScope();
+              this._dropScope();
               return ret;
             }
           }