npm - @luma.gl/shaders - Versions diffs - 10.0.0-alpha.7 → 10.0.0-alpha.9 - Mend

@luma.gl/shaders 10.0.0-alpha.7 → 10.0.0-alpha.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (86) hide show

package/dist/index.d.ts CHANGED Viewed

@@ -6,7 +6,7 @@ export type { PlatformInfo } from "./lib/shader-assembly/platform-info.js";
 export type { ShaderBindingDebugRow } from "./lib/shader-assembly/wgsl-binding-debug.js";
 export { scanWGSLInterface, type ScanWGSLInterfaceOptions } from "./lib/shader-assembly/wgsl-interface-scan.js";
 export type { ShaderModule } from "./lib/shader-module/shader-module.js";
-export type { ResolvedShaderPlugins, ResolvedShaderPluginInterStageVariable, ShaderPlugin, ShaderPluginInjection, ShaderPluginInjectionTarget, ShaderPluginInterStageVariable, ShaderPluginInterStageVariableInterpolation } from "./lib/shader-plugin.js";
+export type { ResolvedShaderPlugins, ResolvedShaderPluginInterStageVariable, ShaderPlugin, ShaderPluginInterStageVariable, ShaderPluginInterStageVariableInterpolation } from "./lib/shader-plugin.js";
 export type { ShaderPass, ShaderPassInputSource, ShaderPassRenderTarget, ShaderSubPass } from "./lib/shader-module/shader-pass.js";
 export type { CompositeShaderPassComputeOptimization, CompositeShaderPass, CompositeShaderPassStep } from "./lib/shader-module/composite-shader-pass.js";
 export type { ShaderModuleUniformValue, UniformTypes } from "./lib/utils/uniform-types.js";
@@ -20,8 +20,8 @@ export { getGLSLUniformBlocks, getShaderModuleUniformBlockFields, getShaderModul
 export { getShaderModuleSource } from "./lib/shader-assembly/assemble-shaders.js";
 export { resolveModules as _resolveModules } from "./lib/shader-module/shader-module-dependencies.js";
 export { ShaderAssembler, GLSLShaderAssembler, WGSLShaderAssembler } from "./lib/shader-assembler.js";
-export type { ShaderHook, ShaderHookOptions } from "./lib/shader-assembly/shader-hooks.js";
-export type { ShaderInjection } from "./lib/shader-assembly/shader-injections.js";
+export type { ShaderHook, ShaderHookImplementation } from "./lib/shader-assembly/shader-hooks.js";
+export type { ShaderInjection, ResolvedShaderInjection } from "./lib/shader-assembly/shader-injections.js";
 export { getShaderInfo } from "./lib/glsl-utils/get-shader-info.js";
 export { getQualifierDetails, getPassthroughFS, typeToChannelSuffix, typeToChannelCount, convertToVec4 } from "./lib/glsl-utils/shader-utils.js";
 export type { ShaderGenerationOptions } from "./lib/shader-generator/generate-shader.js";

package/dist/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,YAAY,EAAC,YAAY,EAAC,+CAA4C;AACtE,YAAY,EAAC,qBAAqB,EAAC,oDAAiD;AACpF,OAAO,EACL,iBAAiB,EACjB,KAAK,wBAAwB,EAC9B,qDAAkD;AAInD,YAAY,EAAC,YAAY,EAAC,6CAA0C;AACpE,YAAY,EACV,qBAAqB,EACrB,sCAAsC,EACtC,YAAY,EACZ,~~qBAAqB,EACrB,2BAA2B,EAC3B,~~8BAA8B,EAC9B,2CAA2C,EAC5C,+BAA4B;AAC7B,YAAY,EACV,UAAU,EACV,qBAAqB,EACrB,sBAAsB,EACtB,aAAa,EACd,2CAAwC;AACzC,YAAY,EACV,sCAAsC,EACtC,mBAAmB,EACnB,uBAAuB,EACxB,qDAAkD;AACnD,YAAY,EAAC,wBAAwB,EAAE,YAAY,EAAC,qCAAkC;AAEtF,OAAO,EAAC,sBAAsB,EAAE,uBAAuB,EAAC,6CAA0C;AAClG,OAAO,EAAC,uBAAuB,EAAC,6CAA0C;AAC1E,OAAO,EAAC,2BAA2B,EAAC,0DAAuD;AAC3F,OAAO,EAAC,6BAA6B,EAAC,6CAA0C;AAChF,OAAO,EAAC,wBAAwB,EAAE,oBAAoB,EAAC,+BAA4B;AACnF,YAAY,EACV,oBAAoB,EACpB,8BAA8B,EAC9B,yCAAyC,EAC1C,4DAAyD;AAC1D,OAAO,EACL,oBAAoB,EACpB,iCAAiC,EACjC,+BAA+B,EAC/B,4CAA4C,EAC5C,iCAAiC,EACjC,mCAAmC,EACpC,4DAAyD;AAE1D,OAAO,EAAC,qBAAqB,EAAC,kDAA+C;AAE7E,OAAO,EAAC,cAAc,IAAI,eAAe,EAAC,0DAAuD;AAGjG,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAE,mBAAmB,EAAC,kCAA+B;AACjG,YAAY,EAAC,UAAU,EAAE,~~iBAAiB~~,EAAC,8CAA2C;~~AACtF~~,YAAY,~~EAAC~~,eAAe,~~EAAC~~,mDAAgD;~~AAK7E~~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"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,4DAA4D;AAU5D,OAAO,EACL,iBAAiB,EAElB,qDAAkD;~~AA2BnD~~,OAAO,EAAC,sBAAsB,EAAE,uBAAuB,EAAC,6CAA0C;AAClG,OAAO,EAAC,uBAAuB,EAAC,6CAA0C;AAC1E,OAAO,EAAC,2BAA2B,EAAC,0DAAuD;AAC3F,OAAO,EAAC,6BAA6B,EAAC,6CAA0C;AAChF,OAAO,EAAC,wBAAwB,EAAE,oBAAoB,EAAC,+BAA4B;AAMnF,OAAO,EACL,oBAAoB,EACpB,iCAAiC,EACjC,+BAA+B,EAC/B,4CAA4C,EAC5C,iCAAiC,EACjC,mCAAmC,EACpC,4DAAyD;AAE1D,OAAO,EAAC,qBAAqB,EAAC,kDAA+C;AAE7E,OAAO,EAAC,cAAc,IAAI,eAAe,EAAC,0DAAuD;AAEjG,kBAAkB;AAClB,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAE,mBAAmB,EAAC,kCAA+B;~~AAIjG~~,iBAAiB;AAEjB,8BAA8B;AAC9B,OAAO,EAAC,aAAa,EAAC,4CAAyC;AAC/D,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACd,yCAAsC;AAIvC,OAAO,EAAC,uBAAuB,EAAC,kDAA+C;AAC/E,OAAO,EAAC,UAAU,EAAC,mDAAgD;AAEnE,uDAAuD;AACvD,OAAO,EAAC,UAAU,EAAC,2CAAwC;AAC3D,OAAO,EAAC,sBAAsB,EAAC,kDAA+C;AAC9E,OAAO,EAAC,cAAc,EAAC,mDAAgD;AAEvE,aAAa;AACb,OAAO,EAAC,WAAW,EAAE,aAAa,EAAC,0CAAuC;AAC1E,OAAO,EAAC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAC,0CAAuC;AACpF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EACrB,6CAA0C;AAE3C,OAAO,EAAC,YAAY,EAAyB,0DAAuD;AACpG,OAAO,EACL,QAAQ,EAGT,kDAA+C;AAEhD,iBAAiB;AACjB,OAAO,EAAC,MAAM,EAAC,wCAAqC;AACpD,OAAO,EAAC,cAAc,EAAC,4CAAyC;AAEhE,OAAO,EAAC,IAAI,EAAC,oCAAiC;AAC9C,OAAO,EAAC,IAAI,EAAE,cAAc,EAAC,oCAAiC;AAC9D,OAAO,EAAC,IAAI,EAAC,0CAAuC;AAYpD,OAAO,EACL,MAAM,EACN,WAAW,EACX,kCAAkC,EAClC,oBAAoB,EACpB,iCAAiC,EACjC,aAAa,EACd,wCAAqC;AAQtC,OAAO,EAAC,OAAO,EAAC,4CAAyC;AAEzD,OAAO,EAAC,kBAAkB,EAAC,0CAAuC;AAElE,OAAO,EAAC,gBAAgB,EAAC,sCAAmC;AAE5D,OAAO,EAAC,IAAI,EAAE,eAAe,EAAC,sCAAmC;AAKjE,OAAO,EAAC,YAAY,EAAC,wDAAqD;AAa1E,OAAO,EAAC,QAAQ,EAAC,8CAA2C;AAE5D,OAAO,EAAC,GAAG,EAAC,sCAAmC;AAC/C,OAAO,EAAC,QAAQ,EAAC,mDAAgD;AAEjE,OAAO,EAAC,eAAe,EAAC,gEAA6D;AAErF,OAAO,EAAC,eAAe,EAAC,gEAA6D;AAErF,OAAO,EAAC,aAAa,EAAC,4DAAyD;AAK/E,OAAO,EAAC,aAAa,EAAC,4DAAyD;AAK/E,OAAO,EAAC,kBAAkB,EAAC,kEAA+D;AAc1F,OAAO,EAAC,WAAW,EAAC,wDAAqD;AACzE,OAAO,EAAC,QAAQ,EAAE,iBAAiB,EAAC,qDAAkD;AAEtF,OAAO,EAAC,SAAS,EAAC,oDAAiD;AACnE,OAAO,EAAC,kBAAkB,EAAC,8DAA2D;AAEtF,OAAO,EACL,WAAW,EAGZ,wDAAqD;AACtD,OAAO,EACL,SAAS,EAGV,oDAAiD;AAElD,OAAO,EAAC,aAAa,EAAC,0DAAuD;AAa7E,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAClE,OAAO,EAAC,MAAM,EAAsC,4CAAyC;AAE7F,OAAO,EACL,UAAU,EAGX,oDAAiD;AAClD,OAAO,EACL,cAAc,EACd,uBAAuB,EAKxB,8DAA2D;AAE5D,OAAO,EAAC,OAAO,EAA0C,8CAA2C;AAEpG,OAAO,EACL,WAAW,EAGZ,wDAAqD;AAEtD,OAAO,EACL,YAAY,EAGb,0DAAuD"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/shader-assembler-base.cjs CHANGED Viewed

@@ -88,11 +88,10 @@ class ShaderAssembler {
   }
   /**
    * Register a shader hook
-   * @param hook Stage-prefixed hook signature, such as `vs:OFFSET_POSITION(inout vec4 position)`.
-   * @param options Optional hook metadata such as always-on header and footer source.
+   * @param hook Shared stage and name with language-specific parameters, return type, and source.
    */
-  addShaderHook(hook, options) {
-    this._hookFunctions.push(options ? { ...options, hook } : hook);
+  addShaderHook(hook) {
+    this._hookFunctions.push(hook);
   }
   /**
    * Remove all registered shader hooks, for example before re-registering hooks for a new

package/dist/lib/shader-assembler-base.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { ShaderModule } from "./shader-module/shader-module.js";
 import type { AssembleShaderProps } from "./shader-assembly/shader-assembly-types.js";
-import type { ShaderHook, ShaderHookOptions } from "./shader-assembly/shader-hooks.js";
+import type { ShaderHook } from "./shader-assembly/shader-hooks.js";
 import type { ShaderTranspiler, ShaderTranspileResult } from "./shader-transpiler/shader-transpiler.js";
 /**
  * A stateful version of `assembleShaders` that can be used to assemble shaders.
@@ -12,7 +12,7 @@ export declare abstract class ShaderAssembler {
     /** Compilers registered by the application, isolated to this assembler. */
     private readonly _shaderTranspilers;
     /** Hook functions */
-    protected readonly _hookFunctions: (ShaderHook | string)[];
+    protected readonly _hookFunctions: ShaderHook[];
     /** Shader modules */
     protected _defaultModules: ShaderModule[];
     /** Register or replace the compiler for one input language. */
@@ -35,10 +35,9 @@ export declare abstract class ShaderAssembler {
     removeDefaultModule(module: ShaderModule): void;
     /**
      * Register a shader hook
-     * @param hook Stage-prefixed hook signature, such as `vs:OFFSET_POSITION(inout vec4 position)`.
-     * @param options Optional hook metadata such as always-on header and footer source.
+     * @param hook Shared stage and name with language-specific parameters, return type, and source.
      */
-    addShaderHook(hook: string, options?: ShaderHookOptions): void;
+    addShaderHook(hook: ShaderHook): void;
     /**
      * Remove all registered shader hooks, for example before re-registering hooks for a new
      * application configuration. Default modules are not affected.

package/dist/lib/shader-assembler-base.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"shader-assembler-base.d.ts","sourceRoot":"","sources":["../../src/lib/shader-assembler-base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,yCAAsC;AAEhE,OAAO,KAAK,EAAC,mBAAmB,EAAC,mDAAgD;AACjF,OAAO,KAAK,EAAC,UAAU,~~EAAE,iBAAiB,~~EAAC,0CAAuC;~~AAElF~~,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EAEtB,iDAA8C;AAG/C;;;GAGG;AACH,8BAAsB,eAAe;IACnC,kDAAkD;IAClD,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;IAClD,2EAA2E;IAC3E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAuC;IAC1E,qBAAqB;IACrB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,~~CAAC,~~UAAU,~~GAAG,MAAM,CAAC,~~EAAE,CAAM;~~IAChE~~,qBAAqB;IACrB,SAAS,CAAC,eAAe,EAAE,YAAY,EAAE,CAAM;IAE/C,+DAA+D;IAC/D,mBAAmB,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI;IAIvD,kDAAkD;IAClD,sBAAsB,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI;IAIpD,wFAAwF;IACxF,SAAS,CAAC,gBAAgB,CACxB,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,YAAY,EAAE,EACvB,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,GACxC,qBAAqB,GAAG;QAAC,OAAO,EAAE,YAAY,EAAE,CAAA;KAAC;IAsDpD;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAU5C;;;OAGG;IACH,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAK/C~~;;;;OAIG~~;IACH,aAAa,CAAC,IAAI,EAAE,~~MAAM~~,~~EAAE,OAAO,CAAC,EAAE,iBAAiB,~~GAAG,IAAI;~~IAI9D~~;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAIxB;;OAEG;IACH,cAAc,CAAC,UAAU,GAAE,YAAY,EAAO,GAAG,YAAY,EAAE;CA0BhE"}
1	+ {"version":3,"file":"shader-assembler-base.d.ts","sourceRoot":"","sources":["../../src/lib/shader-assembler-base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,yCAAsC;AAEhE,OAAO,KAAK,EAAC,mBAAmB,EAAC,mDAAgD;AACjF,OAAO,KAAK,EAAC,UAAU,EAAC,0CAAuC;AAE/D,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EAEtB,iDAA8C;AAG/C;;;GAGG;AACH,8BAAsB,eAAe;IACnC,kDAAkD;IAClD,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;IAClD,2EAA2E;IAC3E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAuC;IAC1E,qBAAqB;IACrB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,EAAE,CAAM;IACrD,qBAAqB;IACrB,SAAS,CAAC,eAAe,EAAE,YAAY,EAAE,CAAM;IAE/C,+DAA+D;IAC/D,mBAAmB,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI;IAIvD,kDAAkD;IAClD,sBAAsB,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI;IAIpD,wFAAwF;IACxF,SAAS,CAAC,gBAAgB,CACxB,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,YAAY,EAAE,EACvB,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,GACxC,qBAAqB,GAAG;QAAC,OAAO,EAAE,YAAY,EAAE,CAAA;KAAC;IAsDpD;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAU5C;;;OAGG;IACH,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAK/C;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAIrC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAIxB;;OAEG;IACH,cAAc,CAAC,UAAU,GAAE,YAAY,EAAO,GAAG,YAAY,EAAE;CA0BhE"}

package/dist/lib/shader-assembler-base.js CHANGED Viewed

@@ -86,11 +86,10 @@ export class ShaderAssembler {
     }
     /**
      * Register a shader hook
-     * @param hook Stage-prefixed hook signature, such as `vs:OFFSET_POSITION(inout vec4 position)`.
-     * @param options Optional hook metadata such as always-on header and footer source.
+     * @param hook Shared stage and name with language-specific parameters, return type, and source.
      */
-    addShaderHook(hook, options) {
-        this._hookFunctions.push(options ? { ...options, hook } : hook);
+    addShaderHook(hook) {
+        this._hookFunctions.push(hook);
     }
     /**
      * Remove all registered shader hooks, for example before re-registering hooks for a new

package/dist/lib/shader-assembler-base.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"shader-assembler-base.js","sourceRoot":"","sources":["../../src/lib/shader-assembler-base.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,4DAA4D;AAG5D,OAAO,EAAC,uBAAuB,EAAC,yCAAsC;AAGtE,OAAO,EAAC,MAAM,EAAC,0BAAuB;AAMtC,OAAO,EAAC,2BAA2B,EAAC,sDAAmD;AAEvF;;;GAGG;AACH,MAAM,OAAgB,eAAe;IAGnC,2EAA2E;IAC1D,kBAAkB,GAAG,IAAI,GAAG,EAA4B,CAAC;IAC1E,qBAAqB;IACF,cAAc,~~GAA4B~~,EAAE,CAAC;~~IAChE~~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~~;;;;OAIG~~;IACH,aAAa,CAAC,~~IAAY,EAAE,OAA2B~~;~~QACrD~~,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,~~OAAO,CAAC,CAAC,CAAC,EAAC,GAAG,OAAO,EAAE,~~IAAI,~~EAAC,~~CAAC,CAAC~~,CAAC,IAAI,CAAC,CAAC~~;~~IAChE~~,CAAC;IAED;;;OAGG;IACH,gBAAgB;QACd,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,aAA6B,EAAE;QAC5C,MAAM,OAAO,GAAG,IAAI,KAAK,CAAe,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QACzF,MAAM,IAAI,GAA4B,EAAE,CAAC;QACzC,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACpB,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC;YACtD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;YACpB,CAAC;QACH,CAAC;QAED,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;QAEvB,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
1	+ {"version":3,"file":"shader-assembler-base.js","sourceRoot":"","sources":["../../src/lib/shader-assembler-base.ts"],"names":[],"mappings":"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"}

package/dist/lib/shader-assembly/assemble-glsl-shaders.cjs CHANGED Viewed

@@ -61,7 +61,6 @@ function assembleGLSLShaderPair(options) {
   };
 }
 function assembleShaderGLSL(platformInfo, options) {
-  var _a;
   const { source, stage, language = "glsl", modules, defines = {}, hookFunctions = [], inject = {}, pluginInjections = {}, pluginVertexInputs = {}, pluginInterStageVariables = {}, prologue = true, log } = options;
   (0, import_assert.assert)(typeof source === "string", "shader source must be a string");
   const sourceVersion = language === "glsl" ? (0, import_get_shader_info.getShaderInfo)(source).version : -1;
@@ -95,13 +94,16 @@ ${getApplicationDefines(allDefines)}
 `;
       break;
   }
-  const hookFunctionMap = (0, import_shader_hooks.normalizeShaderHooks)(hookFunctions);
+  const hookFunctionMap = (0, import_shader_hooks.normalizeShaderHooks)(hookFunctions, options.pluginHooks, "glsl");
   const hookInjections = {};
   const declInjections = {};
   const mainInjections = {};
   (0, import_shader_assembly_shared.appendInjections)(pluginInjections, hookInjections, declInjections, mainInjections);
-  for (const key in inject) {
-    const injection = typeof inject[key] === "string" ? { injection: inject[key], order: 0 } : inject[key];
+  const applicationInjections = Array.isArray(inject) ? (0, import_shader_injections.resolveShaderInjections)(inject, "glsl") : {};
+  (0, import_shader_assembly_shared.appendInjections)(applicationInjections, hookInjections, declInjections, mainInjections);
+  const injectionMap = Array.isArray(inject) ? {} : inject;
+  for (const key in injectionMap) {
+    const injection = typeof injectionMap[key] === "string" ? { injection: injectionMap[key], order: 0 } : injectionMap[key];
     const match = /^(v|f)s:(#)?([\w-]+)$/.exec(key);
     if (match) {
       const hash = match[2];
@@ -143,19 +145,6 @@ ${getApplicationDefines(allDefines)}
     }
     const moduleSource = (0, import_shader_assembly_shared.getShaderModuleSource)(module2, stage, log);
     assembledSource += moduleSource;
-    const injections = ((_a = module2.instance) == null ? void 0 : _a.normalizedInjections[stage]) || {};
-    for (const key in injections) {
-      const match = /^(v|f)s:#([\w-]+)$/.exec(key);
-      if (match) {
-        const name = match[2];
-        const injectionType = name === "decl" ? declInjections : mainInjections;
-        injectionType[key] = injectionType[key] || [];
-        injectionType[key].push(injections[key]);
-      } else {
-        hookInjections[key] = hookInjections[key] || [];
-        hookInjections[key].push(injections[key]);
-      }
-    }
   }
   (0, import_shader_hooks.validateShaderHookInjections)(hookFunctionMap, hookInjections, stage);
   assembledSource += "// ----- MAIN SHADER SOURCE -------------------------";

package/dist/lib/shader-assembly/assemble-glsl-shaders.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { type AssembleShaderOptions, type GetUniformsFunc, type ShaderAssemblyLo
 import { PlatformInfo } from "./platform-info.js";
 import { type ShaderModule } from "../shader-module/shader-module.js";
 import { type ShaderHook } from "./shader-hooks.js";
-import { type ShaderInjection } from "./shader-injections.js";
+import { type ShaderInjection, type ResolvedShaderInjection } from "./shader-injections.js";
 import { type AttributeShaderType } from "../../types.js";
 import { type ResolvedShaderPluginInterStageVariable } from "../shader-plugin.js";
 /**
@@ -37,9 +37,10 @@ export declare function assembleShaderGLSL(platformInfo: PlatformInfo, options:
     stage: 'vertex' | 'fragment';
     modules: ShaderModule[];
     defines?: Record<string, boolean | number>;
-    hookFunctions?: readonly (ShaderHook | string)[];
-    inject?: Record<string, string | ShaderInjection>;
-    pluginInjections?: Record<string, ShaderInjection[]>;
+    hookFunctions?: readonly ShaderHook[];
+    pluginHooks?: readonly ShaderHook[];
+    inject?: readonly ShaderInjection[] | Record<string, string | ResolvedShaderInjection>;
+    pluginInjections?: Record<string, ResolvedShaderInjection[]>;
     pluginVertexInputs?: Record<string, AttributeShaderType>;
     pluginInterStageVariables?: Record<string, ResolvedShaderPluginInterStageVariable>;
     prologue?: boolean;

package/dist/lib/shader-assembly/assemble-glsl-shaders.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"assemble-glsl-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-glsl-shaders.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACvB,mCAAgC;AAOjC,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,KAAK,YAAY,EAAgC,0CAAuC;AAChG,OAAO,EACL,KAAK,UAAU,EAIhB,0BAAuB;AACxB,OAAO,~~EAAC~~,KAAK,eAAe,~~EAAe~~,+BAA4B;~~AACvE~~,OAAO,EAAC,KAAK,mBAAmB,EAAC,uBAAoB;AACrD,OAAO,EAAC,KAAK,sCAAsC,EAAC,4BAAyB;AAS7E;;;GAGG;AACH,eAAO,MAAM,wBAAwB,6BAEpC,CAAC;AAEF;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,qBAAqB,GAAG;IAC/B,oBAAoB;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,sBAAsB;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA;IACD,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,eAAe,CAAC;CAC9B,CAoBA;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE;IACP,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,SAAS,~~CAAC,~~UAAU,~~GAAG~~,~~MAAM~~,CAAC,EAAE,CAAC;~~IACjD~~,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,~~eAAe~~,CAAC,CAAC;~~IAClD~~,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,~~eAAe~~,EAAE,CAAC,CAAC;~~IACrD~~,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACzD,yBAAyB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sCAAsC,CAAC,CAAC;IACnF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,iBAAiB,CAAC;CACzB,~~UAqKF~~;AAED;;;;;;;;;;;;;;;;;;EAkBE;AAEF,sEAAsE;AACtE,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAM,GAAG,MAAM,CAS5F"}
1	+ {"version":3,"file":"assemble-glsl-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-glsl-shaders.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACvB,mCAAgC;AAOjC,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,KAAK,YAAY,EAAgC,0CAAuC;AAChG,OAAO,EACL,KAAK,UAAU,EAIhB,0BAAuB;AACxB,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAG7B,+BAA4B;AAC7B,OAAO,EAAC,KAAK,mBAAmB,EAAC,uBAAoB;AACrD,OAAO,EAAC,KAAK,sCAAsC,EAAC,4BAAyB;AAS7E;;;GAGG;AACH,eAAO,MAAM,wBAAwB,6BAEpC,CAAC;AAEF;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,qBAAqB,GAAG;IAC/B,oBAAoB;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,sBAAsB;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA;IACD,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,eAAe,CAAC;CAC9B,CAoBA;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE;IACP,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IACtC,WAAW,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,eAAe,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,uBAAuB,CAAC,CAAC;IACvF,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC;IAC7D,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACzD,yBAAyB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sCAAsC,CAAC,CAAC;IACnF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,iBAAiB,CAAC;CACzB,UAgKF;AAED;;;;;;;;;;;;;;;;;;EAkBE;AAEF,sEAAsE;AACtE,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAM,GAAG,MAAM,CAS5F"}

package/dist/lib/shader-assembly/assemble-glsl-shaders.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { getShaderModuleDependencies } from "../shader-module/shader-module-depe
 import { assembleGetUniforms, appendInjections, getShaderModuleSource, INJECT_SHADER_DECLARATIONS } from "./shader-assembly-shared.js";
 import { checkShaderModuleDeprecations } from "../shader-module/shader-module.js";
 import { normalizeShaderHooks, validateShaderHookInjections, getShaderHooks } from "./shader-hooks.js";
-import { injectShader } from "./shader-injections.js";
+import { injectShader, resolveShaderInjections } from "./shader-injections.js";
 import { assert } from "../utils/assert.js";
 import { getShaderInfo } from "../glsl-utils/get-shader-info.js";
 import { getPlatformShaderDefines } from "./platform-defines.js";
@@ -92,14 +92,23 @@ ${getApplicationDefines(allDefines)}
 `;
             break;
     }
-    const hookFunctionMap = normalizeShaderHooks(hookFunctions);
+    const hookFunctionMap = normalizeShaderHooks(hookFunctions, options.pluginHooks, 'glsl');
     // Add source of dependent modules in resolved order
     const hookInjections = {};
     const declInjections = {};
     const mainInjections = {};
     appendInjections(pluginInjections, hookInjections, declInjections, mainInjections);
-    for (const key in inject) {
-        const injection = typeof inject[key] === 'string' ? { injection: inject[key], order: 0 } : inject[key];
+    const applicationInjections = Array.isArray(inject)
+        ? resolveShaderInjections(inject, 'glsl')
+        : {};
+    appendInjections(applicationInjections, hookInjections, declInjections, mainInjections);
+    const injectionMap = Array.isArray(inject)
+        ? {}
+        : inject;
+    for (const key in injectionMap) {
+        const injection = typeof injectionMap[key] === 'string'
+            ? { injection: injectionMap[key], order: 0 }
+            : injectionMap[key];
         const match = /^(v|f)s:(#)?([\w-]+)$/.exec(key);
         if (match) {
             const hash = match[2];
@@ -146,22 +155,8 @@ ${getApplicationDefines(allDefines)}
         const moduleSource = getShaderModuleSource(module, stage, log);
         // Add the module source, and a #define that declares it presence
         assembledSource += moduleSource;
-        const injections = module.instance?.normalizedInjections[stage] || {};
-        for (const key in injections) {
-            const match = /^(v|f)s:#([\w-]+)$/.exec(key);
-            if (match) {
-                const name = match[2];
-                const injectionType = name === 'decl' ? declInjections : mainInjections;
-                injectionType[key] = injectionType[key] || [];
-                injectionType[key].push(injections[key]);
-            }
-            else {
-                hookInjections[key] = hookInjections[key] || [];
-                hookInjections[key].push(injections[key]);
-            }
-        }
     }
-    // GLSL module injections are GLSL source, so application, plugin, and module hook targets must exist.
+    // Named hook injections must target a registered hook.
     validateShaderHookInjections(hookFunctionMap, hookInjections, stage);
     assembledSource += '// ----- MAIN SHADER SOURCE -------------------------';
     // For injectShader

package/dist/lib/shader-assembly/assemble-glsl-shaders.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"assemble-glsl-shaders.js","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-glsl-shaders.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,4DAA4D;AAE5D,OAAO,EAAC,2BAA2B,EAAC,uDAAoD;AAMxF,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EACrB,0BAA0B,EAC3B,oCAAiC;AAElC,OAAO,EAAoB,6BAA6B,EAAC,0CAAuC;AAChG,OAAO,EAEL,oBAAoB,EACpB,4BAA4B,EAC5B,cAAc,EACf,0BAAuB;AACxB,OAAO,~~EAAuB~~,YAAY,~~EAAC~~,+BAA4B;~~AAGvE~~,OAAO,EAAC,MAAM,EAAC,2BAAwB;AACvC,OAAO,EAAC,aAAa,EAAC,yCAAsC;AAC5D,OAAO,EAAC,wBAAwB,EAAC,8BAA2B;AAC5D,OAAO,EAAC,0CAA0C,EAAC,yCAAsC;AACzF,OAAO,EAAC,2CAA2C,EAAC,oCAAiC;AACrF,OAAO,EAAC,mBAAmB,EAAC,sDAAmD;AAC/E,OAAO,EAAC,mCAAmC,EAAC,yDAAsD;AAElG;;;GAGG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,UAAU,CAAC;;CAElD,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,OAKC;IAMD,MAAM,EAAC,EAAE,EAAE,EAAE,EAAC,GAAG,OAAO,CAAC;IACzB,MAAM,OAAO,GAAG,2BAA2B,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAEnE,OAAO;QACL,EAAE,EAAE,kBAAkB,CAAC,OAAO,CAAC,YAAY,EAAE;YAC3C,GAAG,OAAO;YACV,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,QAAQ;YACf,OAAO;SACR,CAAC;QACF,EAAE,EAAE,kBAAkB,CAAC,OAAO,CAAC,YAAY,EAAE;YAC3C,GAAG,OAAO;YACV,mBAAmB;YACnB,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,UAAU;YACjB,OAAO;SACR,CAAC;QACF,WAAW,EAAE,mBAAmB,CAAC,OAAO,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,YAA0B,EAC1B,~~OAcC~~;IAED,MAAM,EACJ,MAAM,EACN,KAAK,EACL,QAAQ,GAAG,MAAM,EACjB,OAAO,EACP,OAAO,GAAG,EAAE,EACZ,aAAa,GAAG,EAAE,EAClB,MAAM,GAAG,EAAE,EACX,gBAAgB,GAAG,EAAE,EACrB,kBAAkB,GAAG,EAAE,EACvB,yBAAyB,GAAG,EAAE,EAC9B,QAAQ,GAAG,IAAI,EACf,GAAG,EACJ,GAAG,OAAO,CAAC;IAEZ,MAAM,CAAC,OAAO,MAAM,KAAK,QAAQ,EAAE,gCAAgC,CAAC,CAAC;IAErE,MAAM,aAAa,GAAG,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,MAAM,aAAa,GAAG,YAAY,CAAC,qBAAqB,CAAC;IAEzD,MAAM,sBAAsB,GAAG,aAAa,KAAK,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAE1F,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,2EAA2E;IAC3E,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnD,yCAAyC;IACzC,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACvB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEnC,yFAAyF;IACzF,qEAAqE;IACrE,iDAAiD;IACjD,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,MAAM;YACT,MAAM;QACR,KAAK,MAAM;YACT,eAAe,GAAG,QAAQ;gBACxB,CAAC,CAAC;EACR,sBAAsB;;;EAGtB,uBAAuB,KAAK,CAAC,WAAW,EAAE,EAAE;;EAE5C,wBAAwB,CAAC,YAAY,CAAC;EACtC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE;;;;EAIpD,qBAAqB,CAAC,UAAU,CAAC;;CAElC;gBACO,CAAC,CAAC,GAAG,sBAAsB;CAClC,CAAC;YACI,MAAM;IACV,CAAC;IAED,MAAM,eAAe,GAAG,oBAAoB,CAAC,aAAa,CAAC,CAAC;~~IAE5D~~,oDAAoD;IACpD,MAAM,cAAc,~~GAAsC~~,EAAE,CAAC;~~IAC7D~~,MAAM,cAAc,~~GAAsC~~,EAAE,CAAC;~~IAC7D~~,MAAM,cAAc,~~GAAsC~~,EAAE,CAAC;~~IAE7D~~,gBAAgB,CAAC,gBAAgB,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;IAEnF,KAAK,MAAM,GAAG,~~IAAI~~,MAAM,EAAE,CAAC;~~QACzB~~,MAAM,SAAS,GACb,OAAO,~~MAAM~~,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,~~CAAC,~~EAAC,SAAS,EAAE,~~MAAM~~,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC,CAAC,CAAC,~~CAAC~~,~~MAAM,~~CAAC,GAAG,CAAC,CAAC;~~QACrF~~,MAAM,KAAK,GAAG,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;oBACpB,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;gBACpE,CAAC;qBAAM,CAAC;oBACN,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,kBAAkB;YAClB,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IACD,4EAA4E;IAC5E,+EAA+E;IAC/E,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvB,MAAM,YAAY,GAAG,0CAA0C,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAChG,IAAI,YAAY;YAAE,eAAe,IAAI,GAAG,YAAY,IAAI,CAAC;IAC3D,CAAC;IACD,MAAM,qBAAqB,GAAG,2CAA2C,CACvE,UAAU,EACV,KAAK,EACL,yBAAyB,CAC1B,CAAC;IACF,IAAI,qBAAqB,CAAC,YAAY,EAAE,CAAC;QACvC,eAAe,IAAI,GAAG,qBAAqB,CAAC,YAAY,IAAI,CAAC;IAC/D,CAAC;IACD,IAAI,qBAAqB,CAAC,cAAc,EAAE,CAAC;QACzC,cAAc,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAC1E,cAAc,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC;YACpC,SAAS,EAAE,qBAAqB,CAAC,cAAc;YAC/C,KAAK,EAAE,MAAM,CAAC,gBAAgB;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,GAAG,EAAE,CAAC;YACR,6BAA6B,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,YAAY,GAAG,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/D,iEAAiE;QACjE,eAAe,IAAI,YAAY,CAAC;~~QAEhC~~,~~MAAM,UAAU,GAAG,MAAM,~~CAAC~~,QAAQ,EAAE,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC~~;QACtE,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,aAAa,GAAG,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;gBACxE,aAAa,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC9C,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAChD,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;IACH,CAAC;IAED,~~sGAAsG~~;~~IACtG~~,4BAA4B,CAAC,eAAe,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IAErE,eAAe,IAAI,uDAAuD,CAAC;IAE3E,mBAAmB;IACnB,eAAe,IAAI,0BAA0B,CAAC;IAE9C,eAAe,GAAG,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IAEvE,eAAe,IAAI,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,CAAC;IAE1E,6DAA6D;IAC7D,eAAe,IAAI,UAAU,CAAC;IAE9B,wCAAwC;IACxC,eAAe,GAAG,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IAEvE,IAAI,QAAQ,KAAK,MAAM,IAAI,aAAa,KAAK,aAAa,EAAE,CAAC;QAC3D,eAAe,GAAG,mBAAmB,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;QACxB,mCAAmC,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,eAAe,CAAC,IAAI,EAAE,CAAC;AAChC,CAAC;AAED;;;;;;;;;;;;;;;;;;EAkBE;AAEF,sEAAsE;AACtE,MAAM,UAAU,qBAAqB,CAAC,UAA4C,EAAE;IAClF,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,UAAU,IAAI,WAAW,MAAM,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QACvE,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
1	+ {"version":3,"file":"assemble-glsl-shaders.js","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-glsl-shaders.ts"],"names":[],"mappings":"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"}

package/dist/lib/shader-assembly/assemble-wgsl-shaders.cjs CHANGED Viewed

@@ -32,7 +32,6 @@ __export(assemble_wgsl_shaders_exports, {
   getBindingRegistryKey: () => getBindingRegistryKey,
   getUsedBindingsByGroupFromApplicationWGSL: () => getUsedBindingsByGroupFromApplicationWGSL,
   getWGSLDeclarationInjections: () => getWGSLDeclarationInjections,
-  getWGSLModuleInjections: () => getWGSLModuleInjections,
   getWGSLModuleNameAtIndex: () => getWGSLModuleNameAtIndex,
   getWGSLShaderHooks: () => getWGSLShaderHooks,
   isInApplicationWGSLSection: () => isInApplicationWGSLSection,
@@ -107,13 +106,16 @@ function assembleShaderWGSL(platformInfo, options) {
   const pluginVaryingAssembly = (0, import_shader_plugin_varyings.assembleShaderPluginInterStageVariablesWGSL)(pluginVertexInputAssembly.source, vertexEntryPoint, fragmentEntryPoint, pluginInterStageVariables);
   const coreSource = pluginVaryingAssembly.source;
   let assembledSource = "";
-  const hookFunctionMap = (0, import_shader_hooks.normalizeShaderHooks)(hookFunctions);
+  const hookFunctionMap = (0, import_shader_hooks.normalizeShaderHooks)(hookFunctions, options.pluginHooks, "wgsl");
   const hookInjections = {};
   const declInjections = {};
   const mainInjections = {};
   (0, import_shader_assembly_shared.appendInjections)(pluginInjections, hookInjections, declInjections, mainInjections);
-  for (const key in inject) {
-    const injection = typeof inject[key] === "string" ? { injection: inject[key], order: 0 } : inject[key];
+  const applicationInjections = Array.isArray(inject) ? (0, import_shader_injections.resolveShaderInjections)(inject, "wgsl") : {};
+  (0, import_shader_assembly_shared.appendInjections)(applicationInjections, hookInjections, declInjections, mainInjections);
+  const injectionMap = Array.isArray(inject) ? {} : inject;
+  for (const key in injectionMap) {
+    const injection = typeof injectionMap[key] === "string" ? { injection: injectionMap[key], order: 0 } : injectionMap[key];
     const match = /^(v|f)s:(#)?([\w-]+)$/.exec(key);
     if (match) {
       const hash = match[2];
@@ -156,19 +158,6 @@ function assembleShaderWGSL(platformInfo, options) {
       (0, import_shader_module.checkShaderModuleDeprecations)(module2, coreSource, log);
     }
     assembledSource += moduleSource;
-    const injections = getWGSLModuleInjections(module2);
-    for (const key in injections) {
-      const match = /^(v|f)s:#([\w-]+)$/.exec(key);
-      if (match) {
-        const name = match[2];
-        const injectionType = name === "decl" ? declInjections : mainInjections;
-        injectionType[key] = injectionType[key] || [];
-        injectionType[key].push(injections[key]);
-      } else if ((0, import_shader_hooks.isShaderHookRegistered)(hookFunctionMap, key)) {
-        hookInjections[key] = hookInjections[key] || [];
-        hookInjections[key].push(injections[key]);
-      }
-    }
   }
   assembledSource += import_shader_assembly_shared.INJECT_SHADER_DECLARATIONS;
   assembledSource = (0, import_shader_injections.injectShader)(assembledSource, stage, getWGSLDeclarationInjections(declInjections), false, "wgsl", { vertex: vertexEntryPoint, fragment: fragmentEntryPoint });
@@ -221,13 +210,6 @@ function appendGeneratedVaryingInjections(assembly, declarationInjections, mainI
     });
   }
 }
-function getWGSLModuleInjections(module2) {
-  var _a, _b;
-  return {
-    ...((_a = module2.instance) == null ? void 0 : _a.normalizedInjections.vertex) || {},
-    ...((_b = module2.instance) == null ? void 0 : _b.normalizedInjections.fragment) || {}
-  };
-}
 function getWGSLDeclarationInjections(declarationInjections) {
   const unifiedDeclarations = [
     ...declarationInjections["vs:#decl"] || [],
@@ -486,7 +468,6 @@ function formatWGSLSourceSnippet(source) {
   getBindingRegistryKey,
   getUsedBindingsByGroupFromApplicationWGSL,
   getWGSLDeclarationInjections,
-  getWGSLModuleInjections,
   getWGSLModuleNameAtIndex,
   getWGSLShaderHooks,
   isInApplicationWGSLSection,

package/dist/lib/shader-assembly/assemble-wgsl-shaders.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { type ShaderLayout } from "../../types.js";
 import { type AssembleWGSLShaderOptions, type GetUniformsFunc, type WGSLBindingAssignment, type AssembleStageOptions, type WGSLApplicationRelocationState, type BindingRelocationContext, type WGSLRelocationParams } from "./shader-assembly-types.js";
 import { PlatformInfo } from "./platform-info.js";
 import { normalizeShaderHooks } from "./shader-hooks.js";
-import { type ShaderInjection } from "./shader-injections.js";
+import { type ResolvedShaderInjection } from "./shader-injections.js";
 import { type ShaderModule } from "../shader-module/shader-module.js";
 import { type WGSLBindingDeclarationMatch } from "./wgsl-binding-scan.js";
 export declare const RESERVED_APPLICATION_GROUP_0_BINDING_LIMIT = 100;
@@ -32,15 +32,14 @@ export declare function assembleShaderWGSL(platformInfo: PlatformInfo, options:
     source: string;
     bindingAssignments: WGSLBindingAssignment[];
 };
-export declare function appendGeneratedVertexInputInjections(declarations: string, initialization: string, declarationInjections: Record<string, ShaderInjection[]>, mainInjections: Record<string, ShaderInjection[]>): void;
+export declare function appendGeneratedVertexInputInjections(declarations: string, initialization: string, declarationInjections: Record<string, ResolvedShaderInjection[]>, mainInjections: Record<string, ResolvedShaderInjection[]>): void;
 export declare function appendGeneratedVaryingInjections(assembly: {
     declarations: string;
     vertexInitialization: string;
     fragmentInitialization: string;
-}, declarationInjections: Record<string, ShaderInjection[]>, mainInjections: Record<string, ShaderInjection[]>): void;
-export declare function getWGSLModuleInjections(module: ShaderModule): Record<string, ShaderInjection>;
-export declare function getWGSLDeclarationInjections(declarationInjections: Record<string, ShaderInjection[]>): Record<string, ShaderInjection[]>;
-export declare function getWGSLShaderHooks(hookFunctionMap: ReturnType<typeof normalizeShaderHooks>, hookInjections: Record<string, ShaderInjection[]>): string;
+}, declarationInjections: Record<string, ResolvedShaderInjection[]>, mainInjections: Record<string, ResolvedShaderInjection[]>): void;
+export declare function getWGSLDeclarationInjections(declarationInjections: Record<string, ResolvedShaderInjection[]>): Record<string, ResolvedShaderInjection[]>;
+export declare function getWGSLShaderHooks(hookFunctionMap: ReturnType<typeof normalizeShaderHooks>, hookInjections: Record<string, ResolvedShaderInjection[]>): string;
 export declare function getUsedBindingsByGroupFromApplicationWGSL(source: string): Map<number, Set<number>>;
 export declare function relocateWGSLApplicationBindings(source: string): {
     source: string;

package/dist/lib/shader-assembly/assemble-wgsl-shaders.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"assemble-wgsl-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-wgsl-shaders.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,qBAAqB,EAAoC,gCAA6B;AACnG,OAAO,EAAC,KAAK,YAAY,EAAC,uBAAoB;AAE9C,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,8BAA8B,EACnC,KAAK,wBAAwB,EAE7B,KAAK,oBAAoB,EAC1B,mCAAgC;AAQjC,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAK7C,OAAO,~~EACL~~,oBAAoB,~~EAIrB~~,0BAAuB;~~AACxB~~,OAAO,~~EAAC~~,KAAK,~~eAAe~~,~~EAAe~~,+BAA4B;~~AACvE~~,OAAO,EAAgC,KAAK,YAAY,EAAC,0CAAuC;AAChG,OAAO,EAOL,KAAK,2BAA2B,EAEjC,+BAA4B;AAE7B,eAAO,MAAM,0CAA0C,MAAM,CAAC;AAE9D,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,eAAe,CAAC;IAC7B,kBAAkB,EAAE,qBAAqB,EAAE,CAAC;IAC5C,YAAY,EAAE,qBAAqB,EAAE,CAAC;IACtC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;CACnC,CAaA;AAED,qGAAqG;AACrG,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,eAAe,CAAC;IAC7B,kBAAkB,EAAE,qBAAqB,EAAE,CAAC;CAC7C,CAcA;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,oBAAoB,GAC5B;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,qBAAqB,EAAE,CAAA;CAAC,~~CAgL~~/D;AAED,wBAAgB,oCAAoC,CAClD,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,~~eAAe~~,EAAE,CAAC,~~EACxD~~,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,~~eAAe~~,EAAE,CAAC,~~GAChD~~,IAAI,CAeN;AAED,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE;IACR,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,MAAM,CAAC;CAChC,EACD,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,~~eAAe~~,EAAE,CAAC,~~EACxD~~,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,~~eAAe~~,EAAE,CAAC,~~GAChD~~,IAAI,CAsBN;AAED,wBAAgB,~~uBAAuB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAK7F;AAED,wBAAgB,~~4BAA4B,CAC1C,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,~~eAAe~~,EAAE,CAAC,~~GACvD~~,MAAM,CAAC,MAAM,EAAE,~~eAAe~~,EAAE,CAAC,~~CAOnC~~;AAED,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,EACxD,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,~~eAAe~~,EAAE,CAAC,~~GAChD~~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"}
1	+ {"version":3,"file":"assemble-wgsl-shaders.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/assemble-wgsl-shaders.ts"],"names":[],"mappings":"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"}

package/dist/lib/shader-assembly/assemble-wgsl-shaders.js CHANGED Viewed

@@ -9,8 +9,8 @@ import { assert } from "../utils/assert.js";
 import { preprocess } from "../preprocessor/preprocessor.js";
 import { assembleShaderPluginVertexInputsWGSL } from "./shader-plugin-vertex-inputs.js";
 import { assembleShaderPluginInterStageVariablesWGSL } from "./shader-plugin-varyings.js";
-import { normalizeShaderHooks, validateShaderHookInjections, isShaderHookRegistered, getShaderHooks } from "./shader-hooks.js";
-import { injectShader } from "./shader-injections.js";
+import { normalizeShaderHooks, validateShaderHookInjections, getShaderHooks } from "./shader-hooks.js";
+import { injectShader, resolveShaderInjections } from "./shader-injections.js";
 import { checkShaderModuleDeprecations } from "../shader-module/shader-module.js";
 import { getWGSLBindingDeclarationMatches, WGSL_EXPLICIT_BINDING_DECLARATION_REGEXES, WGSL_BINDING_DECLARATION_REGEXES, replaceWGSLBindingDeclarationMatches, hasWGSLAutoBinding, MODULE_WGSL_BINDING_DECLARATION_REGEXES, getFirstWGSLAutoBindingDeclarationMatch } from "./wgsl-binding-scan.js";
 export const RESERVED_APPLICATION_GROUP_0_BINDING_LIMIT = 100;
@@ -80,14 +80,23 @@ export function assembleShaderWGSL(platformInfo, options) {
     // ${isVertex ? '' : FRAGMENT_SHADER_PROLOGUE}
     // `
     // `;
-    const hookFunctionMap = normalizeShaderHooks(hookFunctions);
+    const hookFunctionMap = normalizeShaderHooks(hookFunctions, options.pluginHooks, 'wgsl');
     // Add source of dependent modules in resolved order
     const hookInjections = {};
     const declInjections = {};
     const mainInjections = {};
     appendInjections(pluginInjections, hookInjections, declInjections, mainInjections);
-    for (const key in inject) {
-        const injection = typeof inject[key] === 'string' ? { injection: inject[key], order: 0 } : inject[key];
+    const applicationInjections = Array.isArray(inject)
+        ? resolveShaderInjections(inject, 'wgsl')
+        : {};
+    appendInjections(applicationInjections, hookInjections, declInjections, mainInjections);
+    const injectionMap = Array.isArray(inject)
+        ? {}
+        : inject;
+    for (const key in injectionMap) {
+        const injection = typeof injectionMap[key] === 'string'
+            ? { injection: injectionMap[key], order: 0 }
+            : injectionMap[key];
         const match = /^(v|f)s:(#)?([\w-]+)$/.exec(key);
         if (match) {
             const hash = match[2];
@@ -137,22 +146,6 @@ export function assembleShaderWGSL(platformInfo, options) {
             checkShaderModuleDeprecations(module, coreSource, log);
         }
         assembledSource += moduleSource;
-        const injections = getWGSLModuleInjections(module);
-        for (const key in injections) {
-            const match = /^(v|f)s:#([\w-]+)$/.exec(key);
-            if (match) {
-                const name = match[2];
-                const injectionType = name === 'decl' ? declInjections : mainInjections;
-                injectionType[key] = injectionType[key] || [];
-                injectionType[key].push(injections[key]);
-            }
-            else if (isShaderHookRegistered(hookFunctionMap, key)) {
-                // `ShaderModule.inject` is not language-specific and often carries GLSL-only hook
-                // injections, so WGSL silently skips module injections into hooks it has not declared.
-                hookInjections[key] = hookInjections[key] || [];
-                hookInjections[key].push(injections[key]);
-            }
-        }
     }
     // For injectShader
     assembledSource += INJECT_SHADER_DECLARATIONS;
@@ -208,12 +201,6 @@ export function appendGeneratedVaryingInjections(assembly, declarationInjections
         });
     }
 }
-export function getWGSLModuleInjections(module) {
-    return {
-        ...(module.instance?.normalizedInjections.vertex || {}),
-        ...(module.instance?.normalizedInjections.fragment || {})
-    };
-}
 export function getWGSLDeclarationInjections(declarationInjections) {
     const unifiedDeclarations = [
         ...(declarationInjections['vs:#decl'] || []),