Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions packages/loader/src/ShaderLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import {

@resourceLoader(AssetType.Shader, ["shader", "shaderc"])
class ShaderLoader extends Loader<Shader> {
private static _builtinRegex = /^\s*\/\/\s*@builtin\s+(\w+)/;

load(item: LoadItem, resourceManager: ResourceManager): AssetPromise<Shader> {
const url = item.url!;

Expand All @@ -25,17 +23,7 @@ class ShaderLoader extends Loader<Shader> {

// @ts-ignore
return resourceManager._request<string>(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];
}
}
3 changes: 2 additions & 1 deletion packages/shader-compiler/src/parser/SemanticAnalyzer.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Logger } from "@galacean/engine-core";
import { ShaderRange } from "../common";
import { SymbolTable } from "../common/SymbolTable";
import { SymbolTableStack } from "../common/SymbolTableStack";
Expand Down Expand Up @@ -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());
}
}
Loading