From 072d4f2ed5af8bae9fa0e8d107c223777db4a6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Beaufort?= Date: Thu, 23 Nov 2023 17:25:56 +0100 Subject: [PATCH] Remove entryPoint if not required --- package-lock.json | 8 ++++---- package.json | 2 +- public/workload-simulator.html | 2 -- src/sample/a-buffer/main.ts | 6 ------ src/sample/animometer/main.ts | 2 -- src/sample/bitonicSort/main.ts | 3 --- src/sample/bitonicSort/utils.ts | 2 -- src/sample/cameras/main.ts | 2 -- src/sample/computeBoids/main.ts | 3 --- src/sample/cornell/rasterizer.ts | 2 -- src/sample/cornell/raytracer.ts | 1 - src/sample/cornell/tonemapper.ts | 1 - src/sample/cubemap/main.ts | 2 -- src/sample/deferredRendering/main.ts | 7 ------- src/sample/fractalCube/main.ts | 2 -- src/sample/gameOfLife/main.ts | 3 --- src/sample/helloTriangle/main.ts | 2 -- src/sample/helloTriangleMSAA/main.ts | 2 -- src/sample/imageBlur/main.ts | 3 --- src/sample/instancedCube/main.ts | 2 -- src/sample/normalMap/utils.ts | 2 -- src/sample/particles/main.ts | 3 --- src/sample/renderBundles/main.ts | 2 -- src/sample/resizeCanvas/main.ts | 2 -- src/sample/reversedZ/main.ts | 7 ------- src/sample/rotatingCube/main.ts | 2 -- src/sample/samplerParameters/main.ts | 5 +---- src/sample/shadowMapping/main.ts | 3 --- src/sample/texturedCube/main.ts | 2 -- src/sample/twoCubes/main.ts | 2 -- src/sample/videoUploading/main.ts | 2 -- src/sample/videoUploadingWebCodecs/main.ts | 2 -- src/sample/worker/worker.ts | 2 -- 33 files changed, 6 insertions(+), 87 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75588b63..5d132632 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@types/stats.js": "^0.17.0", "@typescript-eslint/eslint-plugin": "^5.41.0", "@typescript-eslint/parser": "^5.41.0", - "@webgpu/types": "^0.1.38", + "@webgpu/types": "^0.1.40", "eslint": "^8.26.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", @@ -1098,9 +1098,9 @@ } }, "node_modules/@webgpu/types": { - "version": "0.1.38", - "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.38.tgz", - "integrity": "sha512-7LrhVKz2PRh+DD7+S+PVaFd5HxaWQvoMqBbsV9fNJO1pjUs1P8bM2vQVNfk+3URTqbuTI7gkXi0rfsN0IadoBA==", + "version": "0.1.40", + "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.40.tgz", + "integrity": "sha512-/BBkHLS6/eQjyWhY2H7Dx5DHcVrS2ICj9owvSRdgtQT6KcafLZA86tPze0xAOsd4FbsYKCUBUQyNi87q7gV7kw==", "dev": true }, "node_modules/@xtuc/ieee754": { diff --git a/package.json b/package.json index c9a76881..608c8163 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@types/stats.js": "^0.17.0", "@typescript-eslint/eslint-plugin": "^5.41.0", "@typescript-eslint/parser": "^5.41.0", - "@webgpu/types": "^0.1.38", + "@webgpu/types": "^0.1.40", "eslint": "^8.26.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", 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/src/sample/a-buffer/main.ts b/src/sample/a-buffer/main.ts index 33d52087..fe8e5b6d 100644 --- a/src/sample/a-buffer/main.ts +++ b/src/sample/a-buffer/main.ts @@ -87,7 +87,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { layout: 'auto', vertex: { module: opaqueModule, - entryPoint: 'main_vs', buffers: [ { arrayStride: 3 * Float32Array.BYTES_PER_ELEMENT, @@ -104,7 +103,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { }, fragment: { module: opaqueModule, - entryPoint: 'main_fs', targets: [ { format: presentationFormat, @@ -207,7 +205,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { }), vertex: { module: translucentModule, - entryPoint: 'main_vs', buffers: [ { arrayStride: 3 * Float32Array.BYTES_PER_ELEMENT, @@ -223,7 +220,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { }, fragment: { module: translucentModule, - entryPoint: 'main_fs', targets: [ { format: presentationFormat, @@ -295,11 +291,9 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { }), vertex: { module: compositeModule, - entryPoint: 'main_vs', }, fragment: { module: compositeModule, - entryPoint: 'main_fs', targets: [ { format: presentationFormat, diff --git a/src/sample/animometer/main.ts b/src/sample/animometer/main.ts index f8772358..bd35279f 100644 --- a/src/sample/animometer/main.ts +++ b/src/sample/animometer/main.ts @@ -100,7 +100,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { layout: 'auto', vertex: { module: shaderModule, - entryPoint: 'vert_main', buffers: [ { // vertex buffer @@ -125,7 +124,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { }, fragment: { module: shaderModule, - entryPoint: 'frag_main', targets: [ { format: presentationFormat, diff --git a/src/sample/bitonicSort/main.ts b/src/sample/bitonicSort/main.ts index 1ef69e40..c5bc6224 100644 --- a/src/sample/bitonicSort/main.ts +++ b/src/sample/bitonicSort/main.ts @@ -195,7 +195,6 @@ SampleInitFactoryWebGPU( module: device.createShaderModule({ code: NaiveBitonicCompute(settings['Total Threads']), }), - entryPoint: 'computeMain', }, }); @@ -208,7 +207,6 @@ SampleInitFactoryWebGPU( module: device.createShaderModule({ code: atomicToZero, }), - entryPoint: 'atomicToZero', }, }); @@ -310,7 +308,6 @@ SampleInitFactoryWebGPU( module: device.createShaderModule({ code: NaiveBitonicCompute(settings['Total Elements'] / 2), }), - entryPoint: 'computeMain', }, }); // Randomize array elements diff --git a/src/sample/bitonicSort/utils.ts b/src/sample/bitonicSort/utils.ts index bbbeb9f3..10d3c4da 100644 --- a/src/sample/bitonicSort/utils.ts +++ b/src/sample/bitonicSort/utils.ts @@ -196,13 +196,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/src/sample/cameras/main.ts b/src/sample/cameras/main.ts index 861ab27f..94deb314 100644 --- a/src/sample/cameras/main.ts +++ b/src/sample/cameras/main.ts @@ -70,7 +70,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: cubeWGSL, }), - entryPoint: 'vertex_main', buffers: [ { arrayStride: cubeVertexSize, @@ -95,7 +94,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: cubeWGSL, }), - entryPoint: 'fragment_main', targets: [ { format: presentationFormat, diff --git a/src/sample/computeBoids/main.ts b/src/sample/computeBoids/main.ts index a95ab8ec..5f616975 100644 --- a/src/sample/computeBoids/main.ts +++ b/src/sample/computeBoids/main.ts @@ -47,7 +47,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { layout: 'auto', vertex: { module: spriteShaderModule, - entryPoint: 'vert_main', buffers: [ { // instanced particles buffer @@ -85,7 +84,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { }, fragment: { module: spriteShaderModule, - entryPoint: 'frag_main', targets: [ { format: presentationFormat, @@ -103,7 +101,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: updateSpritesWGSL, }), - entryPoint: 'main', }, }); diff --git a/src/sample/cornell/rasterizer.ts b/src/sample/cornell/rasterizer.ts index 300d7dcf..754b4ece 100644 --- a/src/sample/cornell/rasterizer.ts +++ b/src/sample/cornell/rasterizer.ts @@ -106,12 +106,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/src/sample/cornell/raytracer.ts b/src/sample/cornell/raytracer.ts index 56767323..0cf72ec2 100644 --- a/src/sample/cornell/raytracer.ts +++ b/src/sample/cornell/raytracer.ts @@ -90,7 +90,6 @@ export default class Raytracer { module: device.createShaderModule({ code: raytracerWGSL + common.wgsl, }), - entryPoint: 'main', constants: { WorkgroupSizeX: this.kWorkgroupSizeX, WorkgroupSizeY: this.kWorkgroupSizeY, diff --git a/src/sample/cornell/tonemapper.ts b/src/sample/cornell/tonemapper.ts index f7346525..4d81e772 100644 --- a/src/sample/cornell/tonemapper.ts +++ b/src/sample/cornell/tonemapper.ts @@ -80,7 +80,6 @@ export default class Tonemapper { layout: pipelineLayout, compute: { module: mod, - entryPoint: 'main', constants: { WorkgroupSizeX: this.kWorkgroupSizeX, WorkgroupSizeY: this.kWorkgroupSizeY, diff --git a/src/sample/cubemap/main.ts b/src/sample/cubemap/main.ts index d6513c54..817b4d9a 100644 --- a/src/sample/cubemap/main.ts +++ b/src/sample/cubemap/main.ts @@ -45,7 +45,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -70,7 +69,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: sampleCubemapWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/deferredRendering/main.ts b/src/sample/deferredRendering/main.ts index 072a3751..a0a049be 100644 --- a/src/sample/deferredRendering/main.ts +++ b/src/sample/deferredRendering/main.ts @@ -125,14 +125,12 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: vertexWriteGBuffers, }), - entryPoint: 'main', buffers: vertexBuffers, }, fragment: { module: device.createShaderModule({ code: fragmentWriteGBuffers, }), - entryPoint: 'main', targets: [ // normal { format: 'rgba16float' }, @@ -208,13 +206,11 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: vertexTextureQuad, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: fragmentGBuffersDebugView, }), - entryPoint: 'main', targets: [ { format: presentationFormat, @@ -239,13 +235,11 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: vertexTextureQuad, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: fragmentDeferredRendering, }), - entryPoint: 'main', targets: [ { format: presentationFormat, @@ -424,7 +418,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: lightUpdate, }), - entryPoint: 'main', }, }); const lightsBufferBindGroup = device.createBindGroup({ diff --git a/src/sample/fractalCube/main.ts b/src/sample/fractalCube/main.ts index 3abc1149..052a1725 100644 --- a/src/sample/fractalCube/main.ts +++ b/src/sample/fractalCube/main.ts @@ -49,7 +49,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -74,7 +73,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: sampleSelfWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/gameOfLife/main.ts b/src/sample/gameOfLife/main.ts index f772b46f..7ba391cc 100644 --- a/src/sample/gameOfLife/main.ts +++ b/src/sample/gameOfLife/main.ts @@ -124,7 +124,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { }), compute: { module: computeShader, - entryPoint: 'main', constants: { blockSize: GameOptions.workgroupSize, }, @@ -190,12 +189,10 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { }, vertex: { module: vertexShader, - entryPoint: 'main', buffers: [cellsStride, squareStride], }, fragment: { module: fragmentShader, - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/helloTriangle/main.ts b/src/sample/helloTriangle/main.ts index 0330b4df..026ba7fa 100644 --- a/src/sample/helloTriangle/main.ts +++ b/src/sample/helloTriangle/main.ts @@ -27,13 +27,11 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: triangleVertWGSL, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: redFragWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/helloTriangleMSAA/main.ts b/src/sample/helloTriangleMSAA/main.ts index 9b663118..d22a1e8c 100644 --- a/src/sample/helloTriangleMSAA/main.ts +++ b/src/sample/helloTriangleMSAA/main.ts @@ -29,13 +29,11 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: triangleVertWGSL, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: redFragWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/imageBlur/main.ts b/src/sample/imageBlur/main.ts index 4331e717..9e0a6676 100644 --- a/src/sample/imageBlur/main.ts +++ b/src/sample/imageBlur/main.ts @@ -31,7 +31,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: blurWGSL, }), - entryPoint: 'main', }, }); @@ -41,13 +40,11 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: fullscreenTexturedQuadWGSL, }), - entryPoint: 'vert_main', }, fragment: { module: device.createShaderModule({ code: fullscreenTexturedQuadWGSL, }), - entryPoint: 'frag_main', targets: [ { format: presentationFormat, diff --git a/src/sample/instancedCube/main.ts b/src/sample/instancedCube/main.ts index baec3e39..f5cb6ec3 100644 --- a/src/sample/instancedCube/main.ts +++ b/src/sample/instancedCube/main.ts @@ -45,7 +45,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: instancedVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -70,7 +69,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: vertexPositionColorWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/normalMap/utils.ts b/src/sample/normalMap/utils.ts index 6161a41a..50bdc2f1 100644 --- a/src/sample/normalMap/utils.ts +++ b/src/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/src/sample/particles/main.ts b/src/sample/particles/main.ts index 8ca9d7fb..0f005a8b 100644 --- a/src/sample/particles/main.ts +++ b/src/sample/particles/main.ts @@ -44,7 +44,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: particleWGSL, }), - entryPoint: 'vs_main', buffers: [ { // instanced particles buffer @@ -84,7 +83,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: particleWGSL, }), - entryPoint: 'fs_main', targets: [ { format: presentationFormat, @@ -340,7 +338,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: particleWGSL, }), - entryPoint: 'simulate', }, }); const computeBindGroup = device.createBindGroup({ diff --git a/src/sample/renderBundles/main.ts b/src/sample/renderBundles/main.ts index bbe243d2..34378a16 100644 --- a/src/sample/renderBundles/main.ts +++ b/src/sample/renderBundles/main.ts @@ -49,7 +49,6 @@ const init: SampleInit = async ({ canvas, pageState, gui, stats }) => { layout: 'auto', vertex: { module: shaderModule, - entryPoint: 'vertexMain', buffers: [ { arrayStride: SphereLayout.vertexStride, @@ -78,7 +77,6 @@ const init: SampleInit = async ({ canvas, pageState, gui, stats }) => { }, fragment: { module: shaderModule, - entryPoint: 'fragmentMain', targets: [ { format: presentationFormat, diff --git a/src/sample/resizeCanvas/main.ts b/src/sample/resizeCanvas/main.ts index ff09fa55..10028472 100644 --- a/src/sample/resizeCanvas/main.ts +++ b/src/sample/resizeCanvas/main.ts @@ -33,13 +33,11 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: triangleVertWGSL, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: redFragWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/reversedZ/main.ts b/src/sample/reversedZ/main.ts index a5e4adbd..a6445f27 100644 --- a/src/sample/reversedZ/main.ts +++ b/src/sample/reversedZ/main.ts @@ -137,7 +137,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: vertexDepthPrePassWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: geometryVertexSize, @@ -188,7 +187,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: vertexPrecisionErrorPassWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: geometryVertexSize, @@ -207,7 +205,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: fragmentPrecisionErrorPassWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, @@ -247,7 +244,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: vertexWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: geometryVertexSize, @@ -272,7 +268,6 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: fragmentWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, @@ -313,13 +308,11 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: vertexTextureQuadWGSL, }), - entryPoint: 'main', }, fragment: { module: device.createShaderModule({ code: fragmentTextureQuadWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/rotatingCube/main.ts b/src/sample/rotatingCube/main.ts index fa92f556..63dc0c10 100644 --- a/src/sample/rotatingCube/main.ts +++ b/src/sample/rotatingCube/main.ts @@ -45,7 +45,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -70,7 +69,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: vertexPositionColorWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/samplerParameters/main.ts b/src/sample/samplerParameters/main.ts index ce05fc7c..ca37a5f4 100644 --- a/src/sample/samplerParameters/main.ts +++ b/src/sample/samplerParameters/main.ts @@ -232,10 +232,9 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { }); 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' }, @@ -258,12 +257,10 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { 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/src/sample/shadowMapping/main.ts b/src/sample/shadowMapping/main.ts index 9322dff6..82dfc4b1 100644 --- a/src/sample/shadowMapping/main.ts +++ b/src/sample/shadowMapping/main.ts @@ -116,7 +116,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: vertexShadowWGSL, }), - entryPoint: 'main', buffers: vertexBuffers, }, depthStencil: { @@ -164,14 +163,12 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: vertexWGSL, }), - entryPoint: 'main', buffers: vertexBuffers, }, fragment: { module: device.createShaderModule({ code: fragmentWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/texturedCube/main.ts b/src/sample/texturedCube/main.ts index 60c213f8..ff2a1ad7 100644 --- a/src/sample/texturedCube/main.ts +++ b/src/sample/texturedCube/main.ts @@ -45,7 +45,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -70,7 +69,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: sampleTextureMixColorWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/twoCubes/main.ts b/src/sample/twoCubes/main.ts index 62064a1f..499be9b3 100644 --- a/src/sample/twoCubes/main.ts +++ b/src/sample/twoCubes/main.ts @@ -45,7 +45,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: basicVertWGSL, }), - entryPoint: 'main', buffers: [ { arrayStride: cubeVertexSize, @@ -70,7 +69,6 @@ const init: SampleInit = async ({ canvas, pageState }) => { module: device.createShaderModule({ code: vertexPositionColorWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/videoUploading/main.ts b/src/sample/videoUploading/main.ts index 1cfa5d9c..e361d919 100644 --- a/src/sample/videoUploading/main.ts +++ b/src/sample/videoUploading/main.ts @@ -35,13 +35,11 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: fullscreenTexturedQuadWGSL, }), - entryPoint: 'vert_main', }, fragment: { module: device.createShaderModule({ code: sampleExternalTextureWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/videoUploadingWebCodecs/main.ts b/src/sample/videoUploadingWebCodecs/main.ts index 3fe34500..f7f23ff0 100644 --- a/src/sample/videoUploadingWebCodecs/main.ts +++ b/src/sample/videoUploadingWebCodecs/main.ts @@ -35,13 +35,11 @@ const init: SampleInit = async ({ canvas, pageState, gui }) => { module: device.createShaderModule({ code: fullscreenTexturedQuadWGSL, }), - entryPoint: 'vert_main', }, fragment: { module: device.createShaderModule({ code: sampleExternalTextureWGSL, }), - entryPoint: 'main', targets: [ { format: presentationFormat, diff --git a/src/sample/worker/worker.ts b/src/sample/worker/worker.ts index c71d9d20..4ca56210 100644 --- a/src/sample/worker/worker.ts +++ b/src/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,