typegpu 0.10.2 → 0.11.0-rc.1

package/core/constant/tgpuConstant.js

@@ -1,15 +1,16 @@
 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";
 import { valueProxyHandler } from "../valueProxyUtils.js";
-
 //#region src/core/constant/tgpuConstant.ts
-/**
-* Creates a module constant with specified value.
-*/
 function constant(dataType, value) {
+	if (!isData(dataType)) {
+		if (!Array.isArray(value)) throw new Error(`Expected an array value for a partially-applied array schema, but received: ${typeof value}.`);
+		return new TgpuConstImpl(dataType(value.length), value);
+	}
 	return new TgpuConstImpl(dataType, value);
 }
 function deepFreeze(object) {
@@ -23,10 +24,11 @@ function deepFreeze(object) {
 var TgpuConstImpl = class {
 	[$internal] = {};
 	resourceType;
+	dataType;
 	#value;
 	constructor(dataType, value) {
-		this.dataType = dataType;
 		this.resourceType = "const";
+		this.dataType = dataType;
 		this.#value = value && typeof value === "object" ? deepFreeze(value) : value;
 	}
 	$name(label) {
@@ -62,6 +64,5 @@ var TgpuConstImpl = class {
 		return this.$;
 	}
 };
-
 //#endregion
-export { constant };
+export { constant };

package/core/declare/tgpuDeclare.js

@@ -2,7 +2,6 @@ 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";
-
 //#region src/core/declare/tgpuDeclare.ts
 /**
 * Allows defining extra declarations that shall be included in the final WGSL code,
@@ -16,25 +15,25 @@ function declare(declaration) {
 }
 var TgpuDeclareImpl = class {
 	[$internal] = true;
-	externalsToApply = [];
+	#externalsToApply = [];
+	#declaration;
 	constructor(declaration) {
-		this.declaration = declaration;
+		this.#declaration = declaration;
 	}
 	$uses(dependencyMap) {
-		this.externalsToApply.push(dependencyMap);
+		this.#externalsToApply.push(dependencyMap);
 		return this;
 	}
 	[$resolve](ctx) {
 		const externalMap = {};
-		for (const externals of this.externalsToApply) applyExternals(externalMap, externals);
-		const replacedDeclaration = replaceExternalsInWgsl(ctx, externalMap, this.declaration);
+		for (const externals of this.#externalsToApply) applyExternals(externalMap, externals);
+		const replacedDeclaration = replaceExternalsInWgsl(ctx, externalMap, this.#declaration);
 		ctx.addDeclaration(replacedDeclaration);
 		return snip("", Void, "constant");
 	}
 	toString() {
-		return `declare: ${this.declaration}`;
+		return `declare: ${this.#declaration}`;
 	}
 };
-
 //#endregion
-export { declare };
+export { declare };

package/core/function/autoIO.d.ts

@@ -1,8 +1,8 @@
+import { Assume, RemoveIndexSignature } from "../../shared/utilityTypes.js";
 import { BuiltinClipDistances, BuiltinFragDepth, BuiltinFrontFacing, BuiltinInstanceIndex, BuiltinPosition, BuiltinPrimitiveIndex, BuiltinSampleIndex, BuiltinSampleMask, BuiltinSubgroupInvocationId, BuiltinSubgroupSize, BuiltinVertexIndex, OmitBuiltins } from "../../builtin.js";
-import "../../data/snippet.js";
 import { BaseIOData } from "./fnTypes.js";
-import "../../data/autoStruct.js";
-import "../../types.js";
+import { TgpuVertexAttrib } from "../../shared/vertexFormat.js";
+import { FormatToWGSLType } from "../../data/vertexFormatData.js";
 import { v4f } from "../../data/wgslTypes.js";
 import { InferGPU, InferGPURecord, InferRecord } from "../../shared/repr.js";
 
@@ -12,7 +12,8 @@ declare const builtinVertexIn: {
   readonly $vertexIndex: BuiltinVertexIndex;
   readonly $instanceIndex: BuiltinInstanceIndex;
 };
-type AutoVertexIn<T extends AnyAutoCustoms> = T & InferRecord<typeof builtinVertexIn>;
+type AutoVertexIn<T extends AnyAutoCustoms> = RemoveIndexSignature<T> & InferRecord<typeof builtinVertexIn>;
+type _AutoVertexIn<T> = AutoVertexIn<{ [Key in keyof T]: T[Key] extends TgpuVertexAttrib ? InferGPU<FormatToWGSLType<T[Key]['format']>> : Assume<T[Key], InferGPU<BaseIOData>> }>;
 declare const builtinVertexOut: {
   readonly $clipDistances: BuiltinClipDistances;
   readonly $position: BuiltinPosition;
@@ -27,11 +28,11 @@ declare const builtinFragmentIn: {
   readonly $subgroupInvocationId: BuiltinSubgroupInvocationId;
   readonly $subgroupSize: BuiltinSubgroupSize;
 };
-type AutoFragmentIn<T extends AnyAutoCustoms> = T & InferRecord<typeof builtinFragmentIn>;
+type AutoFragmentIn<T extends AnyAutoCustoms> = RemoveIndexSignature<T> & InferRecord<typeof builtinFragmentIn>;
 declare const builtinFragmentOut: {
   readonly $fragDepth: BuiltinFragDepth;
   readonly $sampleMask: BuiltinSampleMask;
 };
 type AutoFragmentOut<T extends undefined | v4f | AnyAutoCustoms> = T extends undefined | v4f ? T : T & Partial<InferGPURecord<typeof builtinFragmentOut>>;
 //#endregion
-export { AnyAutoCustoms, AutoFragmentIn, AutoFragmentOut, AutoVertexIn, AutoVertexOut };
+export { AnyAutoCustoms, AutoFragmentIn, AutoFragmentOut, AutoVertexIn, AutoVertexOut, _AutoVertexIn };

package/core/function/autoIO.js

@@ -5,7 +5,6 @@ import { AutoStruct } from "../../data/autoStruct.js";
 import { createFnCore } from "./fnCore.js";
 import { shaderStageSlot } from "../slot/internalSlots.js";
 import { builtin } from "../../builtin.js";
-
 //#region src/core/function/autoIO.ts
 const builtinVertexIn = {
 	$vertexIndex: builtin.vertexIndex,
@@ -82,6 +81,5 @@ var AutoVertexFn = class {
 };
 AutoVertexFn.prototype[$internal] = true;
 AutoVertexFn.prototype.resourceType = "auto-vertex-fn";
-
 //#endregion
-export { AutoFragmentFn, AutoVertexFn };
+export { AutoFragmentFn, AutoVertexFn };

package/core/function/comptime.js

@@ -3,7 +3,6 @@ import { setName } from "../../shared/meta.js";
 import { WgslTypeError } from "../../errors.js";
 import { isKnownAtComptime } from "../../types.js";
 import { coerceToSnippet } from "../../tgsl/generationHelpers.js";
-
 //#region src/core/function/comptime.ts
 /**
 * Creates a version of `func` that can called safely in a TypeGPU function to
@@ -46,6 +45,5 @@ function comptime(func) {
 	Object.defineProperty(impl, $internal, { value: { isComptime: true } });
 	return impl;
 }
-
 //#endregion
-export { comptime };
+export { comptime };

package/core/function/createCallableSchema.js

@@ -4,7 +4,6 @@ import { isPtr } from "../../data/wgslTypes.js";
 import { snip } from "../../data/snippet.js";
 import { NormalState, isKnownAtComptime } from "../../types.js";
 import { tryConvertSnippet } from "../../tgsl/conversion.js";
-
 //#region src/core/function/createCallableSchema.ts
 function callableSchema(options) {
 	const impl = ((...args) => {
@@ -15,7 +14,7 @@ function callableSchema(options) {
 	impl[$gpuCallable] = {
 		get strictSignature() {},
 		call(ctx, args) {
-			const { argTypes, returnType } = options.signature(...args.map((s) => {
+			const argTypes = options.argTypes(...args.map((s) => {
 				if (isPtr(s.dataType) && s.dataType.implicit) return s.dataType.inner;
 				return s.dataType;
 			}));
@@ -27,16 +26,15 @@ function callableSchema(options) {
 			if (converted.every((s) => isKnownAtComptime(s))) {
 				ctx.pushMode(new NormalState());
 				try {
-					return snip(options.normalImpl(...converted.map((s) => s.value)), returnType, "constant");
+					return snip(options.normalImpl(...converted.map((s) => s.value)), options.schema(), "constant");
 				} finally {
 					ctx.popMode("normal");
 				}
 			}
-			return snip(options.codegenImpl(ctx, converted), returnType, "runtime");
+			return options.codegenImpl(ctx, converted);
 		}
 	};
 	return impl;
 }
-
 //#endregion
-export { callableSchema };
+export { callableSchema };

package/core/function/dualImpl.js

@@ -5,7 +5,6 @@ import { snip } from "../../data/snippet.js";
 import { NormalState, isKnownAtComptime } from "../../types.js";
 import { tryConvertSnippet } from "../../tgsl/conversion.js";
 import { concretize } from "../../tgsl/generationHelpers.js";
-
 //#region src/core/function/dualImpl.ts
 var MissingCpuImplError = class extends Error {
 	constructor(message) {
@@ -49,6 +48,5 @@ function dualImpl(options) {
 	};
 	return impl;
 }
-
 //#endregion
-export { MissingCpuImplError, dualImpl };
+export { MissingCpuImplError, dualImpl };

package/core/function/entryInputRouter.js

@@ -0,0 +1,39 @@
+import { $internal } from "../../shared/symbols.js";
+import { isWgslStruct } from "../../data/wgslTypes.js";
+import { undecorate } from "../../data/dataTypes.js";
+import { snip } from "../../data/snippet.js";
+//#region src/core/function/entryInputRouter.ts
+/**
+* Routes `(input) => { input.x }` style property access to the correct WGSL
+* expression: positional args get a direct snippet, struct fields get
+* `structArgName.fieldName`.
+*/
+var EntryInputRouter = class {
+	[$internal] = {};
+	type = "entry-input-router";
+	structArgName;
+	dataSchema;
+	/** Maps schemaKey → { WGSL arg name, type } */
+	positionalArgsMap;
+	constructor(structArgName, dataSchema, positionalArgs) {
+		this.structArgName = structArgName;
+		this.dataSchema = dataSchema;
+		this.positionalArgsMap = new Map(positionalArgs.map((a) => [a.schemaKey, {
+			argName: a.argName,
+			type: a.type
+		}]));
+	}
+	toString() {
+		return "entry-input-router";
+	}
+	accessProp(propName) {
+		const positionalEntry = this.positionalArgsMap.get(propName);
+		if (positionalEntry) return snip(positionalEntry.argName, positionalEntry.type, "argument");
+		if (this.dataSchema && isWgslStruct(this.dataSchema)) {
+			const propType = this.dataSchema.propTypes[propName];
+			if (propType) return snip(`${this.structArgName}.${propName}`, undecorate(propType), "argument");
+		}
+	}
+};
+//#endregion
+export { EntryInputRouter };

package/core/function/extractArgs.js

@@ -111,6 +111,7 @@ function strip(rawCode) {
 	throw new Error("Invalid wgsl code!");
 }
 var ParsableString = class {
+	str;
 	#parseStartPos;
 	#pos;
 	constructor(str) {
@@ -199,6 +200,5 @@ const openingCommentBlock = new Set(["*/"]);
 const parentheses = ["(", ")"];
 const angleBrackets = ["<", ">"];
 const commentBlocks = ["/*", "*/"];
-
 //#endregion
-export { extractArgs };
+export { extractArgs };

package/core/function/fnCore.js

@@ -7,7 +7,6 @@ import { MissingLinksError } from "../../errors.js";
 import { getAttributesString } from "../../data/attributes.js";
 import { applyExternals, replaceExternalsInWgsl } from "../resolve/externals.js";
 import { extractArgs } from "./extractArgs.js";
-
 //#region src/core/function/fnCore.ts
 function createFnCore(implementation, fnAttribute = "") {
 	/**
@@ -22,24 +21,33 @@ function createFnCore(implementation, fnAttribute = "") {
 		applyExternals(newExternals) {
 			externalsToApply.push(newExternals);
 		},
-		resolve(ctx, argTypes, returnType) {
+		resolve(ctx, argTypes, returnType, entryInput) {
 			const externalMap = {};
 			for (const externals of externalsToApply) applyExternals(externalMap, externals);
 			const id = ctx.getUniqueName(this);
 			if (typeof implementation === "string") {
 				if (!returnType) throw new Error("Explicit return type is required for string implementation");
+				const validArgNames = entryInput ? Object.fromEntries(entryInput.positionalArgs.map((a) => [a.schemaKey, ctx.makeNameValid(a.schemaKey)])) : void 0;
+				if (validArgNames && Object.keys(validArgNames).length > 0) applyExternals(externalMap, { in: validArgNames });
 				const replacedImpl = replaceExternalsInWgsl(ctx, externalMap, implementation);
 				let header = "";
 				let body = "";
-				if (fnAttribute !== "") {
-					const input = isWgslStruct(argTypes[0]) ? `(in: ${ctx.resolve(argTypes[0]).value})` : "()";
+				if (fnAttribute !== "" && entryInput && validArgNames) {
+					const { dataSchema, positionalArgs } = entryInput;
+					const parts = [];
+					if (dataSchema && isArgUsedInBody("in", replacedImpl)) parts.push(`in: ${ctx.resolve(dataSchema).value}`);
+					for (const a of positionalArgs) {
+						const argName = validArgNames[a.schemaKey] ?? "";
+						if (argName !== "" && isArgUsedInBody(argName, replacedImpl)) parts.push(`${getAttributesString(a.type)}${argName}: ${ctx.resolve(a.type).value}`);
+					}
+					const input = `(${parts.join(", ")})`;
 					const attributes = isWgslData(returnType) ? getAttributesString(returnType) : "";
-					header = `${input} ${returnType !== Void ? isWgslStruct(returnType) ? `-> ${ctx.resolve(returnType).value}` : `-> ${attributes !== "" ? attributes : "@location(0)"} ${ctx.resolve(returnType).value}` : ""} `;
+					header = `${input}${returnType !== Void ? isWgslStruct(returnType) ? ` -> ${ctx.resolve(returnType).value} ` : ` -> ${attributes !== "" ? attributes : "@location(0)"} ${ctx.resolve(returnType).value} ` : " "}`;
 					body = replacedImpl;
 				} else {
 					const providedArgs = extractArgs(replacedImpl);
 					if (providedArgs.args.length !== argTypes.length) throw new Error(`WGSL implementation has ${providedArgs.args.length} arguments, while the shell has ${argTypes.length} arguments.`);
-					header = `(${providedArgs.args.map((argInfo, i) => `${argInfo.identifier}: ${checkAndReturnType(ctx, `parameter ${argInfo.identifier}`, argInfo.type, argTypes[i])}`).join(", ")}) ${returnType === Void ? "" : `-> ${checkAndReturnType(ctx, "return type", providedArgs.ret?.type, returnType)}`}`;
+					header = `(${providedArgs.args.map((argInfo, i) => `${argInfo.identifier}: ${checkAndReturnType(ctx, `parameter ${argInfo.identifier}`, argInfo.type, argTypes[i])}`).join(", ")})${returnType === Void ? " " : ` -> ${checkAndReturnType(ctx, "return type", providedArgs.ret?.type, returnType)} `}`;
 					body = replacedImpl.slice(providedArgs.range.end);
 				}
 				ctx.addDeclaration(`${fnAttribute}fn ${id}${header}${body}`);
@@ -57,6 +65,7 @@ function createFnCore(implementation, fnAttribute = "") {
 			const { head, body, returnType: actualReturnType } = ctx.fnToWgsl({
 				functionType: fnAttribute.includes("@compute") ? "compute" : fnAttribute.includes("@vertex") ? "vertex" : fnAttribute.includes("@fragment") ? "fragment" : "normal",
 				argTypes,
+				entryInput,
 				params: ast.params,
 				returnType,
 				body: ast.body,
@@ -67,6 +76,9 @@ function createFnCore(implementation, fnAttribute = "") {
 		}
 	};
 }
+function isArgUsedInBody(argName, body) {
+	return new RegExp(`\\b${argName}\\b`).test(body);
+}
 function checkAndReturnType(ctx, name, wgslType, jsType) {
 	const resolvedJsType = ctx.resolve(jsType).value.replace(/\s/g, "");
 	if (!wgslType) return resolvedJsType;
@@ -74,6 +86,5 @@ function checkAndReturnType(ctx, name, wgslType, jsType) {
 	if (resolvedWgslType !== resolvedJsType) throw new Error(`Type mismatch between TGPU shell and WGSL code string: ${name}, JS type "${resolvedJsType}", WGSL type "${resolvedWgslType}".`);
 	return wgslType;
 }
-
 //#endregion
-export { createFnCore };
+export { createFnCore };

package/core/function/fnTypes.d.ts

@@ -1,12 +1,10 @@
 import { BuiltinClipDistances } from "../../builtin.js";
 import { AnyAttribute } from "../../data/attributes.js";
-import { Bool, Decorated, F16, F32, I32, U32, Vec2f, Vec2h, Vec2i, Vec2u, Vec3f, Vec3h, Vec3i, Vec3u, Vec4f, Vec4h, Vec4i, Vec4u, Void } from "../../data/wgslTypes.js";
-import { Infer } from "../../shared/repr.js";
-import "tinyest";
-
+import { BaseData, Bool, Decorated, F16, F32, I32, U32, Vec2f, Vec2h, Vec2i, Vec2u, Vec3f, Vec3h, Vec3i, Vec3u, Vec4f, Vec4h, Vec4i, Vec4u, Void } from "../../data/wgslTypes.js";
+import { InferGPU } from "../../shared/repr.js";
 //#region src/core/function/fnTypes.d.ts
 type AnyFn = (...args: never[]) => unknown;
-type InferArgs<T extends unknown[]> = { [Idx in keyof T]: Infer<T[Idx]> };
+type InferArgs<T extends unknown[]> = { [Idx in keyof T]: InferGPU<T[Idx]> };
 type InheritTupleValues<T, From> = { [K in keyof T]: K extends keyof From ? From[K] : never };
 /**
  * Returns a type that has arg and return types of `T`, but argument
@@ -18,7 +16,7 @@ type InheritTupleValues<T, From> = { [K in keyof T]: K extends keyof From ? From
 type InheritArgNames<T extends AnyFn, From extends AnyFn> = {
   result: (...args: Parameters<((...args: InheritTupleValues<Parameters<From>, Parameters<T>>) => ReturnType<T>) & T>) => ReturnType<T>;
 };
-type InferImplSchema<ImplSchema extends AnyFn> = (...args: InferArgs<Parameters<ImplSchema>>) => Infer<ReturnType<ImplSchema>>;
+type InferImplSchema<ImplSchema extends AnyFn> = (...args: InferArgs<Parameters<ImplSchema>>) => InferGPU<ReturnType<ImplSchema>>;
 type Implementation<ImplSchema extends AnyFn = AnyFn> = string | InferImplSchema<ImplSchema>;
 type BaseIOData = Bool | F32 | F16 | I32 | U32 | Vec2f | Vec3f | Vec4f | Vec2h | Vec3h | Vec4h | Vec2i | Vec3i | Vec4i | Vec2u | Vec3u | Vec4u;
 type IOData = BaseIOData | Decorated<BaseIOData, AnyAttribute[]> | BuiltinClipDistances;
@@ -29,6 +27,14 @@ type IORecord<TElementType extends IOData = IOData> = Record<string, TElementTyp
 type IOLayout<TElementType extends IOData = IOData> = TElementType | IORecord<TElementType> | Void;
 type InferIO<T> = T extends {
   type: string;
-} ? Infer<T> : T extends Record<string, unknown> ? { [K in keyof T]: Infer<T[K]> } : T;
+} ? InferGPU<T> : T extends Record<string, unknown> ? { [K in keyof T]: InferGPU<T[K]> } : T;
+interface PositionalArgInfo {
+  schemaKey: string;
+  type: BaseData;
+}
+interface SeparatedEntryArgs {
+  dataSchema: BaseData | undefined;
+  positionalArgs: PositionalArgInfo[];
+}
 //#endregion
-export { AnyFn, BaseIOData, IOLayout, IORecord, Implementation, InferArgs, InferIO, InferImplSchema, InheritArgNames };
+export { AnyFn, BaseIOData, IOLayout, IORecord, Implementation, InferArgs, InferIO, InferImplSchema, InheritArgNames, SeparatedEntryArgs };

package/core/function/ioSchema.js

@@ -2,7 +2,6 @@ import { isVoid } from "../../data/wgslTypes.js";
 import { getCustomLocation, isData } from "../../data/dataTypes.js";
 import { isBuiltin, location } from "../../data/attributes.js";
 import { INTERNAL_createStruct } from "../../data/struct.js";
-
 //#region src/core/function/ioSchema.ts
 function withLocations(members, locations = {}) {
 	let nextLocation = 0;
@@ -22,9 +21,31 @@ function withLocations(members, locations = {}) {
 		return [key, location(nextLocation++, member)];
 	}));
 }
+function separateBuiltins(schema, locations = {}) {
+	const positionalArgs = [];
+	const dataFields = {};
+	for (const [key, type] of Object.entries(schema)) if (isBuiltin(type)) positionalArgs.push({
+		schemaKey: key,
+		type
+	});
+	else dataFields[key] = type;
+	return {
+		dataSchema: Object.keys(dataFields).length > 0 ? INTERNAL_createStruct(withLocations(dataFields, locations), false) : void 0,
+		positionalArgs
+	};
+}
+function separateAllAsPositional(schema) {
+	const withLocs = withLocations(schema);
+	return {
+		dataSchema: void 0,
+		positionalArgs: Object.entries(withLocs).map(([key, type]) => ({
+			schemaKey: key,
+			type
+		}))
+	};
+}
 function createIoSchema(layout, locations = {}) {
 	return isData(layout) ? isVoid(layout) ? layout : isBuiltin(layout) ? layout : getCustomLocation(layout) !== void 0 ? layout : location(0, layout) : INTERNAL_createStruct(withLocations(layout, locations), false);
 }
-
 //#endregion
-export { createIoSchema };
+export { createIoSchema, separateAllAsPositional, separateBuiltins };

package/core/function/shelllessImpl.js

@@ -1,7 +1,6 @@
 import { $getNameForward, $internal, $resolve } from "../../shared/symbols.js";
 import { getName } from "../../shared/meta.js";
 import { createFnCore } from "./fnCore.js";
-
 //#region src/core/function/shelllessImpl.ts
 function createShelllessImpl(argTypes, implementation) {
 	const core = createFnCore(implementation, "");
@@ -18,6 +17,5 @@ function createShelllessImpl(argTypes, implementation) {
 		}
 	};
 }
-
 //#endregion
-export { createShelllessImpl };
+export { createShelllessImpl };

package/core/function/templateUtils.js

@@ -8,6 +8,5 @@ function isTemplateStringsArray(value) {
 function templateLiteralIdentity(strings, ...values) {
 	return strings.slice(1).reduce((acc, elem, index) => `${acc}${values[index]}${elem}`, strings[0]);
 }
-
 //#endregion
-export { stripTemplate };
+export { stripTemplate };

package/core/function/tgpuComputeFn.d.ts

@@ -2,7 +2,6 @@ import { TgpuNamable } from "../../shared/meta.js";
 import { $internal } from "../../shared/symbols.js";
 import { AnyComputeBuiltin } from "../../builtin.js";
 import { IORecord, InferIO } from "./fnTypes.js";
-import { IOLayoutToSchema } from "./ioSchema.js";
 import { Void } from "../../data/wgslTypes.js";
 
 //#region src/core/function/tgpuComputeFn.d.ts
@@ -10,9 +9,9 @@ import { Void } from "../../data/wgslTypes.js";
  * Describes a compute entry function signature (its arguments, return type and workgroup size)
  */
 type TgpuComputeFnShellHeader<ComputeIn extends IORecord<AnyComputeBuiltin>> = {
-  readonly argTypes: [IOLayoutToSchema<ComputeIn>] | [];
+  readonly argTypes: ComputeIn[keyof ComputeIn][];
   readonly returnType: Void;
-  readonly workgroupSize: [number, number, number];
+  readonly workgroupSize: number[];
   readonly entryPoint: 'compute';
 };
 /**

package/core/function/tgpuComputeFn.js

@@ -1,11 +1,10 @@
 import { $getNameForward, $internal, $resolve } from "../../shared/symbols.js";
-import { getName, isNamable, setName } from "../../shared/meta.js";
+import { getName, setName } from "../../shared/meta.js";
 import { Void } from "../../data/wgslTypes.js";
-import { createIoSchema } from "./ioSchema.js";
+import { separateBuiltins } from "./ioSchema.js";
 import { createFnCore } from "./fnCore.js";
 import { stripTemplate } from "./templateUtils.js";
 import { shaderStageSlot } from "../slot/internalSlots.js";
-
 //#region src/core/function/tgpuComputeFn.ts
 /**
 * Creates a shell of a typed entry function for the compute shader stage. Any function
@@ -18,24 +17,20 @@ import { shaderStageSlot } from "../slot/internalSlots.js";
 */
 function computeFn(options) {
 	const shell = {
-		argTypes: options.in && Object.keys(options.in).length !== 0 ? [createIoSchema(options.in)] : [],
+		argTypes: Object.values(options.in ?? {}),
 		returnType: Void,
-		workgroupSize: [
-			options.workgroupSize[0] ?? 1,
-			options.workgroupSize[1] ?? 1,
-			options.workgroupSize[2] ?? 1
-		],
+		workgroupSize: options.workgroupSize,
 		entryPoint: "compute"
 	};
-	const call = (arg, ...values) => createComputeFn(shell, options.workgroupSize, stripTemplate(arg, ...values));
+	const entryInput = separateBuiltins(options.in ?? {});
+	const call = (arg, ...values) => createComputeFn(shell, options.workgroupSize, stripTemplate(arg, ...values), entryInput);
 	return Object.assign(call, shell);
 }
 function isTgpuComputeFn(value) {
 	return value?.shell?.entryPoint === "compute";
 }
-function createComputeFn(shell, workgroupSize, implementation) {
+function createComputeFn(shell, workgroupSize, implementation, entryInput) {
 	const core = createFnCore(implementation, `@compute @workgroup_size(${workgroupSize.join(", ")}) `);
-	const inputType = shell.argTypes[0];
 	return {
 		shell,
 		$uses(newExternals) {
@@ -46,17 +41,15 @@ function createComputeFn(shell, workgroupSize, implementation) {
 		[$getNameForward]: core,
 		$name(newLabel) {
 			setName(this, newLabel);
-			if (isNamable(inputType)) inputType.$name(`${newLabel}_Input`);
 			return this;
 		},
 		[$resolve](ctx) {
-			return ctx.withSlots([[shaderStageSlot, "compute"]], () => core.resolve(ctx, shell.argTypes, shell.returnType));
+			return ctx.withSlots([[shaderStageSlot, "compute"]], () => core.resolve(ctx, [], shell.returnType, entryInput));
 		},
 		toString() {
 			return `computeFn:${getName(core) ?? "<unnamed>"}`;
 		}
 	};
 }
-
 //#endregion
-export { computeFn, isTgpuComputeFn };
+export { computeFn, isTgpuComputeFn };

package/core/function/tgpuFn.d.ts

@@ -6,7 +6,7 @@ import { Providing } from "../slot/slotTypes.js";
 import { Withable } from "../root/rootTypes.js";
 import { DualFn } from "../../types.js";
 import { BaseData, Void } from "../../data/wgslTypes.js";
-import { Infer } from "../../shared/repr.js";
+import { InferGPU } from "../../shared/repr.js";
 
 //#region src/core/function/tgpuFn.d.ts
 /**
@@ -22,7 +22,7 @@ type TgpuFnShellHeader<Args extends BaseData[], Return extends BaseData> = {
  * Allows creating tgpu functions by calling this shell
  * and passing the implementation (as WGSL string or JS function) as the argument.
  */
-type TgpuFnShell<Args extends BaseData[], Return extends BaseData> = TgpuFnShellHeader<Args, Return> & (<T extends (...args: InferArgs<Args>) => Infer<Return>>(implementation: T) => TgpuFn<Prettify<InheritArgNames<(...args: Args) => Return, T>>['result']>) & ((implementation: string) => TgpuFn<(...args: Args) => Return>) & ((strings: TemplateStringsArray, ...values: unknown[]) => TgpuFn<(...args: Args) => Return>);
+type TgpuFnShell<Args extends BaseData[], Return extends BaseData> = TgpuFnShellHeader<Args, Return> & (<T extends (...args: InferArgs<Args>) => InferGPU<Return>>(implementation: T) => TgpuFn<Prettify<InheritArgNames<(...args: Args) => Return, T>>['result']>) & ((implementation: string) => TgpuFn<(...args: Args) => Return>) & ((strings: TemplateStringsArray, ...values: unknown[]) => TgpuFn<(...args: Args) => Return>);
 interface TgpuFnBase<ImplSchema extends AnyFn> extends TgpuNamable, Withable<TgpuFn<ImplSchema>> {
   [$internal]: {
     implementation: Implementation<ImplSchema>;

package/core/function/tgpuFn.js

@@ -11,7 +11,6 @@ import { comptime } from "./comptime.js";
 import { addArgTypesToExternals, addReturnTypeToExternals } from "../resolve/externals.js";
 import { createFnCore } from "./fnCore.js";
 import { stripTemplate } from "./templateUtils.js";
-
 //#region src/core/function/tgpuFn.ts
 function fn(argTypesOrCallback, returnType) {
 	if (typeof argTypesOrCallback === "function") return createGenericFn(argTypesOrCallback, []);
@@ -165,6 +164,5 @@ function createGenericFn(inner, pairs) {
 	} });
 	return genericFn;
 }
-
 //#endregion
-export { fn, isGenericFn, isTgpuFn };
+export { fn, isGenericFn, isTgpuFn };

package/core/function/tgpuFragmentFn.d.ts

@@ -3,8 +3,9 @@ import { $internal } from "../../shared/symbols.js";
 import { Prettify } from "../../shared/utilityTypes.js";
 import { AnyFragmentInputBuiltin, AnyFragmentOutputBuiltin, OmitBuiltins } from "../../builtin.js";
 import { BaseIOData, IOLayout, IORecord, InferIO } from "./fnTypes.js";
-import { IOLayoutToSchema } from "./ioSchema.js";
+import { AnyAutoCustoms, AutoFragmentIn, AutoFragmentOut } from "./autoIO.js";
 import { InstanceToSchema } from "../../data/instanceToSchema.js";
+import { IOLayoutToSchema } from "./ioSchema.js";
 import { BaseData, Decorated, Interpolate, Location, Vec4f, Vec4i, Vec4u, WgslStruct } from "../../data/wgslTypes.js";
 import { UndecorateRecord } from "../../data/dataTypes.js";
 
@@ -55,6 +56,9 @@ interface TgpuFragmentFn<in Varying extends TgpuFragmentFn.In = Record<string, n
 declare namespace TgpuFragmentFn {
   type In = Record<string, BaseData>;
   type Out = Record<string, BaseData> | BaseData;
+  type AutoIn<T extends AnyAutoCustoms> = AutoFragmentIn<T>;
+  type AutoOut<T extends AnyAutoCustoms = AnyAutoCustoms> = AutoFragmentOut<T>;
+  type AutoInEmpty = AutoFragmentIn<Record<string, never>>;
 }
 declare function fragmentFn<FragmentOut extends FragmentOutConstrained>(options: {
   out: FragmentOut;

package/core/function/tgpuFragmentFn.js

@@ -1,11 +1,10 @@
 import { $getNameForward, $internal, $resolve } from "../../shared/symbols.js";
 import { getName, isNamable, setName } from "../../shared/meta.js";
-import { createIoSchema } from "./ioSchema.js";
+import { createIoSchema, separateBuiltins } from "./ioSchema.js";
 import { addReturnTypeToExternals } from "../resolve/externals.js";
 import { createFnCore } from "./fnCore.js";
 import { stripTemplate } from "./templateUtils.js";
 import { shaderStageSlot } from "../slot/internalSlots.js";
-
 //#region src/core/function/tgpuFragmentFn.ts
 /**
 * Creates a shell of a typed entry function for the fragment shader stage. Any function
@@ -50,19 +49,15 @@ function createFragmentFn(shell, implementation) {
 			return this;
 		},
 		[$resolve](ctx) {
-			const inputWithLocation = shell.in ? createIoSchema(shell.in, ctx.varyingLocations) : void 0;
-			if (inputWithLocation) {
-				inputWithLocation.$name(`${getName(this) ?? ""}_Input`);
-				core.applyExternals({ In: inputWithLocation });
-			}
+			const entryInput = separateBuiltins(shell.in ?? {}, ctx.varyingLocations ?? {});
+			if (entryInput.dataSchema && isNamable(entryInput.dataSchema)) entryInput.dataSchema.$name(`${getName(this) ?? ""}_Input`);
 			core.applyExternals({ Out: outputType });
-			return ctx.withSlots([[shaderStageSlot, "fragment"]], () => core.resolve(ctx, inputWithLocation ? [inputWithLocation] : [], shell.returnType));
+			return ctx.withSlots([[shaderStageSlot, "fragment"]], () => core.resolve(ctx, [], shell.returnType, entryInput));
 		},
 		toString() {
 			return `fragmentFn:${getName(core) ?? "<unnamed>"}`;
 		}
 	};
 }
-
 //#endregion
-export { fragmentFn, isTgpuFragmentFn };
+export { fragmentFn, isTgpuFragmentFn };

package/core/function/tgpuVertexFn.d.ts

@@ -3,6 +3,7 @@ import { $internal } from "../../shared/symbols.js";
 import { Prettify } from "../../shared/utilityTypes.js";
 import { AnyVertexInputBuiltin, AnyVertexOutputBuiltin, OmitBuiltins } from "../../builtin.js";
 import { BaseIOData, IORecord, InferIO } from "./fnTypes.js";
+import { AnyAutoCustoms, AutoVertexOut, _AutoVertexIn } from "./autoIO.js";
 import { IOLayoutToSchema } from "./ioSchema.js";
 import { BaseData, Decorated, Interpolate, Location } from "../../data/wgslTypes.js";
 import { UndecorateRecord } from "../../data/dataTypes.js";
@@ -42,6 +43,9 @@ interface TgpuVertexFn<in VertexIn extends TgpuVertexFn.In = Record<string, neve
 declare namespace TgpuVertexFn {
   type In = BaseData | Record<string, BaseData>;
   type Out = Record<string, BaseData>;
+  type AutoIn<T> = _AutoVertexIn<T>;
+  type AutoOut<T extends AnyAutoCustoms = AnyAutoCustoms> = AutoVertexOut<T>;
+  type AutoInEmpty = _AutoVertexIn<Record<string, never>>;
 }
 declare function vertexFn<VertexOut extends VertexOutConstrained>(options: {
   out: VertexOut;