Skip to content

Commit e9d3b66

Browse files
robertleeplummerjrrobertleeplummerjr
committed
Merge branch 'master' into develop
2 parents 6622ecb + 8a7baba commit e9d3b66

24 files changed

+571
-479
lines changed

‎dist/gpu-browser-core.js‎

Lines changed: 211 additions & 202 deletions
Large diffs are not rendered by default.

‎dist/gpu-browser-core.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/gpu-browser.js‎

Lines changed: 211 additions & 202 deletions
Large diffs are not rendered by default.

‎dist/gpu-browser.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json‎

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gpu.js",
3-
"version": "2.11.1",
3+
"version": "2.12.0",
44
"description": "GPU Accelerated JavaScript",
55
"engines": {
66
"node": ">=8.0.0"
@@ -10,8 +10,8 @@
1010
"src",
1111
"dist"
1212
],
13-
"unpkg": "./dist/gpu-browser.min.js",
14-
"jsdelivr": "./dist/gpu-browser.min.js",
13+
"unpkg": "./dist/gpu-browser.js",
14+
"jsdelivr": "./dist/gpu-browser.js",
1515
"browser": "./dist/gpu-browser.js",
1616
"directories": {
1717
"doc": "doc",
@@ -21,7 +21,8 @@
2121
"acorn": "^7.1.1",
2222
"gl": "^4.5.2",
2323
"gl-wiretap": "^0.6.2",
24-
"gpu-mock.js": "^1.3.0"
24+
"gpu-mock.js": "^1.3.0",
25+
"webgpu": "^0.1.16"
2526
},
2627
"devDependencies": {
2728
"benchmark": "^2.1.4",

‎src/backend/function-node.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,6 +1470,7 @@ const typeLookupMap = {
14701470
'Array3D': 'Number',
14711471
'Input': 'Number',
14721472
'HTMLCanvas': 'Array(4)',
1473+
'OffscreenCanvas': 'Array(4)',
14731474
'HTMLImage': 'Array(4)',
14741475
'HTMLVideo': 'Array(4)',
14751476
'HTMLImageArray': 'Array(4)',

‎src/backend/web-gl/function-node.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,7 @@ class WebGLFunctionNode extends FunctionNode {
12481248
break;
12491249
case 'ArrayTexture(4)':
12501250
case 'HTMLCanvas':
1251+
case 'OffscreenCanvas':
12511252
case 'HTMLImage':
12521253
case 'HTMLVideo':
12531254
retArr.push(`getVec4FromSampler2D(${ markupName }, ${ markupName }Size, ${ markupName }Dim, `);

‎src/backend/web-gl/kernel-value-maps.js‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ const { WebGLKernelValueDynamicSingleArray2DI } = require('./kernel-value/dynami
3232
const { WebGLKernelValueSingleArray3DI } = require('./kernel-value/single-array3d-i');
3333
const { WebGLKernelValueDynamicSingleArray3DI } = require('./kernel-value/dynamic-single-array3d-i');
3434

35-
const { WebGLKernelValueSingleArray2 } = require('./kernel-value/single-array2');
36-
const { WebGLKernelValueSingleArray3 } = require('./kernel-value/single-array3');
37-
const { WebGLKernelValueSingleArray4 } = require('./kernel-value/single-array4');
35+
const { WebGLKernelValueArray2 } = require('./kernel-value/array2');
36+
const { WebGLKernelValueArray3 } = require('./kernel-value/array3');
37+
const { WebGLKernelValueArray4 } = require('./kernel-value/array4');
3838

3939
const { WebGLKernelValueUnsignedArray } = require('./kernel-value/unsigned-array');
4040
const { WebGLKernelValueDynamicUnsignedArray } = require('./kernel-value/dynamic-unsigned-array');
@@ -46,9 +46,9 @@ const kernelValueMaps = {
4646
'Integer': WebGLKernelValueInteger,
4747
'Float': WebGLKernelValueFloat,
4848
'Array': WebGLKernelValueDynamicUnsignedArray,
49-
'Array(2)': false,
50-
'Array(3)': false,
51-
'Array(4)': false,
49+
'Array(2)': WebGLKernelValueArray2,
50+
'Array(3)': WebGLKernelValueArray3,
51+
'Array(4)': WebGLKernelValueArray4,
5252
'Array1D(2)': false,
5353
'Array1D(3)': false,
5454
'Array1D(4)': false,
@@ -66,6 +66,7 @@ const kernelValueMaps = {
6666
'ArrayTexture(4)': WebGLKernelValueDynamicNumberTexture,
6767
'MemoryOptimizedNumberTexture': WebGLKernelValueDynamicMemoryOptimizedNumberTexture,
6868
'HTMLCanvas': WebGLKernelValueDynamicHTMLImage,
69+
'OffscreenCanvas': WebGLKernelValueDynamicHTMLImage,
6970
'HTMLImage': WebGLKernelValueDynamicHTMLImage,
7071
'HTMLImageArray': false,
7172
'HTMLVideo': WebGLKernelValueDynamicHTMLVideo,
@@ -75,9 +76,9 @@ const kernelValueMaps = {
7576
'Float': WebGLKernelValueFloat,
7677
'Integer': WebGLKernelValueInteger,
7778
'Array': WebGLKernelValueUnsignedArray,
78-
'Array(2)': false,
79-
'Array(3)': false,
80-
'Array(4)': false,
79+
'Array(2)': WebGLKernelValueArray2,
80+
'Array(3)': WebGLKernelValueArray3,
81+
'Array(4)': WebGLKernelValueArray4,
8182
'Array1D(2)': false,
8283
'Array1D(3)': false,
8384
'Array1D(4)': false,
@@ -95,6 +96,7 @@ const kernelValueMaps = {
9596
'ArrayTexture(4)': WebGLKernelValueNumberTexture,
9697
'MemoryOptimizedNumberTexture': WebGLKernelValueMemoryOptimizedNumberTexture,
9798
'HTMLCanvas': WebGLKernelValueHTMLImage,
99+
'OffscreenCanvas': WebGLKernelValueHTMLImage,
98100
'HTMLImage': WebGLKernelValueHTMLImage,
99101
'HTMLImageArray': false,
100102
'HTMLVideo': WebGLKernelValueHTMLVideo,
@@ -106,9 +108,9 @@ const kernelValueMaps = {
106108
'Integer': WebGLKernelValueInteger,
107109
'Float': WebGLKernelValueFloat,
108110
'Array': WebGLKernelValueDynamicSingleArray,
109-
'Array(2)': WebGLKernelValueSingleArray2,
110-
'Array(3)': WebGLKernelValueSingleArray3,
111-
'Array(4)': WebGLKernelValueSingleArray4,
111+
'Array(2)': WebGLKernelValueArray2,
112+
'Array(3)': WebGLKernelValueArray3,
113+
'Array(4)': WebGLKernelValueArray4,
112114
'Array1D(2)': WebGLKernelValueDynamicSingleArray1DI,
113115
'Array1D(3)': WebGLKernelValueDynamicSingleArray1DI,
114116
'Array1D(4)': WebGLKernelValueDynamicSingleArray1DI,
@@ -126,6 +128,7 @@ const kernelValueMaps = {
126128
'ArrayTexture(4)': WebGLKernelValueDynamicNumberTexture,
127129
'MemoryOptimizedNumberTexture': WebGLKernelValueDynamicMemoryOptimizedNumberTexture,
128130
'HTMLCanvas': WebGLKernelValueDynamicHTMLImage,
131+
'OffscreenCanvas': WebGLKernelValueDynamicHTMLImage,
129132
'HTMLImage': WebGLKernelValueDynamicHTMLImage,
130133
'HTMLImageArray': false,
131134
'HTMLVideo': WebGLKernelValueDynamicHTMLVideo,
@@ -135,9 +138,9 @@ const kernelValueMaps = {
135138
'Float': WebGLKernelValueFloat,
136139
'Integer': WebGLKernelValueInteger,
137140
'Array': WebGLKernelValueSingleArray,
138-
'Array(2)': WebGLKernelValueSingleArray2,
139-
'Array(3)': WebGLKernelValueSingleArray3,
140-
'Array(4)': WebGLKernelValueSingleArray4,
141+
'Array(2)': WebGLKernelValueArray2,
142+
'Array(3)': WebGLKernelValueArray3,
143+
'Array(4)': WebGLKernelValueArray4,
141144
'Array1D(2)': WebGLKernelValueSingleArray1DI,
142145
'Array1D(3)': WebGLKernelValueSingleArray1DI,
143146
'Array1D(4)': WebGLKernelValueSingleArray1DI,
@@ -155,6 +158,7 @@ const kernelValueMaps = {
155158
'ArrayTexture(4)': WebGLKernelValueNumberTexture,
156159
'MemoryOptimizedNumberTexture': WebGLKernelValueMemoryOptimizedNumberTexture,
157160
'HTMLCanvas': WebGLKernelValueHTMLImage,
161+
'OffscreenCanvas': WebGLKernelValueHTMLImage,
158162
'HTMLImage': WebGLKernelValueHTMLImage,
159163
'HTMLImageArray': false,
160164
'HTMLVideo': WebGLKernelValueHTMLVideo,

‎src/backend/web-gl/kernel-value/single-array2.js‎ renamed to ‎src/backend/web-gl/kernel-value/array2.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
const { utils } = require('../../../utils');
21
const { WebGLKernelValue } = require('./index');
32

4-
class WebGLKernelValueSingleArray2 extends WebGLKernelValue {
3+
class WebGLKernelValueArray2 extends WebGLKernelValue {
54
constructor(value, settings) {
65
super(value, settings);
76
this.uploadValue = value;
@@ -26,5 +25,5 @@ class WebGLKernelValueSingleArray2 extends WebGLKernelValue {
2625
}
2726

2827
module.exports = {
29-
WebGLKernelValueSingleArray2
28+
WebGLKernelValueArray2
3029
};

0 commit comments

Comments
 (0)