@luma.gl/shadertools 9.1.0-alpha.14 → 9.1.0-alpha.15

package/dist/index.cjs

@@ -229,7 +229,7 @@ function getHookStage(hook) {
       throw new Error(type);
   }
 }
-function injectShader(source, stage, inject, injectStandardStubs = false) {
+function injectShader(source2, stage, inject, injectStandardStubs = false) {
   const isVertex = stage === "vertex";
   for (const key in inject) {
     const fragmentData = inject[key];
@@ -243,43 +243,43 @@ function injectShader(source, stage, inject, injectStandardStubs = false) {
     switch (key) {
       case "vs:#decl":
         if (isVertex) {
-          source = source.replace(DECLARATION_INJECT_MARKER, fragmentString);
+          source2 = source2.replace(DECLARATION_INJECT_MARKER, fragmentString);
         }
         break;
       case "vs:#main-start":
         if (isVertex) {
-          source = source.replace(REGEX_START_OF_MAIN, (match) => match + fragmentString);
+          source2 = source2.replace(REGEX_START_OF_MAIN, (match) => match + fragmentString);
         }
         break;
       case "vs:#main-end":
         if (isVertex) {
-          source = source.replace(REGEX_END_OF_MAIN, (match) => fragmentString + match);
+          source2 = source2.replace(REGEX_END_OF_MAIN, (match) => fragmentString + match);
         }
         break;
       case "fs:#decl":
         if (!isVertex) {
-          source = source.replace(DECLARATION_INJECT_MARKER, fragmentString);
+          source2 = source2.replace(DECLARATION_INJECT_MARKER, fragmentString);
         }
         break;
       case "fs:#main-start":
         if (!isVertex) {
-          source = source.replace(REGEX_START_OF_MAIN, (match) => match + fragmentString);
+          source2 = source2.replace(REGEX_START_OF_MAIN, (match) => match + fragmentString);
         }
         break;
       case "fs:#main-end":
         if (!isVertex) {
-          source = source.replace(REGEX_END_OF_MAIN, (match) => fragmentString + match);
+          source2 = source2.replace(REGEX_END_OF_MAIN, (match) => fragmentString + match);
         }
         break;
       default:
-        source = source.replace(key, (match) => match + fragmentString);
+        source2 = source2.replace(key, (match) => match + fragmentString);
     }
   }
-  source = source.replace(DECLARATION_INJECT_MARKER, "");
+  source2 = source2.replace(DECLARATION_INJECT_MARKER, "");
   if (injectStandardStubs) {
-    source = source.replace(/\}\s*$/, (match) => match + MODULE_INJECTORS[stage]);
+    source2 = source2.replace(/\}\s*$/, (match) => match + MODULE_INJECTORS[stage]);
   }
-  return source;
+  return source2;
 }
 function combineInjects(injects) {
   const result = {};
@@ -448,19 +448,19 @@ function getPlatformShaderDefines(platformInfo) {
 }
 
 // dist/lib/shader-transpiler/transpile-glsl-shader.js
-function transpileGLSLShader(source, stage) {
+function transpileGLSLShader(source2, stage) {
   var _a;
-  const sourceGLSLVersion = Number(((_a = source.match(/^#version[ \t]+(\d+)/m)) == null ? void 0 : _a[1]) || 100);
+  const sourceGLSLVersion = Number(((_a = source2.match(/^#version[ \t]+(\d+)/m)) == null ? void 0 : _a[1]) || 100);
   if (sourceGLSLVersion !== 300) {
     throw new Error("luma.gl v9 only supports GLSL 3.00 shader sources");
   }
   switch (stage) {
     case "vertex":
-      source = convertShader(source, ES300_VERTEX_REPLACEMENTS);
-      return source;
+      source2 = convertShader(source2, ES300_VERTEX_REPLACEMENTS);
+      return source2;
     case "fragment":
-      source = convertShader(source, ES300_FRAGMENT_REPLACEMENTS);
-      return source;
+      source2 = convertShader(source2, ES300_FRAGMENT_REPLACEMENTS);
+      return source2;
     default:
       throw new Error(stage);
   }
@@ -484,11 +484,11 @@ var ES300_FRAGMENT_REPLACEMENTS = [
   // `varying` keyword replaced with `in`
   [makeVariableTextRegExp("varying"), "in $1"]
 ];
-function convertShader(source, replacements) {
+function convertShader(source2, replacements) {
   for (const [pattern, replacement] of replacements) {
-    source = source.replace(pattern, replacement);
+    source2 = source2.replace(pattern, replacement);
   }
-  return source;
+  return source2;
 }
 function makeVariableTextRegExp(qualifier) {
   return new RegExp(`\\b${qualifier}[ \\t]+(\\w+[ \\t]+\\w+(\\[\\w+\\])?;)`, "g");
@@ -550,11 +550,11 @@ function normalizeShaderHooks(hookFunctions) {
 }
 
 // dist/lib/glsl-utils/get-shader-info.js
-function getShaderInfo(source, defaultName) {
+function getShaderInfo(source2, defaultName) {
   return {
-    name: getShaderName(source, defaultName),
+    name: getShaderName(source2, defaultName),
     language: "glsl",
-    version: getShaderVersion(source)
+    version: getShaderVersion(source2)
   };
 }
 function getShaderName(shader, defaultName = "unnamed") {
@@ -562,9 +562,9 @@ function getShaderName(shader, defaultName = "unnamed") {
   const match = SHADER_NAME_REGEXP.exec(shader);
   return match ? match[1] : defaultName;
 }
-function getShaderVersion(source) {
+function getShaderVersion(source2) {
   let version = 100;
-  const words = source.match(/[^\s]+/g);
+  const words = source2.match(/[^\s]+/g);
   if (words && words.length >= 2 && words[0] === "#version") {
     const parsedVersion = parseInt(words[1], 10);
     if (Number.isFinite(parsedVersion)) {
@@ -623,7 +623,7 @@ function assembleShaderWGSL(platformInfo, options) {
   var _a;
   const {
     // id,
-    source,
+    source: source2,
     stage,
     modules,
     // defines = {},
@@ -631,8 +631,8 @@ function assembleShaderWGSL(platformInfo, options) {
     inject = {},
     log: log2
   } = options;
-  assert(typeof source === "string", "shader source must be a string");
-  const coreSource = source;
+  assert(typeof source2 === "string", "shader source must be a string");
+  const coreSource = source2;
   let assembledSource = "";
   const hookFunctionMap = normalizeShaderHooks(hookFunctions);
   const hookInjections = {};
@@ -687,12 +687,12 @@ function assembleShaderWGSL(platformInfo, options) {
 }
 function assembleShaderGLSL(platformInfo, options) {
   var _a;
-  const { id, source, stage, language = "glsl", modules, defines = {}, hookFunctions = [], inject = {}, prologue = true, log: log2 } = options;
-  assert(typeof source === "string", "shader source must be a string");
-  const sourceVersion = language === "glsl" ? getShaderInfo(source).version : -1;
+  const { id, source: source2, stage, language = "glsl", modules, defines = {}, hookFunctions = [], inject = {}, prologue = true, log: log2 } = options;
+  assert(typeof source2 === "string", "shader source must be a string");
+  const sourceVersion = language === "glsl" ? getShaderInfo(source2).version : -1;
   const targetVersion = platformInfo.shaderLanguageVersion;
   const sourceVersionDirective = sourceVersion === 100 ? "#version 100" : "#version 300 es";
-  const sourceLines = source.split("\n");
+  const sourceLines = source2.split("\n");
   const coreSource = sourceLines.slice(1).join("\n");
   const allDefines = {};
   modules.forEach((module2) => {
@@ -707,7 +707,7 @@ function assembleShaderGLSL(platformInfo, options) {
       assembledSource = prologue ? `${sourceVersionDirective}
 
 // ----- PROLOGUE -------------------------
-${getShaderNameDefine({ id, source, stage })}
+${getShaderNameDefine({ id, source: source2, stage })}
 ${`#define SHADER_TYPE_${stage.toUpperCase()}`}
 
 ${getPlatformShaderDefines(platformInfo)}
@@ -787,8 +787,8 @@ function assembleGetUniforms(modules) {
   };
 }
 function getShaderNameDefine(options) {
-  const { id, source, stage } = options;
-  const injectShaderName = id && source.indexOf("SHADER_NAME") === -1;
+  const { id, source: source2, stage } = options;
+  const injectShaderName = id && source2.indexOf("SHADER_NAME") === -1;
   return injectShaderName ? `
 #define SHADER_NAME ${id}_${stage}` : "";
 }
@@ -822,24 +822,24 @@ function getShaderModuleSource(module2, stage) {
     throw new Error("Shader module must have a name");
   }
   const moduleName = module2.name.toUpperCase().replace(/[^0-9a-z]/gi, "_");
-  let source = `// ----- MODULE ${module2.name} ---------------
+  let source2 = `// ----- MODULE ${module2.name} ---------------
 
 `;
   if (stage !== "wgsl") {
-    source += `#define MODULE_${moduleName}
+    source2 += `#define MODULE_${moduleName}
 `;
   }
-  source += `${moduleSource}
+  source2 += `${moduleSource}
 `;
-  return source;
+  return source2;
 }
 
 // dist/lib/preprocessor/preprocessor.js
 var IFDEF_REGEXP = /^\s*\#\s*ifdef\s*([a-zA-Z_]+)\s*$/;
 var ENDIF_REGEXP = /^\s*\#\s*endif\s*$/;
-function preprocess(source, options) {
+function preprocess(source2, options) {
   var _a;
-  const lines = source.split("\n");
+  const lines = source2.split("\n");
   const output = [];
   let conditional = true;
   let currentDefine = null;
@@ -907,14 +907,14 @@ var _ShaderAssembler = class {
   assembleWGSLShader(props) {
     const modules = this._getModuleList(props.modules);
     const hookFunctions = this._hookFunctions;
-    const { source, getUniforms: getUniforms9 } = assembleWGSLShader({
+    const { source: source2, getUniforms: getUniforms9 } = assembleWGSLShader({
       ...props,
       // @ts-expect-error
       source: props.source,
       modules,
       hookFunctions
     });
-    const preprocessedSource = props.platformInfo.shaderLanguage === "wgsl" ? preprocess(source) : source;
+    const preprocessedSource = props.platformInfo.shaderLanguage === "wgsl" ? preprocess(source2) : source2;
     return { source: preprocessedSource, getUniforms: getUniforms9, modules };
   }
   /**
@@ -1161,12 +1161,12 @@ function generateShaderForModule(module2, options) {
 // dist/lib/wgsl/get-shader-layout-wgsl.js
 var import_core = require("@luma.gl/core");
 var import_wgsl_reflect = require("wgsl_reflect");
-function getShaderLayoutFromWGSL(source) {
+function getShaderLayoutFromWGSL(source2) {
   var _a;
   const shaderLayout = { attributes: [], bindings: [] };
   let parsedWGSL;
   try {
-    parsedWGSL = parseWGSL(source);
+    parsedWGSL = parseWGSL(source2);
   } catch (error) {
     import_core.log.error(error.message)();
     return shaderLayout;
@@ -1206,9 +1206,9 @@ function getShaderLayoutFromWGSL(source) {
 function getType(type) {
   return type.format ? `${type.name}<${type.format.name}>` : type.name;
 }
-function parseWGSL(source) {
+function parseWGSL(source2) {
   try {
-    return new import_wgsl_reflect.WgslReflect(source);
+    return new import_wgsl_reflect.WgslReflect(source2);
   } catch (error) {
     if (error instanceof Error) {
       throw error;
@@ -2889,11 +2889,31 @@ var pbrMaterial = {
   }
 };
 
-// dist/modules/postprocessing/image-adjust-filters/brightnesscontrast.js
+// dist/passes/postprocessing/image-adjust-filters/brightnesscontrast.js
+var source = (
+  /* wgsl */
+  `struct brightnessContrastUniforms {
+  float brightness;
+  float contrast;
+};
+
+// Binding 0:1 is reserved for shader passes
+@binding(1) @group(0) var<uniform> brightnessContrast : brightnessContrastUniforms;
+
+fn brightnessContrast_filterColor(color: vec4<f32>, texSize: vec2<f32>, texCoords: vec2<f32>) -> vec4<f32> {
+  color.rgb += brightnessContrast.brightness;
+  if (brightnessContrast.contrast > 0.0) {
+    color.rgb = (color.rgb - 0.5) / (1.0 - brightnessContrast.contrast) + 0.5;
+  } else {
+    color.rgb = (color.rgb - 0.5) * (1.0 + brightnessContrast.contrast) + 0.5;
+  }
+  return color;
+}
+`
+);
 var fs4 = (
   /* glsl */
-  `
-uniform brightnessContrastUniforms {
+  `uniform brightnessContrastUniforms {
   float brightness;
   float contrast;
 } brightnessContrast;
@@ -2925,11 +2945,12 @@ var brightnessContrast = {
     brightness: { format: "f32", value: 0, min: -1, max: 1 },
     contrast: { format: "f32", value: 0, min: -1, max: 1 }
   },
-  fs: fs4,
-  passes: [{ filter: true }]
+  passes: [{ filter: true }],
+  source,
+  fs: fs4
 };
 
-// dist/modules/postprocessing/image-adjust-filters/denoise.js
+// dist/passes/postprocessing/image-adjust-filters/denoise.js
 var fs5 = (
   /* glsl */
   `uniform denoiseUniforms {
@@ -2971,7 +2992,7 @@ var denoise = {
   passes: [{ sampler: true }, { sampler: true }]
 };
 
-// dist/modules/postprocessing/image-adjust-filters/huesaturation.js
+// dist/passes/postprocessing/image-adjust-filters/huesaturation.js
 var fs6 = (
   /* glsl */
   `uniform hueSaturationUniforms {
@@ -3023,7 +3044,7 @@ var hueSaturation = {
   passes: [{ filter: true }]
 };
 
-// dist/modules/postprocessing/image-adjust-filters/noise.js
+// dist/passes/postprocessing/image-adjust-filters/noise.js
 var fs7 = (
   /* glsl */
   `uniform noiseUniforms {
@@ -3061,7 +3082,7 @@ var noise = {
   passes: [{ filter: true }]
 };
 
-// dist/modules/postprocessing/image-adjust-filters/sepia.js
+// dist/passes/postprocessing/image-adjust-filters/sepia.js
 var fs8 = (
   /* glsl */
   `uniform sepiaUniforms {
@@ -3100,7 +3121,7 @@ var sepia = {
   passes: [{ filter: true }]
 };
 
-// dist/modules/postprocessing/image-adjust-filters/vibrance.js
+// dist/passes/postprocessing/image-adjust-filters/vibrance.js
 var fs9 = (
   /* glsl */
   `uniform vibranceUniforms {
@@ -3131,7 +3152,7 @@ var vibrance = {
   passes: [{ filter: true }]
 };
 
-// dist/modules/postprocessing/image-adjust-filters/vignette.js
+// dist/passes/postprocessing/image-adjust-filters/vignette.js
 var fs10 = (
   /* glsl */
   `uniform vignetteUniforms {
@@ -3166,7 +3187,7 @@ var vignette = {
   fs: fs10
 };
 
-// dist/modules/postprocessing/image-blur-filters/tiltshift.js
+// dist/passes/postprocessing/image-blur-filters/tiltshift.js
 var fs11 = (
   /* glsl */
   `uniform tiltShiftUniforms {
@@ -3231,16 +3252,16 @@ var tiltShift = {
     gradientRadius: { value: 200, min: 0, max: 400 },
     start: { value: [0, 0] },
     end: { value: [1, 1] },
-    invert: { value: false, private: true }
+    invert: { value: 0, private: true }
   },
   passes: [
-    { sampler: true, uniforms: { invert: false } },
-    { sampler: true, uniforms: { invert: true } }
+    { sampler: true, uniforms: { invert: 0 } },
+    { sampler: true, uniforms: { invert: 1 } }
   ],
   fs: fs11
 };
 
-// dist/modules/postprocessing/image-blur-filters/triangleblur.js
+// dist/passes/postprocessing/image-blur-filters/triangleblur.js
 var fs12 = (
   /* glsl */
   `uniform triangleBlurUniforms {
@@ -3298,7 +3319,7 @@ var triangleBlur = {
   ]
 };
 
-// dist/modules/postprocessing/image-blur-filters/zoomblur.js
+// dist/passes/postprocessing/image-blur-filters/zoomblur.js
 var fs13 = `
 uniform zoomBlurUniforms {
   vec2 center;
@@ -3350,7 +3371,7 @@ var zoomBlur = {
   passes: [{ sampler: true }]
 };
 
-// dist/modules/postprocessing/image-fun-filters/colorhalftone.js
+// dist/passes/postprocessing/image-fun-filters/colorhalftone.js
 var fs14 = (
   /* glsl */
   `uniform colorHalftoneUniforms {
@@ -3407,7 +3428,7 @@ var colorHalftone = {
   passes: [{ filter: true }]
 };
 
-// dist/modules/postprocessing/image-fun-filters/dotscreen.js
+// dist/passes/postprocessing/image-fun-filters/dotscreen.js
 var fs15 = (
   /* glsl */
   `uniform dotScreenUniforms {
@@ -3452,7 +3473,7 @@ var dotScreen = {
   passes: [{ filter: true }]
 };
 
-// dist/modules/postprocessing/image-fun-filters/edgework.js
+// dist/passes/postprocessing/image-fun-filters/edgework.js
 var fs16 = (
   /* glsl */
   `uniform edgeWorkUniforms {
@@ -3535,7 +3556,7 @@ var edgeWork = {
   ]
 };
 
-// dist/modules/postprocessing/image-fun-filters/hexagonalpixelate.js
+// dist/passes/postprocessing/image-fun-filters/hexagonalpixelate.js
 var fs17 = (
   /* glsl */
   `uniform hexagonalPixelateUniforms {
@@ -3598,7 +3619,7 @@ var hexagonalPixelate = {
   passes: [{ sampler: true }]
 };
 
-// dist/modules/postprocessing/image-fun-filters/ink.js
+// dist/passes/postprocessing/image-fun-filters/ink.js
 var fs18 = (
   /* glsl */
   `uniform inkUniforms {
@@ -3644,7 +3665,7 @@ var ink = {
   passes: [{ sampler: true }]
 };
 
-// dist/modules/postprocessing/image-fun-filters/magnify.js
+// dist/passes/postprocessing/image-fun-filters/magnify.js
 var fs19 = (
   /* glsl */
   `uniform magnifyUniforms {
@@ -3690,7 +3711,7 @@ var magnify = {
   passes: [{ sampler: true }]
 };
 
-// dist/modules/postprocessing/image-warp-filters/warp.js
+// dist/passes/postprocessing/image-warp-filters/warp.js
 var fs20 = (
   /* glsl */
   `vec4 warp_sampleColor(sampler2D source, vec2 texSize, vec2 coord) {
@@ -3711,7 +3732,7 @@ var warp = {
   fs: fs20
 };
 
-// dist/modules/postprocessing/image-warp-filters/bulgepinch.js
+// dist/passes/postprocessing/image-warp-filters/bulgepinch.js
 var fs21 = (
   /* glsl */
   `uniform bulgePinchUniforms {
@@ -3762,7 +3783,7 @@ var bulgePinch = {
   passes: [{ sampler: true }]
 };
 
-// dist/modules/postprocessing/image-warp-filters/swirl.js
+// dist/passes/postprocessing/image-warp-filters/swirl.js
 var fs22 = (
   /* glsl */
   `uniform swirlUniforms {
@@ -3815,7 +3836,7 @@ var swirl = {
   passes: [{ sampler: true }]
 };
 
-// dist/modules/postprocessing/fxaa/fxaa.js
+// dist/passes/postprocessing/fxaa/fxaa.js
 var fs23 = `
 #define FXAA_QUALITY_PRESET 29