Remove entryPoint if not required (#334)

* Remove entryPoint if not required
webgpu · Mar 8, 2024 · 92bb1a3 · 92bb1a3
1 parent b9b24a4
commit 92bb1a3
Show file tree

Hide file tree

Showing 33 changed files with 1 addition and 86 deletions.
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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,