Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/typegpu/src/core/function/comptime.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { WgslTypeError } from '../../errors.ts';
import { setName, type TgpuNamable } from '../../shared/meta.ts';
import { $getNameForward, $gpuCallable, $internal } from '../../shared/symbols.ts';
import { coerceToSnippet } from '../../tgsl/generationHelpers.ts';
import { coerceToSnippet } from '../../codegen/generationHelpers.ts';
import { type DualFn, isKnownAtComptime } from '../../types.ts';

type AnyFn = (...args: never[]) => unknown;
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/core/function/createCallableSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { type MapValueToSnippet, type ResolvedSnippet, snip } from '../../data/s
import { type BaseData, isPtr } from '../../data/wgslTypes.ts';
import { setName } from '../../shared/meta.ts';
import { $gpuCallable } from '../../shared/symbols.ts';
import { tryConvertSnippet } from '../../tgsl/conversion.ts';
import { tryConvertSnippet } from '../../codegen/conversion.ts';
import { type DualFn, isKnownAtComptime, NormalState, type ResolutionCtx } from '../../types.ts';
import type { AnyFn } from './fnTypes.ts';

Expand Down
4 changes: 2 additions & 2 deletions packages/typegpu/src/core/function/dualImpl.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { type MapValueToSnippet, snip } from '../../data/snippet.ts';
import { setName } from '../../shared/meta.ts';
import { $gpuCallable } from '../../shared/symbols.ts';
import { tryConvertSnippet } from '../../tgsl/conversion.ts';
import { concretize } from '../../tgsl/generationHelpers.ts';
import { tryConvertSnippet } from '../../codegen/conversion.ts';
import { concretize } from '../../codegen/generationHelpers.ts';
import { type DualFn, isKnownAtComptime, NormalState, type ResolutionCtx } from '../../types.ts';
import { type BaseData, isPtr } from '../../data/wgslTypes.ts';

Expand Down
4 changes: 2 additions & 2 deletions packages/typegpu/src/core/pipeline/computePipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import {
type TgpuLayoutEntry,
} from '../../tgpuBindGroupLayout.ts';
import { isGPUCommandEncoder, isGPUComputePassEncoder } from './typeGuards.ts';
import { logDataFromGPU } from '../../tgsl/consoleLog/deserializers.ts';
import type { LogResources } from '../../tgsl/consoleLog/types.ts';
import { logDataFromGPU } from '../../codegen/consoleLog/deserializers.ts';
import type { LogResources } from '../../codegen/consoleLog/types.ts';
import { isGPUBuffer, type ResolutionCtx, type SelfResolvable } from '../../types.ts';
import { wgslExtensions, wgslExtensionToFeatureName } from '../../wgslExtensions.ts';
import type { IORecord } from '../function/fnTypes.ts';
Expand Down
4 changes: 2 additions & 2 deletions packages/typegpu/src/core/pipeline/renderPipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import {
type TgpuBindGroupLayout,
type TgpuLayoutEntry,
} from '../../tgpuBindGroupLayout.ts';
import { logDataFromGPU } from '../../tgsl/consoleLog/deserializers.ts';
import type { LogResources } from '../../tgsl/consoleLog/types.ts';
import { logDataFromGPU } from '../../codegen/consoleLog/deserializers.ts';
import type { LogResources } from '../../codegen/consoleLog/types.ts';
import type { ResolutionCtx, SelfResolvable } from '../../types.ts';
import { isGPUBuffer } from '../../types.ts';
import { wgslExtensions, wgslExtensionToFeatureName } from '../../wgslExtensions.ts';
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/core/resolve/namespace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { ResolvedSnippet } from '../../data/snippet.ts';
import { type NameRegistry, RandomNameRegistry, StrictNameRegistry } from '../../nameRegistry.ts';
import { getName } from '../../shared/meta.ts';
import { $internal } from '../../shared/symbols.ts';
import { ShelllessRepository } from '../../tgsl/shellless.ts';
import { ShelllessRepository } from '../../codegen/shellless.ts';
import type { TgpuLazy, TgpuSlot } from '../slot/slotTypes.ts';

type SlotToValueMap = Map<TgpuSlot<unknown>, unknown>;
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/core/resolve/tgpuResolve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Void } from '../../data/wgslTypes.ts';
import { type ResolutionResult, resolve as resolveImpl } from '../../resolutionCtx.ts';
import { $internal, $resolve } from '../../shared/symbols.ts';
import { isBindGroupLayout } from '../../tgpuBindGroupLayout.ts';
import type { ShaderGenerator } from '../../tgsl/shaderGenerator.ts';
import type { ShaderGenerator } from '../../codegen/shaderGenerator.ts';
import type { ResolvableObject, SelfResolvable, Wgsl } from '../../types.ts';
import type { WgslExtension } from '../../wgslExtensions.ts';
import { isPipeline } from '../pipeline/typeGuards.ts';
Expand Down
4 changes: 2 additions & 2 deletions packages/typegpu/src/core/root/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import type {
TgpuLayoutEntry,
} from '../../tgpuBindGroupLayout.ts';
import { isBindGroup, isBindGroupLayout, TgpuBindGroupImpl } from '../../tgpuBindGroupLayout.ts';
import type { LogGeneratorOptions } from '../../tgsl/consoleLog/types.ts';
import type { ShaderGenerator } from '../../tgsl/shaderGenerator.ts';
import type { LogGeneratorOptions } from '../../codegen/consoleLog/types.ts';
import type { ShaderGenerator } from '../../codegen/shaderGenerator.ts';
import {
INTERNAL_createBuffer,
isBuffer,
Expand Down
4 changes: 2 additions & 2 deletions packages/typegpu/src/core/root/rootTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import type {
TgpuBindGroupLayout,
TgpuLayoutEntry,
} from '../../tgpuBindGroupLayout.ts';
import type { LogGeneratorOptions } from '../../tgsl/consoleLog/types.ts';
import type { ShaderGenerator } from '../../tgsl/shaderGenerator.ts';
import type { LogGeneratorOptions } from '../../codegen/consoleLog/types.ts';
import type { ShaderGenerator } from '../../codegen/shaderGenerator.ts';
import type { Unwrapper } from '../../unwrapper.ts';
import type { TgpuBuffer, VertexFlag } from '../buffer/buffer.ts';
import type { TgpuMutable, TgpuReadonly, TgpuUniform } from '../buffer/bufferShorthand.ts';
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/core/simulate/tgpuSimulate.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { BaseData } from '../../data/wgslTypes.ts';
import { getResolutionCtx, provideCtx } from '../../execMode.ts';
import { ResolutionCtxImpl } from '../../resolutionCtx.ts';
import wgslGenerator from '../../tgsl/wgslGenerator.ts';
import wgslGenerator from '../../codegen/wgslGenerator.ts';
import { SimulationState } from '../../types.ts';
import type { TgpuBuffer } from '../buffer/buffer.ts';
import { namespace } from '../resolve/namespace.ts';
Expand Down
4 changes: 2 additions & 2 deletions packages/typegpu/src/core/valueProxyUtils.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { Snippet } from '../data/snippet.ts';
import { getGPUValue } from '../getGPUValue.ts';
import { $internal, $ownSnippet, $resolve } from '../shared/symbols.ts';
import { accessIndex } from '../tgsl/accessIndex.ts';
import { accessProp } from '../tgsl/accessProp.ts';
import { accessIndex } from '../codegen/accessIndex.ts';
import { accessProp } from '../codegen/accessProp.ts';
import { getOwnSnippet, type SelfResolvable, type WithOwnSnippet } from '../types.ts';

export const valueProxyHandler: ProxyHandler<SelfResolvable & WithOwnSnippet> = {
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/data/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// NOTE: This is a barrel file, internal files should not import things from this file

import { Operator } from 'tsover-runtime';
import { type InfixOperator, infixOperators } from '../tgsl/accessProp.ts';
import { type InfixOperator, infixOperators } from '../codegen/accessProp.ts';
import { MatBase } from './matrix.ts';
import { VecBase } from './vectorImpl.ts';

Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/data/matrix.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { dualImpl } from '../core/function/dualImpl.ts';
import { stitch } from '../core/resolve/stitch.ts';
import { $repr } from '../shared/symbols.ts';
import { $internal, $resolve } from '../shared/symbols.ts';
import { numericLiteralToSnippet } from '../tgsl/generationHelpers.ts';
import { numericLiteralToSnippet } from '../codegen/generationHelpers.ts';
import type { ResolutionCtx, SelfResolvable } from '../types.ts';
import { f32 } from './numeric.ts';
import { type ResolvedSnippet } from './snippet.ts';
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/data/vectorImpl.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { $internal, $resolve } from '../shared/symbols.ts';
import { numericLiteralToSnippet } from '../tgsl/generationHelpers.ts';
import { numericLiteralToSnippet } from '../codegen/generationHelpers.ts';
import type { ResolutionCtx, SelfResolvable } from '../types.ts';
import { bool, f16, f32, i32, u32 } from './numeric.ts';
import { type ResolvedSnippet } from './snippet.ts';
Expand Down
4 changes: 2 additions & 2 deletions packages/typegpu/src/indexNamedExports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ export { isTgpuFragmentFn } from './core/function/tgpuFragmentFn.ts';
export { isTgpuVertexFn } from './core/function/tgpuVertexFn.ts';
export { isTgpuComputeFn } from './core/function/tgpuComputeFn.ts';
export { isVariable } from './core/variable/tgpuVariable.ts';
export { ShaderGenerator } from './tgsl/shaderGenerator.ts';
export { WgslGenerator } from './tgsl/wgslGenerator.ts';
export { ShaderGenerator } from './codegen/shaderGenerator.ts';
export { WgslGenerator } from './codegen/wgslGenerator.ts';

// types

Expand Down
18 changes: 11 additions & 7 deletions packages/typegpu/src/resolutionCtx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,16 @@ import {
type TgpuBindGroupLayout,
type TgpuLayoutEntry,
} from './tgpuBindGroupLayout.ts';
import { LogGeneratorImpl, LogGeneratorNullImpl } from './tgsl/consoleLog/logGenerator.ts';
import type { LogGenerator, LogResources } from './tgsl/consoleLog/types.ts';
import { getBestConversion } from './tgsl/conversion.ts';
import { coerceToSnippet, concretize, numericLiteralToSnippet } from './tgsl/generationHelpers.ts';
import type { ShaderGenerator } from './tgsl/shaderGenerator.ts';
import wgslGenerator from './tgsl/wgslGenerator.ts';
import { LogGeneratorImpl, LogGeneratorNullImpl } from './codegen/consoleLog/logGenerator.ts';
import type { LogGenerator, LogResources } from './codegen/consoleLog/types.ts';
import { getBestConversion } from './codegen/conversion.ts';
import {
coerceToSnippet,
concretize,
numericLiteralToSnippet,
} from './codegen/generationHelpers.ts';
import type { ShaderGenerator } from './codegen/shaderGenerator.ts';
import wgslGenerator from './codegen/wgslGenerator.ts';
import type {
ExecMode,
ExecState,
Expand All @@ -53,7 +57,7 @@ import { CodegenState, isSelfResolvable, NormalState } from './types.ts';
import type { WgslExtension } from './wgslExtensions.ts';
import { getName, hasTinyestMetadata, setName } from './shared/meta.ts';
import { FuncParameterType } from 'tinyest';
import { accessProp } from './tgsl/accessProp.ts';
import { accessProp } from './codegen/accessProp.ts';
import { createIoSchema } from './core/function/ioSchema.ts';
import type { IOData } from './core/function/fnTypes.ts';
import { AutoStruct } from './data/autoStruct.ts';
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/std/bitcast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { isVec } from '../data/wgslTypes.ts';
import { vec2f, vec2i, vec3f, vec3i, vec4f, vec4i } from '../data/vector.ts';
import { VectorOps } from '../data/vectorOps.ts';
import type { v2f, v2i, v2u, v3f, v3i, v3u, v4f, v4i, v4u } from '../data/wgslTypes.ts';
import { unify } from '../tgsl/conversion.ts';
import { unify } from '../codegen/conversion.ts';

export type BitcastU32toF32Overload = ((value: number) => number) &
((value: v2u) => v2f) &
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/std/boolean.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
type v3b,
type v4b,
} from '../data/wgslTypes.ts';
import { unify } from '../tgsl/conversion.ts';
import { unify } from '../codegen/conversion.ts';
import { sub } from './operators.ts';

function correspondingBooleanVectorSchema(dataType: BaseData) {
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/std/numeric.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import {
} from '../data/wgslTypes.ts';
import { SignatureNotSupportedError } from '../errors.ts';
import type { Infer } from '../shared/repr.ts';
import { unify } from '../tgsl/conversion.ts';
import { unify } from '../codegen/conversion.ts';
import type { ResolutionCtx } from '../types.ts';
import { mul, sub } from './operators.ts';

Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/std/operators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
type vecIToVecU,
} from '../data/wgslTypes.ts';
import { SignatureNotSupportedError } from '../errors.ts';
import { unify } from '../tgsl/conversion.ts';
import { unify } from '../codegen/conversion.ts';

type NumVec = AnyNumericVecInstance;
type Mat = AnyMatInstance;
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/std/subgroup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type {
AnyWgslData,
v4u,
} from '../data/wgslTypes.ts';
import { unify } from '../tgsl/conversion.ts';
import { unify } from '../codegen/conversion.ts';

interface IdentityNumOrVec {
(e: number): number;
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import {
import type { TgpuBindGroupLayout, TgpuLayoutEntry } from './tgpuBindGroupLayout.ts';
import type { WgslExtension } from './wgslExtensions.ts';
import type { Infer } from './shared/repr.ts';
import { ShaderGenerator } from './tgsl/shaderGenerator.ts';
import { ShaderGenerator } from './codegen/shaderGenerator.ts';
Copy link

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file imports ShaderGenerator as a value import, but it appears to be used only as a type in this module. With verbatimModuleSyntax enabled, prefer import type { ShaderGenerator } ... to avoid introducing an unnecessary runtime dependency / potential circular import into types.ts.

Copilot uses AI. Check for mistakes.

export type ResolvableObject =
| SelfResolvable
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/tests/tgsl/consoleLog.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, vi } from 'vitest';
import { namespace } from '../../src/core/resolve/namespace.ts';
import tgpu, { d } from '../../src/index.js';
import { ResolutionCtxImpl } from '../../src/resolutionCtx.ts';
import { deserializeAndStringify } from '../../src/tgsl/consoleLog/deserializers.ts';
import { deserializeAndStringify } from '../../src/codegen/consoleLog/deserializers.ts';
import { CodegenState } from '../../src/types.ts';
import { it } from 'typegpu-testing-utility';

Expand Down
4 changes: 2 additions & 2 deletions packages/typegpu/tests/tgsl/conversion.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import {
convertStructValues,
convertToCommonType,
getBestConversion,
} from '../../src/tgsl/conversion.ts';
} from '../../src/codegen/conversion.ts';
import { it } from 'typegpu-testing-utility';
import { INTERNAL_setCtx } from '../../src/execMode.ts';
import { CodegenState } from '../../src/types.ts';
import { UnknownData } from '../../src/data/dataTypes.ts';
import { ResolutionCtxImpl } from '../../src/resolutionCtx.ts';
import { namespace } from '../../src/core/resolve/namespace.ts';
import wgslGenerator from '../../src/tgsl/wgslGenerator.ts';
import wgslGenerator from '../../src/codegen/wgslGenerator.ts';
import { INTERNAL_createPtr } from '../../src/data/ptr.ts';

const ctx = new ResolutionCtxImpl({
Expand Down
6 changes: 3 additions & 3 deletions packages/typegpu/tests/tgsl/generationHelpers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { mat2x2f, mat3x3f, mat4x4f } from '../../src/data/matrix.ts';
import { abstractFloat, abstractInt, bool, f16, f32, i32, u32 } from '../../src/data/numeric.ts';
import { struct } from '../../src/data/struct.ts';
import { vec2f, vec2i, vec3f, vec3i, vec4f, vec4h } from '../../src/data/vector.ts';
import { coerceToSnippet, numericLiteralToSnippet } from '../../src/tgsl/generationHelpers.ts';
import { accessIndex } from '../../src/tgsl/accessIndex.ts';
import { accessProp } from '../../src/tgsl/accessProp.ts';
import { coerceToSnippet, numericLiteralToSnippet } from '../../src/codegen/generationHelpers.ts';
import { accessIndex } from '../../src/codegen/accessIndex.ts';
import { accessProp } from '../../src/codegen/accessProp.ts';
import { UnknownData } from '../../src/data/dataTypes.ts';
import { snip } from '../../src/data/snippet.ts';
import { INTERNAL_setCtx } from '../../src/execMode.ts';
Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/tests/tgsl/typeInference.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import tgpu, { d, std } from '../../src/index.js';
import { namespace } from '../../src/core/resolve/namespace.ts';
import { ResolutionCtxImpl } from '../../src/resolutionCtx.ts';
import { CodegenState } from '../../src/types.ts';
import wgslGenerator from '../../src/tgsl/wgslGenerator.ts';
import wgslGenerator from '../../src/codegen/wgslGenerator.ts';

describe('wgsl generator type inference', () => {
let ctx: ResolutionCtxImpl;
Expand Down
6 changes: 3 additions & 3 deletions packages/typegpu/tests/tgsl/wgslGenerator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import { ResolutionCtxImpl } from '../../src/resolutionCtx.ts';
import { getMetaData } from '../../src/shared/meta.ts';
import { $internal } from '../../src/shared/symbols.ts';
import * as std from '../../src/std/index.ts';
import wgslGenerator from '../../src/tgsl/wgslGenerator.ts';
import wgslGenerator from '../../src/codegen/wgslGenerator.ts';
import { CodegenState } from '../../src/types.ts';
import { it } from 'typegpu-testing-utility';
import { ArrayExpression } from '../../src/tgsl/generationHelpers.ts';
import { ArrayExpression } from '../../src/codegen/generationHelpers.ts';
import { extractSnippetFromFn } from '../utils/parseResolved.ts';
import { UnknownData } from '../../src/tgsl/shaderGenerator_members.ts';
import { UnknownData } from '../../src/codegen/shaderGenerator_members.ts';

const { NodeTypeCatalog: NODE } = tinyest;

Expand Down
2 changes: 1 addition & 1 deletion packages/typegpu/tests/utils/parseResolved.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { UnknownData } from '../../src/data/dataTypes.ts';
import { ResolutionCtxImpl } from '../../src/resolutionCtx.ts';
import { provideCtx } from '../../src/execMode.ts';
import { getMetaData } from '../../src/shared/meta.ts';
import wgslGenerator from '../../src/tgsl/wgslGenerator.ts';
import wgslGenerator from '../../src/codegen/wgslGenerator.ts';
import { namespace } from '../../src/core/resolve/namespace.ts';
import type { Snippet } from '../../src/data/snippet.ts';
import { $internal } from '../../src/shared/symbols.ts';
Expand Down
Loading