Merge branch 'main' into feat/destruct-entry-args

Author: mhawryluk

apps/typegpu-docs/package.json

@@ -41,7 +41,7 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "remeda": "^2.21.2",
-    "sharp": "^0.32.5",
+    "sharp": "^0.34.2",
     "starlight-blog": "^0.23.2",
     "starlight-typedoc": "^0.19.0",
     "tinybench": "^3.1.0",
@@ -60,7 +60,7 @@
     "@webgpu/types": "catalog:",
     "astro-vtbot": "^2.0.6",
     "autoprefixer": "^10.4.16",
-    "tailwindcss": "^4.1.6",
+    "tailwindcss": "^4.1.7",
     "tailwindcss-motion": "^1.0.1",
     "yaml": "^2.7.0"
   }

apps/typegpu-docs/src/content/docs/reference/data-schema-cheatsheet.mdx

@@ -2,33 +2,47 @@
 title: Data Schema Cheatsheet
 ---
 
-## Numeric data types
+## Scalar data types
 
 import { Code } from '@astrojs/starlight/components';
 
 | Schema | JavaScript | WGSL |
 | --- | --- | --- |
 | <Code code="import { f32 } from 'typegpu/data';" lang="js" />  | `number`  | `f32`  |
+| <Code code="import { f16 } from 'typegpu/data';" lang="js" />  | `number`  | `f16`  |
 | <Code code="import { i32 } from 'typegpu/data';" lang="js" />  | `number`  | `i32`  |
 | <Code code="import { u32 } from 'typegpu/data';" lang="js" />  | `number`  | `u32`  |
 | <Code code="import { bool } from 'typegpu/data';" lang="js" /> | `boolean` | `bool` |
 
 ## Vector and matrix types
 
-| Schema | Value constructors | WGSL equivalents |
+| <div style="width:5em">Schema</div> | Value constructors | <div style="width:5em">WGSL equivalents</div> |
 | --- | --- | --- |
 | `vec2u` | <ul><li>`vec2u(x: number, y: number)`</li> <li>`vec2u(xy: number)`</li> <li>`vec2u()`</li></ul> | vec2u, vec2\<u32\> |
 | `vec2f` | <ul><li>`vec2f(x: number, y: number)`</li> <li>`vec2f(xy: number)`</li> <li>`vec2f()`</li></ul> | vec2f, vec2\<f32\> |
 | `vec2i` | <ul><li>`vec2i(x: number, y: number)`</li> <li>`vec2i(xy: number)`</li> <li>`vec2i()`</li></ul> | vec2i, vec2\<i32\> |
 | `vec2h` | <ul><li>`vec2h(x: number, y: number)`</li> <li>`vec2h(xy: number)`</li> <li>`vec2h()`</li></ul> | vec2h, vec2\<f16\> |
+| `vec2b` | <ul><li>`vec2b(x: boolean, y: boolean)`</li> <li>`vec2b(xy: boolean)`</li> <li>`vec2b()`</li></ul> | vec2\<bool\> |
 | `vec3u` | <ul><li>`vec3u(x: number, y: number, z: number)`</li> <li>`vec3u(xyz: number)`</li> <li>`vec3u()`</li></ul>  | vec3u, vec3\<u32\> |
 | `vec3f` | <ul><li>`vec3f(x: number, y: number, z: number)`</li> <li>`vec3f(xyz: number)`</li> <li>`vec3f()`</li></ul>  | vec3f, vec3\<f32\> |
 | `vec3i` | <ul><li>`vec3i(x: number, y: number, z: number)`</li> <li>`vec3i(xyz: number)`</li> <li>`vec3i()`</li></ul>  | vec3i, vec3\<i32\> |
 | `vec3h` | <ul><li>`vec3h(x: number, y: number, z: number)`</li> <li>`vec3h(xyz: number)`</li> <li>`vec3h()`</li></ul>  | vec3h, vec3\<f16\> |
+| `vec3b` | <ul><li>`vec3b(x: boolean, y: boolean, z: boolean)`</li> <li>`vec3b(xyz: boolean)`</li> <li>`vec3b()`</li></ul>  | vec3\<bool\> |
 | `vec4u` | <ul><li>`vec4u(x: number, y: number, z: number, w: number)`</li> <li>`vec4u(xyzw: number)`</li> <li>`vec4u()`</li></ul>  | vec4u, vec4\<u32\> |
 | `vec4f` | <ul><li>`vec4f(x: number, y: number, z: number, w: number)`</li> <li>`vec4f(xyzw: number)`</li> <li>`vec4f()`</li></ul>  | vec4f, vec4\<f32\> |
 | `vec4i` | <ul><li>`vec4i(x: number, y: number, z: number, w: number)`</li> <li>`vec4i(xyzw: number)`</li> <li>`vec4i()`</li></ul>  | vec4i, vec4\<i32\> |
 | `vec4h` | <ul><li>`vec4h(x: number, y: number, z: number, w: number)`</li> <li>`vec4h(xyzw: number)`</li> <li>`vec4h()`</li></ul>  | vec4h, vec4\<f16\> |
-| `mat2x2f` | <ul><li>`mat2x2f(...elements: number[])`</li> <li>`mat2x2f(...columns: vec2f[])`</li> <li>`mat2x2f()`</li></ul>  | mat2x2f, mat2x2\<f32\> |
-| `mat3x3f` | <ul><li>`mat3x3f(...elements: number[])`</li> <li>`mat3x3f(...columns: vec3f[])`</li> <li>`mat3x3f()`</li></ul>  | mat3x3f, mat3x3\<f32\> |
-| `mat4x4f` | <ul><li>`mat4x4f(...elements: number[])`</li> <li>`mat4x4f(...columns: vec4f[])`</li> <li>`mat4x4f()`</li></ul>  | mat4x4f, mat4x4\<f32\> |
+| `vec4b` | <ul><li>`vec4b(x: boolean, y: boolean, z: boolean, w: boolean)`</li> <li>`vec4b(xyzw: boolean)`</li> <li>`vec4b()`</li></ul>  | vec4\<bool\> |
+| `mat2x2f` | <ul><li>`mat2x2f(...elements: [number, number, number, number])`</li> <li>`mat2x2f(...columns: [v2f, v2f])`</li> <li>`mat2x2f()`</li></ul>  | mat2x2f, mat2x2\<f32\> |
+| `mat3x3f` | <ul><li>`mat3x3f(...elements: [number, number, number, number, number, number, number, number, number])`</li> <li>`mat3x3f(...columns: [v3f, v3f, v3f])`</li> <li>`mat3x3f()`</li></ul>  | mat3x3f, mat3x3\<f32\> |
+| `mat4x4f` | <ul><li>`mat4x4f(...elements: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number])`</li> <li>`mat4x4f(...columns: [v4f, v4f, v4f, v4f])`</li> <li>`mat4x4f()`</li></ul>  | mat4x4f, mat4x4\<f32\> |
+
+Apart from the listed constructors, all vectors can be created from any mix of other vectors and numbers, like this:
+
+<Code code="
+import { vec2f, vec3f, vec4f } from 'typegpu/data';
+
+const a = vec2f(1, 2);  // 1, 2
+const b = vec3f(0, a);  // 0, 1, 2
+const c = vec4f(b.xz, a.xx);  // 0, 2, 1, 1 
+" lang="js" />

packages/typegpu/package.json

@@ -76,7 +76,7 @@
     "tsup": "catalog:",
     "typescript": "catalog:",
     "unplugin-typegpu": "workspace:*",
-    "wesl": "0.6.0-rc4",
+    "wesl": "0.6.7",
     "wgpu-matrix": "^3.4.0"
   },
   "packageManager": "[email protected]+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",

packages/typegpu/src/core/function/fnTypes.ts

@@ -1,4 +1,5 @@
 import type * as tinyest from 'tinyest';
+import type { BuiltinClipDistances } from '../../builtin.ts';
 import type { AnyAttribute } from '../../data/attributes.ts';
 import type {
   Decorated,
@@ -80,7 +81,10 @@ export type BaseIOData =
   | Vec3u
   | Vec4u;
 
-export type IOData = BaseIOData | Decorated<BaseIOData, AnyAttribute[]>;
+export type IOData =
+  | BaseIOData
+  | Decorated<BaseIOData, AnyAttribute[]>
+  | BuiltinClipDistances;
 
 export type IORecord<TElementType extends IOData = IOData> = Record<
   string,

packages/typegpu/src/core/function/ioOutputType.ts

@@ -18,7 +18,7 @@ import type { IOData, IOLayout, IORecord } from './fnTypes.ts';
 export type WithLocations<T extends IORecord> = {
   [Key in keyof T]: IsBuiltin<T[Key]> extends true ? T[Key]
     : HasCustomLocation<T[Key]> extends true ? T[Key]
-    : Decorate<T[Key], Location<number>>;
+    : Decorate<T[Key], Location>;
 };
 
 export type IOLayoutToSchema<T extends IOLayout> = T extends BaseData
@@ -52,7 +52,10 @@ export function withLocations<T extends IOData>(
   );
 }
 
-export function createOutputType<T extends IOData>(returnType: IOLayout<T>) {
+export function createIoSchema<
+  T extends IOData,
+  Layout extends IORecord<T> | IOLayout<T>,
+>(returnType: Layout) {
   return (
     isData(returnType)
       ? isVoid(returnType)
@@ -61,9 +64,5 @@ export function createOutputType<T extends IOData>(returnType: IOLayout<T>) {
         ? returnType
         : location(0, returnType)
       : struct(withLocations(returnType) as Record<string, T>)
-  ) as IOLayoutToSchema<IOLayout<T>>;
-}
-
-export function createStructFromIO<T extends IOData>(members: IORecord<T>) {
-  return struct(withLocations(members) as Record<string, T>);
+  ) as IOLayoutToSchema<Layout>;
 }

packages/typegpu/src/core/function/tgpuComputeFn.ts

@@ -1,11 +1,11 @@
 import type { AnyComputeBuiltin } from '../../builtin.ts';
-import { type AnyWgslStruct, Void } from '../../data/wgslTypes.ts';
+import { Void } from '../../data/wgslTypes.ts';
 import { getName, isNamable, setName, type TgpuNamable } from '../../name.ts';
 import { $getNameForward } from '../../shared/symbols.ts';
 import type { ResolutionCtx, SelfResolvable } from '../../types.ts';
 import { createFnCore, type FnCore } from './fnCore.ts';
-import type { Implementation, InferIO } from './fnTypes.ts';
-import { createStructFromIO } from './ioOutputType.ts';
+import type { Implementation, InferIO, IORecord } from './fnTypes.ts';
+import { createIoSchema, type IOLayoutToSchema } from './ioOutputType.ts';
 import { stripTemplate } from './templateUtils.ts';
 
 // ----------
@@ -16,9 +16,9 @@ import { stripTemplate } from './templateUtils.ts';
  * Describes a compute entry function signature (its arguments, return type and workgroup size)
  */
 type TgpuComputeFnShellHeader<
-  ComputeIn extends Record<string, AnyComputeBuiltin>,
+  ComputeIn extends IORecord<AnyComputeBuiltin>,
 > = {
-  readonly argTypes: [AnyWgslStruct] | [];
+  readonly argTypes: [IOLayoutToSchema<ComputeIn>] | [];
   readonly returnType: Void;
   readonly workgroupSize: [number, number, number];
   readonly isEntry: true;
@@ -30,7 +30,7 @@ type TgpuComputeFnShellHeader<
  * and passing the implementation (as WGSL string or JS function) as the argument.
  */
 export type TgpuComputeFnShell<
-  ComputeIn extends Record<string, AnyComputeBuiltin>,
+  ComputeIn extends IORecord<AnyComputeBuiltin>,
 > =
   & TgpuComputeFnShellHeader<ComputeIn>
   /**
@@ -66,12 +66,10 @@ export type TgpuComputeFnShell<
   };
 
 export interface TgpuComputeFn<
-  ComputeIn extends Record<string, AnyComputeBuiltin> = Record<
-    string,
-    AnyComputeBuiltin
-  >,
+  // biome-ignore lint/suspicious/noExplicitAny: to allow assigning any compute fn to TgpuComputeFn (non-generic) type
+  ComputeIn extends IORecord<AnyComputeBuiltin> = any,
 > extends TgpuNamable {
-  readonly shell: TgpuComputeFnShell<ComputeIn>;
+  readonly shell: TgpuComputeFnShellHeader<ComputeIn>;
 
   $uses(dependencyMap: Record<string, unknown>): this;
 }
@@ -86,7 +84,7 @@ export function computeFn(options: {
 }): TgpuComputeFnShell<{}>;
 
 export function computeFn<
-  ComputeIn extends Record<string, AnyComputeBuiltin>,
+  ComputeIn extends IORecord<AnyComputeBuiltin>,
 >(options: {
   in: ComputeIn;
   workgroupSize: number[];
@@ -102,14 +100,14 @@ export function computeFn<
  *   Size of blocks that the thread grid will be divided into (up to 3 dimensions).
  */
 export function computeFn<
-  ComputeIn extends Record<string, AnyComputeBuiltin>,
+  ComputeIn extends IORecord<AnyComputeBuiltin>,
 >(options: {
   in?: ComputeIn;
   workgroupSize: number[];
 }): TgpuComputeFnShell<ComputeIn> {
   const shell: TgpuComputeFnShellHeader<ComputeIn> = {
     argTypes: options.in && Object.keys(options.in).length !== 0
-      ? [createStructFromIO(options.in)]
+      ? [createIoSchema(options.in)]
       : [],
     returnType: Void,
     workgroupSize: [
@@ -139,7 +137,7 @@ export function computeFn<
 // Implementation
 // --------------
 
-function createComputeFn<ComputeIn extends Record<string, AnyComputeBuiltin>>(
+function createComputeFn<ComputeIn extends IORecord<AnyComputeBuiltin>>(
   shell: TgpuComputeFnShellHeader<ComputeIn>,
   workgroupSize: number[],
   implementation: Implementation,

packages/typegpu/src/core/function/tgpuFragmentFn.ts

@@ -3,13 +3,11 @@ import type {
   AnyFragmentOutputBuiltin,
   OmitBuiltins,
 } from '../../builtin.ts';
-import type { AnyAttribute } from '../../data/attributes.ts';
 import type {
-  AnyWgslStruct,
   Decorated,
+  Interpolate,
   Location,
   Vec4f,
-  Void,
 } from '../../data/wgslTypes.ts';
 import { getName, isNamable, setName, type TgpuNamable } from '../../name.ts';
 import { $getNameForward } from '../../shared/symbols.ts';
@@ -21,44 +19,38 @@ import type {
   BaseIOData,
   Implementation,
   InferIO,
+  IOLayout,
   IORecord,
 } from './fnTypes.ts';
-import {
-  createOutputType,
-  createStructFromIO,
-  type IOLayoutToSchema,
-} from './ioOutputType.ts';
+import { createIoSchema, type IOLayoutToSchema } from './ioOutputType.ts';
 import { stripTemplate } from './templateUtils.ts';
 
 // ----------
 // Public API
 // ----------
 
-export type FragmentOutConstrained =
-  | Void
-  | Vec4f
-  | Decorated<Vec4f, [Location<number>]>
-  | AnyFragmentOutputBuiltin
-  | IORecord<
-    Vec4f | Decorated<Vec4f, [Location<number>]> | AnyFragmentOutputBuiltin
-  >;
-
 export type FragmentInConstrained = IORecord<
   | BaseIOData
-  | Decorated<BaseIOData, AnyAttribute<never>[]>
+  | Decorated<BaseIOData, (Location | Interpolate)[]>
   | AnyFragmentInputBuiltin
 >;
 
+export type FragmentOutConstrained = IOLayout<
+  | Vec4f
+  | Decorated<Vec4f, (Location | Interpolate)[]>
+  | AnyFragmentOutputBuiltin
+>;
+
 /**
  * Describes a fragment entry function signature (its arguments, return type and targets)
  */
 type TgpuFragmentFnShellHeader<
   FragmentIn extends FragmentInConstrained,
   FragmentOut extends FragmentOutConstrained,
 > = {
-  readonly argTypes: [AnyWgslStruct] | [];
+  readonly argTypes: [IOLayoutToSchema<FragmentIn>] | [];
   readonly targets: FragmentOut;
-  readonly returnType: FragmentOut;
+  readonly returnType: IOLayoutToSchema<FragmentOut>;
   readonly isEntry: true;
 };
 
@@ -154,10 +146,10 @@ export function fragmentFn<
 }): TgpuFragmentFnShell<FragmentIn, FragmentOut> {
   const shell: TgpuFragmentFnShellHeader<FragmentIn, FragmentOut> = {
     argTypes: options.in && Object.keys(options.in).length !== 0
-      ? [createStructFromIO(options.in)]
+      ? [createIoSchema(options.in)]
       : [],
     targets: options.out,
-    returnType: createOutputType(options.out) as FragmentOut,
+    returnType: createIoSchema(options.out),
     isEntry: true,
   };
 
@@ -185,9 +177,7 @@ function createFragmentFn(
   type This = TgpuFragmentFn & SelfResolvable & { [$getNameForward]: FnCore };
 
   const core = createFnCore(shell, implementation);
-  const outputType = shell.returnType as IOLayoutToSchema<
-    typeof shell.returnType
-  >;
+  const outputType = shell.returnType;
   const inputType = shell.argTypes[0];
   if (typeof implementation === 'string') {
     addReturnTypeToExternals(