@luma.gl/webgpu 9.0.0-alpha.5 → 9.0.0-alpha.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +3 -1
- package/dist/adapter/helpers/accessor-to-format.js.map +1 -1
- package/dist/adapter/helpers/convert-texture-format.d.ts +2 -2
- package/dist/adapter/helpers/convert-texture-format.d.ts.map +1 -1
- package/dist/adapter/helpers/convert-texture-format.js +0 -1
- package/dist/adapter/helpers/convert-texture-format.js.map +1 -1
- package/dist/adapter/helpers/generate-mipmaps.d.ts +1 -1
- package/dist/adapter/helpers/generate-mipmaps.js +20 -15
- package/dist/adapter/helpers/generate-mipmaps.js.map +1 -1
- package/dist/adapter/helpers/get-bind-group.d.ts +4 -4
- package/dist/adapter/helpers/get-bind-group.d.ts.map +1 -1
- package/dist/adapter/helpers/get-bind-group.js +8 -17
- package/dist/adapter/helpers/get-bind-group.js.map +1 -1
- package/dist/adapter/helpers/get-vertex-buffer-layout.d.ts +5 -5
- package/dist/adapter/helpers/get-vertex-buffer-layout.d.ts.map +1 -1
- package/dist/adapter/helpers/get-vertex-buffer-layout.js +32 -40
- package/dist/adapter/helpers/get-vertex-buffer-layout.js.map +1 -1
- package/dist/adapter/helpers/webgpu-parameters.d.ts +2 -2
- package/dist/adapter/helpers/webgpu-parameters.d.ts.map +1 -1
- package/dist/adapter/helpers/webgpu-parameters.js +51 -48
- package/dist/adapter/helpers/webgpu-parameters.js.map +1 -1
- package/dist/adapter/resources/webgpu-buffer.d.ts +5 -6
- package/dist/adapter/resources/webgpu-buffer.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-buffer.js +19 -33
- package/dist/adapter/resources/webgpu-buffer.js.map +1 -1
- package/dist/adapter/resources/webgpu-command-encoder.d.ts +6 -15
- package/dist/adapter/resources/webgpu-command-encoder.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-command-encoder.js +11 -29
- package/dist/adapter/resources/webgpu-command-encoder.js.map +1 -1
- package/dist/adapter/resources/webgpu-compute-pass.d.ts +6 -6
- package/dist/adapter/resources/webgpu-compute-pass.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-compute-pass.js +14 -27
- package/dist/adapter/resources/webgpu-compute-pass.js.map +1 -1
- package/dist/adapter/resources/webgpu-compute-pipeline.d.ts +4 -4
- package/dist/adapter/resources/webgpu-compute-pipeline.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-compute-pipeline.js +6 -11
- package/dist/adapter/resources/webgpu-compute-pipeline.js.map +1 -1
- package/dist/adapter/resources/webgpu-external-texture.d.ts +5 -5
- package/dist/adapter/resources/webgpu-external-texture.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-external-texture.js +6 -14
- package/dist/adapter/resources/webgpu-external-texture.js.map +1 -1
- package/dist/adapter/resources/webgpu-framebuffer.d.ts +4 -21
- package/dist/adapter/resources/webgpu-framebuffer.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-framebuffer.js +4 -105
- package/dist/adapter/resources/webgpu-framebuffer.js.map +1 -1
- package/dist/adapter/resources/webgpu-query.js.map +1 -1
- package/dist/adapter/resources/webgpu-render-pass.d.ts +12 -7
- package/dist/adapter/resources/webgpu-render-pass.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-render-pass.js +59 -36
- package/dist/adapter/resources/webgpu-render-pass.js.map +1 -1
- package/dist/adapter/resources/webgpu-render-pipeline.d.ts +14 -10
- package/dist/adapter/resources/webgpu-render-pipeline.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-render-pipeline.js +50 -67
- package/dist/adapter/resources/webgpu-render-pipeline.js.map +1 -1
- package/dist/adapter/resources/webgpu-sampler.d.ts +5 -5
- package/dist/adapter/resources/webgpu-sampler.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-sampler.js +11 -11
- package/dist/adapter/resources/webgpu-sampler.js.map +1 -1
- package/dist/adapter/resources/webgpu-shader.d.ts +9 -9
- package/dist/adapter/resources/webgpu-shader.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-shader.js +15 -29
- package/dist/adapter/resources/webgpu-shader.js.map +1 -1
- package/dist/adapter/resources/webgpu-texture.d.ts +15 -8
- package/dist/adapter/resources/webgpu-texture.d.ts.map +1 -1
- package/dist/adapter/resources/webgpu-texture.js +17 -27
- package/dist/adapter/resources/webgpu-texture.js.map +1 -1
- package/dist/adapter/resources/webgpu-vertex-array.d.ts +26 -0
- package/dist/adapter/resources/webgpu-vertex-array.d.ts.map +1 -0
- package/dist/adapter/resources/webgpu-vertex-array.js +39 -0
- package/dist/adapter/resources/webgpu-vertex-array.js.map +1 -0
- package/dist/adapter/webgpu-canvas-context.d.ts +16 -12
- package/dist/adapter/webgpu-canvas-context.d.ts.map +1 -1
- package/dist/adapter/webgpu-canvas-context.js +26 -47
- package/dist/adapter/webgpu-canvas-context.js.map +1 -1
- package/dist/adapter/webgpu-device.d.ts +39 -22
- package/dist/adapter/webgpu-device.d.ts.map +1 -1
- package/dist/adapter/webgpu-device.js +94 -95
- package/dist/adapter/webgpu-device.js.map +1 -1
- package/dist/adapter/webgpu-types.js.map +1 -1
- package/dist/dist.dev.js +3134 -0
- package/dist/glsl/glsllang.js +0 -1
- package/dist/glsl/glsllang.js.map +1 -1
- package/dist/index.cjs +1519 -0
- package/dist/index.d.ts +5 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -7
- package/dist/index.js.map +1 -1
- package/dist.min.js +30 -0
- package/package.json +18 -9
- package/src/adapter/helpers/accessor-to-format.ts +1 -2
- package/src/adapter/helpers/convert-texture-format.ts +1 -1
- package/src/adapter/helpers/generate-mipmaps.ts +2 -2
- package/src/adapter/helpers/get-bind-group.ts +22 -12
- package/src/adapter/helpers/get-vertex-buffer-layout.ts +55 -34
- package/src/adapter/helpers/webgpu-parameters.ts +56 -47
- package/src/adapter/resources/webgpu-buffer.ts +11 -12
- package/src/adapter/resources/webgpu-command-encoder.ts +62 -41
- package/src/adapter/resources/webgpu-compute-pass.ts +13 -13
- package/src/adapter/resources/webgpu-compute-pipeline.ts +6 -5
- package/src/adapter/resources/webgpu-external-texture.ts +5 -5
- package/src/adapter/resources/webgpu-framebuffer.ts +8 -109
- package/src/adapter/resources/webgpu-query.ts +3 -3
- package/src/adapter/resources/webgpu-render-pass.ts +74 -18
- package/src/adapter/resources/webgpu-render-pipeline.ts +64 -39
- package/src/adapter/resources/webgpu-sampler.ts +12 -5
- package/src/adapter/resources/webgpu-shader.ts +22 -16
- package/src/adapter/resources/webgpu-texture.ts +22 -8
- package/src/adapter/resources/webgpu-vertex-array.ts +74 -0
- package/src/adapter/webgpu-canvas-context.ts +52 -27
- package/src/adapter/webgpu-device.ts +158 -64
- package/src/index.ts +7 -9
- package/dist/bundle.d.ts +0 -2
- package/dist/bundle.d.ts.map +0 -1
- package/dist/bundle.js +0 -5
- package/dist/bundle.js.map +0 -1
- package/dist/init.d.ts +0 -2
- package/dist/init.d.ts.map +0 -1
- package/dist/init.js +0 -4
- package/dist/init.js.map +0 -1
- package/src/bundle.ts +0 -4
- package/src/init.ts +0 -4
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
/// <reference types="
|
|
2
|
-
|
|
3
|
-
import {
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
export default class WebGPUTexture extends Texture {
|
|
1
|
+
/// <reference types="dist" />
|
|
2
|
+
import { Texture, TextureProps, Sampler, SamplerProps } from '@luma.gl/core';
|
|
3
|
+
import type { WebGPUDevice } from '../webgpu-device';
|
|
4
|
+
import { WebGPUSampler } from './webgpu-sampler';
|
|
5
|
+
export declare class WebGPUTexture extends Texture {
|
|
7
6
|
readonly device: WebGPUDevice;
|
|
8
7
|
readonly handle: GPUTexture;
|
|
9
8
|
readonly view: GPUTextureView;
|
|
10
9
|
sampler: WebGPUSampler;
|
|
10
|
+
height: number;
|
|
11
|
+
width: number;
|
|
11
12
|
constructor(device: WebGPUDevice, props: TextureProps);
|
|
12
13
|
protected createHandle(): GPUTexture;
|
|
13
14
|
destroy(): void;
|
|
@@ -18,7 +19,10 @@ export default class WebGPUTexture extends Texture {
|
|
|
18
19
|
setSampler(sampler: Sampler | SamplerProps): this;
|
|
19
20
|
setData(options: {
|
|
20
21
|
data: any;
|
|
21
|
-
}):
|
|
22
|
+
}): {
|
|
23
|
+
width: number;
|
|
24
|
+
height: number;
|
|
25
|
+
};
|
|
22
26
|
/** Set image */
|
|
23
27
|
setImage(options: {
|
|
24
28
|
source: ImageBitmap | HTMLCanvasElement | OffscreenCanvas;
|
|
@@ -34,6 +38,9 @@ export default class WebGPUTexture extends Texture {
|
|
|
34
38
|
aspect?: 'all' | 'stencil-only' | 'depth-only';
|
|
35
39
|
colorSpace?: 'srgb';
|
|
36
40
|
premultipliedAlpha?: boolean;
|
|
37
|
-
}):
|
|
41
|
+
}): {
|
|
42
|
+
width: number;
|
|
43
|
+
height: number;
|
|
44
|
+
};
|
|
38
45
|
}
|
|
39
46
|
//# sourceMappingURL=webgpu-texture.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgpu-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webgpu-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-texture.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAW/C,qBAAa,aAAc,SAAQ,OAAO;IACxC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,OAAO,EAAE,aAAa,CAAC;IAEd,MAAM,EAAE,MAAM,CAAK;IACnB,KAAK,EAAE,MAAM,CAAK;gBASf,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY;IAyCrD,SAAS,CAAC,YAAY,IAAI,UAAU;IAyB3B,OAAO,IAAI,IAAI;IAIxB;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,IAAI;IAKjD,OAAO,CAAC,OAAO,EAAE;QACf,IAAI,EAAE,GAAG,CAAC;KACX;;;;IAID,gBAAgB;IAChB,QAAQ,CAAC,OAAO,EAAE;QAChB,MAAM,EAAE,WAAW,GAAG,iBAAiB,GAAG,eAAe,CAAC;QAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,MAAM,CAAC,EAAE,KAAK,GAAG,cAAc,GAAG,YAAY,CAAC;QAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,GAAG;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC;CA6HpC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import WebGPUSampler from './webgpu-sampler';
|
|
1
|
+
import { Texture } from '@luma.gl/core';
|
|
2
|
+
import { getWebGPUTextureFormat } from "../helpers/convert-texture-format.js";
|
|
3
|
+
import { WebGPUSampler } from "./webgpu-sampler.js";
|
|
5
4
|
const BASE_DIMENSIONS = {
|
|
6
5
|
'1d': '1d',
|
|
7
6
|
'2d': '2d',
|
|
@@ -10,42 +9,35 @@ const BASE_DIMENSIONS = {
|
|
|
10
9
|
'cube-array': '2d',
|
|
11
10
|
'3d': '3d'
|
|
12
11
|
};
|
|
13
|
-
export
|
|
12
|
+
export class WebGPUTexture extends Texture {
|
|
14
13
|
constructor(device, props) {
|
|
15
14
|
super(device, props);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
_defineProperty(this, "sampler", void 0);
|
|
24
|
-
|
|
15
|
+
this.device = void 0;
|
|
16
|
+
this.handle = void 0;
|
|
17
|
+
this.view = void 0;
|
|
18
|
+
this.sampler = void 0;
|
|
19
|
+
this.height = 1;
|
|
20
|
+
this.width = 1;
|
|
25
21
|
if (typeof this.props.format === 'number') {
|
|
26
22
|
throw new Error('number format');
|
|
27
23
|
}
|
|
28
|
-
|
|
29
24
|
this.device = device;
|
|
30
25
|
this.handle = this.props.handle || this.createHandle();
|
|
31
|
-
|
|
32
26
|
if (this.props.data) {
|
|
33
27
|
this.setData({
|
|
34
28
|
data: this.props.data
|
|
35
29
|
});
|
|
36
30
|
}
|
|
37
|
-
|
|
38
|
-
this.
|
|
31
|
+
this.width = this.handle.width;
|
|
32
|
+
this.height = this.handle.height;
|
|
33
|
+
this.sampler = props.sampler instanceof WebGPUSampler ? props.sampler : new WebGPUSampler(this.device, props.sampler);
|
|
39
34
|
this.view = this.handle.createView({});
|
|
40
35
|
}
|
|
41
|
-
|
|
42
36
|
createHandle() {
|
|
43
37
|
var _this$props$data, _this$props$data2;
|
|
44
|
-
|
|
45
38
|
if (typeof this.props.format === 'number') {
|
|
46
39
|
throw new Error('number format');
|
|
47
40
|
}
|
|
48
|
-
|
|
49
41
|
const width = this.props.width || ((_this$props$data = this.props.data) === null || _this$props$data === void 0 ? void 0 : _this$props$data.width) || 1;
|
|
50
42
|
const height = this.props.height || ((_this$props$data2 = this.props.data) === null || _this$props$data2 === void 0 ? void 0 : _this$props$data2.height) || 1;
|
|
51
43
|
return this.device.handle.createTexture({
|
|
@@ -61,22 +53,18 @@ export default class WebGPUTexture extends Texture {
|
|
|
61
53
|
sampleCount: this.props.samples
|
|
62
54
|
});
|
|
63
55
|
}
|
|
64
|
-
|
|
65
56
|
destroy() {
|
|
66
57
|
this.handle.destroy();
|
|
67
58
|
}
|
|
68
|
-
|
|
69
59
|
setSampler(sampler) {
|
|
70
60
|
this.sampler = sampler instanceof WebGPUSampler ? sampler : new WebGPUSampler(this.device, sampler);
|
|
71
61
|
return this;
|
|
72
62
|
}
|
|
73
|
-
|
|
74
63
|
setData(options) {
|
|
75
64
|
return this.setImage({
|
|
76
65
|
source: options.data
|
|
77
66
|
});
|
|
78
67
|
}
|
|
79
|
-
|
|
80
68
|
setImage(options) {
|
|
81
69
|
const {
|
|
82
70
|
source,
|
|
@@ -104,8 +92,10 @@ export default class WebGPUTexture extends Texture {
|
|
|
104
92
|
colorSpace,
|
|
105
93
|
premultipliedAlpha
|
|
106
94
|
}, [width, height, depth]);
|
|
107
|
-
return
|
|
95
|
+
return {
|
|
96
|
+
width,
|
|
97
|
+
height
|
|
98
|
+
};
|
|
108
99
|
}
|
|
109
|
-
|
|
110
100
|
}
|
|
111
101
|
//# sourceMappingURL=webgpu-texture.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/adapter/resources/webgpu-texture.ts"],"names":["Texture","getWebGPUTextureFormat","WebGPUSampler","BASE_DIMENSIONS","WebGPUTexture","constructor","device","props","format","Error","handle","createHandle","data","setData","setSampler","sampler","view","createView","width","height","createTexture","size","depthOrArrayLayers","depth","dimension","usage","mipLevelCount","mipLevels","sampleCount","samples","destroy","options","setImage","source","sourceX","sourceY","mipLevel","x","y","z","aspect","colorSpace","premultipliedAlpha","queue","copyExternalImageToTexture","origin","texture"],"mappings":";AACA,SAAQA,OAAR,QAAmE,cAAnE;AACA,SAAQC,sBAAR,QAAqC,mCAArC;AAEA,OAAOC,aAAP,MAA0B,kBAA1B;AAEA,MAAMC,eAAmD,GAAG;AAC1D,QAAM,IADoD;AAE1D,QAAM,IAFoD;AAG1D,cAAY,IAH8C;AAI1D,UAAQ,IAJkD;AAK1D,gBAAc,IAL4C;AAM1D,QAAM;AANoD,CAA5D;AASA,eAAe,MAAMC,aAAN,SAA4BJ,OAA5B,CAAoC;AAajDK,EAAAA,WAAW,CAACC,MAAD,EAAuBC,KAAvB,EAA4C;AACrD,UAAMD,MAAN,EAAcC,KAAd;;AADqD;;AAAA;;AAAA;;AAAA;;AAGrD,QAAI,OAAO,KAAKA,KAAL,CAAWC,MAAlB,KAA6B,QAAjC,EAA2C;AACzC,YAAM,IAAIC,KAAJ,CAAU,eAAV,CAAN;AACD;;AAED,SAAKH,MAAL,GAAcA,MAAd;AACA,SAAKI,MAAL,GAAc,KAAKH,KAAL,CAAWG,MAAX,IAAqB,KAAKC,YAAL,EAAnC;;AAEA,QAAI,KAAKJ,KAAL,CAAWK,IAAf,EAAqB;AACnB,WAAKC,OAAL,CAAa;AAACD,QAAAA,IAAI,EAAE,KAAKL,KAAL,CAAWK;AAAlB,OAAb;AACD;;AAGD,SAAKE,UAAL,CAAgBP,KAAK,CAACQ,OAAtB;AAIA,SAAKC,IAAL,GAAY,KAAKN,MAAL,CAAYO,UAAZ,CAAuB,EAAvB,CAAZ;AASD;;AAESN,EAAAA,YAAY,GAAe;AAAA;;AACnC,QAAI,OAAO,KAAKJ,KAAL,CAAWC,MAAlB,KAA6B,QAAjC,EAA2C;AACzC,YAAM,IAAIC,KAAJ,CAAU,eAAV,CAAN;AACD;;AAID,UAAMS,KAAK,GAAG,KAAKX,KAAL,CAAWW,KAAX,yBAAoB,KAAKX,KAAL,CAAWK,IAA/B,qDAAoB,iBAAiBM,KAArC,KAA8C,CAA5D;AAEA,UAAMC,MAAM,GAAG,KAAKZ,KAAL,CAAWY,MAAX,0BAAqB,KAAKZ,KAAL,CAAWK,IAAhC,sDAAqB,kBAAiBO,MAAtC,KAAgD,CAA/D;AAEA,WAAO,KAAKb,MAAL,CAAYI,MAAZ,CAAmBU,aAAnB,CAAiC;AACtCC,MAAAA,IAAI,EAAE;AACJH,QAAAA,KADI;AAEJC,QAAAA,MAFI;AAGJG,QAAAA,kBAAkB,EAAE,KAAKf,KAAL,CAAWgB;AAH3B,OADgC;AAMtCC,MAAAA,SAAS,EAAErB,eAAe,CAAC,KAAKI,KAAL,CAAWiB,SAAZ,CANY;AAOtChB,MAAAA,MAAM,EAAEP,sBAAsB,CAAC,KAAKM,KAAL,CAAWC,MAAZ,CAPQ;AAQtCiB,MAAAA,KAAK,EAAE,KAAKlB,KAAL,CAAWkB,KARoB;AAStCC,MAAAA,aAAa,EAAE,KAAKnB,KAAL,CAAWoB,SATY;AAUtCC,MAAAA,WAAW,EAAE,KAAKrB,KAAL,CAAWsB;AAVc,KAAjC,CAAP;AAYD;;AAEDC,EAAAA,OAAO,GAAS;AACd,SAAKpB,MAAL,CAAYoB,OAAZ;AACD;;AAMDhB,EAAAA,UAAU,CAACC,OAAD,EAAwC;AAChD,SAAKA,OAAL,GAAeA,OAAO,YAAYb,aAAnB,GAAmCa,OAAnC,GAA6C,IAAIb,aAAJ,CAAkB,KAAKI,MAAvB,EAA+BS,OAA/B,CAA5D;AACA,WAAO,IAAP;AACD;;AAEDF,EAAAA,OAAO,CAACkB,OAAD,EAEJ;AACD,WAAO,KAAKC,QAAL,CAAc;AAACC,MAAAA,MAAM,EAAEF,OAAO,CAACnB;AAAjB,KAAd,CAAP;AACD;;AAGDoB,EAAAA,QAAQ,CAACD,OAAD,EAcC;AACP,UAAM;AACJE,MAAAA,MADI;AAEJf,MAAAA,KAAK,GAAGa,OAAO,CAACE,MAAR,CAAef,KAFnB;AAGJC,MAAAA,MAAM,GAAGY,OAAO,CAACE,MAAR,CAAed,MAHpB;AAIJI,MAAAA,KAAK,GAAG,CAJJ;AAKJW,MAAAA,OAAO,GAAG,CALN;AAMJC,MAAAA,OAAO,GAAG,CANN;AAOJC,MAAAA,QAAQ,GAAG,CAPP;AAQJC,MAAAA,CAAC,GAAG,CARA;AASJC,MAAAA,CAAC,GAAG,CATA;AAUJC,MAAAA,CAAC,GAAG,CAVA;AAWJC,MAAAA,MAAM,GAAG,KAXL;AAYJC,MAAAA,UAAU,GAAG,MAZT;AAaJC,MAAAA,kBAAkB,GAAG;AAbjB,QAcFX,OAdJ;AAkBA,SAAKzB,MAAL,CAAYI,MAAZ,CAAmBiC,KAAnB,CAAyBC,0BAAzB,CAEE;AACEX,MAAAA,MADF;AAEEY,MAAAA,MAAM,EAAE,CAACX,OAAD,EAAUC,OAAV;AAFV,KAFF,EAOE;AACEW,MAAAA,OAAO,EAAE,KAAKpC,MADhB;AAEEmC,MAAAA,MAAM,EAAE,CAACR,CAAD,EAAIC,CAAJ,EAAOC,CAAP,CAFV;AAGEH,MAAAA,QAHF;AAIEI,MAAAA,MAJF;AAKEC,MAAAA,UALF;AAMEC,MAAAA;AANF,KAPF,EAgBE,CACExB,KADF,EAEEC,MAFF,EAGEI,KAHF,CAhBF;AAsBA,WAAO,IAAP;AACD;;AAhJgD","sourcesContent":["// luma.gl, MIT license\nimport {Texture, TextureProps, Sampler, SamplerProps, assert} from '@luma.gl/api';\nimport {getWebGPUTextureFormat} from '../helpers/convert-texture-format';\nimport type WebGPUDevice from '../webgpu-device';\nimport WebGPUSampler from './webgpu-sampler';\n\nconst BASE_DIMENSIONS: Record<string, '1d' | '2d' | '3d'> = {\n '1d': '1d',\n '2d': '2d',\n '2d-array': '2d',\n 'cube': '2d',\n 'cube-array': '2d',\n '3d': '3d'\n};\n\nexport default class WebGPUTexture extends Texture {\n readonly device: WebGPUDevice;\n readonly handle: GPUTexture;\n readonly view: GPUTextureView;\n sampler: WebGPUSampler;\n\n // static async createFromImageURL(src, usage = 0) {\n // const img = document.createElement('img');\n // img.src = src;\n // await img.decode();\n // return WebGPUTexture(img, usage);\n // }\n\n constructor(device: WebGPUDevice, props: TextureProps) {\n super(device, props);\n\n if (typeof this.props.format === 'number') {\n throw new Error('number format');\n }\n\n this.device = device;\n this.handle = this.props.handle || this.createHandle();\n\n if (this.props.data) {\n this.setData({data: this.props.data} );\n }\n\n // Create a default sampler. This mimics the WebGL1 API where sampler props are stored on the texture\n this.setSampler(props.sampler);\n\n // TODO - To support texture arrays we need to create custom views...\n // But we are not ready to expose TextureViews to the public API.\n this.view = this.handle.createView({\n // format: this.props.format,\n // dimension: this.props.dimension,\n // aspect = \"all\";\n // baseMipLevel: 0;\n // mipLevelCount;\n // baseArrayLayer = 0;\n // arrayLayerCount;\n });\n }\n\n protected createHandle(): GPUTexture {\n if (typeof this.props.format === 'number') {\n throw new Error('number format');\n }\n\n // Deduce size from data - TODO this is a hack\n // @ts-expect-error\n const width = this.props.width || this.props.data?.width || 1;\n // @ts-expect-error\n const height = this.props.height || this.props.data?.height || 1;\n\n return this.device.handle.createTexture({\n size: {\n width,\n height,\n depthOrArrayLayers: this.props.depth\n },\n dimension: BASE_DIMENSIONS[this.props.dimension],\n format: getWebGPUTextureFormat(this.props.format),\n usage: this.props.usage,\n mipLevelCount: this.props.mipLevels,\n sampleCount: this.props.samples\n });\n }\n\n destroy(): void {\n this.handle.destroy();\n }\n\n /**\n * Set default sampler\n * Accept a sampler instance or set of props;\n */\n setSampler(sampler: Sampler | SamplerProps): this {\n this.sampler = sampler instanceof WebGPUSampler ? sampler : new WebGPUSampler(this.device, sampler);\n return this;\n }\n\n setData(options: {\n data: any;\n }) {\n return this.setImage({source: options.data});\n }\n\n /** Set image */\n setImage(options: {\n source: ImageBitmap | HTMLCanvasElement | OffscreenCanvas;\n width?: number;\n height?: number;\n depth?: number;\n sourceX?: number;\n sourceY?: number;\n mipLevel?: number;\n x?: number;\n y?: number;\n z?: number;\n aspect?: 'all' | 'stencil-only' | 'depth-only';\n colorSpace?: 'srgb';\n premultipliedAlpha?: boolean;\n }): this {\n const {\n source,\n width = options.source.width,\n height = options.source.height,\n depth = 1,\n sourceX = 0,\n sourceY = 0,\n mipLevel = 0,\n x = 0,\n y = 0,\n z = 0,\n aspect = 'all',\n colorSpace = 'srgb',\n premultipliedAlpha = false\n } = options;\n\n // TODO - max out width\n\n this.device.handle.queue.copyExternalImageToTexture(\n // source: GPUImageCopyExternalImage\n {\n source,\n origin: [sourceX, sourceY]\n },\n // destination: GPUImageCopyTextureTagged\n {\n texture: this.handle,\n origin: [x, y, z],\n mipLevel,\n aspect,\n colorSpace,\n premultipliedAlpha\n },\n // copySize: GPUExtent3D\n [\n width,\n height,\n depth\n ]\n );\n return this;\n }\n\n /*\n async readPixels() {\n const readbackBuffer = device.createBuffer({\n usage: Buffer.COPY_DST | Buffer.MAP_READ,\n size: 4 * textureWidth * textureHeight,\n });\n\n // Copy data from the texture to the buffer.\n const encoder = device.createCommandEncoder();\n encoder.copyTextureToBuffer(\n { texture },\n { buffer, rowPitch: textureWidth * 4 },\n [textureWidth, textureHeight],\n );\n device.submit([encoder.finish()]);\n\n // Get the data on the CPU.\n await buffer.mapAsync(GPUMapMode.READ);\n saveScreenshot(buffer.getMappedRange());\n buffer.unmap();\n }\n\n setImageData(imageData, usage): this {\n let data = null;\n\n const bytesPerRow = Math.ceil((img.width * 4) / 256) * 256;\n if (bytesPerRow == img.width * 4) {\n data = imageData.data;\n } else {\n data = new Uint8Array(bytesPerRow * img.height);\n let imagePixelIndex = 0;\n for (let y = 0; y < img.height; ++y) {\n for (let x = 0; x < img.width; ++x) {\n const i = x * 4 + y * bytesPerRow;\n data[i] = imageData.data[imagePixelIndex];\n data[i + 1] = imageData.data[imagePixelIndex + 1];\n data[i + 2] = imageData.data[imagePixelIndex + 2];\n data[i + 3] = imageData.data[imagePixelIndex + 3];\n imagePixelIndex += 4;\n }\n }\n }\n return this;\n }\n\n setData(data): this {\n const textureDataBuffer = this.device.handle.createBuffer({\n size: data.byteLength,\n usage: Buffer.COPY_DST | Buffer.COPY_SRC,\n mappedAtCreation: true\n });\n new Uint8Array(textureDataBuffer.getMappedRange()).set(data);\n textureDataBuffer.unmap();\n\n this.setBuffer(textureDataBuffer);\n\n textureDataBuffer.destroy();\n return this;\n }\n\n setBuffer(textureDataBuffer, {bytesPerRow}): this {\n const commandEncoder = this.device.handle.createCommandEncoder();\n commandEncoder.copyBufferToTexture(\n {\n buffer: textureDataBuffer,\n bytesPerRow\n },\n {\n texture: this.handle\n },\n {\n width,\n height,\n depth\n }\n );\n\n this.device.handle.defaultQueue.submit([commandEncoder.finish()]);\n return this;\n }\n */\n}\n"],"file":"webgpu-texture.js"}
|
|
1
|
+
{"version":3,"file":"webgpu-texture.js","names":["Texture","getWebGPUTextureFormat","WebGPUSampler","BASE_DIMENSIONS","WebGPUTexture","constructor","device","props","handle","view","sampler","height","width","format","Error","createHandle","data","setData","createView","_this$props$data","_this$props$data2","createTexture","size","depthOrArrayLayers","depth","dimension","usage","mipLevelCount","mipLevels","sampleCount","samples","destroy","setSampler","options","setImage","source","sourceX","sourceY","mipLevel","x","y","z","aspect","colorSpace","premultipliedAlpha","queue","copyExternalImageToTexture","origin","texture"],"sources":["../../../src/adapter/resources/webgpu-texture.ts"],"sourcesContent":["// luma.gl, MIT license\nimport {Texture, TextureProps, Sampler, SamplerProps} from '@luma.gl/core';\nimport {getWebGPUTextureFormat} from '../helpers/convert-texture-format';\nimport type {WebGPUDevice} from '../webgpu-device';\nimport {WebGPUSampler} from './webgpu-sampler';\n\nconst BASE_DIMENSIONS: Record<string, '1d' | '2d' | '3d'> = {\n '1d': '1d',\n '2d': '2d',\n '2d-array': '2d',\n 'cube': '2d',\n 'cube-array': '2d',\n '3d': '3d'\n};\n\nexport class WebGPUTexture extends Texture {\n readonly device: WebGPUDevice;\n readonly handle: GPUTexture;\n readonly view: GPUTextureView;\n sampler: WebGPUSampler;\n\n override height: number = 1;\n override width: number = 1;\n\n // static async createFromImageURL(src, usage = 0) {\n // const img = document.createElement('img');\n // img.src = src;\n // await img.decode();\n // return WebGPUTexture(img, usage);\n // }\n\n constructor(device: WebGPUDevice, props: TextureProps) {\n super(device, props);\n\n if (typeof this.props.format === 'number') {\n throw new Error('number format');\n }\n\n this.device = device;\n this.handle = this.props.handle || this.createHandle();\n\n if (this.props.data) {\n this.setData({data: this.props.data} );\n }\n\n this.width = this.handle.width;\n this.height = this.handle.height;\n // Why not just read all properties directly from the texture\n // this.depthOrArrayLayers = this.handle.depthOrArrayLayers;\n // this.mipLevelCount = this.handle.mipLevelCount;\n // this.sampleCount = this.handle.sampleCount;\n // this.dimension = this.handle.dimension;\n // this.format = this.handle.format;\n // this.usage = this.handle.usage;\n\n // Create a default sampler. This mimics the WebGL1 API where sampler props are stored on the texture\n // this.setSampler(props.sampler);\n this.sampler = props.sampler instanceof WebGPUSampler ? props.sampler : new WebGPUSampler(this.device, props.sampler);\n\n // TODO - To support texture arrays we need to create custom views...\n // But we are not ready to expose TextureViews to the public API.\n this.view = this.handle.createView({\n // format: this.props.format,\n // dimension: this.props.dimension,\n // aspect = \"all\";\n // baseMipLevel: 0;\n // mipLevelCount;\n // baseArrayLayer = 0;\n // arrayLayerCount;\n });\n }\n\n protected createHandle(): GPUTexture {\n if (typeof this.props.format === 'number') {\n throw new Error('number format');\n }\n\n // Deduce size from data - TODO this is a hack\n // @ts-expect-error\n const width = this.props.width || this.props.data?.width || 1;\n // @ts-expect-error\n const height = this.props.height || this.props.data?.height || 1;\n\n return this.device.handle.createTexture({\n size: {\n width,\n height,\n depthOrArrayLayers: this.props.depth\n },\n dimension: BASE_DIMENSIONS[this.props.dimension],\n format: getWebGPUTextureFormat(this.props.format),\n usage: this.props.usage,\n mipLevelCount: this.props.mipLevels,\n sampleCount: this.props.samples\n });\n }\n\n override destroy(): void {\n this.handle.destroy();\n }\n\n /**\n * Set default sampler\n * Accept a sampler instance or set of props;\n */\n setSampler(sampler: Sampler | SamplerProps): this {\n this.sampler = sampler instanceof WebGPUSampler ? sampler : new WebGPUSampler(this.device, sampler);\n return this;\n }\n\n setData(options: {\n data: any;\n }) {\n return this.setImage({source: options.data});\n }\n\n /** Set image */\n setImage(options: {\n source: ImageBitmap | HTMLCanvasElement | OffscreenCanvas;\n width?: number;\n height?: number;\n depth?: number;\n sourceX?: number;\n sourceY?: number;\n mipLevel?: number;\n x?: number;\n y?: number;\n z?: number;\n aspect?: 'all' | 'stencil-only' | 'depth-only';\n colorSpace?: 'srgb';\n premultipliedAlpha?: boolean;\n }): {width: number, height: number} {\n const {\n source,\n width = options.source.width,\n height = options.source.height,\n depth = 1,\n sourceX = 0,\n sourceY = 0,\n mipLevel = 0,\n x = 0,\n y = 0,\n z = 0,\n aspect = 'all',\n colorSpace = 'srgb',\n premultipliedAlpha = false\n } = options;\n\n // TODO - max out width\n\n this.device.handle.queue.copyExternalImageToTexture(\n // source: GPUImageCopyExternalImage\n {\n source,\n origin: [sourceX, sourceY]\n },\n // destination: GPUImageCopyTextureTagged\n {\n texture: this.handle,\n origin: [x, y, z],\n mipLevel,\n aspect,\n colorSpace,\n premultipliedAlpha\n },\n // copySize: GPUExtent3D\n [\n width,\n height,\n depth\n ]\n );\n return {width, height};\n }\n\n /*\n async readPixels() {\n const readbackBuffer = device.createBuffer({\n usage: Buffer.COPY_DST | Buffer.MAP_READ,\n size: 4 * textureWidth * textureHeight,\n });\n\n // Copy data from the texture to the buffer.\n const encoder = device.createCommandEncoder();\n encoder.copyTextureToBuffer(\n { texture },\n { buffer, rowPitch: textureWidth * 4 },\n [textureWidth, textureHeight],\n );\n device.submit([encoder.finish()]);\n\n // Get the data on the CPU.\n await buffer.mapAsync(GPUMapMode.READ);\n saveScreenshot(buffer.getMappedRange());\n buffer.unmap();\n }\n\n setImageData(imageData, usage): this {\n let data = null;\n\n const bytesPerRow = Math.ceil((img.width * 4) / 256) * 256;\n if (bytesPerRow == img.width * 4) {\n data = imageData.data;\n } else {\n data = new Uint8Array(bytesPerRow * img.height);\n let imagePixelIndex = 0;\n for (let y = 0; y < img.height; ++y) {\n for (let x = 0; x < img.width; ++x) {\n const i = x * 4 + y * bytesPerRow;\n data[i] = imageData.data[imagePixelIndex];\n data[i + 1] = imageData.data[imagePixelIndex + 1];\n data[i + 2] = imageData.data[imagePixelIndex + 2];\n data[i + 3] = imageData.data[imagePixelIndex + 3];\n imagePixelIndex += 4;\n }\n }\n }\n return this;\n }\n\n setData(data): this {\n const textureDataBuffer = this.device.handle.createBuffer({\n size: data.byteLength,\n usage: Buffer.COPY_DST | Buffer.COPY_SRC,\n mappedAtCreation: true\n });\n new Uint8Array(textureDataBuffer.getMappedRange()).set(data);\n textureDataBuffer.unmap();\n\n this.setBuffer(textureDataBuffer);\n\n textureDataBuffer.destroy();\n return this;\n }\n\n setBuffer(textureDataBuffer, {bytesPerRow}): this {\n const commandEncoder = this.device.handle.createCommandEncoder();\n commandEncoder.copyBufferToTexture(\n {\n buffer: textureDataBuffer,\n bytesPerRow\n },\n {\n texture: this.handle\n },\n {\n width,\n height,\n depth\n }\n );\n\n this.device.handle.defaultQueue.submit([commandEncoder.finish()]);\n return this;\n }\n */\n}\n"],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { Device, Buffer, VertexArrayProps, RenderPass, TypedArray } from '@luma.gl/core';
|
|
2
|
+
import { VertexArray } from '@luma.gl/core';
|
|
3
|
+
import { WebGPUDevice } from '../webgpu-device';
|
|
4
|
+
/** VertexArrayObject wrapper */
|
|
5
|
+
export declare class WebGPUVertexArray extends VertexArray {
|
|
6
|
+
get [Symbol.toStringTag](): string;
|
|
7
|
+
readonly device: WebGPUDevice;
|
|
8
|
+
/** Vertex Array is a helper class under WebGPU */
|
|
9
|
+
readonly handle: never;
|
|
10
|
+
/** * Attribute 0 can not be disable on most desktop OpenGL based browsers */
|
|
11
|
+
static isConstantAttributeZeroSupported(device: Device): boolean;
|
|
12
|
+
constructor(device: WebGPUDevice, props?: VertexArrayProps);
|
|
13
|
+
destroy(): void;
|
|
14
|
+
/**
|
|
15
|
+
* Set an elements buffer, for indexed rendering.
|
|
16
|
+
* Must be a Buffer bound to buffer with usage bit Buffer.INDEX set.
|
|
17
|
+
*/
|
|
18
|
+
setIndexBuffer(buffer: Buffer | null): void;
|
|
19
|
+
/** Set a location in vertex attributes array to a buffer, enables the location, sets divisor */
|
|
20
|
+
setBuffer(location: number, buffer: Buffer): void;
|
|
21
|
+
/** Set a location in vertex attributes array to a constant value, disables the location */
|
|
22
|
+
setConstant(location: number, value: TypedArray): void;
|
|
23
|
+
bindBeforeRender(renderPass: RenderPass, firstIndex?: number, indexCount?: number): void;
|
|
24
|
+
unbindAfterRender(renderPass: RenderPass): void;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=webgpu-vertex-array.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webgpu-vertex-array.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgpu-vertex-array.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAC,WAAW,EAAM,MAAM,eAAe,CAAC;AAG/C,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAK9C,gCAAgC;AAChC,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,IAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAE1C;IAED,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,kDAAkD;IAClD,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;IAEvB,6EAA6E;IAC7E,MAAM,CAAC,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;gBAKpD,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,gBAAgB;IAKjD,OAAO,IAAI,IAAI;IAExB;;;OAGG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAK3C,gGAAgG;IAChG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IASjD,2FAA2F;IAClF,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAItD,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAWxF,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;CAGzD"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
let _Symbol$toStringTag;
|
|
2
|
+
import { VertexArray, log } from '@luma.gl/core';
|
|
3
|
+
import { getBrowser } from '@probe.gl/env';
|
|
4
|
+
_Symbol$toStringTag = Symbol.toStringTag;
|
|
5
|
+
export class WebGPUVertexArray extends VertexArray {
|
|
6
|
+
get [_Symbol$toStringTag]() {
|
|
7
|
+
return 'WebGPUVertexArray';
|
|
8
|
+
}
|
|
9
|
+
static isConstantAttributeZeroSupported(device) {
|
|
10
|
+
return device.info.type === 'webgl2' || getBrowser() === 'Chrome';
|
|
11
|
+
}
|
|
12
|
+
constructor(device, props) {
|
|
13
|
+
super(device, props);
|
|
14
|
+
this.device = void 0;
|
|
15
|
+
this.handle = void 0;
|
|
16
|
+
this.device = device;
|
|
17
|
+
}
|
|
18
|
+
destroy() {}
|
|
19
|
+
setIndexBuffer(buffer) {
|
|
20
|
+
this.indexBuffer = buffer;
|
|
21
|
+
}
|
|
22
|
+
setBuffer(location, buffer) {
|
|
23
|
+
this.attributes[location] = buffer;
|
|
24
|
+
}
|
|
25
|
+
setConstant(location, value) {
|
|
26
|
+
log.warn(`${this.id} constant attributes not supported on WebGPU`);
|
|
27
|
+
}
|
|
28
|
+
bindBeforeRender(renderPass, firstIndex, indexCount) {
|
|
29
|
+
const webgpuRenderPass = renderPass;
|
|
30
|
+
const webgpuIndexBuffer = this.indexBuffer;
|
|
31
|
+
webgpuRenderPass.handle.setIndexBuffer(webgpuIndexBuffer === null || webgpuIndexBuffer === void 0 ? void 0 : webgpuIndexBuffer.handle, webgpuIndexBuffer === null || webgpuIndexBuffer === void 0 ? void 0 : webgpuIndexBuffer.indexType);
|
|
32
|
+
for (let location = 0; location < this.maxVertexAttributes; location++) {
|
|
33
|
+
const webgpuBuffer = this.attributes[location];
|
|
34
|
+
webgpuRenderPass.handle.setVertexBuffer(location, webgpuBuffer.handle);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
unbindAfterRender(renderPass) {}
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=webgpu-vertex-array.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webgpu-vertex-array.js","names":["VertexArray","log","getBrowser","_Symbol$toStringTag","Symbol","toStringTag","WebGPUVertexArray","isConstantAttributeZeroSupported","device","info","type","constructor","props","handle","destroy","setIndexBuffer","buffer","indexBuffer","setBuffer","location","attributes","setConstant","value","warn","id","bindBeforeRender","renderPass","firstIndex","indexCount","webgpuRenderPass","webgpuIndexBuffer","indexType","maxVertexAttributes","webgpuBuffer","setVertexBuffer","unbindAfterRender"],"sources":["../../../src/adapter/resources/webgpu-vertex-array.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport type {Device, Buffer, VertexArrayProps, RenderPass, TypedArray} from '@luma.gl/core';\nimport {VertexArray, log} from '@luma.gl/core';\nimport {getBrowser} from '@probe.gl/env';\n\nimport {WebGPUDevice} from '../webgpu-device';\nimport {WebGPUBuffer} from '../resources/webgpu-buffer';\n\nimport {WebGPURenderPass} from './webgpu-render-pass';\n\n/** VertexArrayObject wrapper */\nexport class WebGPUVertexArray extends VertexArray {\n override get [Symbol.toStringTag](): string {\n return 'WebGPUVertexArray';\n }\n\n readonly device: WebGPUDevice;\n /** Vertex Array is a helper class under WebGPU */\n readonly handle: never;\n\n /** * Attribute 0 can not be disable on most desktop OpenGL based browsers */\n static isConstantAttributeZeroSupported(device: Device): boolean {\n return device.info.type === 'webgl2' || getBrowser() === 'Chrome';\n }\n\n // Create a VertexArray\n constructor(device: WebGPUDevice, props?: VertexArrayProps) {\n super(device, props);\n this.device = device;\n }\n\n override destroy(): void {}\n\n /**\n * Set an elements buffer, for indexed rendering.\n * Must be a Buffer bound to buffer with usage bit Buffer.INDEX set. \n */\n setIndexBuffer(buffer: Buffer | null): void {\n // assert(!elementBuffer || elementBuffer.glTarget === GL.ELEMENT_ARRAY_BUFFER, ERR_ELEMENTS);\n this.indexBuffer = buffer;\n }\n\n /** Set a location in vertex attributes array to a buffer, enables the location, sets divisor */\n setBuffer(location: number, buffer: Buffer): void {\n // Sanity check target\n // if (buffer.glUsage === GL.ELEMENT_ARRAY_BUFFER) {\n // throw new Error('Use setIndexBuffer');\n // }\n\n this.attributes[location] = buffer;\n }\n\n /** Set a location in vertex attributes array to a constant value, disables the location */\n override setConstant(location: number, value: TypedArray): void {\n log.warn(`${this.id} constant attributes not supported on WebGPU`)\n }\n\n override bindBeforeRender(renderPass: RenderPass, firstIndex?: number, indexCount?: number): void {\n const webgpuRenderPass = renderPass as WebGPURenderPass;\n const webgpuIndexBuffer = this.indexBuffer as WebGPUBuffer;\n webgpuRenderPass.handle.setIndexBuffer(webgpuIndexBuffer?.handle, webgpuIndexBuffer?.indexType);\n for (let location = 0; location < this.maxVertexAttributes; location++) {\n const webgpuBuffer = this.attributes[location] as WebGPUBuffer;\n webgpuRenderPass.handle.setVertexBuffer(location, webgpuBuffer.handle);\n }\n // TODO - emit warnings/errors/throw if constants have been set on this vertex array\n }\n\n override unbindAfterRender(renderPass: RenderPass): void {\n // On WebGPU we don't unbind\n }\n}\n"],"mappings":";AAIA,SAAQA,WAAW,EAAEC,GAAG,QAAO,eAAe;AAC9C,SAAQC,UAAU,QAAO,eAAe;AAACC,mBAAA,GASzBC,MAAM,CAACC,WAAW;AADlC,OAAO,MAAMC,iBAAiB,SAASN,WAAW,CAAC;EACjD,KAAAG,mBAAA,IAA4C;IAC1C,OAAO,mBAAmB;EAC5B;EAOA,OAAOI,gCAAgCA,CAACC,MAAc,EAAW;IAC/D,OAAOA,MAAM,CAACC,IAAI,CAACC,IAAI,KAAK,QAAQ,IAAIR,UAAU,CAAC,CAAC,KAAK,QAAQ;EACnE;EAGAS,WAAWA,CAACH,MAAoB,EAAEI,KAAwB,EAAE;IAC1D,KAAK,CAACJ,MAAM,EAAEI,KAAK,CAAC;IAAC,KAXdJ,MAAM;IAAA,KAENK,MAAM;IAUb,IAAI,CAACL,MAAM,GAAGA,MAAM;EACtB;EAESM,OAAOA,CAAA,EAAS,CAAC;EAM1BC,cAAcA,CAACC,MAAqB,EAAQ;IAE1C,IAAI,CAACC,WAAW,GAAGD,MAAM;EAC3B;EAGAE,SAASA,CAACC,QAAgB,EAAEH,MAAc,EAAQ;IAMhD,IAAI,CAACI,UAAU,CAACD,QAAQ,CAAC,GAAGH,MAAM;EACpC;EAGSK,WAAWA,CAACF,QAAgB,EAAEG,KAAiB,EAAQ;IAC9DrB,GAAG,CAACsB,IAAI,CAAE,GAAE,IAAI,CAACC,EAAG,8CAA6C,CAAC;EACpE;EAESC,gBAAgBA,CAACC,UAAsB,EAAEC,UAAmB,EAAEC,UAAmB,EAAQ;IAChG,MAAMC,gBAAgB,GAAGH,UAA8B;IACvD,MAAMI,iBAAiB,GAAG,IAAI,CAACb,WAA2B;IAC1DY,gBAAgB,CAAChB,MAAM,CAACE,cAAc,CAACe,iBAAiB,aAAjBA,iBAAiB,uBAAjBA,iBAAiB,CAAEjB,MAAM,EAAEiB,iBAAiB,aAAjBA,iBAAiB,uBAAjBA,iBAAiB,CAAEC,SAAS,CAAC;IAC/F,KAAK,IAAIZ,QAAQ,GAAG,CAAC,EAAEA,QAAQ,GAAG,IAAI,CAACa,mBAAmB,EAAEb,QAAQ,EAAE,EAAE;MACtE,MAAMc,YAAY,GAAG,IAAI,CAACb,UAAU,CAACD,QAAQ,CAAiB;MAC9DU,gBAAgB,CAAChB,MAAM,CAACqB,eAAe,CAACf,QAAQ,EAAEc,YAAY,CAACpB,MAAM,CAAC;IACxE;EAEF;EAESsB,iBAAiBA,CAACT,UAAsB,EAAQ,CAEzD;AACF"}
|
|
@@ -1,24 +1,28 @@
|
|
|
1
|
-
/// <reference types="
|
|
2
|
-
import type { Texture, TextureFormat, CanvasContextProps } from '@luma.gl/
|
|
3
|
-
import { CanvasContext } from '@luma.gl/
|
|
4
|
-
import WebGPUDevice from './webgpu-device';
|
|
5
|
-
import
|
|
1
|
+
/// <reference types="dist" />
|
|
2
|
+
import type { Texture, TextureFormat, CanvasContextProps } from '@luma.gl/core';
|
|
3
|
+
import { CanvasContext } from '@luma.gl/core';
|
|
4
|
+
import { WebGPUDevice } from './webgpu-device';
|
|
5
|
+
import { WebGPUFramebuffer } from './resources/webgpu-framebuffer';
|
|
6
|
+
import { WebGPUTexture } from './resources/webgpu-texture';
|
|
6
7
|
/**
|
|
7
|
-
* Holds a WebGPU Canvas Context
|
|
8
|
+
* Holds a WebGPU Canvas Context
|
|
9
|
+
* The primary job of the CanvasContext is to generate textures for rendering into the current canvas
|
|
10
|
+
* It also manages canvas sizing calculations and resizing.
|
|
8
11
|
*/
|
|
9
|
-
export
|
|
12
|
+
export declare class WebGPUCanvasContext extends CanvasContext {
|
|
10
13
|
readonly device: WebGPUDevice;
|
|
11
14
|
readonly gpuCanvasContext: GPUCanvasContext;
|
|
15
|
+
/** Format of returned textures: "bgra8unorm", "rgba8unorm", "rgba16float". */
|
|
12
16
|
readonly format: TextureFormat;
|
|
13
|
-
|
|
14
|
-
height: number;
|
|
17
|
+
/** Default stencil format for depth textures */
|
|
15
18
|
depthStencilFormat: TextureFormat;
|
|
16
|
-
sampleCount: number;
|
|
17
19
|
private depthStencilAttachment;
|
|
18
20
|
constructor(device: WebGPUDevice, adapter: GPUAdapter, props: CanvasContextProps);
|
|
21
|
+
/** Destroy any textures produced while configured and remove the context configuration. */
|
|
19
22
|
destroy(): void;
|
|
23
|
+
getCurrentTexture(): WebGPUTexture;
|
|
20
24
|
/** Update framebuffer with properly resized "swap chain" texture views */
|
|
21
|
-
getCurrentFramebuffer():
|
|
25
|
+
getCurrentFramebuffer(): WebGPUFramebuffer;
|
|
22
26
|
/** Resizes and updates render targets if necessary */
|
|
23
27
|
update(): void;
|
|
24
28
|
resize(options?: {
|
|
@@ -27,6 +31,6 @@ export default class WebGPUCanvasContext extends CanvasContext {
|
|
|
27
31
|
useDevicePixels?: boolean | number;
|
|
28
32
|
}): void;
|
|
29
33
|
/** We build render targets on demand (i.e. not when size changes but when about to render) */
|
|
30
|
-
_createDepthStencilAttachment(): Texture
|
|
34
|
+
_createDepthStencilAttachment(): Texture<import("@luma.gl/core").TextureProps>;
|
|
31
35
|
}
|
|
32
36
|
//# sourceMappingURL=webgpu-canvas-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgpu-canvas-context.d.ts","sourceRoot":"","sources":["../../src/adapter/webgpu-canvas-context.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"webgpu-canvas-context.d.ts","sourceRoot":"","sources":["../../src/adapter/webgpu-canvas-context.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAC,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAC,aAAa,EAAM,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AAEzD;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,aAAa;IACpD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,8EAA8E;IAC9E,QAAQ,CAAC,MAAM,EAAE,aAAa,CAA4C;IAC1E,gDAAgD;IAChD,kBAAkB,EAAE,aAAa,CAAiB;IAElD,OAAO,CAAC,sBAAsB,CAAwB;gBAE1C,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,kBAAkB;IAehF,2FAA2F;IAC3F,OAAO,IAAI,IAAI;IAIf,iBAAiB,IAAI,aAAa;IAQlC,0EAA0E;IAC1E,qBAAqB,IAAI,iBAAiB;IA2B1C,sDAAsD;IACtD,MAAM;IA6BN,MAAM,CAAC,OAAO,CAAC,EAAE;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;KAAC,GAAG,IAAI;IAI7F,8FAA8F;IAC9F,6BAA6B;CAY9B"}
|
|
@@ -1,82 +1,63 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
export default class WebGPUCanvasContext extends CanvasContext {
|
|
1
|
+
import { CanvasContext, log } from '@luma.gl/core';
|
|
2
|
+
import { getWebGPUTextureFormat } from "./helpers/convert-texture-format.js";
|
|
3
|
+
import { WebGPUFramebuffer } from "./resources/webgpu-framebuffer.js";
|
|
4
|
+
export class WebGPUCanvasContext extends CanvasContext {
|
|
6
5
|
constructor(device, adapter, props) {
|
|
7
6
|
super(props);
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
_defineProperty(this, "format", void 0);
|
|
14
|
-
|
|
15
|
-
_defineProperty(this, "width", -1);
|
|
16
|
-
|
|
17
|
-
_defineProperty(this, "height", -1);
|
|
18
|
-
|
|
19
|
-
_defineProperty(this, "depthStencilFormat", 'depth24plus');
|
|
20
|
-
|
|
21
|
-
_defineProperty(this, "sampleCount", 1);
|
|
22
|
-
|
|
23
|
-
_defineProperty(this, "depthStencilAttachment", void 0);
|
|
24
|
-
|
|
7
|
+
this.device = void 0;
|
|
8
|
+
this.gpuCanvasContext = void 0;
|
|
9
|
+
this.format = navigator.gpu.getPreferredCanvasFormat();
|
|
10
|
+
this.depthStencilFormat = 'depth24plus';
|
|
11
|
+
this.depthStencilAttachment = null;
|
|
25
12
|
this.device = device;
|
|
13
|
+
this.width = -1;
|
|
14
|
+
this.height = -1;
|
|
15
|
+
this._setAutoCreatedCanvasId(`${this.device.id}-canvas`);
|
|
26
16
|
this.gpuCanvasContext = this.canvas.getContext('webgpu');
|
|
27
|
-
this.format =
|
|
17
|
+
this.format = 'bgra8unorm';
|
|
28
18
|
}
|
|
29
|
-
|
|
30
19
|
destroy() {
|
|
31
20
|
this.gpuCanvasContext.unconfigure();
|
|
32
21
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
this.update();
|
|
36
|
-
const currentColorAttachment = this.device.createTexture({
|
|
22
|
+
getCurrentTexture() {
|
|
23
|
+
return this.device._createTexture({
|
|
37
24
|
id: 'default-render-target',
|
|
38
|
-
handle: this.gpuCanvasContext.getCurrentTexture()
|
|
39
|
-
format: this.format,
|
|
40
|
-
width: this.width,
|
|
41
|
-
height: this.height
|
|
25
|
+
handle: this.gpuCanvasContext.getCurrentTexture()
|
|
42
26
|
});
|
|
43
|
-
|
|
27
|
+
}
|
|
28
|
+
getCurrentFramebuffer() {
|
|
29
|
+
this.update();
|
|
30
|
+
const currentColorAttachment = this.getCurrentTexture();
|
|
31
|
+
this.width = currentColorAttachment.width;
|
|
32
|
+
this.height = currentColorAttachment.height;
|
|
44
33
|
this._createDepthStencilAttachment();
|
|
45
|
-
|
|
46
|
-
return new WEBGPUFramebuffer(this.device, {
|
|
34
|
+
return new WebGPUFramebuffer(this.device, {
|
|
47
35
|
colorAttachments: [currentColorAttachment],
|
|
48
36
|
depthStencilAttachment: this.depthStencilAttachment
|
|
49
37
|
});
|
|
50
38
|
}
|
|
51
|
-
|
|
52
39
|
update() {
|
|
53
40
|
const [width, height] = this.getPixelSize();
|
|
54
41
|
const sizeChanged = width !== this.width || height !== this.height;
|
|
55
|
-
|
|
56
42
|
if (sizeChanged) {
|
|
57
43
|
this.width = width;
|
|
58
44
|
this.height = height;
|
|
59
|
-
|
|
60
45
|
if (this.depthStencilAttachment) {
|
|
61
46
|
this.depthStencilAttachment.destroy();
|
|
62
|
-
this.depthStencilAttachment =
|
|
47
|
+
this.depthStencilAttachment = null;
|
|
63
48
|
}
|
|
64
|
-
|
|
65
49
|
this.gpuCanvasContext.configure({
|
|
66
50
|
device: this.device.handle,
|
|
67
51
|
format: getWebGPUTextureFormat(this.format),
|
|
68
|
-
size: [this.width, this.height],
|
|
69
52
|
colorSpace: this.props.colorSpace,
|
|
70
|
-
|
|
53
|
+
alphaMode: this.props.alphaMode
|
|
71
54
|
});
|
|
72
|
-
log.log(1,
|
|
55
|
+
log.log(1, `Resized to ${this.width}x${this.height}px`)();
|
|
73
56
|
}
|
|
74
57
|
}
|
|
75
|
-
|
|
76
58
|
resize(options) {
|
|
77
59
|
this.update();
|
|
78
60
|
}
|
|
79
|
-
|
|
80
61
|
_createDepthStencilAttachment() {
|
|
81
62
|
if (!this.depthStencilAttachment) {
|
|
82
63
|
this.depthStencilAttachment = this.device.createTexture({
|
|
@@ -87,9 +68,7 @@ export default class WebGPUCanvasContext extends CanvasContext {
|
|
|
87
68
|
usage: GPUTextureUsage.RENDER_ATTACHMENT
|
|
88
69
|
});
|
|
89
70
|
}
|
|
90
|
-
|
|
91
71
|
return this.depthStencilAttachment;
|
|
92
72
|
}
|
|
93
|
-
|
|
94
73
|
}
|
|
95
74
|
//# sourceMappingURL=webgpu-canvas-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"webgpu-canvas-context.js","names":["CanvasContext","log","getWebGPUTextureFormat","WebGPUFramebuffer","WebGPUCanvasContext","constructor","device","adapter","props","gpuCanvasContext","format","navigator","gpu","getPreferredCanvasFormat","depthStencilFormat","depthStencilAttachment","width","height","_setAutoCreatedCanvasId","id","canvas","getContext","destroy","unconfigure","getCurrentTexture","_createTexture","handle","getCurrentFramebuffer","update","currentColorAttachment","_createDepthStencilAttachment","colorAttachments","getPixelSize","sizeChanged","configure","colorSpace","alphaMode","resize","options","createTexture","usage","GPUTextureUsage","RENDER_ATTACHMENT"],"sources":["../../src/adapter/webgpu-canvas-context.ts"],"sourcesContent":["// / <reference types=\"@webgpu/types\" />\nimport type {Texture, TextureFormat, CanvasContextProps} from '@luma.gl/core';\nimport {CanvasContext, log} from '@luma.gl/core';\nimport {getWebGPUTextureFormat} from './helpers/convert-texture-format';\nimport {WebGPUDevice} from './webgpu-device';\nimport {WebGPUFramebuffer} from './resources/webgpu-framebuffer';\nimport {WebGPUTexture} from './resources/webgpu-texture';\n\n/** \n * Holds a WebGPU Canvas Context\n * The primary job of the CanvasContext is to generate textures for rendering into the current canvas\n * It also manages canvas sizing calculations and resizing.\n */\nexport class WebGPUCanvasContext extends CanvasContext {\n readonly device: WebGPUDevice;\n readonly gpuCanvasContext: GPUCanvasContext;\n /** Format of returned textures: \"bgra8unorm\", \"rgba8unorm\", \"rgba16float\". */\n readonly format: TextureFormat = navigator.gpu.getPreferredCanvasFormat();\n /** Default stencil format for depth textures */\n depthStencilFormat: TextureFormat = 'depth24plus';\n\n private depthStencilAttachment: Texture | null = null;\n\n constructor(device: WebGPUDevice, adapter: GPUAdapter, props: CanvasContextProps) {\n super(props);\n this.device = device;\n // TODO - hack to trigger resize?\n this.width = -1;\n this.height = -1;\n\n this._setAutoCreatedCanvasId(`${this.device.id}-canvas`);\n // @ts-ignore TODO - we don't handle OffscreenRenderingContext.\n this.gpuCanvasContext = this.canvas.getContext('webgpu');\n // TODO this has been replaced\n // this.format = this.gpuCanvasContext.getPreferredFormat(adapter);\n this.format = 'bgra8unorm';\n }\n\n /** Destroy any textures produced while configured and remove the context configuration. */\n destroy(): void {\n this.gpuCanvasContext.unconfigure();\n }\n\n getCurrentTexture(): WebGPUTexture {\n // Wrap the current canvas context texture in a luma.gl texture \n return this.device._createTexture({\n id: 'default-render-target',\n handle: this.gpuCanvasContext.getCurrentTexture()\n });\n }\n\n /** Update framebuffer with properly resized \"swap chain\" texture views */\n getCurrentFramebuffer(): WebGPUFramebuffer {\n // Ensure the canvas context size is updated\n this.update();\n\n // Wrap the current canvas context texture in a luma.gl texture\n // const currentColorAttachment = this.device.createTexture({\n // id: 'default-render-target',\n // handle: this.gpuCanvasContext.getCurrentTexture(),\n // format: this.format,\n // width: this.width,\n // height: this.height\n // });\n\n // Wrap the current canvas context texture in a luma.gl texture \n const currentColorAttachment = this.getCurrentTexture();\n this.width = currentColorAttachment.width;\n this.height = currentColorAttachment.height;\n\n // Resize the depth stencil attachment\n this._createDepthStencilAttachment();\n\n return new WebGPUFramebuffer(this.device, {\n colorAttachments: [currentColorAttachment],\n depthStencilAttachment: this.depthStencilAttachment\n });\n }\n\n /** Resizes and updates render targets if necessary */\n update() {\n const [width, height] = this.getPixelSize();\n\n const sizeChanged = width !== this.width || height !== this.height;\n\n if (sizeChanged) {\n this.width = width;\n this.height = height;\n\n if (this.depthStencilAttachment) {\n this.depthStencilAttachment.destroy();\n this.depthStencilAttachment = null;\n }\n\n // Reconfigure the canvas size.\n // https://www.w3.org/TR/webgpu/#canvas-configuration\n this.gpuCanvasContext.configure({\n device: this.device.handle,\n format: getWebGPUTextureFormat(this.format),\n // Can be used to define e.g. -srgb views\n // viewFormats: [...]\n colorSpace: this.props.colorSpace,\n alphaMode: this.props.alphaMode\n });\n\n log.log(1, `Resized to ${this.width}x${this.height}px`)();\n }\n }\n\n resize(options?: {width?: number; height?: number; useDevicePixels?: boolean | number}): void {\n this.update();\n }\n\n /** We build render targets on demand (i.e. not when size changes but when about to render) */\n _createDepthStencilAttachment() {\n if (!this.depthStencilAttachment) {\n this.depthStencilAttachment = this.device.createTexture({\n id: 'depth-stencil-target',\n format: this.depthStencilFormat,\n width: this.width,\n height: this.height,\n usage: GPUTextureUsage.RENDER_ATTACHMENT\n });\n }\n return this.depthStencilAttachment;\n }\n}\n"],"mappings":"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"}
|
|
@@ -1,28 +1,29 @@
|
|
|
1
|
-
/// <reference types="
|
|
2
|
-
import type { DeviceProps, DeviceInfo, DeviceLimits, DeviceFeature, CanvasContextProps, BufferProps, SamplerProps, ShaderProps, TextureProps, TextureFormat, ExternalTextureProps, FramebufferProps, RenderPipelineProps, ComputePipelineProps, RenderPassProps, ComputePassProps } from '@luma.gl/
|
|
3
|
-
import { Device } from '@luma.gl/
|
|
4
|
-
import WebGPUBuffer from './resources/webgpu-buffer';
|
|
5
|
-
import WebGPUTexture from './resources/webgpu-texture';
|
|
6
|
-
import WebGPUExternalTexture from './resources/webgpu-external-texture';
|
|
7
|
-
import WebGPUSampler from './resources/webgpu-sampler';
|
|
8
|
-
import WebGPUShader from './resources/webgpu-shader';
|
|
9
|
-
import WebGPURenderPipeline from './resources/webgpu-render-pipeline';
|
|
10
|
-
import WebGPUFramebuffer from './resources/webgpu-framebuffer';
|
|
11
|
-
import WebGPUComputePipeline from './resources/webgpu-compute-pipeline';
|
|
12
|
-
import WebGPURenderPass from './resources/webgpu-render-pass';
|
|
13
|
-
import WebGPUComputePass from './resources/webgpu-compute-pass';
|
|
14
|
-
import
|
|
1
|
+
/// <reference types="dist" />
|
|
2
|
+
import type { DeviceProps, DeviceInfo, DeviceLimits, DeviceFeature, CanvasContextProps, BufferProps, SamplerProps, ShaderProps, Texture, TextureProps, TextureFormat, ExternalTextureProps, FramebufferProps, RenderPipelineProps, ComputePipelineProps, RenderPassProps, ComputePassProps, VertexArrayProps, TransformFeedback, TransformFeedbackProps } from '@luma.gl/core';
|
|
3
|
+
import { Device } from '@luma.gl/core';
|
|
4
|
+
import { WebGPUBuffer } from './resources/webgpu-buffer';
|
|
5
|
+
import { WebGPUTexture } from './resources/webgpu-texture';
|
|
6
|
+
import { WebGPUExternalTexture } from './resources/webgpu-external-texture';
|
|
7
|
+
import { WebGPUSampler } from './resources/webgpu-sampler';
|
|
8
|
+
import { WebGPUShader } from './resources/webgpu-shader';
|
|
9
|
+
import { WebGPURenderPipeline } from './resources/webgpu-render-pipeline';
|
|
10
|
+
import { WebGPUFramebuffer } from './resources/webgpu-framebuffer';
|
|
11
|
+
import { WebGPUComputePipeline } from './resources/webgpu-compute-pipeline';
|
|
12
|
+
import { WebGPURenderPass } from './resources/webgpu-render-pass';
|
|
13
|
+
import { WebGPUComputePass } from './resources/webgpu-compute-pass';
|
|
14
|
+
import { WebGPUVertexArray } from './resources/webgpu-vertex-array';
|
|
15
|
+
import { WebGPUCanvasContext } from './webgpu-canvas-context';
|
|
15
16
|
/** WebGPU Device implementation */
|
|
16
|
-
export
|
|
17
|
+
export declare class WebGPUDevice extends Device {
|
|
17
18
|
readonly handle: GPUDevice;
|
|
18
19
|
readonly adapter: GPUAdapter;
|
|
19
20
|
readonly lost: Promise<{
|
|
20
21
|
reason: 'destroyed';
|
|
21
22
|
message: string;
|
|
22
23
|
}>;
|
|
23
|
-
canvasContext: WebGPUCanvasContext |
|
|
24
|
-
commandEncoder: GPUCommandEncoder;
|
|
25
|
-
renderPass: WebGPURenderPass;
|
|
24
|
+
canvasContext: WebGPUCanvasContext | null;
|
|
25
|
+
commandEncoder: GPUCommandEncoder | null;
|
|
26
|
+
renderPass: WebGPURenderPass | null;
|
|
26
27
|
private _info;
|
|
27
28
|
private _isLost;
|
|
28
29
|
static type: string;
|
|
@@ -40,7 +41,7 @@ export default class WebGPUDevice extends Device {
|
|
|
40
41
|
/** @todo implement proper check? */
|
|
41
42
|
isTextureFormatRenderable(format: TextureFormat): boolean;
|
|
42
43
|
get isLost(): boolean;
|
|
43
|
-
|
|
44
|
+
createBuffer(props: BufferProps | ArrayBuffer | ArrayBufferView): WebGPUBuffer;
|
|
44
45
|
_createTexture(props: TextureProps): WebGPUTexture;
|
|
45
46
|
createExternalTexture(props: ExternalTextureProps): WebGPUExternalTexture;
|
|
46
47
|
createShader(props: ShaderProps): WebGPUShader;
|
|
@@ -48,20 +49,36 @@ export default class WebGPUDevice extends Device {
|
|
|
48
49
|
createRenderPipeline(props: RenderPipelineProps): WebGPURenderPipeline;
|
|
49
50
|
createFramebuffer(props: FramebufferProps): WebGPUFramebuffer;
|
|
50
51
|
createComputePipeline(props: ComputePipelineProps): WebGPUComputePipeline;
|
|
52
|
+
createVertexArray(props: VertexArrayProps): WebGPUVertexArray;
|
|
51
53
|
/**
|
|
52
54
|
* Allows a render pass to begin against a canvas context
|
|
53
55
|
* @todo need to support a "Framebuffer" equivalent (aka preconfigured RenderPassDescriptors?).
|
|
54
56
|
*/
|
|
55
|
-
beginRenderPass(props
|
|
56
|
-
beginComputePass(props
|
|
57
|
-
|
|
57
|
+
beginRenderPass(props: RenderPassProps): WebGPURenderPass;
|
|
58
|
+
beginComputePass(props: ComputePassProps): WebGPUComputePass;
|
|
59
|
+
createTransformFeedback(props: TransformFeedbackProps): TransformFeedback;
|
|
60
|
+
createCanvasContext(props: CanvasContextProps): WebGPUCanvasContext;
|
|
58
61
|
/**
|
|
59
62
|
* Gets default renderpass encoder.
|
|
60
63
|
* Creates a new encoder against default canvasContext if not already created
|
|
61
64
|
* @note Called internally by Model.
|
|
65
|
+
* @deprecated Create explicit pass with device.beginRenderPass
|
|
62
66
|
*/
|
|
63
67
|
getDefaultRenderPass(): WebGPURenderPass;
|
|
64
68
|
submit(): void;
|
|
65
69
|
_getFeatures(): Set<DeviceFeature>;
|
|
70
|
+
copyExternalImageToTexture(options: {
|
|
71
|
+
texture: Texture;
|
|
72
|
+
mipLevel?: number;
|
|
73
|
+
aspect?: 'all' | 'stencil-only' | 'depth-only';
|
|
74
|
+
colorSpace?: 'display-p3' | 'srgb';
|
|
75
|
+
premultipliedAlpha?: boolean;
|
|
76
|
+
source: ImageBitmap | HTMLVideoElement | HTMLCanvasElement | OffscreenCanvas;
|
|
77
|
+
sourceX?: number;
|
|
78
|
+
sourceY?: number;
|
|
79
|
+
width?: number;
|
|
80
|
+
height?: number;
|
|
81
|
+
depth?: number;
|
|
82
|
+
}): void;
|
|
66
83
|
}
|
|
67
84
|
//# sourceMappingURL=webgpu-device.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgpu-device.d.ts","sourceRoot":"","sources":["../../src/adapter/webgpu-device.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"webgpu-device.d.ts","sourceRoot":"","sources":["../../src/adapter/webgpu-device.ts"],"names":[],"mappings":"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"}
|