eric/matrix
1
0
Fork 0
mirror of https://github.com/Rezmason/matrix.git synced 2026-04-18 06:09:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Looks like uniform buffers don't need to specify which shader stages use them.

Browse Source 
Removed the primitive state from the pipeline descriptor, because the project uses its default values.
This commit is contained in:
Rezmason
2021-10-29 09:20:37 -07:00
parent fb6406e753
commit dd4fe3cac6
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
js/webgpu_main.js
View File

@@ -16,7 +16,7 @@ const loadTexture = async (device, url) => {
const texture = device.createTexture({ const texture = device.createTexture({
size: [imageBitmap.width, imageBitmap.height, 1], size: [imageBitmap.width, imageBitmap.height, 1],
format: "rgba8unorm", format: "rgba8unorm",
usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT, // Which of these are necessary? usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT,
}); });
device.queue.copyExternalImageToTexture( device.queue.copyExternalImageToTexture(
@@ -79,17 +79,16 @@ export default async (canvas, config) => {
const configBufferSize = configStructLayout.size; const configBufferSize = configStructLayout.size;
const configBuffer = device.createBuffer({ const configBuffer = device.createBuffer({
size: configBufferSize, size: configBufferSize,
usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.VERTEX | GPUBufferUsage.FRAGMENT, // Which of these are necessary? usage: GPUBufferUsage.UNIFORM,
mappedAtCreation: true, mappedAtCreation: true,
}); });
configStructLayout.build([numColumns, numRows, config.glyphHeightToWidth], configBuffer.getMappedRange()); configStructLayout.build([numColumns, numRows, config.glyphHeightToWidth], configBuffer.getMappedRange());
configBuffer.unmap(); configBuffer.unmap();
// prettier-ignore
const msdfStructLayout = std140(["i32", "i32"]); const msdfStructLayout = std140(["i32", "i32"]);
const msdfBuffer = device.createBuffer({ const msdfBuffer = device.createBuffer({
size: msdfStructLayout.size, size: msdfStructLayout.size,
usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.FRAGMENT, // Which of these are necessary? usage: GPUBufferUsage.UNIFORM,
mappedAtCreation: true, mappedAtCreation: true,
}); });
msdfStructLayout.build([config.glyphTextureColumns, config.glyphSequenceLength], msdfBuffer.getMappedRange()); msdfStructLayout.build([config.glyphTextureColumns, config.glyphSequenceLength], msdfBuffer.getMappedRange());
@@ -98,14 +97,13 @@ export default async (canvas, config) => {
const timeStructLayout = std140(["f32", "i32"]); const timeStructLayout = std140(["f32", "i32"]);
const timeBuffer = device.createBuffer({ const timeBuffer = device.createBuffer({
size: timeStructLayout.size, size: timeStructLayout.size,
usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.VERTEX | GPUBufferUsage.FRAGMENT | GPUBufferUsage.COMPUTE | GPUBufferUsage.COPY_DST, // Which of these are necessary? usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
}); });
// prettier-ignore
const sceneStructLayout = std140(["vec2<f32>", "mat4x4<f32>", "mat4x4<f32>"]); const sceneStructLayout = std140(["vec2<f32>", "mat4x4<f32>", "mat4x4<f32>"]);
const sceneBuffer = device.createBuffer({ const sceneBuffer = device.createBuffer({
size: sceneStructLayout.size, size: sceneStructLayout.size,
usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.VERTEX | GPUBufferUsage.COMPUTE | GPUBufferUsage.COPY_DST, // Which of these are necessary? usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
}); });
const camera = mat4.create(); const camera = mat4.create();
@@ -154,11 +152,6 @@ export default async (canvas, config) => {
}, },
], ],
}, },
primitive: {
// What happens if this isn't here?
topology: "triangle-list", // What happens if this isn't here?
cullMode: "back", // What happens if this isn't here?
},
}); });
console.log(device.limits); console.log(device.limits);