diff --git a/public/workload-simulator.html b/public/workload-simulator.html index bd73ddb1..807490e8 100644 --- a/public/workload-simulator.html +++ b/public/workload-simulator.html @@ -676,11 +676,9 @@

Web graphics workload simulator

layout: pipelineLayout, multisample: { count: sampleCount }, vertex: { - entryPoint: 'vs', module: shaderModule, }, fragment: { - entryPoint: 'fs', targets: [ { format: canvasFormat, }, ], module: shaderModule, }, diff --git a/sample/a-buffer/main.ts b/sample/a-buffer/main.ts index 4ca54669..39f8b2b3 100644 --- a/sample/a-buffer/main.ts +++ b/sample/a-buffer/main.ts @@ -85,7 +85,6 @@ const opaquePipeline = device.createRenderPipeline({ layout: 'auto', vertex: { module: opaqueModule, - entryPoint: 'main_vs', buffers: [ { arrayStride: 3 * Float32Array.BYTES_PER_ELEMENT, @@ -102,7 +101,6 @@ const opaquePipeline = device.createRenderPipeline({ }, fragment: { module: opaqueModule, - entryPoint: 'main_fs', targets: [ { format: presentationFormat, @@ -205,7 +203,6 @@ const translucentPipeline = device.createRenderPipeline({ }), vertex: { module: translucentModule, - entryPoint: 'main_vs', buffers: [ { arrayStride: 3 * Float32Array.BYTES_PER_ELEMENT, @@ -221,7 +218,6 @@ const translucentPipeline = device.createRenderPipeline({ }, fragment: { module: translucentModule, - entryPoint: 'main_fs', targets: [ { format: presentationFormat, @@ -293,11 +289,9 @@ const compositePipeline = device.createRenderPipeline({ }), vertex: { module: compositeModule, - entryPoint: 'main_vs', }, fragment: { module: compositeModule, - entryPoint: 'main_fs', targets: [ { format: presentationFormat, diff --git a/sample/animometer/main.ts b/sample/animometer/main.ts index f7ec9d5d..d5cf6ba9 100644 --- a/sample/animometer/main.ts +++ b/sample/animometer/main.ts @@ -96,7 +96,6 @@ const pipelineDesc: GPURenderPipelineDescriptor = { layout: 'auto', vertex: { module: shaderModule, - entryPoint: 'vert_main', buffers: [ { // vertex buffer @@ -121,7 +120,6 @@ const pipelineDesc: GPURenderPipelineDescriptor = { }, fragment: { module: shaderModule, - entryPoint: 'frag_main', targets: [ { format: presentationFormat, diff --git a/sample/bitonicSort/main.ts b/sample/bitonicSort/main.ts index dfe8ca8c..786b5c22 100644 --- a/sample/bitonicSort/main.ts +++ b/sample/bitonicSort/main.ts @@ -294,7 +294,6 @@ SampleInitFactoryWebGPU( module: device.createShaderModule({ code: NaiveBitonicCompute(settings['Workgroup Size']), }), - entryPoint: 'computeMain', }, }); @@ -307,7 +306,6 @@ SampleInitFactoryWebGPU( module: device.createShaderModule({ code: atomicToZero, }), - entryPoint: 'atomicToZero', }, }); @@ -427,7 +425,6 @@ SampleInitFactoryWebGPU( Math.min(settings['Total Elements'] / 2, settings['Size Limit']) ), }), - entryPoint: 'computeMain', }, }); // Randomize array elements @@ -544,7 +541,6 @@ SampleInitFactoryWebGPU( Math.min(settings['Total Elements'] / 2, settings['Size Limit']) ), }), - entryPoint: 'computeMain', }, }); // Create new config key for current element + size limit configuration diff --git a/sample/bitonicSort/utils.ts b/sample/bitonicSort/utils.ts index dbe5dee9..371401d9 100644 --- a/sample/bitonicSort/utils.ts +++ b/sample/bitonicSort/utils.ts @@ -203,13 +203,11 @@ export abstract class Base2DRendererClass { module: device.createShaderModule({ code: fullscreenTexturedQuad, }), - entryPoint: 'vert_main', }, fragment: { module: device.createShaderModule({ code: code, }), - entryPoint: 'frag_main', targets: [ { format: presentationFormat, diff --git a/sample/cameras/main.ts b/sample/cameras/main.ts index dfadd9ff..be4a4ec5 100644 --- a/sample/cameras/main.ts +++ b/sample/cameras/main.ts @@ -69,7 +69,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: cubeWGSL, }), - entryPoint: 'vertex_main', buffers: [ { arrayStride: cubeVertexSize, @@ -94,7 +93,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: cubeWGSL, }), - entryPoint: 'fragment_main', targets: [ { format: presentationFormat, diff --git a/sample/computeBoids/main.ts b/sample/computeBoids/main.ts index 44702a33..0d0e5e78 100644 --- a/sample/computeBoids/main.ts +++ b/sample/computeBoids/main.ts @@ -44,7 +44,6 @@ const renderPipeline = device.createRenderPipeline({ layout: 'auto', vertex: { module: spriteShaderModule, - entryPoint: 'vert_main', buffers: [ { // instanced particles buffer @@ -82,7 +81,6 @@ const renderPipeline = device.createRenderPipeline({ }, fragment: { module: spriteShaderModule, - entryPoint: 'frag_main', targets: [ { format: presentationFormat, @@ -100,7 +98,6 @@ const computePipeline = device.createComputePipeline({ module: device.createShaderModule({ code: updateSpritesWGSL, }), - entryPoint: 'main', }, }); diff --git a/sample/cornell/rasterizer.ts b/sample/cornell/rasterizer.ts index 7ad072fd..190141f4 100644 --- a/sample/cornell/rasterizer.ts +++ b/sample/cornell/rasterizer.ts @@ -101,12 +101,10 @@ export default class Rasterizer { }), vertex: { module: mod, - entryPoint: 'vs_main', buffers: scene.vertexBufferLayout, }, fragment: { module: mod, - entryPoint: 'fs_main', targets: [{ format: framebuffer.format }], }, primitive: { diff --git a/sample/cornell/raytracer.ts b/sample/cornell/raytracer.ts index ebe4135a..98ca67bc 100644 --- a/sample/cornell/raytracer.ts +++ b/sample/cornell/raytracer.ts @@ -85,7 +85,6 @@ export default class Raytracer { module: device.createShaderModule({ code: raytracerWGSL + common.wgsl, }), - entryPoint: 'main', constants: { WorkgroupSizeX: this.kWorkgroupSizeX, WorkgroupSizeY: this.kWorkgroupSizeY, diff --git a/sample/cornell/tonemapper.ts b/sample/cornell/tonemapper.ts index ce59780e..a7d26c6a 100644 --- a/sample/cornell/tonemapper.ts +++ b/sample/cornell/tonemapper.ts @@ -75,7 +75,6 @@ export default class Tonemapper { layout: pipelineLayout, compute: { module: mod, - entryPoint: 'main', constants: { WorkgroupSizeX: this.kWorkgroupSizeX, WorkgroupSizeY: this.kWorkgroupSizeY, diff --git a/sample/cubemap/main.ts b/sample/cubemap/main.ts index 419d0136..26bd4a8c 100644 --- a/sample/cubemap/main.ts +++ b/sample/cubemap/main.ts @@ -43,7 +43,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -68,7 +67,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: sampleCubemapWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/deferredRendering/main.ts b/sample/deferredRendering/main.ts index 4d466677..2e54621a 100644 --- a/sample/deferredRendering/main.ts +++ b/sample/deferredRendering/main.ts @@ -123,14 +123,12 @@ const writeGBuffersPipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: vertexWriteGBuffers, }), - entryPoint: 'main', buffers: vertexBuffers, }, fragment: { module: device.createShaderModule({ code: fragmentWriteGBuffers, }), - entryPoint: 'main', targets: [ // normal { format: 'rgba16float' }, @@ -206,13 +204,11 @@ const gBuffersDebugViewPipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: vertexTextureQuad, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: fragmentGBuffersDebugView, }), - entryPoint: 'main', targets: [ { format: presentationFormat, @@ -237,13 +233,11 @@ const deferredRenderPipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: vertexTextureQuad, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: fragmentDeferredRendering, }), - entryPoint: 'main', targets: [ { format: presentationFormat, @@ -423,7 +417,6 @@ const lightUpdateComputePipeline = device.createComputePipeline({ module: device.createShaderModule({ code: lightUpdate, }), - entryPoint: 'main', }, }); const lightsBufferBindGroup = device.createBindGroup({ diff --git a/sample/fractalCube/main.ts b/sample/fractalCube/main.ts index fce3a277..9b274217 100644 --- a/sample/fractalCube/main.ts +++ b/sample/fractalCube/main.ts @@ -47,7 +47,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -72,7 +71,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: sampleSelfWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/gameOfLife/main.ts b/sample/gameOfLife/main.ts index 4c3e4bcb..3d5589ad 100644 --- a/sample/gameOfLife/main.ts +++ b/sample/gameOfLife/main.ts @@ -125,7 +125,6 @@ function resetGameData() { }), compute: { module: computeShader, - entryPoint: 'main', constants: { blockSize: GameOptions.workgroupSize, }, @@ -191,12 +190,10 @@ function resetGameData() { }, vertex: { module: vertexShader, - entryPoint: 'main', buffers: [cellsStride, squareStride], }, fragment: { module: fragmentShader, - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/helloTriangle/main.ts b/sample/helloTriangle/main.ts index fc4ad884..ba5561a6 100644 --- a/sample/helloTriangle/main.ts +++ b/sample/helloTriangle/main.ts @@ -24,13 +24,11 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: triangleVertWGSL, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: redFragWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/helloTriangleMSAA/main.ts b/sample/helloTriangleMSAA/main.ts index ae9a3562..aac0117c 100644 --- a/sample/helloTriangleMSAA/main.ts +++ b/sample/helloTriangleMSAA/main.ts @@ -26,13 +26,11 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: triangleVertWGSL, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: redFragWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/imageBlur/main.ts b/sample/imageBlur/main.ts index 9b3738fe..0aec1df0 100644 --- a/sample/imageBlur/main.ts +++ b/sample/imageBlur/main.ts @@ -29,7 +29,6 @@ const blurPipeline = device.createComputePipeline({ module: device.createShaderModule({ code: blurWGSL, }), - entryPoint: 'main', }, }); @@ -39,13 +38,11 @@ const fullscreenQuadPipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: fullscreenTexturedQuadWGSL, }), - entryPoint: 'vert_main', }, fragment: { module: device.createShaderModule({ code: fullscreenTexturedQuadWGSL, }), - entryPoint: 'frag_main', targets: [ { format: presentationFormat, diff --git a/sample/instancedCube/main.ts b/sample/instancedCube/main.ts index ef205840..2fb86064 100644 --- a/sample/instancedCube/main.ts +++ b/sample/instancedCube/main.ts @@ -43,7 +43,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: instancedVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -68,7 +67,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: vertexPositionColorWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/normalMap/utils.ts b/sample/normalMap/utils.ts index 6161a41a..50bdc2f1 100644 --- a/sample/normalMap/utils.ts +++ b/sample/normalMap/utils.ts @@ -155,7 +155,6 @@ export const create3DRenderPipeline = ( label: `${label}.vertexShader`, code: vertexShader, }), - entryPoint: 'vertexMain', buffers: vBufferFormats.length !== 0 ? [createVBuffer(vBufferFormats)] : [], }, @@ -164,7 +163,6 @@ export const create3DRenderPipeline = ( label: `${label}.fragmentShader`, code: fragmentShader, }), - entryPoint: 'fragmentMain', targets: [ { format: presentationFormat, diff --git a/sample/particles/main.ts b/sample/particles/main.ts index 566c9cdf..66e3da7f 100644 --- a/sample/particles/main.ts +++ b/sample/particles/main.ts @@ -43,7 +43,6 @@ const renderPipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: particleWGSL, }), - entryPoint: 'vs_main', buffers: [ { // instanced particles buffer @@ -83,7 +82,6 @@ const renderPipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: particleWGSL, }), - entryPoint: 'fs_main', targets: [ { format: presentationFormat, diff --git a/sample/renderBundles/main.ts b/sample/renderBundles/main.ts index 4766a7a8..5f184b3d 100644 --- a/sample/renderBundles/main.ts +++ b/sample/renderBundles/main.ts @@ -49,7 +49,6 @@ const pipeline = device.createRenderPipeline({ layout: 'auto', vertex: { module: shaderModule, - entryPoint: 'vertexMain', buffers: [ { arrayStride: SphereLayout.vertexStride, @@ -78,7 +77,6 @@ const pipeline = device.createRenderPipeline({ }, fragment: { module: shaderModule, - entryPoint: 'fragmentMain', targets: [ { format: presentationFormat, diff --git a/sample/resizeCanvas/main.ts b/sample/resizeCanvas/main.ts index 2e2a5fc5..94d39331 100644 --- a/sample/resizeCanvas/main.ts +++ b/sample/resizeCanvas/main.ts @@ -27,13 +27,11 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: triangleVertWGSL, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: redFragWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/reversedZ/main.ts b/sample/reversedZ/main.ts index 44171253..cf49b5fb 100644 --- a/sample/reversedZ/main.ts +++ b/sample/reversedZ/main.ts @@ -135,7 +135,6 @@ const depthPrePassRenderPipelineDescriptorBase = { module: device.createShaderModule({ code: vertexDepthPrePassWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: geometryVertexSize, @@ -186,7 +185,6 @@ const precisionPassRenderPipelineDescriptorBase = { module: device.createShaderModule({ code: vertexPrecisionErrorPassWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: geometryVertexSize, @@ -205,7 +203,6 @@ const precisionPassRenderPipelineDescriptorBase = { module: device.createShaderModule({ code: fragmentPrecisionErrorPassWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, @@ -245,7 +242,6 @@ const colorPassRenderPipelineDescriptorBase: GPURenderPipelineDescriptor = { module: device.createShaderModule({ code: vertexWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: geometryVertexSize, @@ -270,7 +266,6 @@ const colorPassRenderPipelineDescriptorBase: GPURenderPipelineDescriptor = { module: device.createShaderModule({ code: fragmentWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, @@ -311,13 +306,11 @@ const textureQuadPassPipline = device.createRenderPipeline({ module: device.createShaderModule({ code: vertexTextureQuadWGSL, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: fragmentTextureQuadWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/rotatingCube/main.ts b/sample/rotatingCube/main.ts index cd60c88d..4aa8d3ff 100644 --- a/sample/rotatingCube/main.ts +++ b/sample/rotatingCube/main.ts @@ -43,7 +43,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -68,7 +67,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: vertexPositionColorWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/samplerParameters/main.ts b/sample/samplerParameters/main.ts index 8d5b39cf..f923d5d6 100644 --- a/sample/samplerParameters/main.ts +++ b/sample/samplerParameters/main.ts @@ -231,10 +231,9 @@ const showTextureModule = device.createShaderModule({ }); const showTexturePipeline = device.createRenderPipeline({ layout: 'auto', - vertex: { module: showTextureModule, entryPoint: 'vmain' }, + vertex: { module: showTextureModule }, fragment: { module: showTextureModule, - entryPoint: 'fmain', targets: [{ format: presentationFormat }], }, primitive: { topology: 'triangle-list' }, @@ -257,12 +256,10 @@ const texturedSquarePipeline = device.createRenderPipeline({ layout: 'auto', vertex: { module: texturedSquareModule, - entryPoint: 'vmain', constants: { kTextureBaseSize, kViewportSize }, }, fragment: { module: texturedSquareModule, - entryPoint: 'fmain', targets: [{ format: presentationFormat }], }, primitive: { topology: 'triangle-list' }, diff --git a/sample/shadowMapping/main.ts b/sample/shadowMapping/main.ts index 962354f0..39a616f2 100644 --- a/sample/shadowMapping/main.ts +++ b/sample/shadowMapping/main.ts @@ -112,7 +112,6 @@ const shadowPipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: vertexShadowWGSL, }), - entryPoint: 'main', buffers: vertexBuffers, }, depthStencil: { @@ -160,14 +159,12 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: vertexWGSL, }), - entryPoint: 'main', buffers: vertexBuffers, }, fragment: { module: device.createShaderModule({ code: fragmentWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/skinnedMesh/glbUtils.ts b/sample/skinnedMesh/glbUtils.ts index c2c8643c..0bd69931 100644 --- a/sample/skinnedMesh/glbUtils.ts +++ b/sample/skinnedMesh/glbUtils.ts @@ -375,7 +375,6 @@ export class GLTFPrimitive { module: device.createShaderModule({ code: VertexInputShaderString + vertexShader, }), - entryPoint: 'vertexMain', buffers: vertexBuffers, }; @@ -384,7 +383,6 @@ export class GLTFPrimitive { module: device.createShaderModule({ code: VertexInputShaderString + fragmentShader, }), - entryPoint: 'fragmentMain', // Output render target info targets: [{ format: colorFormat }], }; diff --git a/sample/skinnedMesh/gridUtils.ts b/sample/skinnedMesh/gridUtils.ts index 4d42af41..c09c73da 100644 --- a/sample/skinnedMesh/gridUtils.ts +++ b/sample/skinnedMesh/gridUtils.ts @@ -57,7 +57,6 @@ export const createSkinnedGridRenderPipeline = ( label: `SkinnedGridRenderer.vertexShader`, code: vertexShader, }), - entryPoint: 'vertexMain', buffers: [ // Vertex Positions (positions) { @@ -99,7 +98,6 @@ export const createSkinnedGridRenderPipeline = ( label: `SkinnedGridRenderer.fragmentShader`, code: fragmentShader, }), - entryPoint: 'fragmentMain', targets: [ { format: presentationFormat, diff --git a/sample/texturedCube/main.ts b/sample/texturedCube/main.ts index 7214a901..d1124f37 100644 --- a/sample/texturedCube/main.ts +++ b/sample/texturedCube/main.ts @@ -43,7 +43,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -68,7 +67,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: sampleTextureMixColorWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/twoCubes/main.ts b/sample/twoCubes/main.ts index db901d17..efdadf0a 100644 --- a/sample/twoCubes/main.ts +++ b/sample/twoCubes/main.ts @@ -43,7 +43,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -68,7 +67,6 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: vertexPositionColorWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/videoUploading/main.ts b/sample/videoUploading/main.ts index 2b4a6746..5644b827 100644 --- a/sample/videoUploading/main.ts +++ b/sample/videoUploading/main.ts @@ -32,13 +32,11 @@ const pipeline = device.createRenderPipeline({ module: device.createShaderModule({ code: fullscreenTexturedQuadWGSL, }), - entryPoint: 'vert_main', }, fragment: { module: device.createShaderModule({ code: sampleExternalTextureWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/videoUploading/video.ts b/sample/videoUploading/video.ts index f3cd3724..e59953ff 100644 --- a/sample/videoUploading/video.ts +++ b/sample/videoUploading/video.ts @@ -33,13 +33,11 @@ export default async function ({ useVideoFrame }: { useVideoFrame: boolean }) { module: device.createShaderModule({ code: fullscreenTexturedQuadWGSL, }), - entryPoint: 'vert_main', }, fragment: { module: device.createShaderModule({ code: sampleExternalTextureWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/sample/worker/worker.ts b/sample/worker/worker.ts index c71d9d20..4ca56210 100644 --- a/sample/worker/worker.ts +++ b/sample/worker/worker.ts @@ -61,7 +61,6 @@ async function init(canvas) { module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -86,7 +85,6 @@ async function init(canvas) { module: device.createShaderModule({ code: vertexPositionColorWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat,