Skip to content

fix(webgpu): string index arguments and unsupported surface usages #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
triniwiz merged 2 commits into from
Sep 28, 2026
+16 −12
Merged

fix(webgpu): string index arguments and unsupported surface usages #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cb4c40
fix(webgpu): convert index arguments to numbers
triniwiz Sep 28, 2026
149cfd1
fix(webgpu): mask configure usage to the surface's on desktop hosts
triniwiz Sep 28, 2026
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
3 changes: 2 additions & 1 deletion packages/canvas/WebGPU/GPUCanvasContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ export class GPUCanvasContext implements CanvasRenderingContext {
console.warn(`GPUCanvasContext: configure usage unsupported falling back to ${capabilities.usages}`);
}

if (__APPLE__) {
// Keep to the usages the surface supports.
if (__APPLE__ || NAPI_HOST) {
const supported = (capabilities && (capabilities as any).usages) || 0;
const unsupported = opts.usage & ~supported;
if (unsupported !== 0) {
Expand Down
7 changes: 4 additions & 3 deletions packages/canvas/WebGPU/GPUComputePassEncoder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,19 @@ export class GPUComputePassEncoder {
this[native_].pushDebugGroup(groupLabel);
}

// Index arguments are converted to numbers, as WebIDL does: `for...in` keys arrive as strings.
setBindGroup(index: number, bindGroup: GPUBindGroup, dynamicOffsetsData?: number[] | Uint32Array, dynamicOffsetsDataStart?: number, dynamicOffsetsDataLength?: number) {
const group = bindGroup?.[native_];
if (!group) {
return;
}
if (Array.isArray(dynamicOffsetsData)) {
const data = new Uint32Array(dynamicOffsetsData);
this[native_].setBindGroup(index, group, data, 0, data.length);
this[native_].setBindGroup(Number(index), group, data, 0, data.length);
} else if (dynamicOffsetsData instanceof Uint32Array) {
this[native_].setBindGroup(index, group, dynamicOffsetsData, dynamicOffsetsDataStart, dynamicOffsetsDataLength);
this[native_].setBindGroup(Number(index), group, dynamicOffsetsData, dynamicOffsetsDataStart, dynamicOffsetsDataLength);
} else {
this[native_].setBindGroup(index, group);
this[native_].setBindGroup(Number(index), group);
}
}

Expand Down
9 changes: 5 additions & 4 deletions packages/canvas/WebGPU/GPURenderBundleEncoder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,19 @@ export class GPURenderBundleEncoder {
this[native_].pushDebugGroup(groupLabel);
}

// Index arguments are converted to numbers, as WebIDL does: `for...in` keys arrive as strings.
setBindGroup(index: number, bindGroup: GPUBindGroup, dynamicOffsetsData?: number[] | Uint32Array, dynamicOffsetsDataStart?: number, dynamicOffsetsDataLength?: number) {
const group = bindGroup?.[native_];
if (!group) {
return;
}
if (Array.isArray(dynamicOffsetsData)) {
const data = new Uint32Array(dynamicOffsetsData);
this[native_].setBindGroup(index, group, data, 0, data.length);
this[native_].setBindGroup(Number(index), group, data, 0, data.length);
} else if (dynamicOffsetsData instanceof Uint32Array) {
this[native_].setBindGroup(index, group, dynamicOffsetsData, dynamicOffsetsDataStart, dynamicOffsetsDataLength);
this[native_].setBindGroup(Number(index), group, dynamicOffsetsData, dynamicOffsetsDataStart, dynamicOffsetsDataLength);
} else {
this[native_].setBindGroup(index, group);
this[native_].setBindGroup(Number(index), group);
}
}

Expand All @@ -68,7 +69,7 @@ export class GPURenderBundleEncoder {
}

setVertexBuffer(slot: number, buffer: GPUBuffer, offset?: number, size?: number) {
this[native_].setVertexBuffer(slot, buffer[native_], offset ?? 0, size ?? buffer.size - (offset ?? 0));
this[native_].setVertexBuffer(Number(slot), buffer[native_], offset ?? 0, size ?? buffer.size - (offset ?? 0));
}

static fromNative(encoder) {
Expand Down
9 changes: 5 additions & 4 deletions packages/canvas/WebGPU/GPURenderPassEncoder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export class GPURenderPassEncoder {
this[native_].pushDebugGroup(groupLabel);
}

// Index arguments are converted to numbers, as WebIDL does: `for...in` keys arrive as strings.
setBindGroup(index: number, bindGroup: GPUBindGroup, dynamicOffsetsData?: number[] | Uint32Array, dynamicOffsetsDataStart?: number, dynamicOffsetsDataLength?: number) {
const group = bindGroup?.[native_];
if (!group) {
Expand All @@ -82,11 +83,11 @@ export class GPURenderPassEncoder {

if (Array.isArray(dynamicOffsetsData)) {
const data = new Uint32Array(dynamicOffsetsData);
this[native_].setBindGroup(index, group, data, 0, data.length);
this[native_].setBindGroup(Number(index), group, data, 0, data.length);
} else if (dynamicOffsetsData instanceof Uint32Array) {
this[native_].setBindGroup(index, group, dynamicOffsetsData, dynamicOffsetsDataStart, dynamicOffsetsDataLength);
this[native_].setBindGroup(Number(index), group, dynamicOffsetsData, dynamicOffsetsDataStart, dynamicOffsetsDataLength);
} else {
this[native_].setBindGroup(index, group);
this[native_].setBindGroup(Number(index), group);
}
}

Expand Down Expand Up @@ -121,7 +122,7 @@ export class GPURenderPassEncoder {
}

setVertexBuffer(slot: number, buffer: GPUBuffer, offset?: number, size?: number) {
this[native_].setVertexBuffer(slot, buffer[native_], offset ?? 0, size ?? buffer.size - (offset ?? 0));
this[native_].setVertexBuffer(Number(slot), buffer[native_], offset ?? 0, size ?? buffer.size - (offset ?? 0));
}

setViewport(x, y, width, height, minDepth, maxDepth) {
Expand Down
Loading