Skip to content

Commit 4727638

Browse files
beaufortfrancoisbeaufortfrancois
authored
Use GPUBuffer in GPUBindingResource (#514)
Spec PR: gpuweb/gpuweb#5193
1 parent 626a4b8 commit 4727638

File tree

36 files changed

+112
-440
lines changed

36 files changed

+112
-440
lines changed

‎sample/a-buffer/main.ts‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -451,21 +451,15 @@ const configure = () => {
451451
entries: [
452452
{
453453
binding: 0,
454-
resource: {
455-
buffer: uniformBuffer,
456-
},
454+
resource: uniformBuffer,
457455
},
458456
{
459457
binding: 1,
460-
resource: {
461-
buffer: headsBuffer,
462-
},
458+
resource: headsBuffer,
463459
},
464460
{
465461
binding: 2,
466-
resource: {
467-
buffer: linkedListBuffer,
468-
},
462+
resource: linkedListBuffer,
469463
},
470464
{
471465
binding: 3,
@@ -487,21 +481,15 @@ const configure = () => {
487481
entries: [
488482
{
489483
binding: 0,
490-
resource: {
491-
buffer: uniformBuffer,
492-
},
484+
resource: uniformBuffer,
493485
},
494486
{
495487
binding: 1,
496-
resource: {
497-
buffer: headsBuffer,
498-
},
488+
resource: headsBuffer,
499489
},
500490
{
501491
binding: 2,
502-
resource: {
503-
buffer: linkedListBuffer,
504-
},
492+
resource: linkedListBuffer,
505493
},
506494
{
507495
binding: 3,

‎sample/blending/main.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ const srcBindGroupUnpremultipliedAlpha = device.createBindGroup({
194194
entries: [
195195
{ binding: 0, resource: sampler },
196196
{ binding: 1, resource: srcTextureUnpremultipliedAlpha.createView() },
197-
{ binding: 2, resource: { buffer: srcUniform.buffer } },
197+
{ binding: 2, resource: srcUniform.buffer },
198198
],
199199
});
200200

@@ -203,7 +203,7 @@ const dstBindGroupUnpremultipliedAlpha = device.createBindGroup({
203203
entries: [
204204
{ binding: 0, resource: sampler },
205205
{ binding: 1, resource: dstTextureUnpremultipliedAlpha.createView() },
206-
{ binding: 2, resource: { buffer: dstUniform.buffer } },
206+
{ binding: 2, resource: dstUniform.buffer },
207207
],
208208
});
209209

@@ -212,7 +212,7 @@ const srcBindGroupPremultipliedAlpha = device.createBindGroup({
212212
entries: [
213213
{ binding: 0, resource: sampler },
214214
{ binding: 1, resource: srcTexturePremultipliedAlpha.createView() },
215-
{ binding: 2, resource: { buffer: srcUniform.buffer } },
215+
{ binding: 2, resource: srcUniform.buffer },
216216
],
217217
});
218218

@@ -221,7 +221,7 @@ const dstBindGroupPremultipliedAlpha = device.createBindGroup({
221221
entries: [
222222
{ binding: 0, resource: sampler },
223223
{ binding: 1, resource: dstTexturePremultipliedAlpha.createView() },
224-
{ binding: 2, resource: { buffer: dstUniform.buffer } },
224+
{ binding: 2, resource: dstUniform.buffer },
225225
],
226226
});
227227

‎sample/cameras/main.ts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -155,20 +155,9 @@ const sampler = device.createSampler({
155155
const uniformBindGroup = device.createBindGroup({
156156
layout: pipeline.getBindGroupLayout(0),
157157
entries: [
158-
{
159-
binding: 0,
160-
resource: {
161-
buffer: uniformBuffer,
162-
},
163-
},
164-
{
165-
binding: 1,
166-
resource: sampler,
167-
},
168-
{
169-
binding: 2,
170-
resource: cubeTexture.createView(),
171-
},
158+
{ binding: 0, resource: uniformBuffer },
159+
{ binding: 1, resource: sampler },
160+
{ binding: 2, resource: cubeTexture.createView() },
172161
],
173162
});
174163

‎sample/computeBoids/main.ts‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -231,28 +231,9 @@ for (let i = 0; i < 2; ++i) {
231231
particleBindGroups[i] = device.createBindGroup({
232232
layout: computePipeline.getBindGroupLayout(0),
233233
entries: [
234-
{
235-
binding: 0,
236-
resource: {
237-
buffer: simParamBuffer,
238-
},
239-
},
240-
{
241-
binding: 1,
242-
resource: {
243-
buffer: particleBuffers[i],
244-
offset: 0,
245-
size: initialParticleData.byteLength,
246-
},
247-
},
248-
{
249-
binding: 2,
250-
resource: {
251-
buffer: particleBuffers[(i + 1) % 2],
252-
offset: 0,
253-
size: initialParticleData.byteLength,
254-
},
255-
},
234+
{ binding: 0, resource: simParamBuffer },
235+
{ binding: 1, resource: particleBuffers[i] },
236+
{ binding: 2, resource: particleBuffers[(i + 1) % 2] },
256237
],
257238
});
258239
}

‎sample/cornell/common.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,12 @@ export default class Common {
5555
{
5656
// common_uniforms
5757
binding: 0,
58-
resource: {
59-
buffer: this.uniformBuffer,
60-
offset: 0,
61-
size: this.uniformBuffer.size,
62-
},
58+
resource: this.uniformBuffer,
6359
},
6460
{
6561
// quads
6662
binding: 1,
67-
resource: {
68-
buffer: quads,
69-
offset: 0,
70-
size: quads.size,
71-
},
63+
resource: quads,
7264
},
7365
],
7466
});

‎sample/cornell/radiosity.ts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,7 @@ export default class Radiosity {
111111
{
112112
// accumulation buffer
113113
binding: 0,
114-
resource: {
115-
buffer: this.accumulationBuffer,
116-
size: this.accumulationBuffer.size,
117-
},
114+
resource: this.accumulationBuffer,
118115
},
119116
{
120117
// lightmap
@@ -124,10 +121,7 @@ export default class Radiosity {
124121
{
125122
// radiosity_uniforms
126123
binding: 2,
127-
resource: {
128-
buffer: this.uniformBuffer,
129-
size: this.uniformBuffer.size,
130-
},
124+
resource: this.uniformBuffer,
131125
},
132126
],
133127
});

‎sample/cubemap/main.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,7 @@ const uniformBindGroup = device.createBindGroup({
158158
entries: [
159159
{
160160
binding: 0,
161-
resource: {
162-
buffer: uniformBuffer,
163-
offset: 0,
164-
size: uniformBufferSize,
165-
},
161+
resource: uniformBuffer,
166162
},
167163
{
168164
binding: 1,

‎sample/deferredRendering/main.ts‎

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -345,36 +345,17 @@ const cameraUniformBuffer = device.createBuffer({
345345
const sceneUniformBindGroup = device.createBindGroup({
346346
layout: writeGBuffersPipeline.getBindGroupLayout(0),
347347
entries: [
348-
{
349-
binding: 0,
350-
resource: {
351-
buffer: modelUniformBuffer,
352-
},
353-
},
354-
{
355-
binding: 1,
356-
resource: {
357-
buffer: cameraUniformBuffer,
358-
},
359-
},
348+
{ binding: 0, resource: modelUniformBuffer },
349+
{ binding: 1, resource: cameraUniformBuffer },
360350
],
361351
});
362352

363353
const gBufferTexturesBindGroup = device.createBindGroup({
364354
layout: gBufferTexturesBindGroupLayout,
365355
entries: [
366-
{
367-
binding: 0,
368-
resource: gBufferTextureViews[0],
369-
},
370-
{
371-
binding: 1,
372-
resource: gBufferTextureViews[1],
373-
},
374-
{
375-
binding: 2,
376-
resource: gBufferTextureViews[2],
377-
},
356+
{ binding: 0, resource: gBufferTextureViews[0] },
357+
{ binding: 1, resource: gBufferTextureViews[1] },
358+
{ binding: 2, resource: gBufferTextureViews[2] },
378359
],
379360
});
380361

@@ -445,21 +426,15 @@ const lightsBufferBindGroup = device.createBindGroup({
445426
entries: [
446427
{
447428
binding: 0,
448-
resource: {
449-
buffer: lightsBuffer,
450-
},
429+
resource: lightsBuffer,
451430
},
452431
{
453432
binding: 1,
454-
resource: {
455-
buffer: configUniformBuffer,
456-
},
433+
resource: configUniformBuffer,
457434
},
458435
{
459436
binding: 2,
460-
resource: {
461-
buffer: cameraUniformBuffer,
462-
},
437+
resource: cameraUniformBuffer,
463438
},
464439
],
465440
});
@@ -468,21 +443,15 @@ const lightsBufferComputeBindGroup = device.createBindGroup({
468443
entries: [
469444
{
470445
binding: 0,
471-
resource: {
472-
buffer: lightsBuffer,
473-
},
446+
resource: lightsBuffer,
474447
},
475448
{
476449
binding: 1,
477-
resource: {
478-
buffer: configUniformBuffer,
479-
},
450+
resource: configUniformBuffer,
480451
},
481452
{
482453
binding: 2,
483-
resource: {
484-
buffer: lightExtentBuffer,
485-
},
454+
resource: lightExtentBuffer,
486455
},
487456
],
488457
});

‎sample/fractalCube/main.ts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,9 @@ const sampler = device.createSampler({
127127
const uniformBindGroup = device.createBindGroup({
128128
layout: pipeline.getBindGroupLayout(0),
129129
entries: [
130-
{
131-
binding: 0,
132-
resource: {
133-
buffer: uniformBuffer,
134-
},
135-
},
136-
{
137-
binding: 1,
138-
resource: sampler,
139-
},
140-
{
141-
binding: 2,
142-
resource: cubeTexture.createView(),
143-
},
130+
{ binding: 0, resource: uniformBuffer },
131+
{ binding: 1, resource: sampler },
132+
{ binding: 2, resource: cubeTexture.createView() },
144133
],
145134
});
146135

‎sample/gameOfLife/main.ts‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,18 +169,18 @@ function resetGameData() {
169169
const bindGroup0 = device.createBindGroup({
170170
layout: bindGroupLayoutCompute,
171171
entries: [
172-
{ binding: 0, resource: { buffer: sizeBuffer } },
173-
{ binding: 1, resource: { buffer: buffer0 } },
174-
{ binding: 2, resource: { buffer: buffer1 } },
172+
{ binding: 0, resource: sizeBuffer },
173+
{ binding: 1, resource: buffer0 },
174+
{ binding: 2, resource: buffer1 },
175175
],
176176
});
177177

178178
const bindGroup1 = device.createBindGroup({
179179
layout: bindGroupLayoutCompute,
180180
entries: [
181-
{ binding: 0, resource: { buffer: sizeBuffer } },
182-
{ binding: 1, resource: { buffer: buffer1 } },
183-
{ binding: 2, resource: { buffer: buffer0 } },
181+
{ binding: 0, resource: sizeBuffer },
182+
{ binding: 1, resource: buffer1 },
183+
{ binding: 2, resource: buffer0 },
184184
],
185185
});
186186

@@ -210,11 +210,7 @@ function resetGameData() {
210210
entries: [
211211
{
212212
binding: 0,
213-
resource: {
214-
buffer: sizeBuffer,
215-
offset: 0,
216-
size: 2 * Uint32Array.BYTES_PER_ELEMENT,
217-
},
213+
resource: sizeBuffer,
218214
},
219215
],
220216
});

0 commit comments

Comments
 (0)