@triforge/shader-core 0.4.0 → 0.4.1

package/dist/bundle.js

@@ -300,6 +300,12 @@ var CompileContext = class _CompileContext {
     this.order = [];
     this.emittedDefs = /* @__PURE__ */ new Set();
     this.defs = [];
+    /**
+     * `#extension` pragmas collected from any node's compileDefs() output.
+     * GLSL requires these before any other non-preprocessor token in the
+     * shader — see _extractExtensions / buildFragmentShader.
+     */
+    this._extensions = /* @__PURE__ */ new Set();
     this.calls = [];
     this.graphPath = [];
     this._uniforms = {};
@@ -421,16 +427,32 @@ var CompileContext = class _CompileContext {
     const fn = node.glslFunction ?? NodeClass.glslFunction;
     const defsSource = node.compileDefs();
     if (isInstanceSpecific) {
-      if (defsSource.trim()) this.defs.push(defsSource);
+      if (defsSource.trim()) this.defs.push(this._extractExtensions(defsSource));
     } else {
       const key = node.nodeType;
       if (!this.emittedDefs.has(key)) {
         this.emittedDefs.add(key);
         const source = fn ?? defsSource;
-        if (source.trim()) this.defs.push(source);
+        if (source.trim()) this.defs.push(this._extractExtensions(source));
       }
     }
   }
+  /**
+   * Strips `#extension` lines out of a node's compileDefs() output and
+   * collects them (deduplicated) to be hoisted to the very top of the
+   * fragment shader by buildFragmentShader(). WebGL2/ESSL3 requires
+   * `#extension` directives to appear before any non-preprocessor token —
+   * leaving them in place mid-file (after other nodes' defs/uniforms) throws
+   * "extension directive must occur before any non-preprocessor tokens".
+   * A node just writes `#extension NAME : enable` anywhere in compileDefs()
+   * and gets correct placement automatically — no per-node opt-in needed.
+   */
+  _extractExtensions(source) {
+    return source.replace(/^[ \t]*#extension[^\n]*$/gm, (line) => {
+      this._extensions.add(line.trim());
+      return "";
+    });
+  }
   // ── Validation ────────────────────────────────────────────────────
   validate(root) {
     if (ShaderConfig.errorLevel === "off") return;
@@ -495,11 +517,13 @@ ${customAssigns}
     return Object.entries(this._uniforms).map(([name, { value }]) => Array.isArray(value) ? `uniform vec3 ${name};` : `uniform float ${name};`).join("\n");
   }
   buildFragmentShader() {
+    const extensionsBlock = [...this._extensions].join("\n");
     const uniformsBlock = this.buildUniformDeclarations();
     const customVaryings = [...this._vertexInjections.entries()].map(([vName, { attrType }]) => `varying ${attrType} ${vName};`).join("\n");
     const defsBlock = this.defs.join("\n\n");
     const callsBlock = this.calls.map((c) => `  ${c}`).join("\n");
     return `
+${extensionsBlock}
 precision mediump float;
 
 varying vec2 vUv;
@@ -2844,10 +2868,7 @@ vec3 _st_bump(float height, float strength, float distance, vec3 N) {
   compileDefs() {
     if (this._method === "uv-offset") {
       return [
-        "#ifndef _ST_BUMP_TEXLOD_EXT",
-        "#define _ST_BUMP_TEXLOD_EXT",
         "#extension GL_EXT_shader_texture_lod : enable",
-        "#endif",
         `uniform sampler2D ${this._uniformName};`
       ].join("\n");
     }

package/dist/core/CompileContext.d.ts

@@ -27,6 +27,12 @@ export declare class CompileContext {
     private order;
     private emittedDefs;
     private defs;
+    /**
+     * `#extension` pragmas collected from any node's compileDefs() output.
+     * GLSL requires these before any other non-preprocessor token in the
+     * shader — see _extractExtensions / buildFragmentShader.
+     */
+    private _extensions;
     private calls;
     private graphPath;
     private _uniforms;
@@ -48,6 +54,17 @@ export declare class CompileContext {
     private visit;
     private emit;
     private emitDefs;
+    /**
+     * Strips `#extension` lines out of a node's compileDefs() output and
+     * collects them (deduplicated) to be hoisted to the very top of the
+     * fragment shader by buildFragmentShader(). WebGL2/ESSL3 requires
+     * `#extension` directives to appear before any non-preprocessor token —
+     * leaving them in place mid-file (after other nodes' defs/uniforms) throws
+     * "extension directive must occur before any non-preprocessor tokens".
+     * A node just writes `#extension NAME : enable` anywhere in compileDefs()
+     * and gets correct placement automatically — no per-node opt-in needed.
+     */
+    private _extractExtensions;
     private validate;
     private validateNode;
     private typesCompatible;

package/dist/core/CompileContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompileContext.d.ts","sourceRoot":"","sources":["../../src/core/CompileContext.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAO,MAAM,CAAA;IACzB,cAAc,EAAK,MAAM,CAAA;IACzB,QAAQ,EAAW,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;IACrD,KAAK,EAAc,UAAU,EAAE,CAAA;IAC/B,gHAAgH;IAChH,iBAAiB,EAAE,OAAO,CAAA;CAC3B;AAED;;;;;;;;;GASG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAqD;IACpE,OAAO,CAAC,QAAQ,CAAoD;IACpE,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,WAAW,CAAiD;IACpE,OAAO,CAAC,IAAI,CAAiD;IAC7D,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,SAAS,CAAuD;IACxE,0FAA0F;IAC1F,OAAO,CAAC,iBAAiB,CAAiE;IAI1F,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,gBAAgB;IAejD;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAKvD;;;;;OAKG;IACH,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,MAAM;IAgDlD,OAAO,CAAC,KAAK;IA8Bb,OAAO,CAAC,IAAI;IAyBZ,OAAO,CAAC,QAAQ;IA0BhB,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,YAAY;IAsCpB,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,SAAS;IAwBjB,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAS3D,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQrC,OAAO,CAAC,SAAS;CAGlB"}
+{"version":3,"file":"CompileContext.d.ts","sourceRoot":"","sources":["../../src/core/CompileContext.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAO,MAAM,CAAA;IACzB,cAAc,EAAK,MAAM,CAAA;IACzB,QAAQ,EAAW,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;IACrD,KAAK,EAAc,UAAU,EAAE,CAAA;IAC/B,gHAAgH;IAChH,iBAAiB,EAAE,OAAO,CAAA;CAC3B;AAED;;;;;;;;;GASG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAqD;IACpE,OAAO,CAAC,QAAQ,CAAoD;IACpE,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,WAAW,CAAiD;IACpE,OAAO,CAAC,IAAI,CAAiD;IAC7D;;;;OAIG;IACH,OAAO,CAAC,WAAW,CAAiD;IACpE,OAAO,CAAC,KAAK,CAAgD;IAC7D,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,SAAS,CAAuD;IACxE,0FAA0F;IAC1F,OAAO,CAAC,iBAAiB,CAAiE;IAI1F,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,gBAAgB;IAejD;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAKvD;;;;;OAKG;IACH,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,MAAM;IAgDlD,OAAO,CAAC,KAAK;IA8Bb,OAAO,CAAC,IAAI;IAyBZ,OAAO,CAAC,QAAQ;IAwBhB;;;;;;;;;OASG;IACH,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,QAAQ;IAKhB,OAAO,CAAC,YAAY;IAsCpB,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,wBAAwB;IAMhC,OAAO,CAAC,mBAAmB;IA6B3B,OAAO,CAAC,SAAS;IAwBjB,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAS3D,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQrC,OAAO,CAAC,SAAS;CAGlB"}

package/dist/core/CompileContext.js

@@ -18,6 +18,12 @@ export class CompileContext {
         this.order = [];
         this.emittedDefs = new Set();
         this.defs = [];
+        /**
+         * `#extension` pragmas collected from any node's compileDefs() output.
+         * GLSL requires these before any other non-preprocessor token in the
+         * shader — see _extractExtensions / buildFragmentShader.
+         */
+        this._extensions = new Set();
         this.calls = [];
         this.graphPath = [];
         this._uniforms = {};
@@ -159,7 +165,7 @@ export class CompileContext {
         if (isInstanceSpecific) {
             // Each instance emits its own uniquely named function — no dedup
             if (defsSource.trim())
-                this.defs.push(defsSource);
+                this.defs.push(this._extractExtensions(defsSource));
         }
         else {
             // Shared function — emit once per node type
@@ -168,10 +174,26 @@ export class CompileContext {
                 this.emittedDefs.add(key);
                 const source = fn ?? defsSource;
                 if (source.trim())
-                    this.defs.push(source);
+                    this.defs.push(this._extractExtensions(source));
             }
         }
     }
+    /**
+     * Strips `#extension` lines out of a node's compileDefs() output and
+     * collects them (deduplicated) to be hoisted to the very top of the
+     * fragment shader by buildFragmentShader(). WebGL2/ESSL3 requires
+     * `#extension` directives to appear before any non-preprocessor token —
+     * leaving them in place mid-file (after other nodes' defs/uniforms) throws
+     * "extension directive must occur before any non-preprocessor tokens".
+     * A node just writes `#extension NAME : enable` anywhere in compileDefs()
+     * and gets correct placement automatically — no per-node opt-in needed.
+     */
+    _extractExtensions(source) {
+        return source.replace(/^[ \t]*#extension[^\n]*$/gm, (line) => {
+            this._extensions.add(line.trim());
+            return '';
+        });
+    }
     // ── Validation ────────────────────────────────────────────────────
     validate(root) {
         if (ShaderConfig.errorLevel === 'off')
@@ -255,6 +277,7 @@ ${customAssigns}
             .join('\n');
     }
     buildFragmentShader() {
+        const extensionsBlock = [...this._extensions].join('\n');
         const uniformsBlock = this.buildUniformDeclarations();
         const customVaryings = [...this._vertexInjections.entries()]
             .map(([vName, { attrType }]) => `varying ${attrType} ${vName};`)
@@ -262,6 +285,7 @@ ${customAssigns}
         const defsBlock = this.defs.join('\n\n');
         const callsBlock = this.calls.map(c => `  ${c}`).join('\n');
         return `
+${extensionsBlock}
 precision mediump float;
 
 varying vec2 vUv;

package/dist/nodes/process/Bump.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Bump.d.ts","sourceRoot":"","sources":["../../../src/nodes/process/Bump.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAIvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,YAAY,GAAG,MAAM,CAAA;IAChC,QAAQ,CAAC,EAAE,YAAY,GAAG,MAAM,CAAA;IAChC,MAAM,CAAC,EAAI,YAAY,CAAA;IACvB,MAAM,CAAC,EAAI,YAAY,CAAA;IACvB;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAO,YAAY,GAAG,WAAW,CAAA;IACxC,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,kFAAkF;IAClF,MAAM,CAAC,EAAO,YAAY,CAAA;IAC1B,oFAAoF;IACpF,SAAS,CAAC,EAAI,YAAY,GAAG,MAAM,CAAA;IACnC,mEAAmE;IACnE,GAAG,CAAC,EAAU,YAAY,GAAG,MAAM,CAAA;CACpC;AAED;;;;;;;;GAQG;AACH,qBAAa,IAAK,SAAQ,WAAW;IACnC,IAAI,QAAQ,WAAoB;IAKhC,MAAM,CAAC,mBAAmB,UAAO;IAEjC,IAAI,QAAQ,IAAI,YAAY,CAE3B;IAED,MAAM,CAAC,sBAAsB,SA8BxB;IAEL,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2E;IACnG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmE;gBAEhF,MAAM,GAAE,UAAe;IA+BnC,eAAe;IACf,gBAAgB;IAEhB,WAAW,IAAI,MAAM;IAarB,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM;CAkDzC"}
+{"version":3,"file":"Bump.d.ts","sourceRoot":"","sources":["../../../src/nodes/process/Bump.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAIvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,YAAY,GAAG,MAAM,CAAA;IAChC,QAAQ,CAAC,EAAE,YAAY,GAAG,MAAM,CAAA;IAChC,MAAM,CAAC,EAAI,YAAY,CAAA;IACvB,MAAM,CAAC,EAAI,YAAY,CAAA;IACvB;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAO,YAAY,GAAG,WAAW,CAAA;IACxC,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,kFAAkF;IAClF,MAAM,CAAC,EAAO,YAAY,CAAA;IAC1B,oFAAoF;IACpF,SAAS,CAAC,EAAI,YAAY,GAAG,MAAM,CAAA;IACnC,mEAAmE;IACnE,GAAG,CAAC,EAAU,YAAY,GAAG,MAAM,CAAA;CACpC;AAED;;;;;;;;GAQG;AACH,qBAAa,IAAK,SAAQ,WAAW;IACnC,IAAI,QAAQ,WAAoB;IAKhC,MAAM,CAAC,mBAAmB,UAAO;IAEjC,IAAI,QAAQ,IAAI,YAAY,CAE3B;IAED,MAAM,CAAC,sBAAsB,SA8BxB;IAEL,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2E;IACnG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmE;gBAEhF,MAAM,GAAE,UAAe;IA+BnC,eAAe;IACf,gBAAgB;IAEhB,WAAW,IAAI,MAAM;IAcrB,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM;CAkDzC"}

package/dist/nodes/process/Bump.js

@@ -50,11 +50,12 @@ export class Bump extends ProcessNode {
     getOutputSockets() { return this._outputs; }
     compileDefs() {
         if (this._method === 'uv-offset') {
+            // The #extension line is hoisted to the very top of the fragment shader
+            // (before `precision`) and deduplicated by CompileContext regardless of
+            // where/how many times it's emitted here — see
+            // CompileContext._extractExtensions. No local guard needed.
             return [
-                '#ifndef _ST_BUMP_TEXLOD_EXT',
-                '#define _ST_BUMP_TEXLOD_EXT',
                 '#extension GL_EXT_shader_texture_lod : enable',
-                '#endif',
                 `uniform sampler2D ${this._uniformName};`,
             ].join('\n');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triforge/shader-core",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "GLSL shader library for Three.js with Blender workflow",
   "type": "module",
   "main": "./dist/index.js",