typegpu 0.11.6 → 0.11.8

package/bin.mjs

@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+import { spawn } from 'node:child_process';
+import pkg from './package.json' with { type: 'json' };
+
+/**
+ * Used to extract the version of `typegpu` that was used to
+ * trigger the CLI, which then allows us to download the latest
+ * version matching the major and minor of the `typegpu` package.
+ */
+const versionPattern = /^(\d+)\.(\d+)\.(\d+)/;
+
+const result = versionPattern.exec(pkg.version);
+const [_, major, minor] = result;
+
+if (major === undefined || minor === undefined) {
+  throw new Error(`TypeGPU version doesn't match the expected major.minor.patch format`);
+}
+
+/**
+ * Targeting the latest version with the same major and minor as `typegpu`
+ */
+const semver = `^${major}.${minor}.0`;
+
+function asyncSpawn(...args) {
+  return new Promise((resolve, _reject) => {
+    const child = spawn(...args);
+
+    child.on('exit', (code, signal) => {
+      if (signal) {
+        process.kill(process.pid, signal);
+        process.exit(0);
+        return;
+      }
+
+      resolve(code);
+    });
+  });
+}
+
+(async () => {
+  const code = await asyncSpawn('npx', [`@typegpu/cli@${semver}`, ...process.argv.slice(2)], {
+    stdio: ['inherit', 'inherit', 'ignore'],
+  });
+
+  if (code !== 0) {
+    console.warn(
+      `Couldn't find @typegpu/cli version matching ${semver}, falling back to latest...`,
+    );
+    // Fallback to latest
+    const code = await asyncSpawn('npx', [`@typegpu/cli@latest`, ...process.argv.slice(2)], {
+      stdio: 'inherit',
+    });
+    process.exit(code ?? 0);
+  }
+
+  process.exit(code ?? 0);
+})();

package/builtin.d.ts

@@ -13,7 +13,9 @@ type BuiltinSampleMask = Decorated<U32, [Builtin<'sample_mask'>]>;
 type BuiltinLocalInvocationId = Decorated<Vec3u, [Builtin<'local_invocation_id'>]>;
 type BuiltinLocalInvocationIndex = Decorated<U32, [Builtin<'local_invocation_index'>]>;
 type BuiltinGlobalInvocationId = Decorated<Vec3u, [Builtin<'global_invocation_id'>]>;
+type BuiltinGlobalInvocationIndex = Decorated<U32, [Builtin<'global_invocation_index'>]>;
 type BuiltinWorkgroupId = Decorated<Vec3u, [Builtin<'workgroup_id'>]>;
+type BuiltinWorkgroupIndex = Decorated<U32, [Builtin<'workgroup_index'>]>;
 type BuiltinNumWorkgroups = Decorated<Vec3u, [Builtin<'num_workgroups'>]>;
 type BuiltinSubgroupInvocationId = Decorated<U32, [Builtin<'subgroup_invocation_id'>]>;
 type BuiltinSubgroupSize = Decorated<U32, [Builtin<'subgroup_size'>]>;
@@ -32,7 +34,9 @@ declare const builtin: {
   readonly localInvocationId: BuiltinLocalInvocationId;
   readonly localInvocationIndex: BuiltinLocalInvocationIndex;
   readonly globalInvocationId: BuiltinGlobalInvocationId;
+  readonly globalInvocationIndex: BuiltinGlobalInvocationIndex;
   readonly workgroupId: BuiltinWorkgroupId;
+  readonly workgroupIndex: BuiltinWorkgroupIndex;
   readonly numWorkgroups: BuiltinNumWorkgroups;
   readonly subgroupInvocationId: BuiltinSubgroupInvocationId;
   readonly subgroupSize: BuiltinSubgroupSize;
@@ -40,7 +44,7 @@ declare const builtin: {
   readonly numSubgroups: BuiltinNumSubgroups;
 };
 type AnyBuiltin = (typeof builtin)[keyof typeof builtin];
-type AnyComputeBuiltin = BuiltinLocalInvocationId | BuiltinLocalInvocationIndex | BuiltinGlobalInvocationId | BuiltinWorkgroupId | BuiltinNumWorkgroups | BuiltinSubgroupInvocationId | BuiltinSubgroupSize | BuiltinSubgroupId | BuiltinNumSubgroups;
+type AnyComputeBuiltin = BuiltinLocalInvocationId | BuiltinLocalInvocationIndex | BuiltinGlobalInvocationId | BuiltinGlobalInvocationIndex | BuiltinWorkgroupId | BuiltinWorkgroupIndex | BuiltinNumWorkgroups | BuiltinSubgroupInvocationId | BuiltinSubgroupSize | BuiltinSubgroupId | BuiltinNumSubgroups;
 type AnyVertexInputBuiltin = BuiltinVertexIndex | BuiltinInstanceIndex;
 type AnyVertexOutputBuiltin = BuiltinClipDistances | BuiltinPosition;
 type AnyFragmentInputBuiltin = BuiltinPosition | BuiltinFrontFacing | BuiltinPrimitiveIndex | BuiltinSampleIndex | BuiltinSampleMask | BuiltinSubgroupInvocationId | BuiltinSubgroupSize;

package/builtin.js

@@ -25,7 +25,9 @@ const builtin = {
 	localInvocationId: defineBuiltin(vec3u, "local_invocation_id"),
 	localInvocationIndex: defineBuiltin(u32, "local_invocation_index"),
 	globalInvocationId: defineBuiltin(vec3u, "global_invocation_id"),
+	globalInvocationIndex: defineBuiltin(u32, "global_invocation_index"),
 	workgroupId: defineBuiltin(vec3u, "workgroup_id"),
+	workgroupIndex: defineBuiltin(u32, "workgroup_index"),
 	numWorkgroups: defineBuiltin(vec3u, "num_workgroups"),
 	subgroupInvocationId: defineBuiltin(u32, "subgroup_invocation_id"),
 	subgroupSize: defineBuiltin(u32, "subgroup_size"),

package/core/buffer/buffer.js

@@ -1,6 +1,6 @@
 import { $internal } from "../../shared/symbols.js";
-import { getName, setName } from "../../shared/meta.js";
 import { isWgslData } from "../../data/wgslTypes.js";
+import { getName, setName } from "../../shared/meta.js";
 import { isGPUBuffer } from "../../types.js";
 import { sizeOf } from "../../data/sizeOf.js";
 import { getCompiledWriter } from "../../data/compiledIO.js";

package/core/buffer/bufferUsage.js

@@ -1,6 +1,5 @@
 import { $getNameForward, $gpuValueOf, $internal, $ownSnippet, $resolve } from "../../shared/symbols.js";
 import { getName, setName } from "../../shared/meta.js";
-import { isNaturallyEphemeral } from "../../data/wgslTypes.js";
 import { snip } from "../../data/snippet.js";
 import { IllegalBufferAccessError } from "../../errors.js";
 import { getExecMode, inCodegenMode, isInsideTgpuFn } from "../../execMode.js";
@@ -13,11 +12,6 @@ import { isUsableAsStorage } from "../../extension.js";
 function isUsableAsUniform(buffer) {
 	return !!buffer.usableAsUniform;
 }
-const usageToVarTemplateMap = {
-	uniform: "uniform",
-	mutable: "storage, read_write",
-	readonly: "storage, read"
-};
 var TgpuFixedBufferImpl = class {
 	resourceType = "buffer-usage";
 	usage;
@@ -41,9 +35,14 @@ var TgpuFixedBufferImpl = class {
 			storage: dataType,
 			access: this.usage
 		}, this.buffer);
-		const usage = usageToVarTemplateMap[this.usage];
-		ctx.addDeclaration(`@group(${group}) @binding(${binding}) var<${usage}> ${id}: ${ctx.resolve(dataType).value};`);
-		return snip(id, dataType, isNaturallyEphemeral(dataType) ? "runtime" : this.usage);
+		return ctx.gen.declareGlobalVar({
+			group,
+			binding,
+			scope: this.usage,
+			id,
+			dataType,
+			init: void 0
+		});
 	}
 	toString() {
 		return `${this.usage}:${getName(this) ?? "<unnamed>"}`;
@@ -54,7 +53,7 @@ var TgpuFixedBufferImpl = class {
 		return new Proxy({
 			[$internal]: true,
 			get [$ownSnippet]() {
-				return snip(this, dataType, isNaturallyEphemeral(dataType) ? "runtime" : usage);
+				return snip(this, dataType, usage);
 			},
 			[$resolve]: (ctx) => ctx.resolve(this),
 			toString: () => `${this.usage}:${getName(this) ?? "<unnamed>"}.$`
@@ -105,9 +104,14 @@ var TgpuLaidOutBufferImpl = class {
 	[$resolve](ctx) {
 		const id = ctx.makeUniqueIdentifier(getName(this), "global");
 		const group = ctx.allocateLayoutEntry(this.#membership.layout);
-		const usage = usageToVarTemplateMap[this.usage];
-		ctx.addDeclaration(`@group(${group}) @binding(${this.#membership.idx}) var<${usage}> ${id}: ${ctx.resolve(this.dataType).value};`);
-		return snip(id, this.dataType, isNaturallyEphemeral(this.dataType) ? "runtime" : this.usage);
+		return ctx.gen.declareGlobalVar({
+			group,
+			binding: this.#membership.idx,
+			scope: this.usage,
+			id,
+			dataType: this.dataType,
+			init: void 0
+		});
 	}
 	toString() {
 		return `${this.usage}:${getName(this) ?? "<unnamed>"}`;
@@ -118,7 +122,7 @@ var TgpuLaidOutBufferImpl = class {
 		return new Proxy({
 			[$internal]: true,
 			get [$ownSnippet]() {
-				return snip(this, schema, isNaturallyEphemeral(schema) ? "runtime" : usage);
+				return snip(this, schema, usage);
 			},
 			[$resolve]: (ctx) => ctx.resolve(this),
 			toString: () => `${this.usage}:${getName(this) ?? "<unnamed>"}.$`

package/core/constant/tgpuConstant.js

@@ -1,6 +1,5 @@
 import { $gpuValueOf, $internal, $ownSnippet, $resolve } from "../../shared/symbols.js";
 import { getName, setName } from "../../shared/meta.js";
-import { isNaturallyEphemeral } from "../../data/wgslTypes.js";
 import { isData } from "../../data/dataTypes.js";
 import { snip } from "../../data/snippet.js";
 import { inCodegenMode } from "../../execMode.js";
@@ -38,10 +37,11 @@ var TgpuConstImpl = class {
 	}
 	[$resolve](ctx) {
 		const id = ctx.makeUniqueIdentifier(getName(this), "global");
-		const resolvedDataType = ctx.resolve(this.dataType).value;
-		const resolvedValue = ctx.resolve(this.#value, this.dataType).value;
-		ctx.addDeclaration(`const ${id}: ${resolvedDataType} = ${resolvedValue};`);
-		return snip(id, this.dataType, isNaturallyEphemeral(this.dataType) ? "constant" : "constant-tgpu-const-ref");
+		return ctx.gen.declareGlobalConst({
+			id,
+			dataType: this.dataType,
+			init: snip(this.#value, this.dataType, "constant")
+		});
 	}
 	toString() {
 		return `const:${getName(this) ?? "<unnamed>"}`;
@@ -51,7 +51,7 @@ var TgpuConstImpl = class {
 		return new Proxy({
 			[$internal]: true,
 			get [$ownSnippet]() {
-				return snip(this, dataType, isNaturallyEphemeral(dataType) ? "constant" : "constant-tgpu-const-ref");
+				return snip(this, dataType, "constant-immutable-def");
 			},
 			[$resolve]: (ctx) => ctx.resolve(this),
 			toString: () => `const:${getName(this) ?? "<unnamed>"}.$`

package/core/declare/tgpuDeclare.js

@@ -1,7 +1,7 @@
 import { $internal, $resolve } from "../../shared/symbols.js";
 import { Void } from "../../data/wgslTypes.js";
 import { snip } from "../../data/snippet.js";
-import { applyExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
+import { mergeExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
 
 //#region src/core/declare/tgpuDeclare.ts
 /**
@@ -27,7 +27,7 @@ var TgpuDeclareImpl = class {
 	}
 	[$resolve](ctx) {
 		const externalMap = {};
-		for (const externals of this.#externalsToApply) applyExternals(externalMap, externals);
+		for (const externals of this.#externalsToApply) mergeExternals(externalMap, externals);
 		const replacedDeclaration = replaceExternalsInWgsl(ctx, externalMap, this.#declaration);
 		ctx.addDeclaration(replacedDeclaration);
 		return snip("", Void, "constant");

package/core/function/comptime.js

@@ -1,7 +1,7 @@
 import { $getNameForward, $gpuCallable, $internal } from "../../shared/symbols.js";
 import { setName } from "../../shared/meta.js";
 import { WgslTypeError } from "../../errors.js";
-import { isKnownAtComptime } from "../../types.js";
+import { NormalState, isKnownAtComptime } from "../../types.js";
 import { coerceToSnippet } from "../../tgsl/generationHelpers.js";
 
 //#region src/core/function/comptime.ts
@@ -35,9 +35,14 @@ function comptime(func) {
 	});
 	impl.toString = () => "comptime";
 	impl[$getNameForward] = func;
-	impl[$gpuCallable] = { call(_ctx, args) {
+	impl[$gpuCallable] = { call(ctx, args) {
 		if (!args.every((s) => isKnownAtComptime(s))) throw new WgslTypeError(`Called comptime function with runtime-known values: ${args.filter((s) => !isKnownAtComptime(s)).map((s) => `'${s.value}'`).join(", ")}`);
-		return coerceToSnippet(func(...args.map((s) => s.value)));
+		ctx.pushMode(new NormalState());
+		try {
+			return coerceToSnippet(func(...args.map((s) => s.value)));
+		} finally {
+			ctx.popMode();
+		}
 	} };
 	impl.$name = (label) => {
 		setName(func, label);

package/core/function/createCallableSchema.js

@@ -1,7 +1,7 @@
 import { $gpuCallable } from "../../shared/symbols.js";
-import { setName } from "../../shared/meta.js";
 import { isPtr } from "../../data/wgslTypes.js";
-import { snip } from "../../data/snippet.js";
+import { setName } from "../../shared/meta.js";
+import { noSideEffects, snip } from "../../data/snippet.js";
 import { NormalState, isKnownAtComptime } from "../../types.js";
 import { tryConvertSnippet } from "../../tgsl/conversion.js";
 
@@ -24,15 +24,17 @@ function callableSchema(options) {
 				if (!argType) throw new Error("Function called with invalid arguments");
 				return tryConvertSnippet(ctx, s, argType, false);
 			});
+			let result;
 			if (converted.every((s) => isKnownAtComptime(s))) {
 				ctx.pushMode(new NormalState());
 				try {
-					return snip(options.normalImpl(...converted.map((s) => s.value)), options.schema(), "constant");
+					result = snip(options.normalImpl(...converted.map((s) => s.value)), options.schema(), "constant");
 				} finally {
 					ctx.popMode("normal");
 				}
-			}
-			return options.codegenImpl(ctx, converted);
+			} else result = options.codegenImpl(ctx, converted);
+			if (!args.some((a) => a.possibleSideEffects)) return noSideEffects(result);
+			return result;
 		}
 	};
 	return impl;

package/core/function/dualImpl.js

@@ -1,6 +1,6 @@
 import { $gpuCallable } from "../../shared/symbols.js";
-import { setName } from "../../shared/meta.js";
 import { isPtr } from "../../data/wgslTypes.js";
+import { setName } from "../../shared/meta.js";
 import { snip } from "../../data/snippet.js";
 import { NormalState, isKnownAtComptime } from "../../types.js";
 import { tryConvertSnippet } from "../../tgsl/conversion.js";
@@ -18,7 +18,7 @@ function dualImpl(options) {
 		if (typeof options.normalImpl === "string") throw new MissingCpuImplError(options.normalImpl);
 		return options.normalImpl(...args);
 	});
-	setName(impl, options.name);
+	if (options.name) setName(impl, options.name);
 	impl.toString = () => options.name ?? "<unknown>";
 	impl[$gpuCallable] = {
 		get strictSignature() {

package/core/function/fnCore.js

@@ -1,12 +1,11 @@
 import { $getNameForward } from "../../shared/symbols.js";
-import { getMetaData, getName } from "../../shared/meta.js";
 import { Void, isWgslData, isWgslStruct } from "../../data/wgslTypes.js";
+import { getFunctionMetadata, getName } from "../../shared/meta.js";
 import { undecorate } from "../../data/dataTypes.js";
 import { snip } from "../../data/snippet.js";
-import { MissingLinksError } from "../../errors.js";
 import { getAttributesString } from "../../data/attributes.js";
 import { validateIdentifier } from "../../nameUtils.js";
-import { applyExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
+import { mergeExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
 import { extractArgs } from "./extractArgs.js";
 
 //#region src/core/function/fnCore.ts
@@ -29,7 +28,7 @@ function createFnCore(implementation, functionType, workgroupSize) {
 			if (functionType === "compute") attributes = `@compute @workgroup_size(${workgroupSize?.join(", ")}) `;
 			else if (functionType === "vertex") attributes = `@vertex `;
 			else if (functionType === "fragment") attributes = `@fragment `;
-			for (const externals of externalsToApply) applyExternals(externalMap, externals);
+			for (const externals of externalsToApply) mergeExternals(externalMap, externals);
 			const id = ctx.makeUniqueIdentifier(getName(this), "global");
 			if (typeof implementation === "string") {
 				if (!returnType) throw new Error("Explicit return type is required for string implementation");
@@ -38,7 +37,7 @@ function createFnCore(implementation, functionType, workgroupSize) {
 						const result = /* @__PURE__ */ validateIdentifier(arg.schemaKey);
 						if (!result.success) throw new Error(`Invalid argument name "${arg.schemaKey}"${result.error ? `: ${result.error}` : ""}`);
 					}
-					applyExternals(externalMap, { in: Object.fromEntries(entryInput.positionalArgs.map((a) => [a.schemaKey, a.schemaKey])) });
+					mergeExternals(externalMap, { in: Object.fromEntries(entryInput.positionalArgs.map((a) => [a.schemaKey, a.schemaKey])) });
 				}
 				const replacedImpl = replaceExternalsInWgsl(ctx, externalMap, implementation);
 				let header = "";
@@ -64,17 +63,17 @@ function createFnCore(implementation, functionType, workgroupSize) {
 				ctx.addDeclaration(`${attributes}fn ${id}${header}${body}`);
 				return snip(id, returnType, "runtime");
 			}
-			const pluginData = getMetaData(implementation);
-			const pluginExternals = typeof pluginData?.externals === "function" ? pluginData.externals() : pluginData?.externals;
-			if (pluginExternals) applyExternals(externalMap, Object.fromEntries(Object.entries(pluginExternals).filter(([name]) => !(name in externalMap))));
+			const pluginData = getFunctionMetadata(implementation);
+			const pluginExternals = pluginData?.externals();
+			if (pluginExternals) mergeExternals(externalMap, Object.fromEntries(Object.entries(pluginExternals).filter(([name]) => !(name in externalMap))));
 			const ast = pluginData?.ast;
 			if (!ast) throw new Error("Missing metadata for tgpu.fn function body (either missing 'use gpu' directive, or misconfigured `unplugin-typegpu`)");
-			const missingExternals = ast.externalNames.filter((name) => !(name in externalMap));
-			if (missingExternals.length > 0) throw new MissingLinksError(getName(this), missingExternals);
 			const maybeSecondArg = ast.params[1];
-			if (maybeSecondArg && maybeSecondArg.type === "i" && functionType !== "normal") applyExternals(externalMap, { [maybeSecondArg.name]: undecorate(returnType) });
-			const { code, returnType: actualReturnType } = ctx.fnToWgsl({
+			if (maybeSecondArg && maybeSecondArg.type === "i" && functionType !== "normal") mergeExternals(externalMap, { [maybeSecondArg.name]: undecorate(returnType) });
+			const { code, returnType: actualReturnType } = ctx.resolveFunction({
 				functionType,
+				name: id,
+				workgroupSize,
 				argTypes,
 				entryInput,
 				params: ast.params,
@@ -82,7 +81,7 @@ function createFnCore(implementation, functionType, workgroupSize) {
 				body: ast.body,
 				externalMap
 			});
-			ctx.addDeclaration(`${attributes}fn ${id}${code}`);
+			ctx.addDeclaration(code);
 			return snip(id, actualReturnType, "runtime");
 		}
 	};

package/core/function/tgpuComputeFn.js

@@ -1,6 +1,6 @@
 import { $getNameForward, $internal, $resolve } from "../../shared/symbols.js";
-import { getName, setName } from "../../shared/meta.js";
 import { Void } from "../../data/wgslTypes.js";
+import { getName, setName } from "../../shared/meta.js";
 import { separateBuiltins } from "./ioSchema.js";
 import { createFnCore } from "./fnCore.js";
 import { stripTemplate } from "./templateUtils.js";

package/core/function/tgpuFn.js

@@ -1,6 +1,6 @@
 import { $getNameForward, $internal, $providing, $resolve, isMarkedInternal } from "../../shared/symbols.js";
-import { getName, setName } from "../../shared/meta.js";
 import { Void } from "../../data/wgslTypes.js";
+import { getName, setName } from "../../shared/meta.js";
 import { ExecutionError } from "../../errors.js";
 import { isAccessor, isMutableAccessor } from "../slot/slotTypes.js";
 import { provideInsideTgpuFn } from "../../execMode.js";
@@ -157,7 +157,8 @@ function createGenericFn(inner, pairs) {
 		return inner(...args);
 	};
 	const genericFn = Object.assign(call, fnBase);
-	if (getName(inner)) setName(genericFn, getName(inner));
+	const innerName = getName(inner);
+	if (innerName) setName(genericFn, innerName);
 	Object.defineProperty(genericFn, "toString", { value() {
 		const fnLabel = getName(genericFn) ?? "<unnamed>";
 		if (pairs.length > 0) return `fn*:${fnLabel}[${pairs.map(stringifyPair).join(", ")}]`;

package/core/pipeline/computePipeline.js

@@ -1,6 +1,6 @@
 import { $getNameForward, $internal, $resolve } from "../../shared/symbols.js";
-import { PERF, getName, setName } from "../../shared/meta.js";
 import { Void } from "../../data/wgslTypes.js";
+import { PERF, getName, setName } from "../../shared/meta.js";
 import { snip } from "../../data/snippet.js";
 import { isGPUBuffer } from "../../types.js";
 import { isBindGroup } from "../../tgpuBindGroupLayout.js";
@@ -9,7 +9,7 @@ import { isGPUCommandEncoder, isGPUComputePassEncoder } from "./typeGuards.js";
 import { namespace } from "../resolve/namespace.js";
 import { applyBindGroups } from "./applyPipelineState.js";
 import { logDataFromGPU } from "../../tgsl/consoleLog/deserializers.js";
-import { wgslExtensionToFeatureName, wgslExtensions } from "../../wgslExtensions.js";
+import { wgslEnableExtensionToFeatureName, wgslEnableExtensions } from "../../wgslExtensions.js";
 import { resolveIndirectOffset } from "./pipelineUtils.js";
 import { createWithPerformanceCallback, createWithTimestampWrites, setupTimestampWrites, triggerPerformanceCallback } from "./timeable.js";
 
@@ -172,7 +172,7 @@ var ComputePipelineCore = class {
 	unwrap() {
 		if (this._memo === void 0) {
 			const device = this.root.device;
-			const enableExtensions = wgslExtensions.filter((extension) => this.root.enabledFeatures.has(wgslExtensionToFeatureName[extension]));
+			const enableExtensions = wgslEnableExtensions.filter((extension) => this.root.enabledFeatures.has(wgslEnableExtensionToFeatureName[extension]));
 			let resolutionResult;
 			let resolveMeasure;
 			const ns = namespace({ names: this.root.nameRegistrySetting });

package/core/pipeline/renderPipeline.js

@@ -1,6 +1,6 @@
 import { $getNameForward, $internal, $resolve } from "../../shared/symbols.js";
-import { PERF, getName, setName } from "../../shared/meta.js";
 import { Void, isWgslData } from "../../data/wgslTypes.js";
+import { PERF, getName, setName } from "../../shared/meta.js";
 import { getCustomLocation } from "../../data/dataTypes.js";
 import { snip } from "../../data/snippet.js";
 import { isGPUBuffer } from "../../types.js";
@@ -15,7 +15,7 @@ import { isGPUCommandEncoder, isGPURenderBundleEncoder, isGPURenderPassEncoder }
 import { namespace } from "../resolve/namespace.js";
 import { applyBindGroups, applyVertexBuffers } from "./applyPipelineState.js";
 import { logDataFromGPU } from "../../tgsl/consoleLog/deserializers.js";
-import { wgslExtensionToFeatureName, wgslExtensions } from "../../wgslExtensions.js";
+import { wgslEnableExtensionToFeatureName, wgslEnableExtensions } from "../../wgslExtensions.js";
 import { resolveIndirectOffset } from "./pipelineUtils.js";
 import { createWithPerformanceCallback, createWithTimestampWrites, setupTimestampWrites, triggerPerformanceCallback } from "./timeable.js";
 import { AutoFragmentFn, AutoVertexFn } from "../function/autoIO.js";
@@ -378,7 +378,7 @@ var RenderPipelineCore = class {
 		if (this._memo !== void 0) return this._memo;
 		const { root, descriptor: tgpuDescriptor } = this.options;
 		const device = root.device;
-		const enableExtensions = wgslExtensions.filter((extension) => root.enabledFeatures.has(wgslExtensionToFeatureName[extension]));
+		const enableExtensions = wgslEnableExtensions.filter((extension) => root.enabledFeatures.has(wgslEnableExtensionToFeatureName[extension]));
 		let resolutionResult;
 		let resolveMeasure;
 		const ns = namespace({ names: root.nameRegistrySetting });

package/core/rawCodeSnippet/tgpuRawCodeSnippet.d.ts

@@ -16,7 +16,7 @@ interface TgpuRawCodeSnippet<TDataType extends BaseData> {
   readonly [$gpuValueOf]: InferGPU<TDataType>;
   $uses(dependencyMap: Record<string, unknown>): this;
 }
-type RawCodeSnippetOrigin = Exclude<Origin, 'function' | 'this-function' | 'argument' | 'constant-ref'>;
+type RawCodeSnippetOrigin = Exclude<Origin, 'function' | 'local-def' | 'argument' | 'constant-immutable-def' | 'runtime-immutable-def'>;
 /**
  * An advanced API that creates a typed shader expression which
  * can be injected into the final shader bundle upon use.

package/core/rawCodeSnippet/tgpuRawCodeSnippet.js

@@ -2,7 +2,7 @@ import { $gpuValueOf, $internal, $ownSnippet, $resolve } from "../../shared/symb
 import { snip } from "../../data/snippet.js";
 import { inCodegenMode } from "../../execMode.js";
 import { valueProxyHandler } from "../valueProxyUtils.js";
-import { applyExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
+import { mergeExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
 
 //#region src/core/rawCodeSnippet/tgpuRawCodeSnippet.ts
 /**
@@ -65,7 +65,7 @@ var TgpuRawCodeSnippetImpl = class {
 	}
 	[$resolve](ctx) {
 		const externalMap = {};
-		for (const externals of this.#externalsToApply) applyExternals(externalMap, externals);
+		for (const externals of this.#externalsToApply) mergeExternals(externalMap, externals);
 		return snip(replaceExternalsInWgsl(ctx, externalMap, this.#expression), this.dataType, this.origin);
 	}
 	toString() {

package/core/resolve/externals.d.ts

@@ -4,7 +4,7 @@ import "../../types.js";
 
 /**
  * A key-value mapping where keys represent identifiers within shader code,
- * and values can be any type that can be resolved to a code string.
+ * and values can either be another ExternalMap, or be any type that can be resolved to a code string.
  */
 type ExternalMap = Record<string, unknown>;
 //#endregion

package/core/resolve/externals.js

@@ -1,32 +1,46 @@
-import { getName, hasTinyestMetadata, setName } from "../../shared/meta.js";
 import { isWgslStruct } from "../../data/wgslTypes.js";
+import { getName, hasTinyestMetadata, setName } from "../../shared/meta.js";
 import { isLooseData } from "../../data/dataTypes.js";
 import { isWgsl } from "../../types.js";
 
 //#region src/core/resolve/externals.ts
+function isResolvable(value) {
+	return isWgsl(value) || isLooseData(value) || hasTinyestMetadata(value);
+}
 /**
-* Merges two external maps into one. If a key is present in both maps, the value from the new map is used.
+* Merges two external maps into one.
 * If the external value is a namable object, it is given a name if it does not already have one.
 * @param existing - The existing external map.
 * @param newExternals - The new external map.
+*
+* NOTE:
+* This function attempts to avoid accidental reference modification
+* by performing a shallow copy before each modification,
+* but it cannot avoid `existing` modification.
+* Make sure that `existing` is created internally, instead of being passed in by users.
 */
-function applyExternals(existing, newExternals) {
+function mergeExternals(existing, newExternals) {
 	for (const [key, value] of Object.entries(newExternals)) {
-		existing[key] = value;
+		const existingValue = existing[key];
+		if (existingValue !== null && typeof existingValue === "object" && value !== null && typeof value === "object" && !isResolvable(existingValue) && !isResolvable(value)) {
+			const copiedValue = { ...existingValue };
+			mergeExternals(copiedValue, value);
+			existing[key] = copiedValue;
+		} else existing[key] = value;
 		if (value && (typeof value === "object" || typeof value === "function") && getName(value) === void 0) setName(value, key);
 	}
 }
-function addArgTypesToExternals(implementation, argTypes, applyExternals$1) {
+function addArgTypesToExternals(implementation, argTypes, applyExternals) {
 	const argTypeNames = [...implementation.matchAll(/:\s*(?<arg>.*?)\s*[,)]/g)].map((found) => found ? found[1] : void 0);
-	applyExternals$1(Object.fromEntries(argTypes.flatMap((argType, i) => {
+	applyExternals(Object.fromEntries(argTypes.flatMap((argType, i) => {
 		const argTypeName = argTypeNames ? argTypeNames[i] : void 0;
 		return isWgslStruct(argType) && argTypeName !== void 0 ? [[argTypeName, argType]] : [];
 	})));
 }
-function addReturnTypeToExternals(implementation, returnType, applyExternals$1) {
+function addReturnTypeToExternals(implementation, returnType, applyExternals) {
 	const matched = implementation.match(/->\s(?<output>[\w\d_]+)\s{/);
 	const outputName = matched ? matched[1]?.trim() : void 0;
-	if (isWgslStruct(returnType) && outputName && !/\s/g.test(outputName)) applyExternals$1({ [outputName]: returnType });
+	if (isWgslStruct(returnType) && outputName && !/\s/g.test(outputName)) applyExternals({ [outputName]: returnType });
 }
 function identifierRegex(name) {
 	return new RegExp(`(?<![\\w\\$_.])${name.replaceAll(".", "\\.").replaceAll("$", "\\$")}(?![\\w\\$_])`, "g");
@@ -44,7 +58,7 @@ function replaceExternalsInWgsl(ctx, externalMap, wgsl) {
 	return Object.entries(externalMap).reduce((acc, [externalName, external]) => {
 		const externalRegex = identifierRegex(externalName);
 		if (wgsl && externalName !== "Out" && externalName !== "in" && !externalRegex.test(wgsl)) console.warn(`The external '${externalName}' wasn't used in the resolved template.`);
-		if (isWgsl(external) || isLooseData(external) || hasTinyestMetadata(external)) return acc.replaceAll(externalRegex, ctx.resolve(external).value);
+		if (isResolvable(external)) return acc.replaceAll(externalRegex, ctx.resolve(external).value);
 		if (external !== null && typeof external === "object") {
 			const foundProperties = [...wgsl.matchAll(new RegExp(`${externalName.replaceAll(".", "\\.").replaceAll("$", "\\$")}\\.(?<prop>.*?)(?![\\w\\$_])`, "g"))].map((found) => found[1]);
 			return [...new Set(foundProperties)].reduce((innerAcc, prop) => prop && prop in external ? replaceExternalsInWgsl(ctx, { [`${externalName}.${prop}`]: external[prop] }, innerAcc) : innerAcc, acc);
@@ -55,4 +69,4 @@ function replaceExternalsInWgsl(ctx, externalMap, wgsl) {
 }
 
 //#endregion
-export { addArgTypesToExternals, addReturnTypeToExternals, applyExternals, replaceExternalsInWgsl };
+export { addArgTypesToExternals, addReturnTypeToExternals, mergeExternals, replaceExternalsInWgsl };

package/core/resolve/tgpuResolve.d.ts

@@ -1,6 +1,6 @@
 import { ShaderGenerator } from "../../tgsl/shaderGenerator.js";
 import { Configurable } from "../root/rootTypes.js";
-import { WgslExtension } from "../../wgslExtensions.js";
+import { WgslEnableExtension } from "../../wgslExtensions.js";
 import { ResolvableObject, Wgsl } from "../../types.js";
 import { Namespace } from "./namespace.js";
 import { ResolutionResult } from "../../resolutionCtx.js";
@@ -27,7 +27,7 @@ interface TgpuResolveOptions {
   /**
    * List of WGSL shader extensions to enable.
    */
-  enableExtensions?: WgslExtension[] | undefined;
+  enableExtensions?: WgslEnableExtension[] | undefined;
   /**
    * **NOTE: This is an unstable API and may change in the future.**
    *

package/core/resolve/tgpuResolve.js

@@ -1,7 +1,7 @@
 import { $internal, $resolve } from "../../shared/symbols.js";
 import { Void } from "../../data/wgslTypes.js";
 import { snip } from "../../data/snippet.js";
-import { applyExternals, replaceExternalsInWgsl } from "./externals.js";
+import { mergeExternals, replaceExternalsInWgsl } from "./externals.js";
 import { isBindGroupLayout } from "../../tgpuBindGroupLayout.js";
 import { resolve } from "../../resolutionCtx.js";
 import { isPipeline } from "../pipeline/typeGuards.js";
@@ -20,7 +20,7 @@ function resolveFromTemplate(options) {
 	const { template, externals, unstable_shaderGenerator: shaderGenerator, names = "strict", config, enableExtensions } = options;
 	if (!template) console.warn("Calling resolve with an empty template is deprecated and will soon return an empty string. Consider using the 'tgpu.resolve(resolvableArray, options)' API instead.");
 	const dependencies = {};
-	applyExternals(dependencies, externals ?? {});
+	mergeExternals(dependencies, externals ?? {});
 	return resolve({
 		[$internal]: true,
 		[$resolve](ctx) {

package/core/root/init.js

@@ -12,6 +12,7 @@ import { clearTextureUtilsCache } from "../texture/textureUtils.js";
 import { INTERNAL_createTexture, isTexture, isTextureView } from "../texture/texture.js";
 import { TgpuBindGroupImpl, isBindGroup, isBindGroupLayout } from "../../tgpuBindGroupLayout.js";
 import { ceil } from "../../std/numeric.js";
+import { allEq } from "../../std/boolean.js";
 import { isComputePipeline, isRenderPipeline } from "../pipeline/typeGuards.js";
 import { builtin } from "../../builtin.js";
 import { INTERNAL_createQuerySet, isQuerySet } from "../querySet/querySet.js";
@@ -22,7 +23,6 @@ import { applyBindGroups, applyVertexBuffers } from "../pipeline/applyPipelineSt
 import { INTERNAL_createComputePipeline } from "../pipeline/computePipeline.js";
 import { isVertexLayout } from "../vertexLayout/vertexLayout.js";
 import { INTERNAL_createRenderPipeline } from "../pipeline/renderPipeline.js";
-import { allEq } from "../../std/boolean.js";
 
 //#region src/core/root/init.ts
 /**

package/core/slot/accessor.js

@@ -51,7 +51,7 @@ var AccessorBase = class {
 		if (isTgpuFn(value) || hasTinyestMetadata(value)) return ctx.withResetIndentLevel(() => snip(`${ctx.resolve(value).value}()`, this.schema, "runtime"));
 		ctx.pushMode(new NormalState());
 		try {
-			return snip(schemaCallWrapper(this.schema, value), this.schema, "constant");
+			return snip(schemaCallWrapper(this.schema, value), this.schema, "constant", false);
 		} finally {
 			ctx.popMode("normal");
 		}