typegpu 0.4.3 → 0.4.4

package/index.d.cts

@@ -1,5 +1,5 @@
-import { A as AnyWgslData, T as TgpuNamable, I as Infer, 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, D as Decorated, n as AnyWgslStruct, B as BaseData, L as Location, W as WgslStruct, o as Default, p as UnionToIntersection, q as WgslArray, r as Disarray, s as Unstruct, t as VertexFormat, u as TgpuVertexAttrib, K as KindToDefaultFormatMap, v as KindToAcceptedAttribMap, w as AnyData, O as OmitProps, P as Prettify, M as Mutable, x as WgslTypeLiteral, y as InferPartial, z as MemIdentity, C as AnyVecInstance, E as AnyMatInstance } from './wgslTypes-D0JqCGnw.cjs';
-import { A as AnyAttribute, a as AnyComputeBuiltin, D as Decorate, I as IsBuiltin, H as HasCustomLocation, b as AnyFragmentInputBuiltin, c as AnyFragmentOutputBuiltin, O as OmitBuiltins } from './attributes--1y4Kirx.cjs';
+import { A as AnyWgslData, T as TgpuNamable, I as Infer, 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, D as Decorated, n as AnyWgslStruct, B as BaseData, L as Location, W as WgslStruct, o as Default, p as UnionToIntersection, q as WgslArray, r as Disarray, s as Unstruct, t as VertexFormat, u as TgpuVertexAttrib, K as KindToDefaultFormatMap, v as KindToAcceptedAttribMap, w as AnyData, O as OmitProps, P as Prettify, M as Mutable, x as WgslTypeLiteral, y as InferPartial, z as MemIdentity, C as AnyVecInstance, E as AnyMatInstance } from './wgslTypes-DgaoTc4M.cjs';
+import { A as AnyAttribute, a as AnyComputeBuiltin, D as Decorate, I as IsBuiltin, H as HasCustomLocation, b as AnyFragmentInputBuiltin, c as AnyFragmentOutputBuiltin, O as OmitBuiltins } from './attributes-B5bhZAAK.cjs';
 import * as smol from 'tinyest';
 import { Block } from 'tinyest';
 
@@ -523,7 +523,7 @@ type DataToContainedAttribs<T> = T extends AnyWgslStruct | Unstruct ? {
     type: VertexFormat;
 } ? TgpuVertexAttrib<T['type']> : T extends {
     type: keyof KindToDefaultFormatMap;
-} ? TgpuVertexAttrib<KindToDefaultFormatMap[T['type']]> : never;
+} ? TgpuVertexAttrib<KindToDefaultFormatMap[T['type']]> : T extends Decorated<infer TInner> ? DataToContainedAttribs<TInner> : never;
 /**
  * Interprets an array as a set of vertex attributes.
  */
@@ -651,6 +651,100 @@ interface DepthStencilAttachment {
     stencilReadOnly?: boolean;
 }
 
+interface SamplerProps {
+    addressModeU?: GPUAddressMode;
+    addressModeV?: GPUAddressMode;
+    /**
+     * Specifies the address modes for the texture width, height, and depth
+     * coordinates, respectively.
+     */
+    addressModeW?: GPUAddressMode;
+    /**
+     * Specifies the sampling behavior when the sample footprint is smaller than or equal to one
+     * texel.
+     */
+    magFilter?: GPUFilterMode;
+    /**
+     * Specifies the sampling behavior when the sample footprint is larger than one texel.
+     */
+    minFilter?: GPUFilterMode;
+    /**
+     * Specifies behavior for sampling between mipmap levels.
+     */
+    mipmapFilter?: GPUMipmapFilterMode;
+    lodMinClamp?: number;
+    /**
+     * Specifies the minimum and maximum levels of detail, respectively, used internally when
+     * sampling a texture.
+     */
+    lodMaxClamp?: number;
+    /**
+     * Specifies the maximum anisotropy value clamp used by the sampler. Anisotropic filtering is
+     * enabled when {@link GPUSamplerDescriptor.maxAnisotropy} is > 1 and the implementation supports it.
+     * Anisotropic filtering improves the image quality of textures sampled at oblique viewing
+     * angles. Higher {@link GPUSamplerDescriptor.maxAnisotropy} values indicate the maximum ratio of
+     * anisotropy supported when filtering.
+     *
+     * Most implementations support {@link GPUSamplerDescriptor.maxAnisotropy} values in range
+     * between 1 and 16, inclusive. The used value of {@link GPUSamplerDescriptor.maxAnisotropy}
+     * will be clamped to the maximum value that the platform supports.
+     * The precise filtering behavior is implementation-dependent.
+     */
+    maxAnisotropy?: number;
+}
+interface ComparisonSamplerProps {
+    compare: GPUCompareFunction;
+    addressModeU?: GPUAddressMode;
+    addressModeV?: GPUAddressMode;
+    /**
+     * Specifies the address modes for the texture width, height, and depth
+     * coordinates, respectively.
+     */
+    addressModeW?: GPUAddressMode;
+    /**
+     * Specifies the sampling behavior when the sample footprint is smaller than or equal to one
+     * texel.
+     */
+    magFilter?: GPUFilterMode;
+    /**
+     * Specifies the sampling behavior when the sample footprint is larger than one texel.
+     */
+    minFilter?: GPUFilterMode;
+    /**
+     * Specifies behavior for sampling between mipmap levels.
+     */
+    mipmapFilter?: GPUMipmapFilterMode;
+    lodMinClamp?: number;
+    /**
+     * Specifies the minimum and maximum levels of detail, respectively, used internally when
+     * sampling a texture.
+     */
+    lodMaxClamp?: number;
+    /**
+     * Specifies the maximum anisotropy value clamp used by the sampler. Anisotropic filtering is
+     * enabled when {@link GPUSamplerDescriptor.maxAnisotropy} is > 1 and the implementation supports it.
+     * Anisotropic filtering improves the image quality of textures sampled at oblique viewing
+     * angles. Higher {@link GPUSamplerDescriptor.maxAnisotropy} values indicate the maximum ratio of
+     * anisotropy supported when filtering.
+     *
+     * Most implementations support {@link GPUSamplerDescriptor.maxAnisotropy} values in range
+     * between 1 and 16, inclusive. The used value of {@link GPUSamplerDescriptor.maxAnisotropy}
+     * will be clamped to the maximum value that the platform supports.
+     * The precise filtering behavior is implementation-dependent.
+     */
+    maxAnisotropy?: number;
+}
+interface TgpuSampler {
+    readonly resourceType: 'sampler';
+}
+interface TgpuComparisonSampler {
+    readonly resourceType: 'sampler-comparison';
+}
+declare function sampler(props: SamplerProps): TgpuSampler;
+declare function comparisonSampler(props: ComparisonSamplerProps): TgpuComparisonSampler;
+declare function isSampler(resource: unknown): resource is TgpuSampler;
+declare function isComparisonSampler(resource: unknown): resource is TgpuComparisonSampler;
+
 interface Unwrapper {
     readonly device: GPUDevice;
     unwrap(resource: TgpuComputePipeline): GPUComputePipeline;
@@ -661,6 +755,8 @@ interface Unwrapper {
     unwrap(resource: TgpuTexture): GPUTexture;
     unwrap(resource: TgpuReadonlyTexture | TgpuWriteonlyTexture | TgpuMutableTexture | TgpuSampledTexture): GPUTextureView;
     unwrap(resource: TgpuVertexLayout): GPUVertexBufferLayout;
+    unwrap(resource: TgpuSampler): GPUSampler;
+    unwrap(resource: TgpuComparisonSampler): GPUSampler;
 }
 
 interface WithCompute {
@@ -959,100 +1055,6 @@ type RestrictVertexUsages<TData extends BaseData> = TData extends {
     readonly type: WgslTypeLiteral;
 } ? ('uniform' | 'storage' | 'vertex')[] : 'vertex'[];
 
-interface SamplerProps {
-    addressModeU?: GPUAddressMode;
-    addressModeV?: GPUAddressMode;
-    /**
-     * Specifies the address modes for the texture width, height, and depth
-     * coordinates, respectively.
-     */
-    addressModeW?: GPUAddressMode;
-    /**
-     * Specifies the sampling behavior when the sample footprint is smaller than or equal to one
-     * texel.
-     */
-    magFilter?: GPUFilterMode;
-    /**
-     * Specifies the sampling behavior when the sample footprint is larger than one texel.
-     */
-    minFilter?: GPUFilterMode;
-    /**
-     * Specifies behavior for sampling between mipmap levels.
-     */
-    mipmapFilter?: GPUMipmapFilterMode;
-    lodMinClamp?: number;
-    /**
-     * Specifies the minimum and maximum levels of detail, respectively, used internally when
-     * sampling a texture.
-     */
-    lodMaxClamp?: number;
-    /**
-     * Specifies the maximum anisotropy value clamp used by the sampler. Anisotropic filtering is
-     * enabled when {@link GPUSamplerDescriptor.maxAnisotropy} is > 1 and the implementation supports it.
-     * Anisotropic filtering improves the image quality of textures sampled at oblique viewing
-     * angles. Higher {@link GPUSamplerDescriptor.maxAnisotropy} values indicate the maximum ratio of
-     * anisotropy supported when filtering.
-     *
-     * Most implementations support {@link GPUSamplerDescriptor.maxAnisotropy} values in range
-     * between 1 and 16, inclusive. The used value of {@link GPUSamplerDescriptor.maxAnisotropy}
-     * will be clamped to the maximum value that the platform supports.
-     * The precise filtering behavior is implementation-dependent.
-     */
-    maxAnisotropy?: number;
-}
-interface ComparisonSamplerProps {
-    compare: GPUCompareFunction;
-    addressModeU?: GPUAddressMode;
-    addressModeV?: GPUAddressMode;
-    /**
-     * Specifies the address modes for the texture width, height, and depth
-     * coordinates, respectively.
-     */
-    addressModeW?: GPUAddressMode;
-    /**
-     * Specifies the sampling behavior when the sample footprint is smaller than or equal to one
-     * texel.
-     */
-    magFilter?: GPUFilterMode;
-    /**
-     * Specifies the sampling behavior when the sample footprint is larger than one texel.
-     */
-    minFilter?: GPUFilterMode;
-    /**
-     * Specifies behavior for sampling between mipmap levels.
-     */
-    mipmapFilter?: GPUMipmapFilterMode;
-    lodMinClamp?: number;
-    /**
-     * Specifies the minimum and maximum levels of detail, respectively, used internally when
-     * sampling a texture.
-     */
-    lodMaxClamp?: number;
-    /**
-     * Specifies the maximum anisotropy value clamp used by the sampler. Anisotropic filtering is
-     * enabled when {@link GPUSamplerDescriptor.maxAnisotropy} is > 1 and the implementation supports it.
-     * Anisotropic filtering improves the image quality of textures sampled at oblique viewing
-     * angles. Higher {@link GPUSamplerDescriptor.maxAnisotropy} values indicate the maximum ratio of
-     * anisotropy supported when filtering.
-     *
-     * Most implementations support {@link GPUSamplerDescriptor.maxAnisotropy} values in range
-     * between 1 and 16, inclusive. The used value of {@link GPUSamplerDescriptor.maxAnisotropy}
-     * will be clamped to the maximum value that the platform supports.
-     * The precise filtering behavior is implementation-dependent.
-     */
-    maxAnisotropy?: number;
-}
-interface TgpuSampler {
-    readonly resourceType: 'sampler';
-}
-interface TgpuComparisonSampler {
-    readonly resourceType: 'sampler-comparison';
-}
-declare function sampler(props: SamplerProps): TgpuSampler;
-declare function comparisonSampler(props: ComparisonSamplerProps): TgpuComparisonSampler;
-declare function isSampler(resource: unknown): resource is TgpuSampler;
-declare function isComparisonSampler(resource: unknown): resource is TgpuComparisonSampler;
-
 type TgpuLayoutEntryBase = {
     /**
      * Limits this resource's visibility to specific shader stages.

package/index.d.ts

@@ -1,5 +1,5 @@
-import { A as AnyWgslData, T as TgpuNamable, I as Infer, 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, D as Decorated, n as AnyWgslStruct, B as BaseData, L as Location, W as WgslStruct, o as Default, p as UnionToIntersection, q as WgslArray, r as Disarray, s as Unstruct, t as VertexFormat, u as TgpuVertexAttrib, K as KindToDefaultFormatMap, v as KindToAcceptedAttribMap, w as AnyData, O as OmitProps, P as Prettify, M as Mutable, x as WgslTypeLiteral, y as InferPartial, z as MemIdentity, C as AnyVecInstance, E as AnyMatInstance } from './wgslTypes-D0JqCGnw.js';
-import { A as AnyAttribute, a as AnyComputeBuiltin, D as Decorate, I as IsBuiltin, H as HasCustomLocation, b as AnyFragmentInputBuiltin, c as AnyFragmentOutputBuiltin, O as OmitBuiltins } from './attributes-Dri8dk1v.js';
+import { A as AnyWgslData, T as TgpuNamable, I as Infer, 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, D as Decorated, n as AnyWgslStruct, B as BaseData, L as Location, W as WgslStruct, o as Default, p as UnionToIntersection, q as WgslArray, r as Disarray, s as Unstruct, t as VertexFormat, u as TgpuVertexAttrib, K as KindToDefaultFormatMap, v as KindToAcceptedAttribMap, w as AnyData, O as OmitProps, P as Prettify, M as Mutable, x as WgslTypeLiteral, y as InferPartial, z as MemIdentity, C as AnyVecInstance, E as AnyMatInstance } from './wgslTypes-DgaoTc4M.js';
+import { A as AnyAttribute, a as AnyComputeBuiltin, D as Decorate, I as IsBuiltin, H as HasCustomLocation, b as AnyFragmentInputBuiltin, c as AnyFragmentOutputBuiltin, O as OmitBuiltins } from './attributes-Cfiq6vud.js';
 import * as smol from 'tinyest';
 import { Block } from 'tinyest';
 
@@ -523,7 +523,7 @@ type DataToContainedAttribs<T> = T extends AnyWgslStruct | Unstruct ? {
     type: VertexFormat;
 } ? TgpuVertexAttrib<T['type']> : T extends {
     type: keyof KindToDefaultFormatMap;
-} ? TgpuVertexAttrib<KindToDefaultFormatMap[T['type']]> : never;
+} ? TgpuVertexAttrib<KindToDefaultFormatMap[T['type']]> : T extends Decorated<infer TInner> ? DataToContainedAttribs<TInner> : never;
 /**
  * Interprets an array as a set of vertex attributes.
  */
@@ -651,6 +651,100 @@ interface DepthStencilAttachment {
     stencilReadOnly?: boolean;
 }
 
+interface SamplerProps {
+    addressModeU?: GPUAddressMode;
+    addressModeV?: GPUAddressMode;
+    /**
+     * Specifies the address modes for the texture width, height, and depth
+     * coordinates, respectively.
+     */
+    addressModeW?: GPUAddressMode;
+    /**
+     * Specifies the sampling behavior when the sample footprint is smaller than or equal to one
+     * texel.
+     */
+    magFilter?: GPUFilterMode;
+    /**
+     * Specifies the sampling behavior when the sample footprint is larger than one texel.
+     */
+    minFilter?: GPUFilterMode;
+    /**
+     * Specifies behavior for sampling between mipmap levels.
+     */
+    mipmapFilter?: GPUMipmapFilterMode;
+    lodMinClamp?: number;
+    /**
+     * Specifies the minimum and maximum levels of detail, respectively, used internally when
+     * sampling a texture.
+     */
+    lodMaxClamp?: number;
+    /**
+     * Specifies the maximum anisotropy value clamp used by the sampler. Anisotropic filtering is
+     * enabled when {@link GPUSamplerDescriptor.maxAnisotropy} is > 1 and the implementation supports it.
+     * Anisotropic filtering improves the image quality of textures sampled at oblique viewing
+     * angles. Higher {@link GPUSamplerDescriptor.maxAnisotropy} values indicate the maximum ratio of
+     * anisotropy supported when filtering.
+     *
+     * Most implementations support {@link GPUSamplerDescriptor.maxAnisotropy} values in range
+     * between 1 and 16, inclusive. The used value of {@link GPUSamplerDescriptor.maxAnisotropy}
+     * will be clamped to the maximum value that the platform supports.
+     * The precise filtering behavior is implementation-dependent.
+     */
+    maxAnisotropy?: number;
+}
+interface ComparisonSamplerProps {
+    compare: GPUCompareFunction;
+    addressModeU?: GPUAddressMode;
+    addressModeV?: GPUAddressMode;
+    /**
+     * Specifies the address modes for the texture width, height, and depth
+     * coordinates, respectively.
+     */
+    addressModeW?: GPUAddressMode;
+    /**
+     * Specifies the sampling behavior when the sample footprint is smaller than or equal to one
+     * texel.
+     */
+    magFilter?: GPUFilterMode;
+    /**
+     * Specifies the sampling behavior when the sample footprint is larger than one texel.
+     */
+    minFilter?: GPUFilterMode;
+    /**
+     * Specifies behavior for sampling between mipmap levels.
+     */
+    mipmapFilter?: GPUMipmapFilterMode;
+    lodMinClamp?: number;
+    /**
+     * Specifies the minimum and maximum levels of detail, respectively, used internally when
+     * sampling a texture.
+     */
+    lodMaxClamp?: number;
+    /**
+     * Specifies the maximum anisotropy value clamp used by the sampler. Anisotropic filtering is
+     * enabled when {@link GPUSamplerDescriptor.maxAnisotropy} is > 1 and the implementation supports it.
+     * Anisotropic filtering improves the image quality of textures sampled at oblique viewing
+     * angles. Higher {@link GPUSamplerDescriptor.maxAnisotropy} values indicate the maximum ratio of
+     * anisotropy supported when filtering.
+     *
+     * Most implementations support {@link GPUSamplerDescriptor.maxAnisotropy} values in range
+     * between 1 and 16, inclusive. The used value of {@link GPUSamplerDescriptor.maxAnisotropy}
+     * will be clamped to the maximum value that the platform supports.
+     * The precise filtering behavior is implementation-dependent.
+     */
+    maxAnisotropy?: number;
+}
+interface TgpuSampler {
+    readonly resourceType: 'sampler';
+}
+interface TgpuComparisonSampler {
+    readonly resourceType: 'sampler-comparison';
+}
+declare function sampler(props: SamplerProps): TgpuSampler;
+declare function comparisonSampler(props: ComparisonSamplerProps): TgpuComparisonSampler;
+declare function isSampler(resource: unknown): resource is TgpuSampler;
+declare function isComparisonSampler(resource: unknown): resource is TgpuComparisonSampler;
+
 interface Unwrapper {
     readonly device: GPUDevice;
     unwrap(resource: TgpuComputePipeline): GPUComputePipeline;
@@ -661,6 +755,8 @@ interface Unwrapper {
     unwrap(resource: TgpuTexture): GPUTexture;
     unwrap(resource: TgpuReadonlyTexture | TgpuWriteonlyTexture | TgpuMutableTexture | TgpuSampledTexture): GPUTextureView;
     unwrap(resource: TgpuVertexLayout): GPUVertexBufferLayout;
+    unwrap(resource: TgpuSampler): GPUSampler;
+    unwrap(resource: TgpuComparisonSampler): GPUSampler;
 }
 
 interface WithCompute {
@@ -959,100 +1055,6 @@ type RestrictVertexUsages<TData extends BaseData> = TData extends {
     readonly type: WgslTypeLiteral;
 } ? ('uniform' | 'storage' | 'vertex')[] : 'vertex'[];
 
-interface SamplerProps {
-    addressModeU?: GPUAddressMode;
-    addressModeV?: GPUAddressMode;
-    /**
-     * Specifies the address modes for the texture width, height, and depth
-     * coordinates, respectively.
-     */
-    addressModeW?: GPUAddressMode;
-    /**
-     * Specifies the sampling behavior when the sample footprint is smaller than or equal to one
-     * texel.
-     */
-    magFilter?: GPUFilterMode;
-    /**
-     * Specifies the sampling behavior when the sample footprint is larger than one texel.
-     */
-    minFilter?: GPUFilterMode;
-    /**
-     * Specifies behavior for sampling between mipmap levels.
-     */
-    mipmapFilter?: GPUMipmapFilterMode;
-    lodMinClamp?: number;
-    /**
-     * Specifies the minimum and maximum levels of detail, respectively, used internally when
-     * sampling a texture.
-     */
-    lodMaxClamp?: number;
-    /**
-     * Specifies the maximum anisotropy value clamp used by the sampler. Anisotropic filtering is
-     * enabled when {@link GPUSamplerDescriptor.maxAnisotropy} is > 1 and the implementation supports it.
-     * Anisotropic filtering improves the image quality of textures sampled at oblique viewing
-     * angles. Higher {@link GPUSamplerDescriptor.maxAnisotropy} values indicate the maximum ratio of
-     * anisotropy supported when filtering.
-     *
-     * Most implementations support {@link GPUSamplerDescriptor.maxAnisotropy} values in range
-     * between 1 and 16, inclusive. The used value of {@link GPUSamplerDescriptor.maxAnisotropy}
-     * will be clamped to the maximum value that the platform supports.
-     * The precise filtering behavior is implementation-dependent.
-     */
-    maxAnisotropy?: number;
-}
-interface ComparisonSamplerProps {
-    compare: GPUCompareFunction;
-    addressModeU?: GPUAddressMode;
-    addressModeV?: GPUAddressMode;
-    /**
-     * Specifies the address modes for the texture width, height, and depth
-     * coordinates, respectively.
-     */
-    addressModeW?: GPUAddressMode;
-    /**
-     * Specifies the sampling behavior when the sample footprint is smaller than or equal to one
-     * texel.
-     */
-    magFilter?: GPUFilterMode;
-    /**
-     * Specifies the sampling behavior when the sample footprint is larger than one texel.
-     */
-    minFilter?: GPUFilterMode;
-    /**
-     * Specifies behavior for sampling between mipmap levels.
-     */
-    mipmapFilter?: GPUMipmapFilterMode;
-    lodMinClamp?: number;
-    /**
-     * Specifies the minimum and maximum levels of detail, respectively, used internally when
-     * sampling a texture.
-     */
-    lodMaxClamp?: number;
-    /**
-     * Specifies the maximum anisotropy value clamp used by the sampler. Anisotropic filtering is
-     * enabled when {@link GPUSamplerDescriptor.maxAnisotropy} is > 1 and the implementation supports it.
-     * Anisotropic filtering improves the image quality of textures sampled at oblique viewing
-     * angles. Higher {@link GPUSamplerDescriptor.maxAnisotropy} values indicate the maximum ratio of
-     * anisotropy supported when filtering.
-     *
-     * Most implementations support {@link GPUSamplerDescriptor.maxAnisotropy} values in range
-     * between 1 and 16, inclusive. The used value of {@link GPUSamplerDescriptor.maxAnisotropy}
-     * will be clamped to the maximum value that the platform supports.
-     * The precise filtering behavior is implementation-dependent.
-     */
-    maxAnisotropy?: number;
-}
-interface TgpuSampler {
-    readonly resourceType: 'sampler';
-}
-interface TgpuComparisonSampler {
-    readonly resourceType: 'sampler-comparison';
-}
-declare function sampler(props: SamplerProps): TgpuSampler;
-declare function comparisonSampler(props: ComparisonSamplerProps): TgpuComparisonSampler;
-declare function isSampler(resource: unknown): resource is TgpuSampler;
-declare function isComparisonSampler(resource: unknown): resource is TgpuComparisonSampler;
-
 type TgpuLayoutEntryBase = {
     /**
      * Limits this resource's visibility to specific shader stages.