From 7f2973c32d5560d371e5a883f86b60d060ae817e Mon Sep 17 00:00:00 2001 From: Joel Arbuckle Date: Wed, 3 Jun 2026 07:28:03 -0700 Subject: [PATCH 1/3] Folder restructuring for potential modular impls in the future --- packages/core/src/rendering/types.ts | 26 +++++++++++++++++++ .../webgpu/shaders/attributes.test.ts | 0 .../webgpu/shaders/attributes.ts | 0 .../webgpu/shaders/declarations.test.ts | 0 .../webgpu/shaders/declarations.ts | 0 .../webgpu/shaders/example.test.ts | 0 .../{ => rendering}/webgpu/shaders/index.ts | 0 .../webgpu/shaders/shader.test.ts | 0 .../{ => rendering}/webgpu/shaders/shader.ts | 0 9 files changed, 26 insertions(+) create mode 100644 packages/core/src/rendering/types.ts rename packages/core/src/{ => rendering}/webgpu/shaders/attributes.test.ts (100%) rename packages/core/src/{ => rendering}/webgpu/shaders/attributes.ts (100%) rename packages/core/src/{ => rendering}/webgpu/shaders/declarations.test.ts (100%) rename packages/core/src/{ => rendering}/webgpu/shaders/declarations.ts (100%) rename packages/core/src/{ => rendering}/webgpu/shaders/example.test.ts (100%) rename packages/core/src/{ => rendering}/webgpu/shaders/index.ts (100%) rename packages/core/src/{ => rendering}/webgpu/shaders/shader.test.ts (100%) rename packages/core/src/{ => rendering}/webgpu/shaders/shader.ts (100%) diff --git a/packages/core/src/rendering/types.ts b/packages/core/src/rendering/types.ts new file mode 100644 index 00000000..60776dbd --- /dev/null +++ b/packages/core/src/rendering/types.ts @@ -0,0 +1,26 @@ +export type PipelineGraph = { + groups: GroupNode[]; +} + +const x: GPUBufferUsageFlags; + +export type Node = GroupNode | BindingNode; + +export type GroupNode = { + type: 'group'; + bindings: BindingNode[]; + subgroups?: GroupNode[]; +}; + +export type BindingNode = { + type: 'binding'; +} & ({ + resourceType: 'uniform'; +} | { + resourceType: 'storage'; +} | { + resourceType: 'sampler'; +} | { + resourceType: 'texture'; +}); + diff --git a/packages/core/src/webgpu/shaders/attributes.test.ts b/packages/core/src/rendering/webgpu/shaders/attributes.test.ts similarity index 100% rename from packages/core/src/webgpu/shaders/attributes.test.ts rename to packages/core/src/rendering/webgpu/shaders/attributes.test.ts diff --git a/packages/core/src/webgpu/shaders/attributes.ts b/packages/core/src/rendering/webgpu/shaders/attributes.ts similarity index 100% rename from packages/core/src/webgpu/shaders/attributes.ts rename to packages/core/src/rendering/webgpu/shaders/attributes.ts diff --git a/packages/core/src/webgpu/shaders/declarations.test.ts b/packages/core/src/rendering/webgpu/shaders/declarations.test.ts similarity index 100% rename from packages/core/src/webgpu/shaders/declarations.test.ts rename to packages/core/src/rendering/webgpu/shaders/declarations.test.ts diff --git a/packages/core/src/webgpu/shaders/declarations.ts b/packages/core/src/rendering/webgpu/shaders/declarations.ts similarity index 100% rename from packages/core/src/webgpu/shaders/declarations.ts rename to packages/core/src/rendering/webgpu/shaders/declarations.ts diff --git a/packages/core/src/webgpu/shaders/example.test.ts b/packages/core/src/rendering/webgpu/shaders/example.test.ts similarity index 100% rename from packages/core/src/webgpu/shaders/example.test.ts rename to packages/core/src/rendering/webgpu/shaders/example.test.ts diff --git a/packages/core/src/webgpu/shaders/index.ts b/packages/core/src/rendering/webgpu/shaders/index.ts similarity index 100% rename from packages/core/src/webgpu/shaders/index.ts rename to packages/core/src/rendering/webgpu/shaders/index.ts diff --git a/packages/core/src/webgpu/shaders/shader.test.ts b/packages/core/src/rendering/webgpu/shaders/shader.test.ts similarity index 100% rename from packages/core/src/webgpu/shaders/shader.test.ts rename to packages/core/src/rendering/webgpu/shaders/shader.test.ts diff --git a/packages/core/src/webgpu/shaders/shader.ts b/packages/core/src/rendering/webgpu/shaders/shader.ts similarity index 100% rename from packages/core/src/webgpu/shaders/shader.ts rename to packages/core/src/rendering/webgpu/shaders/shader.ts From f307f618acd061d21bf421e6f68b315345c83c31 Mon Sep 17 00:00:00 2001 From: Joel Arbuckle Date: Thu, 4 Jun 2026 11:06:13 -0700 Subject: [PATCH 2/3] Removed unused line that was causing errors --- packages/core/src/rendering/types.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/core/src/rendering/types.ts b/packages/core/src/rendering/types.ts index 60776dbd..d09a31e1 100644 --- a/packages/core/src/rendering/types.ts +++ b/packages/core/src/rendering/types.ts @@ -2,8 +2,6 @@ export type PipelineGraph = { groups: GroupNode[]; } -const x: GPUBufferUsageFlags; - export type Node = GroupNode | BindingNode; export type GroupNode = { From 68e783cb8cc5a217bfa7218c6491c5695b78d453 Mon Sep 17 00:00:00 2001 From: Joel Arbuckle Date: Thu, 4 Jun 2026 11:08:20 -0700 Subject: [PATCH 3/3] Fmt fixes --- packages/core/src/rendering/types.ts | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/core/src/rendering/types.ts b/packages/core/src/rendering/types.ts index d09a31e1..750f42d4 100644 --- a/packages/core/src/rendering/types.ts +++ b/packages/core/src/rendering/types.ts @@ -1,6 +1,6 @@ export type PipelineGraph = { groups: GroupNode[]; -} +}; export type Node = GroupNode | BindingNode; @@ -12,13 +12,17 @@ export type GroupNode = { export type BindingNode = { type: 'binding'; -} & ({ - resourceType: 'uniform'; -} | { - resourceType: 'storage'; -} | { - resourceType: 'sampler'; -} | { - resourceType: 'texture'; -}); - +} & ( + | { + resourceType: 'uniform'; + } + | { + resourceType: 'storage'; + } + | { + resourceType: 'sampler'; + } + | { + resourceType: 'texture'; + } +);