diff --git a/packages/loader/src/ShaderLoader.ts b/packages/loader/src/ShaderLoader.ts index 455e2dadc5..4c5fd2e027 100644 --- a/packages/loader/src/ShaderLoader.ts +++ b/packages/loader/src/ShaderLoader.ts @@ -10,8 +10,6 @@ import { @resourceLoader(AssetType.Shader, ["shader", "shaderc"]) class ShaderLoader extends Loader { - private static _builtinRegex = /^\s*\/\/\s*@builtin\s+(\w+)/; - load(item: LoadItem, resourceManager: ResourceManager): AssetPromise { const url = item.url!; @@ -25,17 +23,7 @@ class ShaderLoader extends Loader { // @ts-ignore return resourceManager._request(url, { ...item, type: "text" }).then((code: string) => { - const builtinShader = this._getBuiltinShader(code); - if (builtinShader) { - return Shader.find(builtinShader); - } - return Shader.create(code, undefined, url); }); } - - private _getBuiltinShader(code: string) { - const match = code.match(ShaderLoader._builtinRegex); - if (match && match[1]) return match[1]; - } } diff --git a/packages/shader-compiler/src/common/SymbolTable.ts b/packages/shader-compiler/src/common/SymbolTable.ts index 96fb249a0e..4df92eb72c 100644 --- a/packages/shader-compiler/src/common/SymbolTable.ts +++ b/packages/shader-compiler/src/common/SymbolTable.ts @@ -1,3 +1,4 @@ +import { Logger } from "@galacean/engine-core"; import { IBaseSymbol } from "./IBaseSymbol"; export class SymbolTable { @@ -10,7 +11,7 @@ export class SymbolTable { for (let i = 0, n = entry.length; i < n; i++) { if (entry[i].isInMacroBranch) continue; if (entry[i].equal(symbol)) { - console.warn("Replace symbol:", symbol.ident); + Logger.warn("Replace symbol:", symbol.ident); entry[i] = symbol; return; } diff --git a/packages/shader-compiler/src/lalr/LALR1.ts b/packages/shader-compiler/src/lalr/LALR1.ts index c4d4cd974b..7a19e86d34 100644 --- a/packages/shader-compiler/src/lalr/LALR1.ts +++ b/packages/shader-compiler/src/lalr/LALR1.ts @@ -1,3 +1,4 @@ +import { Logger } from "@galacean/engine-core"; import { ETokenType } from "../common"; import { Keyword } from "../common/enums/Keyword"; import { Grammar } from "../parser/Grammar"; @@ -168,7 +169,7 @@ export class LALR1 { if (exist.action === EAction.Shift && action.action === EAction.Reduce) return; } else { // #if _VERBOSE - console.warn( + Logger.warn( `conflict detect: \n`, Utils.printAction(exist), "\n", diff --git a/packages/shader-compiler/src/parser/SemanticAnalyzer.ts b/packages/shader-compiler/src/parser/SemanticAnalyzer.ts index dbb66e1778..fe553bb734 100644 --- a/packages/shader-compiler/src/parser/SemanticAnalyzer.ts +++ b/packages/shader-compiler/src/parser/SemanticAnalyzer.ts @@ -1,3 +1,4 @@ +import { Logger } from "@galacean/engine-core"; import { ShaderRange } from "../common"; import { SymbolTable } from "../common/SymbolTable"; import { SymbolTableStack } from "../common/SymbolTableStack"; @@ -88,6 +89,6 @@ export default class SemanticAnalyzer { } reportWarning(loc: ShaderRange, message: string): void { - console.warn(new GSError(GSErrorName.CompilationWarn, message, loc, ShaderCompiler._processingPassText).toString()); + Logger.warn(new GSError(GSErrorName.CompilationWarn, message, loc, ShaderCompiler._processingPassText).toString()); } }