typegpu 0.3.4 → 0.4.0

package/index.d.ts

@@ -1,5 +1,5 @@
-import { A as AnyWgslData, I as Infer, D as Decorated, F as F32, a as F16, b as I32, U as U32, V as Vec2f, c as Vec3f, d as Vec4f, e as Vec2h, f as Vec3h, g as Vec4h, h as Vec2i, i as Vec3i, j as Vec4i, k as Vec2u, l as Vec3u, m as Vec4u, n as AnyWgslStruct, o as AnyData, B as BaseWgslData, L as Location, W as WgslArray, p as Disarray, K as KindToAcceptedAttribMap, q as Unstruct, r as VertexFormat, T as TgpuVertexAttrib, s as KindToDefaultFormatMap, M as MemIdentity, t as WgslTypeLiteral, u as AnyVecInstance, v as AnyMatInstance } from './wgslTypes-DHAmU620.js';
-import { T as TgpuNamable, E as Exotic, A as AnyAttribute, a as AnyComputeBuiltin, D as Default, U as UnionToIntersection, b as Decorate, c as TgpuStruct, I as IsBuiltin, H as HasCustomLocation, O as OmitBuiltins, d as OmitProps, P as Prettify, M as Mutable, e as Infer$1, f as ExoticArray } from './index-FeXoGB17.js';
+import { A as AnyWgslData, T as TgpuNamable, I as Infer, D as Decorated, F as F32, a as F16, b as I32, U as U32, V as Vec2f, c as Vec3f, d as Vec4f, e as Vec2h, f as Vec3h, g as Vec4h, h as Vec2i, i as Vec3i, j as Vec4i, k as Vec2u, l as Vec3u, m as Vec4u, n as AnyWgslStruct, o as Default, p as UnionToIntersection, W as WgslArray, q as Disarray, K as KindToAcceptedAttribMap, r as Unstruct, s as VertexFormat, t as TgpuVertexAttrib, u as KindToDefaultFormatMap, v as AnyData, B as BaseData, L as Location, w as WgslStruct, O as OmitProps, P as Prettify, M as Mutable, x as InferPartial, y as MemIdentity, z as WgslTypeLiteral, C as AnyVecInstance, E as AnyMatInstance } from './wgslTypes-BNsjCP--.js';
+import { A as AnyAttribute, a as AnyComputeBuiltin, D as Decorate, I as IsBuiltin, H as HasCustomLocation, O as OmitBuiltins, B as BuiltinSampleMask, b as BuiltinFragDepth } from './attributes-BQuRnaZ4.js';
 import * as smol from 'tinyest';
 import { Block } from 'tinyest';
 
@@ -10,7 +10,7 @@ interface TgpuConst<TDataType extends AnyWgslData = AnyWgslData> extends TgpuNam
 /**
  * Creates a module constant with specified value.
  */
-declare function constant<TDataType extends AnyWgslData>(dataType: Exotic<TDataType>, value: Infer<Exotic<TDataType>>): TgpuConst<Exotic<TDataType>>;
+declare function constant<TDataType extends AnyWgslData>(dataType: TDataType, value: Infer<TDataType>): TgpuConst<TDataType>;
 
 /**
  * Extra declaration that shall be included in final WGSL code,
@@ -56,11 +56,6 @@ type InferIO<T> = T extends {
 } ? Infer<T> : T extends Record<string, unknown> ? {
     [K in keyof T]: Infer<T[K]>;
 } : T;
-type ExoticIO<T> = T extends {
-    type: string;
-} ? Exotic<T> : T extends Record<string, unknown> ? {
-    [K in keyof T]: Exotic<T[K]>;
-} : T;
 
 /**
  * Describes a compute entry function signature (its arguments and return type)
@@ -369,7 +364,7 @@ declare function isUsableAsSampled<T>(value: T): value is T & Sampled;
 declare function isUsableAsRender<T>(value: T): value is T & Render;
 
 type ResolveStorageDimension<TDimension extends GPUTextureViewDimension, TProps extends TextureProps> = StorageTextureDimension extends TDimension ? Default<TProps['dimension'], '2d'> : TDimension extends StorageTextureDimension ? TDimension : '2d';
-type ViewUsages<TProps extends TextureProps, TTexture extends TgpuTexture<TProps>> = boolean extends TTexture['usableAsSampled'] ? boolean extends TTexture['usableAsStorage'] ? never : 'readonly' | 'writeonly' | 'mutable' : boolean extends TTexture['usableAsStorage'] ? 'sampled' : 'readonly' | 'writeonly' | 'mutable' | 'sampled';
+type ViewUsages$1<TProps extends TextureProps, TTexture extends TgpuTexture<TProps>> = boolean extends TTexture['usableAsSampled'] ? boolean extends TTexture['usableAsStorage'] ? never : 'readonly' | 'writeonly' | 'mutable' : boolean extends TTexture['usableAsStorage'] ? 'sampled' : 'readonly' | 'writeonly' | 'mutable' | 'sampled';
 type ChannelData = U32 | I32 | F32;
 type TexelData = Vec4u | Vec4i | Vec4f;
 /**
@@ -383,7 +378,7 @@ interface TgpuTexture<TProps extends TextureProps = TextureProps> extends TgpuNa
     readonly usableAsSampled: boolean;
     readonly usableAsRender: boolean;
     $usage<T extends AllowedUsages<TProps>[]>(...usages: T): this & UnionToIntersection<LiteralToExtensionMap[T[number]]>;
-    createView<TUsage extends ViewUsages<TProps, this>, TDimension extends 'sampled' extends TUsage ? GPUTextureViewDimension : StorageTextureDimension, TFormat extends 'sampled' extends TUsage ? SampledFormatOptions<TProps> : StorageFormatOptions<TProps>>(access: TUsage, params?: TextureViewParams<TDimension, TFormat>): {
+    createView<TUsage extends ViewUsages$1<TProps, this>, TDimension extends 'sampled' extends TUsage ? GPUTextureViewDimension : StorageTextureDimension, TFormat extends 'sampled' extends TUsage ? SampledFormatOptions<TProps> : StorageFormatOptions<TProps>>(access: TUsage, params?: TextureViewParams<TDimension, TFormat>): {
         mutable: TgpuMutableTexture<ResolveStorageDimension<TDimension, TProps>, TexelFormatToDataTypeOrNever<StorageFormatOptions<TProps> extends TFormat ? TProps['format'] : TFormat>>;
         readonly: TgpuReadonlyTexture<ResolveStorageDimension<TDimension, TProps>, TexelFormatToDataTypeOrNever<StorageFormatOptions<TProps> extends TFormat ? TProps['format'] : TFormat>>;
         writeonly: TgpuWriteonlyTexture<ResolveStorageDimension<TDimension, TProps>, TexelFormatToDataTypeOrNever<StorageFormatOptions<TProps> extends TFormat ? TProps['format'] : TFormat>>;
@@ -443,26 +438,64 @@ declare function isStorageTextureView<T extends TgpuReadonlyTexture | TgpuWriteo
 declare function isSampledTextureView<T extends TgpuSampledTexture>(value: unknown | T): value is T;
 type TgpuAnyTextureView = TgpuReadonlyTexture | TgpuWriteonlyTexture | TgpuMutableTexture | TgpuSampledTexture;
 
+/**
+ * The array can hold T, where T is a single/multi-component numeric, or a struct with members of type T.
+ * Examples of valid array members:
+ * - Vec3f,
+ * - unorm8x2
+ * - WgslStruct<{ a: Vec3f, b: unorm8x2 }>
+ * - WgslStruct<{ nested: WgslStruct<{ a: Vec3f }> }>
+ */
+type DataToContainedAttribs<T> = T extends AnyWgslStruct | Unstruct ? {
+    [Key in keyof T['propTypes']]: DataToContainedAttribs<T['propTypes'][Key]>;
+} : T extends {
+    type: VertexFormat;
+} ? TgpuVertexAttrib<T['type']> : T extends {
+    type: keyof KindToDefaultFormatMap;
+} ? TgpuVertexAttrib<KindToDefaultFormatMap[T['type']]> : never;
+/**
+ * Interprets an array as a set of vertex attributes.
+ */
+type ArrayToContainedAttribs<T extends WgslArray | Disarray> = DataToContainedAttribs<T['elementType']>;
+type LayoutToAllowedAttribs<T> = T extends {
+    type: keyof KindToAcceptedAttribMap;
+} ? KindToAcceptedAttribMap[T['type']] : T extends Record<string, unknown> ? {
+    [Key in keyof T]: LayoutToAllowedAttribs<T[Key]>;
+} : never;
+
+interface TgpuVertexLayout<TData extends WgslArray | Disarray = WgslArray | Disarray> extends TgpuNamable, Labelled {
+    readonly resourceType: 'vertex-layout';
+    readonly stride: number;
+    readonly stepMode: 'vertex' | 'instance';
+    readonly attrib: ArrayToContainedAttribs<TData>;
+    readonly vertexLayout: GPUVertexBufferLayout;
+    schemaForCount(n: number): TData;
+}
+declare function vertexLayout<TData extends WgslArray | Disarray>(schemaForCount: (count: number) => TData, stepMode?: 'vertex' | 'instance'): TgpuVertexLayout<TData>;
+
 interface Unwrapper {
     readonly device: GPUDevice;
     unwrap(resource: TgpuComputePipeline): GPUComputePipeline;
     unwrap(resource: TgpuBindGroupLayout): GPUBindGroupLayout;
     unwrap(resource: TgpuBindGroup): GPUBindGroup;
-    unwrap(resource: TgpuBuffer$1<AnyData>): GPUBuffer;
+    unwrap(resource: TgpuBuffer<AnyData>): GPUBuffer;
     unwrap(resource: TgpuTexture): GPUTexture;
     unwrap(resource: TgpuReadonlyTexture | TgpuWriteonlyTexture | TgpuMutableTexture | TgpuSampledTexture): GPUTextureView;
+    unwrap(resource: TgpuVertexLayout): GPUVertexBufferLayout;
 }
 
 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>>;
 };
-type IOLayoutToSchema<T extends IOLayout> = T extends BaseWgslData ? Decorate<T, Location<0>> : T extends IORecord ? TgpuStruct<WithLocations<T>> : never;
+type IOLayoutToSchema<T extends IOLayout> = T extends BaseData ? Decorate<T, Location<0>> : T extends IORecord ? WgslStruct<WithLocations<T>> : never;
 
+type FragmentOutConstrained = Vec4f | Decorated<Vec4f, [Location<number>]> | BuiltinSampleMask | BuiltinFragDepth | IORecord<Vec4f | Decorated<Vec4f, [Location<number>]> | BuiltinSampleMask | BuiltinFragDepth>;
 /**
  * Describes a fragment entry function signature (its arguments and return type)
  */
-interface TgpuFragmentFnShell<FragmentIn extends IOLayout, FragmentOut extends IOLayout<Vec4f>> {
-    readonly argTypes: [FragmentIn];
+interface TgpuFragmentFnShell<FragmentIn extends IOLayout, FragmentOut extends FragmentOutConstrained> {
+    readonly argTypes: [AnyWgslStruct];
+    readonly targets: FragmentOut;
     readonly returnType: FragmentOut;
     /**
      * Creates a type-safe implementation of this signature
@@ -476,7 +509,7 @@ interface TgpuFragmentFnShell<FragmentIn extends IOLayout, FragmentOut extends I
      */
     does(implementation: string): TgpuFragmentFn<OmitBuiltins<FragmentIn>, OmitBuiltins<FragmentOut>>;
 }
-interface TgpuFragmentFn<Varying extends IOLayout = IOLayout, Output extends IOLayout<Vec4f> = IOLayout<Vec4f>> extends TgpuNamable {
+interface TgpuFragmentFn<Varying extends IOLayout = IOLayout, Output extends FragmentOutConstrained = FragmentOutConstrained> extends TgpuNamable {
     readonly shell: TgpuFragmentFnShell<Varying, Output>;
     readonly outputType: IOLayoutToSchema<Output>;
     $uses(dependencyMap: Record<string, unknown>): this;
@@ -493,7 +526,7 @@ interface TgpuFragmentFn<Varying extends IOLayout = IOLayout, Output extends IOL
  *   A `vec4f`, signaling this function outputs a color for one target, or a struct/array containing
  *   colors for multiple targets.
  */
-declare function fragmentFn<FragmentIn extends IORecord, FragmentOut extends IOLayout<Vec4f>>(inputType: FragmentIn, outputType: FragmentOut): TgpuFragmentFnShell<ExoticIO<FragmentIn>, ExoticIO<FragmentOut>>;
+declare function fragmentFn<FragmentIn extends IORecord, FragmentOut extends FragmentOutConstrained>(inputType: FragmentIn, outputType: FragmentOut): TgpuFragmentFnShell<FragmentIn, FragmentOut>;
 
 /**
  * Describes a vertex entry function signature (its arguments and return type)
@@ -531,46 +564,12 @@ interface TgpuVertexFn<VertexIn extends IOLayout = IOLayout, VertexOut extends I
  *   A struct type containing the final position of the vertex, and any information
  *   passed onto the fragment shader stage.
  */
-declare function vertexFn<VertexIn extends IORecord, VertexOut extends IORecord>(inputType: VertexIn, outputType: VertexOut): TgpuVertexFnShell<ExoticIO<VertexIn>, ExoticIO<VertexOut>>;
-
-/**
- * The array can hold T, where T is a single/multi-component numeric, or a struct with members of type T.
- * Examples of valid array members:
- * - Vec3f,
- * - unorm8x2
- * - TgpuStruct<{ a: Vec3f, b: unorm8x2 }>
- * - TgpuStruct<{ nested: TgpuStruct<{ a: Vec3f }> }>
- */
-type DataToContainedAttribs<T> = T extends AnyWgslStruct | Unstruct ? {
-    [Key in keyof T['propTypes']]: DataToContainedAttribs<T['propTypes'][Key]>;
-} : T extends {
-    type: VertexFormat;
-} ? TgpuVertexAttrib<T['type']> : T extends {
-    type: keyof KindToDefaultFormatMap;
-} ? TgpuVertexAttrib<KindToDefaultFormatMap[T['type']]> : never;
-/**
- * Interprets an array as a set of vertex attributes.
- */
-type ArrayToContainedAttribs<T extends WgslArray | Disarray> = DataToContainedAttribs<T['elementType']>;
-type LayoutToAllowedAttribs<T> = T extends {
-    type: keyof KindToAcceptedAttribMap;
-} ? KindToAcceptedAttribMap[T['type']] : T extends Record<string, unknown> ? {
-    [Key in keyof T]: LayoutToAllowedAttribs<T[Key]>;
-} : never;
-
-interface TgpuVertexLayout<TData extends WgslArray | Disarray = WgslArray | Disarray> extends TgpuNamable, Labelled {
-    readonly resourceType: 'vertex-layout';
-    readonly stride: number;
-    readonly stepMode: 'vertex' | 'instance';
-    readonly attrib: ArrayToContainedAttribs<TData>;
-    schemaForCount(n: number): TData;
-}
-declare function vertexLayout<TData extends WgslArray | Disarray>(schemaForCount: (count: number) => TData, stepMode?: 'vertex' | 'instance'): TgpuVertexLayout<ExoticIO<TData>>;
+declare function vertexFn<VertexIn extends IORecord, VertexOut extends IORecord>(inputType: VertexIn, outputType: VertexOut): TgpuVertexFnShell<VertexIn, VertexOut>;
 
 interface TgpuRenderPipeline<Output extends IOLayout = IOLayout> extends TgpuNamable {
     readonly resourceType: 'render-pipeline';
     readonly label: string | undefined;
-    with<TData extends WgslArray | Disarray>(vertexLayout: TgpuVertexLayout<TData>, buffer: TgpuBuffer$1<TData> & Vertex): TgpuRenderPipeline<IOLayout>;
+    with<TData extends WgslArray | Disarray>(vertexLayout: TgpuVertexLayout<TData>, buffer: TgpuBuffer<TData> & Vertex): TgpuRenderPipeline<IOLayout>;
     with<Entries extends Record<string, TgpuLayoutEntry | null>>(bindGroupLayout: TgpuBindGroupLayout<Entries>, bindGroup: TgpuBindGroup<Entries>): TgpuRenderPipeline<IOLayout>;
     withColorAttachment(attachment: FragmentOutToColorAttachment<Output>): TgpuRenderPipeline<IOLayout>;
     withDepthStencilAttachment(attachment: DepthStencilAttachment): TgpuRenderPipeline<IOLayout>;
@@ -677,7 +676,7 @@ interface DepthStencilAttachment {
 interface WithCompute {
     createPipeline(): TgpuComputePipeline;
 }
-type ValidateFragmentIn<VertexOut extends IORecord, FragmentIn extends IORecord, FragmentOut extends IOLayout<Vec4f>> = FragmentIn extends Partial<VertexOut> ? VertexOut extends FragmentIn ? [
+type ValidateFragmentIn<VertexOut extends IORecord, FragmentIn extends IORecord, FragmentOut extends FragmentOutConstrained> = FragmentIn extends Partial<VertexOut> ? VertexOut extends FragmentIn ? [
     entryFn: TgpuFragmentFn<FragmentIn, FragmentOut>,
     targets: FragmentOutToTargets<FragmentOut>
 ] : [
@@ -694,9 +693,9 @@ type ValidateFragmentIn<VertexOut extends IORecord, FragmentIn extends IORecord,
     }
 ];
 interface WithVertex<VertexOut extends IORecord = IORecord> {
-    withFragment<FragmentIn extends IORecord, FragmentOut extends IOLayout<Vec4f>>(...args: ValidateFragmentIn<VertexOut, FragmentIn, FragmentOut>): WithFragment<FragmentOut>;
+    withFragment<FragmentIn extends IORecord, FragmentOut extends FragmentOutConstrained>(...args: ValidateFragmentIn<VertexOut, FragmentIn, FragmentOut>): WithFragment<FragmentOut>;
 }
-interface WithFragment<Output extends IOLayout<Vec4f> = IOLayout<Vec4f>> {
+interface WithFragment<Output extends FragmentOutConstrained = FragmentOutConstrained> {
     withPrimitive(primitiveState: GPUPrimitiveState | undefined): WithFragment<Output>;
     withDepthStencil(depthStencilState: GPUDepthStencilState | undefined): WithFragment<Output>;
     createPipeline(): TgpuRenderPipeline<Output>;
@@ -761,7 +760,7 @@ interface TgpuRoot extends Unwrapper {
      * @param typeSchema The type of data that this buffer will hold.
      * @param initial The initial value of the buffer. (optional)
      */
-    createBuffer<TData extends AnyData>(typeSchema: TData, initial?: Infer<Exotic<TData>> | undefined): TgpuBuffer$1<Exotic<TData>>;
+    createBuffer<TData extends AnyData>(typeSchema: TData, initial?: Infer<TData> | undefined): TgpuBuffer<TData>;
     /**
      * Allocates memory on the GPU, allows passing data between host and shader.
      *
@@ -771,7 +770,7 @@ interface TgpuRoot extends Unwrapper {
      * @param typeSchema The type of data that this buffer will hold.
      * @param gpuBuffer A vanilla WebGPU buffer.
      */
-    createBuffer<TData extends AnyData>(typeSchema: TData, gpuBuffer: GPUBuffer): TgpuBuffer$1<Exotic<TData>>;
+    createBuffer<TData extends AnyData>(typeSchema: TData, gpuBuffer: GPUBuffer): TgpuBuffer<TData>;
     /**
      * Creates a group of resources that can be bound to a shader based on a specified layout.
      *
@@ -815,6 +814,9 @@ interface ExperimentalTgpuRoot extends TgpuRoot, WithBinding {
      * hold the same value until `flush()` is called.
      */
     readonly commandEncoder: GPUCommandEncoder;
+    createUniform<TData extends AnyWgslData>(typeSchema: TData, initialOrBuffer?: Infer<TData> | GPUBuffer): TgpuBufferUniform<TData> & TgpuFixedBufferUsage<TData>;
+    createMutable<TData extends AnyWgslData>(typeSchema: TData, initialOrBuffer?: Infer<TData> | GPUBuffer): TgpuBufferMutable<TData> & TgpuFixedBufferUsage<TData>;
+    createReadonly<TData extends AnyWgslData>(typeSchema: TData, initialOrBuffer?: Infer<TData> | GPUBuffer): TgpuBufferReadonly<TData> & TgpuFixedBufferUsage<TData>;
     createTexture<TWidth extends number, THeight extends number, TDepth extends number, TSize extends readonly [TWidth] | readonly [TWidth, THeight] | readonly [TWidth, THeight, TDepth], TFormat extends GPUTextureFormat, TMipLevelCount extends number, TSampleCount extends number, TViewFormat extends GPUTextureFormat, TDimension extends GPUTextureDimension>(props: CreateTextureOptions<TSize, TFormat, TMipLevelCount, TSampleCount, TViewFormat, TDimension>): TgpuTexture<CreateTextureResult<TSize, TFormat, TMipLevelCount, TSampleCount, TViewFormat, TDimension>>;
     /**
      * Causes all commands enqueued by pipelines to be
@@ -826,30 +828,38 @@ interface ExperimentalTgpuRoot extends TgpuRoot, WithBinding {
 interface Uniform {
     usableAsUniform: true;
 }
-declare const Uniform: Uniform;
 interface Vertex {
     usableAsVertex: true;
 }
-declare const Vertex: Vertex;
 type LiteralToUsageType<T extends 'uniform' | 'storage' | 'vertex'> = T extends 'uniform' ? Uniform : T extends 'storage' ? Storage : T extends 'vertex' ? Vertex : never;
-interface TgpuBuffer$1<TData extends AnyData> extends TgpuNamable {
+type ViewUsages<TBuffer extends TgpuBuffer<BaseData>> = (boolean extends TBuffer['usableAsUniform'] ? never : 'uniform') | (boolean extends TBuffer['usableAsStorage'] ? never : 'readonly' | 'mutable');
+type UsageTypeToBufferUsage<TData extends BaseData> = {
+    uniform: TgpuBufferUniform<TData> & TgpuFixedBufferUsage<TData>;
+    mutable: TgpuBufferMutable<TData> & TgpuFixedBufferUsage<TData>;
+    readonly: TgpuBufferReadonly<TData> & TgpuFixedBufferUsage<TData>;
+};
+interface TgpuBuffer<TData extends BaseData> extends TgpuNamable {
     readonly resourceType: 'buffer';
     readonly dataType: TData;
     readonly initial?: Infer<TData> | undefined;
     readonly label: string | undefined;
     readonly buffer: GPUBuffer;
     readonly destroyed: boolean;
+    usableAsUniform: boolean;
+    usableAsStorage: boolean;
+    usableAsVertex: boolean;
     $usage<T extends RestrictVertexUsages<TData>>(...usages: T): this & UnionToIntersection<LiteralToUsageType<T[number]>>;
     $addFlags(flags: GPUBufferUsageFlags): this;
+    as<T extends ViewUsages<this>>(usage: T): UsageTypeToBufferUsage<TData>[T];
     write(data: Infer<TData>): void;
-    copyFrom(srcBuffer: TgpuBuffer$1<MemIdentity<TData>>): void;
+    writePartial(data: InferPartial<TData>): void;
+    copyFrom(srcBuffer: TgpuBuffer<MemIdentity<TData>>): void;
     read(): Promise<Infer<TData>>;
     destroy(): void;
 }
-declare function isBuffer<T extends TgpuBuffer$1<AnyData>>(value: T | unknown): value is T;
-declare function isUsableAsUniform<T extends TgpuBuffer$1<AnyData>>(buffer: T): buffer is T & Uniform;
-declare function isUsableAsVertex<T extends TgpuBuffer$1<AnyData>>(buffer: T): buffer is T & Vertex;
-type RestrictVertexUsages<TData extends AnyData> = TData extends {
+declare function isBuffer<T extends TgpuBuffer<AnyData>>(value: T | unknown): value is T;
+declare function isUsableAsVertex<T extends TgpuBuffer<AnyData>>(buffer: T): buffer is T & Vertex;
+type RestrictVertexUsages<TData extends BaseData> = TData extends {
     readonly type: WgslTypeLiteral;
 } ? ('uniform' | 'storage' | 'vertex')[] : 'vertex'[];
 
@@ -1002,7 +1012,7 @@ type TgpuLayoutExternalTexture = TgpuLayoutEntryBase & {
     externalTexture: Record<string, never>;
 };
 type TgpuLayoutEntry = TgpuLayoutUniform | TgpuLayoutStorage | TgpuLayoutSampler | TgpuLayoutComparisonSampler | TgpuLayoutTexture | TgpuLayoutStorageTexture | TgpuLayoutExternalTexture;
-type UnwrapRuntimeConstructorInner<T extends BaseWgslData | ((_: number) => BaseWgslData)> = T extends (_: number) => BaseWgslData ? ReturnType<T> : T;
+type UnwrapRuntimeConstructorInner<T extends BaseData | ((_: number) => BaseData)> = T extends (_: number) => BaseData ? ReturnType<T> : T;
 type UnwrapRuntimeConstructor<T extends AnyData | ((_: number) => AnyData)> = T extends unknown ? UnwrapRuntimeConstructorInner<T> : never;
 interface TgpuBindGroupLayout<Entries extends Record<string, TgpuLayoutEntry | null> = Record<string, TgpuLayoutEntry | null>> extends TgpuNamable {
     readonly resourceType: 'bind-group-layout';
@@ -1039,7 +1049,7 @@ interface TgpuBindGroupLayout<Entries extends Record<string, TgpuLayoutEntry | n
 }
 type StorageUsageForEntry<T extends TgpuLayoutStorage> = T extends {
     access?: infer Access;
-} ? 'mutable' | 'readonly' extends Access ? TgpuBufferReadonly$1<UnwrapRuntimeConstructor<T['storage']>> | TgpuBufferMutable$1<UnwrapRuntimeConstructor<T['storage']>> : 'readonly' extends Access ? TgpuBufferReadonly$1<UnwrapRuntimeConstructor<T['storage']>> : 'mutable' extends Access ? TgpuBufferMutable$1<UnwrapRuntimeConstructor<T['storage']>> : TgpuBufferReadonly$1<UnwrapRuntimeConstructor<T['storage']>> | TgpuBufferMutable$1<UnwrapRuntimeConstructor<T['storage']>> : TgpuBufferReadonly$1<UnwrapRuntimeConstructor<T['storage']>>;
+} ? 'mutable' | 'readonly' extends Access ? TgpuBufferReadonly<UnwrapRuntimeConstructor<T['storage']>> | TgpuBufferMutable<UnwrapRuntimeConstructor<T['storage']>> : 'readonly' extends Access ? TgpuBufferReadonly<UnwrapRuntimeConstructor<T['storage']>> : 'mutable' extends Access ? TgpuBufferMutable<UnwrapRuntimeConstructor<T['storage']>> : TgpuBufferReadonly<UnwrapRuntimeConstructor<T['storage']>> | TgpuBufferMutable<UnwrapRuntimeConstructor<T['storage']>> : TgpuBufferReadonly<UnwrapRuntimeConstructor<T['storage']>>;
 type GetUsageForStorageTexture<T extends TgpuLayoutStorageTexture, TAccess extends 'readonly' | 'writeonly' | 'mutable'> = {
     mutable: TgpuMutableTexture<Default<GetDimension<T['viewDimension']>, '2d'>, TexelFormatToDataType[T['storageTexture']]>;
     readonly: TgpuReadonlyTexture<Default<GetDimension<T['viewDimension']>, '2d'>, TexelFormatToDataType[T['storageTexture']]>;
@@ -1061,38 +1071,46 @@ type GetStorageTextureRestriction<T extends TgpuLayoutStorageTexture> = Default<
     format: T['storageTexture'];
     dimension: Dimension;
 } : never;
-type LayoutEntryToInput<T extends TgpuLayoutEntry | null> = T extends TgpuLayoutUniform ? (TgpuBuffer$1<UnwrapRuntimeConstructor<T['uniform']>> & Uniform) | GPUBuffer : T extends TgpuLayoutStorage ? (TgpuBuffer$1<UnwrapRuntimeConstructor<T['storage']>> & Storage) | GPUBuffer : T extends TgpuLayoutSampler ? TgpuSampler | GPUSampler : T extends TgpuLayoutComparisonSampler ? TgpuComparisonSampler | GPUSampler : T extends TgpuLayoutTexture ? GPUTextureView | (Sampled & TgpuTexture<Prettify<TextureProps & GetTextureRestriction<T>>>) : T extends TgpuLayoutStorageTexture ? GPUTextureView | (Storage & TgpuTexture<Prettify<TextureProps & GetStorageTextureRestriction<T>>>) : T extends TgpuLayoutExternalTexture ? GPUExternalTexture : never;
-type BindLayoutEntry<T extends TgpuLayoutEntry | null> = T extends TgpuLayoutUniform ? TgpuBufferUniform$1<UnwrapRuntimeConstructor<T['uniform']>> : T extends TgpuLayoutStorage ? StorageUsageForEntry<T> : T extends TgpuLayoutSampler ? TgpuSampler : T extends TgpuLayoutComparisonSampler ? TgpuComparisonSampler : T extends TgpuLayoutTexture ? TgpuSampledTexture<Default<GetDimension<T['viewDimension']>, '2d'>, ChannelFormatToSchema[T['texture']]> : T extends TgpuLayoutStorageTexture ? StorageTextureUsageForEntry<T> : never;
+type LayoutEntryToInput<T extends TgpuLayoutEntry | null> = T extends TgpuLayoutUniform ? (TgpuBuffer<UnwrapRuntimeConstructor<T['uniform']>> & Uniform) | GPUBuffer : T extends TgpuLayoutStorage ? (TgpuBuffer<UnwrapRuntimeConstructor<T['storage']>> & Storage) | GPUBuffer : T extends TgpuLayoutSampler ? TgpuSampler | GPUSampler : T extends TgpuLayoutComparisonSampler ? TgpuComparisonSampler | GPUSampler : T extends TgpuLayoutTexture ? GPUTextureView | (Sampled & TgpuTexture<Prettify<TextureProps & GetTextureRestriction<T>>>) : T extends TgpuLayoutStorageTexture ? GPUTextureView | (Storage & TgpuTexture<Prettify<TextureProps & GetStorageTextureRestriction<T>>>) : T extends TgpuLayoutExternalTexture ? GPUExternalTexture : never;
+type BindLayoutEntry<T extends TgpuLayoutEntry | null> = T extends TgpuLayoutUniform ? TgpuBufferUniform<UnwrapRuntimeConstructor<T['uniform']>> : T extends TgpuLayoutStorage ? StorageUsageForEntry<T> : T extends TgpuLayoutSampler ? TgpuSampler : T extends TgpuLayoutComparisonSampler ? TgpuComparisonSampler : T extends TgpuLayoutTexture ? TgpuSampledTexture<Default<GetDimension<T['viewDimension']>, '2d'>, ChannelFormatToSchema[T['texture']]> : T extends TgpuLayoutStorageTexture ? StorageTextureUsageForEntry<T> : never;
 type TgpuBindGroup<Entries extends Record<string, TgpuLayoutEntry | null> = Record<string, TgpuLayoutEntry | null>> = {
     readonly resourceType: 'bind-group';
     readonly layout: TgpuBindGroupLayout<Entries>;
     unwrap(unwrapper: Unwrapper): GPUBindGroup;
 };
-type ExoticEntry<T> = T extends Record<string | number | symbol, unknown> ? {
-    [Key in keyof T]: T[Key] extends BaseWgslData ? Exotic<T[Key]> : T[Key] extends (...args: infer TArgs) => infer TReturn ? (...args: TArgs) => Exotic<TReturn> : T[Key];
-} : T;
-type ExoticEntries<T extends Record<string, TgpuLayoutEntry | null>> = {
-    [BindingKey in keyof T]: ExoticEntry<T[BindingKey]>;
-};
-declare function bindGroupLayout<Entries extends Record<string, TgpuLayoutEntry | null>>(entries: Entries): TgpuBindGroupLayout<Prettify<ExoticEntries<Entries>>>;
+declare function bindGroupLayout<Entries extends Record<string, TgpuLayoutEntry | null>>(entries: Entries): TgpuBindGroupLayout<Prettify<Entries>>;
 
-interface TgpuBufferUsage<TData extends BaseWgslData = BaseWgslData, TUsage extends BindableBufferUsage = BindableBufferUsage> {
+interface TgpuBufferUsage<TData extends BaseData = BaseData, TUsage extends BindableBufferUsage = BindableBufferUsage> {
     readonly resourceType: 'buffer-usage';
     readonly usage: TUsage;
     readonly '~repr': Infer<TData>;
     value: Infer<TData>;
 }
-interface TgpuBufferUniform$1<TData extends BaseWgslData> extends TgpuBufferUsage<TData, 'uniform'> {
+interface TgpuBufferUniform<TData extends BaseData> extends TgpuBufferUsage<TData, 'uniform'> {
     readonly value: Infer<TData>;
 }
-interface TgpuBufferReadonly$1<TData extends BaseWgslData> extends TgpuBufferUsage<TData, 'readonly'> {
+interface TgpuBufferReadonly<TData extends BaseData> extends TgpuBufferUsage<TData, 'readonly'> {
     readonly value: Infer<TData>;
 }
-interface TgpuBufferMutable$1<TData extends BaseWgslData> extends TgpuBufferUsage<TData, 'mutable'> {
+interface TgpuFixedBufferUsage<TData extends BaseData> extends TgpuNamable {
+    readonly buffer: TgpuBuffer<TData>;
+    write(data: Infer<TData>): void;
+}
+interface TgpuBufferMutable<TData extends BaseData> extends TgpuBufferUsage<TData, 'mutable'> {
 }
-declare function asMutable<TData extends AnyWgslData>(buffer: TgpuBuffer$1<TData> & Storage): TgpuBufferMutable$1<TData>;
-declare function asReadonly<TData extends AnyWgslData>(buffer: TgpuBuffer$1<TData> & Storage): TgpuBufferReadonly$1<TData>;
-declare function asUniform<TData extends AnyWgslData>(buffer: TgpuBuffer$1<TData> & Uniform): TgpuBufferUniform$1<TData>;
+declare function isUsableAsUniform<T extends TgpuBuffer<AnyData>>(buffer: T): buffer is T & Uniform;
+/**
+ * @deprecated Use buffer.as('mutable') instead.
+ */
+declare function asMutable<TData extends AnyWgslData>(buffer: TgpuBuffer<TData> & Storage): TgpuBufferMutable<TData> & TgpuFixedBufferUsage<TData>;
+/**
+ * @deprecated Use buffer.as('readonly') instead.
+ */
+declare function asReadonly<TData extends AnyWgslData>(buffer: TgpuBuffer<TData> & Storage): TgpuBufferReadonly<TData> & TgpuFixedBufferUsage<TData>;
+/**
+ * @deprecated Use buffer.as('uniform') instead.
+ */
+declare function asUniform<TData extends AnyWgslData>(buffer: TgpuBuffer<TData> & Uniform): TgpuBufferUniform<TData> & TgpuFixedBufferUsage<TData>;
 
 interface TgpuExternalTexture {
     readonly resourceType: 'external-texture';
@@ -1109,7 +1127,7 @@ interface TgpuVar<TScope extends VariableScope = VariableScope, TDataType extend
  * @param dataType The schema of the held data's type
  * @param initialValue If not provided, the variable will be initialized to the dataType's "zero-value".
  */
-declare function privateVar<TDataType extends AnyWgslData>(dataType: Exotic<TDataType>, initialValue?: Infer<Exotic<TDataType>>): TgpuVar<'private', Exotic<TDataType>>;
+declare function privateVar<TDataType extends AnyWgslData>(dataType: TDataType, initialValue?: Infer<TDataType>): TgpuVar<'private', TDataType>;
 /**
  * Defines a variable scoped to the whole workgroup, shared between entry functions
  * of the same invocation.
@@ -1118,7 +1136,7 @@ declare function privateVar<TDataType extends AnyWgslData>(dataType: Exotic<TDat
  */
 declare function workgroupVar<TDataType extends AnyWgslData>(dataType: TDataType): TgpuVar<'workgroup', TDataType>;
 
-type ResolvableObject = SelfResolvable | TgpuBufferUsage | TgpuConst | TgpuDeclare | TgpuFn | TgpuComputeFn | TgpuFragmentFn | TgpuComputePipeline | TgpuRenderPipeline | TgpuVertexFn | TgpuSampler | TgpuAccessor | TgpuExternalTexture | TgpuTexture | TgpuAnyTextureView | TgpuVar | AnyVecInstance | AnyMatInstance | AnyWgslData | TgpuFn<any, any>;
+type ResolvableObject = SelfResolvable | TgpuBufferUsage | TgpuConst | TgpuDeclare | TgpuFn | TgpuComputeFn | TgpuFragmentFn | TgpuComputePipeline | TgpuRenderPipeline | TgpuVertexFn | TgpuSampler | TgpuAccessor | TgpuExternalTexture | TgpuTexture | TgpuAnyTextureView | TgpuVar | AnyVecInstance | AnyMatInstance | AnyData | TgpuFn<any, any>;
 type Wgsl = Eventual<string | number | boolean | ResolvableObject>;
 declare const UnknownData: unique symbol;
 type UnknownData = typeof UnknownData;
@@ -1161,7 +1179,7 @@ interface ResolutionCtx {
      */
     unwrap<T>(eventual: Eventual<T>): T;
     resolve(item: unknown): string;
-    resolveValue<T extends BaseWgslData>(value: Infer<T>, schema: T): string;
+    resolveValue<T extends BaseData>(value: Infer<T>, schema: T): string;
     transpileFn(fn: string): {
         argNames: string[];
         body: Block;
@@ -1210,11 +1228,11 @@ interface TgpuFnBase<Args extends AnyWgslData[], Return extends AnyWgslData | un
     readonly '~providing'?: Providing | undefined;
     $uses(dependencyMap: Record<string, unknown>): this;
     with<T>(slot: TgpuSlot<T>, value: Eventual<T>): TgpuFn<Args, Return>;
-    with<T extends AnyWgslData>(accessor: TgpuAccessor<T>, value: TgpuFn<[], T> | TgpuBufferUsage<T> | Infer$1<T>): TgpuFn<Args, Return>;
+    with<T extends AnyWgslData>(accessor: TgpuAccessor<T>, value: TgpuFn<[], T> | TgpuBufferUsage<T> | Infer<T>): TgpuFn<Args, Return>;
 }
 type TgpuFn<Args extends AnyWgslData[] = AnyWgslData[], Return extends AnyWgslData | undefined = AnyWgslData | undefined> = TgpuFnBase<Args, Return> & ((...args: InferArgs<Args>) => InferReturn<Return>);
-declare function fn<Args extends AnyWgslData[] | []>(argTypes: Args, returnType?: undefined): TgpuFnShell<ExoticArray<Args>, undefined>;
-declare function fn<Args extends AnyWgslData[] | [], Return extends AnyWgslData>(argTypes: Args, returnType: Return): TgpuFnShell<ExoticArray<Args>, Exotic<Return>>;
+declare function fn<Args extends AnyWgslData[] | []>(argTypes: Args, returnType?: undefined): TgpuFnShell<Args, undefined>;
+declare function fn<Args extends AnyWgslData[] | [], Return extends AnyWgslData>(argTypes: Args, returnType: Return): TgpuFnShell<Args, Return>;
 declare function isTgpuFn<Args extends AnyWgslData[], Return extends AnyWgslData | undefined = undefined>(value: unknown | TgpuFn<Args, Return>): value is TgpuFn<Args, Return>;
 
 interface TgpuResolveOptions {
@@ -1324,7 +1342,7 @@ declare function init(options?: InitOptions): Promise<TgpuRoot>;
  */
 declare function initFromDevice(options: InitFromDeviceOptions): TgpuRoot;
 
-declare function accessor<T extends AnyWgslData>(schema: T, defaultValue?: TgpuFn<[], Exotic<T>> | TgpuBufferUsage<Exotic<T>> | Infer<Exotic<T>>): TgpuAccessor<Exotic<T>>;
+declare function accessor<T extends AnyWgslData>(schema: T, defaultValue?: TgpuFn<[], T> | TgpuBufferUsage<T> | Infer<T>): TgpuAccessor<T>;
 
 declare function derived<T>(compute: () => T): TgpuDerived<T>;
 
@@ -1354,7 +1372,7 @@ declare class MissingSlotValueError extends Error {
  * @category Errors
  */
 declare class NotUniformError extends Error {
-    constructor(value: TgpuBuffer$1<AnyData>);
+    constructor(value: TgpuBuffer<AnyData>);
 }
 declare class MissingLinksError extends Error {
     constructor(fnLabel: string | undefined, externalNames: string[]);
@@ -1366,11 +1384,6 @@ declare class MissingVertexBuffersError extends Error {
     constructor(layouts: Iterable<TgpuVertexLayout<WgslArray | Disarray>>);
 }
 
-type TgpuBuffer<TData extends AnyData> = TgpuBuffer$1<Exotic<TData>>;
-type TgpuBufferMutable<TData extends AnyData> = TgpuBufferMutable$1<Exotic<TData>>;
-type TgpuBufferReadonly<TData extends AnyData> = TgpuBufferReadonly$1<Exotic<TData>>;
-type TgpuBufferUniform<TData extends AnyData> = TgpuBufferUniform$1<Exotic<TData>>;
-
 /**
  * @module typegpu
  */
@@ -1398,4 +1411,4 @@ declare const tgpu: {
     };
 };
 
-export { type BindLayoutEntry, type Eventual, type InitFromDeviceOptions, type InitOptions, type LayoutEntryToInput, MissingBindGroupsError, MissingLinksError, MissingSlotValueError, MissingVertexBuffersError, NotUniformError, RandomNameRegistry, type Render, ResolutionError, type Sampled, Storage, StrictNameRegistry, type TextureProps, type TgpuAccessor, type TgpuAnyTextureView, type TgpuBindGroup, type TgpuBindGroupLayout, type TgpuBuffer, type TgpuBufferMutable, type TgpuBufferReadonly, type TgpuBufferUniform, type TgpuComputeFn, type TgpuComputeFnShell, type TgpuComputePipeline, type TgpuConst, type TgpuDeclare, type TgpuDerived, type TgpuFn, type TgpuFnShell, type TgpuFragmentFn, type TgpuFragmentFnShell, type TgpuLayoutComparisonSampler, type TgpuLayoutEntry, type TgpuLayoutExternalTexture, type TgpuLayoutSampler, type TgpuLayoutStorage, type TgpuLayoutStorageTexture, type TgpuLayoutTexture, type TgpuLayoutUniform, type TgpuMutableTexture, type TgpuReadonlyTexture, type TgpuRenderPipeline, type TgpuRoot, type TgpuSampledTexture, type TgpuSampler, type TgpuSlot, type TgpuTexture, type TgpuVar, type TgpuVertexFn, type TgpuVertexFnShell, type TgpuVertexLayout, type TgpuWriteonlyTexture, Uniform, type VariableScope, Vertex, type WithBinding, type WithCompute, type WithFragment, type WithVertex, tgpu as default, isBuffer, isComparisonSampler, isDerived, isSampledTextureView, isSampler, isSlot, isStorageTextureView, isTexture, isTgpuFn, isUsableAsRender, isUsableAsSampled, isUsableAsStorage, isUsableAsUniform, isUsableAsVertex, tgpu, asMutable as unstable_asMutable, asReadonly as unstable_asReadonly, asUniform as unstable_asUniform };
+export { type BindLayoutEntry, type Eventual, type InitFromDeviceOptions, type InitOptions, type LayoutEntryToInput, MissingBindGroupsError, MissingLinksError, MissingSlotValueError, MissingVertexBuffersError, NotUniformError, RandomNameRegistry, type Render, ResolutionError, type Sampled, Storage, StrictNameRegistry, type TextureProps, type TgpuAccessor, type TgpuAnyTextureView, type TgpuBindGroup, type TgpuBindGroupLayout, type TgpuBuffer, type TgpuBufferMutable, type TgpuBufferReadonly, type TgpuBufferUniform, type TgpuComputeFn, type TgpuComputeFnShell, type TgpuComputePipeline, type TgpuConst, type TgpuDeclare, type TgpuDerived, type TgpuFn, type TgpuFnShell, type TgpuFragmentFn, type TgpuFragmentFnShell, type TgpuLayoutComparisonSampler, type TgpuLayoutEntry, type TgpuLayoutExternalTexture, type TgpuLayoutSampler, type TgpuLayoutStorage, type TgpuLayoutStorageTexture, type TgpuLayoutTexture, type TgpuLayoutUniform, type TgpuMutableTexture, type TgpuReadonlyTexture, type TgpuRenderPipeline, type TgpuRoot, type TgpuSampledTexture, type TgpuSampler, type TgpuSlot, type TgpuTexture, type TgpuVar, type TgpuVertexFn, type TgpuVertexFnShell, type TgpuVertexLayout, type TgpuWriteonlyTexture, type Uniform, type VariableScope, type Vertex, type WithBinding, type WithCompute, type WithFragment, type WithVertex, tgpu as default, isBuffer, isComparisonSampler, isDerived, isSampledTextureView, isSampler, isSlot, isStorageTextureView, isTexture, isTgpuFn, isUsableAsRender, isUsableAsSampled, isUsableAsStorage, isUsableAsUniform, isUsableAsVertex, tgpu, asMutable as unstable_asMutable, asReadonly as unstable_asReadonly, asUniform as unstable_asUniform };