Skip to content

fix: Console.log in drawindexed #1771

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
merged 5 commits into from
Oct 9, 2025
Merged

fix: Console.log in drawindexed #1771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b532da0
Support drawIndexed
Oct 1, 2025
9548342
Remove unnecessary test
Oct 1, 2025
ccf10f3
Update tests
Oct 1, 2025
18c21f4
Merge branch 'main' into fix/consolelog-in-drawindexed
aleksanderkatan Oct 6, 2025
8718b71
Merge branch 'main' into fix/consolelog-in-drawindexed
aleksanderkatan Oct 9, 2025
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
90 changes: 54 additions & 36 deletions apps/typegpu-docs/src/examples/tests/log-test/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,39 @@ const root = await tgpu.init({
},
});

// setup for render tests
const presentationFormat = navigator.gpu.getPreferredCanvasFormat();
const canvas = document.querySelector('canvas') as HTMLCanvasElement;

const mainVertex = tgpu['~unstable'].vertexFn({
in: { vertexIndex: d.builtin.vertexIndex },
out: { pos: d.builtin.position },
})((input) => {
const positions = [
d.vec2f(0, 0.5),
d.vec2f(-0.5, -0.5),
d.vec2f(0.5, -0.5),
];

return { pos: d.vec4f(positions[input.vertexIndex], 0, 1) };
});

const mainFragment = tgpu['~unstable'].fragmentFn({
in: { pos: d.builtin.position },
out: d.vec4f,
})(({ pos }) => {
console.log('X:', pos.x, 'Y:', pos.y);
return d.vec4f(0.769, 0.392, 1.0, 1);
});

const context = canvas.getContext('webgpu') as GPUCanvasContext;

context.configure({
device: root.device,
format: presentationFormat,
alphaMode: 'premultiplied',
});

// #region Example controls and cleanup

export const controls = {
Expand Down Expand Up @@ -131,7 +164,6 @@ export const controls = {
for (let i = 0; i < 100; i++) {
indexUniform.write(i);
test.dispatch();
console.log(`dispatched ${i}`);
}
},
},
Expand All @@ -152,29 +184,6 @@ export const controls = {
},
'Render pipeline': {
onButtonClick: () => {
const mainVertex = tgpu['~unstable'].vertexFn({
in: { vertexIndex: d.builtin.vertexIndex },
out: { pos: d.builtin.position },
})((input) => {
const positions = [
d.vec2f(0, 0.5),
d.vec2f(-0.5, -0.5),
d.vec2f(0.5, -0.5),
];

return { pos: d.vec4f(positions[input.vertexIndex], 0, 1) };
});

const mainFragment = tgpu['~unstable'].fragmentFn({
in: { pos: d.builtin.position },
out: d.vec4f,
})(({ pos }) => {
console.log('X:', pos.x, 'Y:', pos.y);
return d.vec4f(0.769, 0.392, 1.0, 1);
});

const presentationFormat = navigator.gpu.getPreferredCanvasFormat();
const canvas = document.querySelector('canvas') as HTMLCanvasElement;
const context = canvas.getContext('webgpu') as GPUCanvasContext;

context.configure({
Expand All @@ -198,6 +207,27 @@ export const controls = {
.draw(3);
},
},
'Draw indexed': {
onButtonClick: () => {
const pipeline = root['~unstable']
.withVertex(mainVertex, {})
.withFragment(mainFragment, { format: presentationFormat })
.createPipeline();

const indexBuffer = root
.createBuffer(d.arrayOf(d.u32, 3), [0, 1, 2])
.$usage('index');

pipeline
.withIndexBuffer(indexBuffer)
.withColorAttachment({
view: context.getCurrentTexture().createView(),
clearValue: [0, 0, 0, 0],
loadOp: 'clear',
storeOp: 'store',
}).drawIndexed(3);
},
},
'Too many logs': {
onButtonClick: () =>
prepareDispatch(root, (x) => {
Expand All @@ -207,18 +237,6 @@ export const controls = {
console.log('Log 3 from thread', x);
}).dispatch(16),
},
'Too much data': {
onButtonClick: () => {
try {
prepareDispatch(root, () => {
'kernel';
console.log(d.mat4x4f(), d.mat4x4f(), 1);
}).dispatch();
} catch (err) {
console.log(err);
}
},
},
Comment on lines -210 to -221
Copy link
Collaborator

Choose a reason for hiding this comment

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

What's the reason for deleting this test?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It does not need to use the GPU, so no need to keep it in an example. The same test already appears in unit tests.

};

export function onCleanup() {
Expand Down
5 changes: 5 additions & 0 deletions packages/typegpu/src/core/pipeline/renderPipeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@ class TgpuRenderPipelineImpl implements TgpuRenderPipeline {
internals.priors.indexBuffer;

const pass = this.setupRenderPass();
const { logResources } = internals.core.unwrap();
const { branch } = internals.core.options;

if (isGPUBuffer(buffer)) {
Expand All @@ -641,6 +642,10 @@ class TgpuRenderPipelineImpl implements TgpuRenderPipeline {

pass.end();

if (logResources) {
logDataFromGPU(logResources);
}

internals.priors.performanceCallback
? triggerPerformanceCallback({
root: branch,
Expand Down
64 changes: 63 additions & 1 deletion packages/typegpu/tests/examples/individual/log-test.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ describe('console log example', () => {
'100 dispatches',
'Varying size logs',
'Render pipeline',
'Draw indexed',
'Too many logs',
],
expectedCalls: 11,
expectedCalls: 12,
}, device);

// the resolution variant for when 'shader-f16' is not enabled
Expand Down Expand Up @@ -1301,6 +1302,67 @@ describe('console log example', () => {
return vec4f(0.7689999938011169, 0.3919999897480011, 1, 1);
}

struct mainVertex_Output_1 {
@builtin(position) pos: vec4f,
}

struct mainVertex_Input_2 {
@builtin(vertex_index) vertexIndex: u32,
}

@vertex fn mainVertex_0(input: mainVertex_Input_2) -> mainVertex_Output_1 {
var positions = array<vec2f, 3>(vec2f(0, 0.5), vec2f(-0.5, -0.5), vec2f(0.5, -0.5));
return mainVertex_Output_1(vec4f(positions[input.vertexIndex], 0, 1));
}

@group(0) @binding(0) var<storage, read_write> indexBuffer_5: atomic<u32>;

struct SerializedLogData_7 {
id: u32,
serializedData: array<u32, 32>,
}

@group(0) @binding(1) var<storage, read_write> dataBuffer_6: array<SerializedLogData_7, 40>;

var<private> dataBlockIndex_8: u32;

var<private> dataByteIndex_9: u32;

fn nextByteIndex_12() -> u32{
let i = dataByteIndex_9;
dataByteIndex_9 = dataByteIndex_9 + 1u;
return i;
}

fn serializeF32_11(n: f32) {
dataBuffer_6[dataBlockIndex_8].serializedData[nextByteIndex_12()] = bitcast<u32>(n);
}

fn log1serializer_10(_arg_0: f32, _arg_1: f32) {
serializeF32_11(_arg_0);
serializeF32_11(_arg_1);
}

fn log1_4(_arg_0: f32, _arg_1: f32) {
dataBlockIndex_8 = atomicAdd(&indexBuffer_5, 1);
if (dataBlockIndex_8 >= 40) {
return;
}
dataBuffer_6[dataBlockIndex_8].id = 1;
dataByteIndex_9 = 0;

log1serializer_10(_arg_0, _arg_1);
}

struct mainFragment_Input_13 {
@builtin(position) pos: vec4f,
}

@fragment fn mainFragment_3(_arg_0: mainFragment_Input_13) -> @location(0) vec4f {
log1_4(_arg_0.pos.x, _arg_0.pos.y);
return vec4f(0.7689999938011169, 0.3919999897480011, 1, 1);
}

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

@group(0) @binding(1) var<storage, read_write> indexBuffer_4: atomic<u32>;
Expand Down