Remove entryPoint if not required

webgpu · Mar 6, 2024 · a28b6fd · a28b6fd
1 parent bcba0c6
commit a28b6fd
Show file tree

Hide file tree

Showing 32 changed files with 6 additions and 85 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -676,11 +676,9 @@ <h2><center>Web graphics workload simulator</center></h2>
           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
@@ -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
@@ -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
@@ -297,7 +297,6 @@ SampleInitFactoryWebGPU(
         module: device.createShaderModule({
           code: NaiveBitonicCompute(settings['Workgroup Size']),
         }),
-        entryPoint: 'computeMain',
       },
     });
 
@@ -310,7 +309,6 @@ SampleInitFactoryWebGPU(
         module: device.createShaderModule({
           code: atomicToZero,
         }),
-        entryPoint: 'atomicToZero',
       },
     });
 
@@ -430,7 +428,6 @@ SampleInitFactoryWebGPU(
               Math.min(settings['Total Elements'] / 2, settings['Size Limit'])
             ),
           }),
-          entryPoint: 'computeMain',
         },
       });
       // Randomize array elements

diff --git a/src/sample/bitonicSort/utils.ts b/src/sample/bitonicSort/utils.ts
@@ -206,13 +206,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,