Skip to content

Commit 92bb1a3

Browse files
beaufortfrancoisbeaufortfrancois
authored
Remove entryPoint if not required (#334)
* Remove entryPoint if not required
1 parent b9b24a4 commit 92bb1a3

File tree

33 files changed

+1
-86
lines changed

33 files changed

+1
-86
lines changed

‎public/workload-simulator.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,11 +676,9 @@ <h2><center>Web graphics workload simulator</center></h2>
676676
layout: pipelineLayout,
677677
multisample: { count: sampleCount },
678678
vertex: {
679-
entryPoint: 'vs',
680679
module: shaderModule,
681680
},
682681
fragment: {
683-
entryPoint: 'fs',
684682
targets: [ { format: canvasFormat, }, ],
685683
module: shaderModule,
686684
},

‎sample/a-buffer/main.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ const opaquePipeline = device.createRenderPipeline({
8585
layout: 'auto',
8686
vertex: {
8787
module: opaqueModule,
88-
entryPoint: 'main_vs',
8988
buffers: [
9089
{
9190
arrayStride: 3 * Float32Array.BYTES_PER_ELEMENT,
@@ -102,7 +101,6 @@ const opaquePipeline = device.createRenderPipeline({
102101
},
103102
fragment: {
104103
module: opaqueModule,
105-
entryPoint: 'main_fs',
106104
targets: [
107105
{
108106
format: presentationFormat,
@@ -205,7 +203,6 @@ const translucentPipeline = device.createRenderPipeline({
205203
}),
206204
vertex: {
207205
module: translucentModule,
208-
entryPoint: 'main_vs',
209206
buffers: [
210207
{
211208
arrayStride: 3 * Float32Array.BYTES_PER_ELEMENT,
@@ -221,7 +218,6 @@ const translucentPipeline = device.createRenderPipeline({
221218
},
222219
fragment: {
223220
module: translucentModule,
224-
entryPoint: 'main_fs',
225221
targets: [
226222
{
227223
format: presentationFormat,
@@ -293,11 +289,9 @@ const compositePipeline = device.createRenderPipeline({
293289
}),
294290
vertex: {
295291
module: compositeModule,
296-
entryPoint: 'main_vs',
297292
},
298293
fragment: {
299294
module: compositeModule,
300-
entryPoint: 'main_fs',
301295
targets: [
302296
{
303297
format: presentationFormat,

‎sample/animometer/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ const pipelineDesc: GPURenderPipelineDescriptor = {
9696
layout: 'auto',
9797
vertex: {
9898
module: shaderModule,
99-
entryPoint: 'vert_main',
10099
buffers: [
101100
{
102101
// vertex buffer
@@ -121,7 +120,6 @@ const pipelineDesc: GPURenderPipelineDescriptor = {
121120
},
122121
fragment: {
123122
module: shaderModule,
124-
entryPoint: 'frag_main',
125123
targets: [
126124
{
127125
format: presentationFormat,

‎sample/bitonicSort/main.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ SampleInitFactoryWebGPU(
294294
module: device.createShaderModule({
295295
code: NaiveBitonicCompute(settings['Workgroup Size']),
296296
}),
297-
entryPoint: 'computeMain',
298297
},
299298
});
300299

@@ -307,7 +306,6 @@ SampleInitFactoryWebGPU(
307306
module: device.createShaderModule({
308307
code: atomicToZero,
309308
}),
310-
entryPoint: 'atomicToZero',
311309
},
312310
});
313311

@@ -427,7 +425,6 @@ SampleInitFactoryWebGPU(
427425
Math.min(settings['Total Elements'] / 2, settings['Size Limit'])
428426
),
429427
}),
430-
entryPoint: 'computeMain',
431428
},
432429
});
433430
// Randomize array elements
@@ -544,7 +541,6 @@ SampleInitFactoryWebGPU(
544541
Math.min(settings['Total Elements'] / 2, settings['Size Limit'])
545542
),
546543
}),
547-
entryPoint: 'computeMain',
548544
},
549545
});
550546
// Create new config key for current element + size limit configuration

‎sample/bitonicSort/utils.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,11 @@ export abstract class Base2DRendererClass {
203203
module: device.createShaderModule({
204204
code: fullscreenTexturedQuad,
205205
}),
206-
entryPoint: 'vert_main',
207206
},
208207
fragment: {
209208
module: device.createShaderModule({
210209
code: code,
211210
}),
212-
entryPoint: 'frag_main',
213211
targets: [
214212
{
215213
format: presentationFormat,

‎sample/cameras/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ const pipeline = device.createRenderPipeline({
6969
module: device.createShaderModule({
7070
code: cubeWGSL,
7171
}),
72-
entryPoint: 'vertex_main',
7372
buffers: [
7473
{
7574
arrayStride: cubeVertexSize,
@@ -94,7 +93,6 @@ const pipeline = device.createRenderPipeline({
9493
module: device.createShaderModule({
9594
code: cubeWGSL,
9695
}),
97-
entryPoint: 'fragment_main',
9896
targets: [
9997
{
10098
format: presentationFormat,

‎sample/computeBoids/main.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ const renderPipeline = device.createRenderPipeline({
4444
layout: 'auto',
4545
vertex: {
4646
module: spriteShaderModule,
47-
entryPoint: 'vert_main',
4847
buffers: [
4948
{
5049
// instanced particles buffer
@@ -82,7 +81,6 @@ const renderPipeline = device.createRenderPipeline({
8281
},
8382
fragment: {
8483
module: spriteShaderModule,
85-
entryPoint: 'frag_main',
8684
targets: [
8785
{
8886
format: presentationFormat,
@@ -100,7 +98,6 @@ const computePipeline = device.createComputePipeline({
10098
module: device.createShaderModule({
10199
code: updateSpritesWGSL,
102100
}),
103-
entryPoint: 'main',
104101
},
105102
});
106103

‎sample/cornell/rasterizer.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,10 @@ export default class Rasterizer {
101101
}),
102102
vertex: {
103103
module: mod,
104-
entryPoint: 'vs_main',
105104
buffers: scene.vertexBufferLayout,
106105
},
107106
fragment: {
108107
module: mod,
109-
entryPoint: 'fs_main',
110108
targets: [{ format: framebuffer.format }],
111109
},
112110
primitive: {

‎sample/cornell/raytracer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ export default class Raytracer {
8585
module: device.createShaderModule({
8686
code: raytracerWGSL + common.wgsl,
8787
}),
88-
entryPoint: 'main',
8988
constants: {
9089
WorkgroupSizeX: this.kWorkgroupSizeX,
9190
WorkgroupSizeY: this.kWorkgroupSizeY,

‎sample/cornell/tonemapper.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ export default class Tonemapper {
7575
layout: pipelineLayout,
7676
compute: {
7777
module: mod,
78-
entryPoint: 'main',
7978
constants: {
8079
WorkgroupSizeX: this.kWorkgroupSizeX,
8180
WorkgroupSizeY: this.kWorkgroupSizeY,

‎sample/cubemap/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ const pipeline = device.createRenderPipeline({
4343
module: device.createShaderModule({
4444
code: basicVertWGSL,
4545
}),
46-
entryPoint: 'main',
4746
buffers: [
4847
{
4948
arrayStride: cubeVertexSize,
@@ -68,7 +67,6 @@ const pipeline = device.createRenderPipeline({
6867
module: device.createShaderModule({
6968
code: sampleCubemapWGSL,
7069
}),
71-
entryPoint: 'main',
7270
targets: [
7371
{
7472
format: presentationFormat,

‎sample/deferredRendering/main.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,12 @@ const writeGBuffersPipeline = device.createRenderPipeline({
123123
module: device.createShaderModule({
124124
code: vertexWriteGBuffers,
125125
}),
126-
entryPoint: 'main',
127126
buffers: vertexBuffers,
128127
},
129128
fragment: {
130129
module: device.createShaderModule({
131130
code: fragmentWriteGBuffers,
132131
}),
133-
entryPoint: 'main',
134132
targets: [
135133
// normal
136134
{ format: 'rgba16float' },
@@ -206,13 +204,11 @@ const gBuffersDebugViewPipeline = device.createRenderPipeline({
206204
module: device.createShaderModule({
207205
code: vertexTextureQuad,
208206
}),
209-
entryPoint: 'main',
210207
},
211208
fragment: {
212209
module: device.createShaderModule({
213210
code: fragmentGBuffersDebugView,
214211
}),
215-
entryPoint: 'main',
216212
targets: [
217213
{
218214
format: presentationFormat,
@@ -237,13 +233,11 @@ const deferredRenderPipeline = device.createRenderPipeline({
237233
module: device.createShaderModule({
238234
code: vertexTextureQuad,
239235
}),
240-
entryPoint: 'main',
241236
},
242237
fragment: {
243238
module: device.createShaderModule({
244239
code: fragmentDeferredRendering,
245240
}),
246-
entryPoint: 'main',
247241
targets: [
248242
{
249243
format: presentationFormat,
@@ -423,7 +417,6 @@ const lightUpdateComputePipeline = device.createComputePipeline({
423417
module: device.createShaderModule({
424418
code: lightUpdate,
425419
}),
426-
entryPoint: 'main',
427420
},
428421
});
429422
const lightsBufferBindGroup = device.createBindGroup({

‎sample/fractalCube/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ const pipeline = device.createRenderPipeline({
4747
module: device.createShaderModule({
4848
code: basicVertWGSL,
4949
}),
50-
entryPoint: 'main',
5150
buffers: [
5251
{
5352
arrayStride: cubeVertexSize,
@@ -72,7 +71,6 @@ const pipeline = device.createRenderPipeline({
7271
module: device.createShaderModule({
7372
code: sampleSelfWGSL,
7473
}),
75-
entryPoint: 'main',
7674
targets: [
7775
{
7876
format: presentationFormat,

‎sample/gameOfLife/main.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ function resetGameData() {
125125
}),
126126
compute: {
127127
module: computeShader,
128-
entryPoint: 'main',
129128
constants: {
130129
blockSize: GameOptions.workgroupSize,
131130
},
@@ -191,12 +190,10 @@ function resetGameData() {
191190
},
192191
vertex: {
193192
module: vertexShader,
194-
entryPoint: 'main',
195193
buffers: [cellsStride, squareStride],
196194
},
197195
fragment: {
198196
module: fragmentShader,
199-
entryPoint: 'main',
200197
targets: [
201198
{
202199
format: presentationFormat,

‎sample/helloTriangle/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ const pipeline = device.createRenderPipeline({
2424
module: device.createShaderModule({
2525
code: triangleVertWGSL,
2626
}),
27-
entryPoint: 'main',
2827
},
2928
fragment: {
3029
module: device.createShaderModule({
3130
code: redFragWGSL,
3231
}),
33-
entryPoint: 'main',
3432
targets: [
3533
{
3634
format: presentationFormat,

‎sample/helloTriangleMSAA/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ const pipeline = device.createRenderPipeline({
2626
module: device.createShaderModule({
2727
code: triangleVertWGSL,
2828
}),
29-
entryPoint: 'main',
3029
},
3130
fragment: {
3231
module: device.createShaderModule({
3332
code: redFragWGSL,
3433
}),
35-
entryPoint: 'main',
3634
targets: [
3735
{
3836
format: presentationFormat,

‎sample/imageBlur/main.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ const blurPipeline = device.createComputePipeline({
2929
module: device.createShaderModule({
3030
code: blurWGSL,
3131
}),
32-
entryPoint: 'main',
3332
},
3433
});
3534

@@ -39,13 +38,11 @@ const fullscreenQuadPipeline = device.createRenderPipeline({
3938
module: device.createShaderModule({
4039
code: fullscreenTexturedQuadWGSL,
4140
}),
42-
entryPoint: 'vert_main',
4341
},
4442
fragment: {
4543
module: device.createShaderModule({
4644
code: fullscreenTexturedQuadWGSL,
4745
}),
48-
entryPoint: 'frag_main',
4946
targets: [
5047
{
5148
format: presentationFormat,

‎sample/instancedCube/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ const pipeline = device.createRenderPipeline({
4343
module: device.createShaderModule({
4444
code: instancedVertWGSL,
4545
}),
46-
entryPoint: 'main',
4746
buffers: [
4847
{
4948
arrayStride: cubeVertexSize,
@@ -68,7 +67,6 @@ const pipeline = device.createRenderPipeline({
6867
module: device.createShaderModule({
6968
code: vertexPositionColorWGSL,
7069
}),
71-
entryPoint: 'main',
7270
targets: [
7371
{
7472
format: presentationFormat,

‎sample/normalMap/utils.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ export const create3DRenderPipeline = (
155155
label: `${label}.vertexShader`,
156156
code: vertexShader,
157157
}),
158-
entryPoint: 'vertexMain',
159158
buffers:
160159
vBufferFormats.length !== 0 ? [createVBuffer(vBufferFormats)] : [],
161160
},
@@ -164,7 +163,6 @@ export const create3DRenderPipeline = (
164163
label: `${label}.fragmentShader`,
165164
code: fragmentShader,
166165
}),
167-
entryPoint: 'fragmentMain',
168166
targets: [
169167
{
170168
format: presentationFormat,

‎sample/particles/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ const renderPipeline = device.createRenderPipeline({
4343
module: device.createShaderModule({
4444
code: particleWGSL,
4545
}),
46-
entryPoint: 'vs_main',
4746
buffers: [
4847
{
4948
// instanced particles buffer
@@ -83,7 +82,6 @@ const renderPipeline = device.createRenderPipeline({
8382
module: device.createShaderModule({
8483
code: particleWGSL,
8584
}),
86-
entryPoint: 'fs_main',
8785
targets: [
8886
{
8987
format: presentationFormat,

0 commit comments

Comments
 (0)