Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into feat/make-preparedisp…
…atch-withable
  • Loading branch information
Aleksander Katan committed Sep 22, 2025
commit 5b0b993caf215adfed7f57ddd62a5c2bdcec7815
17 changes: 5 additions & 12 deletions apps/typegpu-docs/src/examples/tests/log-test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,6 @@ export const controls = {
console.log(d.u32(2), 'plus', d.u32(3), 'equals', d.u32(5));
}).dispatch(),
},
'Different types': {
onButtonClick: () =>
prepareDispatch(root, () => {
'kernel';
console.log(d.bool(true));
console.log(d.u32(3_000_000_000));
console.log(d.vec2u(1, 2));
console.log(d.vec3u(1, 2, 3));
console.log(d.vec4u(1, 2, 3, 4));
}).dispatch(),
},
'Two logs': {
onButtonClick: () =>
prepareDispatch(root, () => {
Expand Down Expand Up @@ -97,7 +86,7 @@ export const controls = {
} else {
console.log("The 'shader-f16' flag is not enabled.");
}
})(),
}).dispatch(),
},
'Two threads': {
onButtonClick: () =>
Expand Down Expand Up @@ -194,6 +183,10 @@ export const controls = {
},
'Too much data': {
onButtonClick: () => {
const dispatch = prepareDispatch(root, () => {
'kernel';
console.log(d.mat4x4f(), d.mat4x4f(), 1);
});
try {
prepareDispatch(root, () => {
'kernel';
Expand Down
8 changes: 4 additions & 4 deletions packages/typegpu/tests/examples/individual/log-test.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -670,11 +670,11 @@ describe('console log example', () => {
}

@compute @workgroup_size(1, 1, 1) fn mainCompute_0(in: mainCompute_Input_16) {
if (any(in.id >= sizeUniform_1)) {
return;
if (any(in.id >= sizeUniform_1)) {
return;
}
wrappedCallback_2(in.id.x, in.id.y, in.id.z);
}
wrappedCallback_2(in.id.x, in.id.y, in.id.z);
}

@group(0) @binding(0) var<uniform> sizeUniform_1: vec3u;

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.