more cleaning up

src/pipelines/eraser/eraser-agent-pipeline.ts

@@ -1,18 +1,14 @@
-import { vec2 } from 'gl-matrix';
-
-import { appConfig } from '../../config';
 import {
   createCachedFloat32BufferWrite,
   writeFloat32BufferIfChanged,
 } from '../../utils/graphics/cached-buffer-write';
-import { getWorkgroupCounts } from '../../utils/graphics/get-workgroup-counts';
+import { getWorkgroupCount } from '../../utils/graphics/get-workgroup-count';
 import { smartCompile } from '../../utils/graphics/smart-compile';
 import agentSchema from '../agents/agent-generation/agent-schema.wgsl?raw';
-import { CommonState } from '../common-state/common-state';
 import shader from './eraser-agent.wgsl?raw';
 
 export class EraserAgentPipeline {
-  private static readonly WORKGROUP_SIZE = appConfig.pipelines.eraser.workgroupSize;
+  private static readonly WORKGROUP_SIZE = 64;
   private static readonly UNIFORM_COUNT = 4;
 
   private readonly bindGroupLayout: GPUBindGroupLayout;
@@ -24,16 +20,15 @@ export class EraserAgentPipeline {
   );
   private readonly bindGroupsByMask = new WeakMap<GPUTextureView, GPUBindGroup>();
 
-  private linePoints: Array<vec2> = [];
   private pendingSegmentCount = 0;
   private activeSegmentCount = 0;
   private agentCount = 0;
 
   public constructor(
     private readonly device: GPUDevice,
-    private readonly commonState: CommonState,
     private readonly agentsBuffer: GPUBuffer
   ) {
+    const emptyBindGroupLayout = device.createBindGroupLayout({ entries: [] });
     this.bindGroupLayout = device.createBindGroupLayout({
       entries: [
         {
@@ -67,41 +62,25 @@ export class EraserAgentPipeline {
 
     this.pipeline = device.createComputePipeline({
       layout: device.createPipelineLayout({
-        bindGroupLayouts: [commonState.bindGroupLayout, this.bindGroupLayout],
+        bindGroupLayouts: [emptyBindGroupLayout, this.bindGroupLayout],
       }),
       compute: {
-        module: smartCompile(device, CommonState.shaderCode, agentSchema, shader),
+        module: smartCompile(device, agentSchema, shader),
         entryPoint: 'main',
       },
     });
   }
 
-  public addSwipe(position: vec2): void {
-    const previousPosition = this.linePoints[this.linePoints.length - 1] ?? position;
-    this.addSwipeSegment(previousPosition, position);
-    this.linePoints.push(vec2.clone(position));
-  }
-
-  public addSwipeSegment(from: vec2, to: vec2): void {
-    void from;
-    void to;
+  public addSwipeSegment(): void {
     this.pendingSegmentCount += 1;
   }
 
   public clearSwipes(): void {
-    this.linePoints.length = 0;
     this.pendingSegmentCount = 0;
     this.activeSegmentCount = 0;
   }
 
-  public setParameters({
-    agentCount,
-    eraserSize: _eraserSize,
-  }: {
-    agentCount: number;
-    eraserSize: number;
-  }): void {
-    void _eraserSize;
+  public setParameters({ agentCount }: { agentCount: number }): void {
     this.agentCount = agentCount;
     this.activeSegmentCount = this.pendingSegmentCount;
     this.pendingSegmentCount = 0;
@@ -129,14 +108,9 @@ export class EraserAgentPipeline {
 
     const passEncoder = commandEncoder.beginComputePass();
     passEncoder.setPipeline(this.pipeline);
-    this.commonState.execute(passEncoder);
     passEncoder.setBindGroup(1, this.getBindGroup(eraserMask));
     passEncoder.dispatchWorkgroups(
-      ...getWorkgroupCounts(
-        this.device,
-        this.agentCount,
-        EraserAgentPipeline.WORKGROUP_SIZE
-      )
+      getWorkgroupCount(this.agentCount, EraserAgentPipeline.WORKGROUP_SIZE)
     );
     passEncoder.end();
   }

src/pipelines/eraser/eraser-agent.wgsl

@@ -10,10 +10,9 @@ struct Settings {
 
 @compute @workgroup_size(64)
 fn main(
-  @builtin(global_invocation_id) global_id: vec3<u32>,
-  @builtin(num_workgroups) workgroup_count: vec3<u32>
+  @builtin(global_invocation_id) global_id: vec3<u32>
 ) {
-  let id = get_id(global_id, workgroup_count);
+  let id = get_id(global_id);
 
   if id >= u32(settings.agentCount) {
     return;

src/pipelines/eraser/eraser-texture-pipeline.ts

@@ -1,7 +1,6 @@
 import { vec2 } from 'gl-matrix';
 
 import { appConfig } from '../../config';
-import { clamp } from '../../utils/clamp';
 import {
   createCachedFloat32BufferWrite,
   writeFloat32BufferIfChanged,
@@ -37,7 +36,6 @@ export class EraserTexturePipeline {
       EraserTexturePipeline.ATTRIBUTES_PER_LINE_SEGMENT
   );
 
-  private linePoints: Array<vec2> = [];
   private lineSegments: Array<LineSegment> = [];
   private actualSegments: Array<LineSegment> = [];
 
@@ -88,12 +86,6 @@ export class EraserTexturePipeline {
     });
   }
 
-  public addSwipe(position: vec2): void {
-    const previousPosition = this.linePoints[this.linePoints.length - 1] ?? position;
-    this.addSwipeSegment(previousPosition, position);
-    this.linePoints.push(vec2.clone(position));
-  }
-
   public addSwipeSegment(from: vec2, to: vec2): void {
     this.lineSegments.push({
       from: vec2.clone(from),
@@ -102,7 +94,6 @@ export class EraserTexturePipeline {
   }
 
   public clearSwipes(): void {
-    this.linePoints.length = 0;
     this.lineSegments.length = 0;
     this.actualSegments.length = 0;
   }
@@ -110,8 +101,8 @@ export class EraserTexturePipeline {
   public setParameters({ eraserSize }: { eraserSize: number }): void {
     const eraserRadius = eraserSize / 2;
 
-    this.uniformValues[0] = eraserRadius;
-    this.uniformValues[1] = eraserRadius * eraserRadius;
+    this.uniformValues[0] = eraserRadius * eraserRadius;
+    this.uniformValues[1] = 0;
     this.uniformValues[2] = 0;
     this.uniformValues[3] = 0;
     writeFloat32BufferIfChanged(
@@ -356,6 +347,6 @@ export class EraserTexturePipeline {
   }
 
   private get lineCount(): number {
-    return clamp(this.actualSegments.length, 0, EraserTexturePipeline.MAX_LINE_COUNT);
+    return this.actualSegments.length;
   }
 }

src/pipelines/eraser/eraser-texture.wgsl

@@ -1,6 +1,6 @@
 struct Settings {
-  eraserRadius: f32,
   eraserRadiusSquared: f32,
+  padding0: f32,
   padding1: f32,
   padding2: f32,
 };