Skip to content

Commit b2a4aa8

Browse files
robertleeplummerjrrobertleeplummerjr
committed
Merge branch 'develop' of https://github.com/gpujs/gpu.js into develop
2 parents 3be597d + c2b7536 commit b2a4aa8

File tree

5 files changed

+63
-63
lines changed

5 files changed

+63
-63
lines changed

‎dist/gpu-browser-core.js

+20-20
Original file line numberDiff line numberDiff line change
@@ -11168,7 +11168,7 @@ float integerCorrectionModulo(float number, float divisor) {
1116811168
result.push(
1116911169
' threadId = indexTo3D(index, uOutputDim)',
1117011170
' kernel()',
11171-
` gl_FragData[0].${channel} = kernelResult`,
11171+
` gl_FragData[0].${channel} = kernelResult`
1117211172
);
1117311173
}
1117411174

@@ -11178,11 +11178,11 @@ float integerCorrectionModulo(float number, float divisor) {
1117811178
const subKernel = this.subKernels[i];
1117911179
if (subKernel.returnType === 'Integer') {
1118011180
result.push(
11181-
` gl_FragData[${i + 1}].${channel} = float(subKernelResult_${this.subKernels[i].name})`,
11181+
` gl_FragData[${i + 1}].${channel} = float(subKernelResult_${this.subKernels[i].name})`
1118211182
);
1118311183
} else {
1118411184
result.push(
11185-
` gl_FragData[${i + 1}].${channel} = subKernelResult_${this.subKernels[i].name}`,
11185+
` gl_FragData[${i + 1}].${channel} = subKernelResult_${this.subKernels[i].name}`
1118611186
);
1118711187
}
1118811188
}
@@ -11203,11 +11203,11 @@ float integerCorrectionModulo(float number, float divisor) {
1120311203
const subKernel = this.subKernels[i];
1120411204
if (subKernel.returnType === 'Integer') {
1120511205
result.push(
11206-
` gl_FragData[${i + 1}][0] = float(subKernelResult_${subKernel.name})`,
11206+
` gl_FragData[${i + 1}][0] = float(subKernelResult_${subKernel.name})`
1120711207
);
1120811208
} else {
1120911209
result.push(
11210-
` gl_FragData[${i + 1}][0] = subKernelResult_${subKernel.name}`,
11210+
` gl_FragData[${i + 1}][0] = subKernelResult_${subKernel.name}`
1121111211
);
1121211212
}
1121311213
}
@@ -11229,7 +11229,7 @@ float integerCorrectionModulo(float number, float divisor) {
1122911229
for (let i = 0; i < this.subKernels.length; ++i) {
1123011230
result.push(
1123111231
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
11232-
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
11232+
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`
1123311233
);
1123411234
}
1123511235
return result;
@@ -11252,7 +11252,7 @@ float integerCorrectionModulo(float number, float divisor) {
1125211252
result.push(
1125311253
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
1125411254
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
11255-
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`,
11255+
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`
1125611256
);
1125711257
}
1125811258
return result;
@@ -11277,11 +11277,11 @@ float integerCorrectionModulo(float number, float divisor) {
1127711277
const subKernel = this.subKernels[i];
1127811278
if (subKernel.returnType === 'Integer') {
1127911279
result.push(
11280-
` gl_FragData[${i + 1}] = float(subKernelResult_${this.subKernels[i].name})`,
11280+
` gl_FragData[${i + 1}] = float(subKernelResult_${this.subKernels[i].name})`
1128111281
);
1128211282
} else {
1128311283
result.push(
11284-
` gl_FragData[${i + 1}] = subKernelResult_${this.subKernels[i].name}`,
11284+
` gl_FragData[${i + 1}] = subKernelResult_${this.subKernels[i].name}`
1128511285
);
1128611286
}
1128711287
}
@@ -11290,7 +11290,7 @@ float integerCorrectionModulo(float number, float divisor) {
1129011290
for (let i = 0; i < this.subKernels.length; ++i) {
1129111291
result.push(
1129211292
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
11293-
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
11293+
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`
1129411294
);
1129511295
}
1129611296
break;
@@ -11299,7 +11299,7 @@ float integerCorrectionModulo(float number, float divisor) {
1129911299
result.push(
1130011300
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
1130111301
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
11302-
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`,
11302+
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`
1130311303
);
1130411304
}
1130511305
break;
@@ -11309,7 +11309,7 @@ float integerCorrectionModulo(float number, float divisor) {
1130911309
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
1131011310
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
1131111311
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`,
11312-
` gl_FragData[${i + 1}][3] = subKernelResult_${this.subKernels[i].name}[3]`,
11312+
` gl_FragData[${i + 1}][3] = subKernelResult_${this.subKernels[i].name}[3]`
1131311313
);
1131411314
}
1131511315
break;
@@ -13222,7 +13222,7 @@ class WebGL2Kernel extends WebGLKernel {
1322213222
result.push(
1322313223
' threadId = indexTo3D(index, uOutputDim)',
1322413224
' kernel()',
13225-
` data0.${channel} = kernelResult`,
13225+
` data0.${channel} = kernelResult`
1322613226
);
1322713227
}
1322813228

@@ -13232,11 +13232,11 @@ class WebGL2Kernel extends WebGLKernel {
1323213232
const subKernel = this.subKernels[i];
1323313233
if (subKernel.returnType === 'Integer') {
1323413234
result.push(
13235-
` data${i + 1}.${channel} = float(subKernelResult_${subKernel.name})`,
13235+
` data${i + 1}.${channel} = float(subKernelResult_${subKernel.name})`
1323613236
);
1323713237
} else {
1323813238
result.push(
13239-
` data${i + 1}.${channel} = subKernelResult_${subKernel.name}`,
13239+
` data${i + 1}.${channel} = subKernelResult_${subKernel.name}`
1324013240
);
1324113241
}
1324213242
}
@@ -13257,11 +13257,11 @@ class WebGL2Kernel extends WebGLKernel {
1325713257
const subKernel = this.subKernels[i];
1325813258
if (subKernel.returnType === 'Integer') {
1325913259
result.push(
13260-
` data${i + 1}[0] = float(subKernelResult_${subKernel.name})`,
13260+
` data${i + 1}[0] = float(subKernelResult_${subKernel.name})`
1326113261
);
1326213262
} else {
1326313263
result.push(
13264-
` data${i + 1}[0] = subKernelResult_${subKernel.name}`,
13264+
` data${i + 1}[0] = subKernelResult_${subKernel.name}`
1326513265
);
1326613266
}
1326713267
}
@@ -13284,7 +13284,7 @@ class WebGL2Kernel extends WebGLKernel {
1328413284
const subKernel = this.subKernels[i];
1328513285
result.push(
1328613286
` data${i + 1}[0] = subKernelResult_${subKernel.name}[0]`,
13287-
` data${i + 1}[1] = subKernelResult_${subKernel.name}[1]`,
13287+
` data${i + 1}[1] = subKernelResult_${subKernel.name}[1]`
1328813288
);
1328913289
}
1329013290
return result;
@@ -13308,7 +13308,7 @@ class WebGL2Kernel extends WebGLKernel {
1330813308
result.push(
1330913309
` data${i + 1}[0] = subKernelResult_${subKernel.name}[0]`,
1331013310
` data${i + 1}[1] = subKernelResult_${subKernel.name}[1]`,
13311-
` data${i + 1}[2] = subKernelResult_${subKernel.name}[2]`,
13311+
` data${i + 1}[2] = subKernelResult_${subKernel.name}[2]`
1331213312
);
1331313313
}
1331413314
return result;
@@ -13327,7 +13327,7 @@ class WebGL2Kernel extends WebGLKernel {
1332713327
if (!this.subKernels) return result;
1332813328
for (let i = 0; i < this.subKernels.length; ++i) {
1332913329
result.push(
13330-
` data${i + 1} = subKernelResult_${this.subKernels[i].name}`,
13330+
` data${i + 1} = subKernelResult_${this.subKernels[i].name}`
1333113331
);
1333213332
}
1333313333
return result;

‎dist/gpu-browser.js

+20-20
Original file line numberDiff line numberDiff line change
@@ -15621,7 +15621,7 @@ float integerCorrectionModulo(float number, float divisor) {
1562115621
result.push(
1562215622
' threadId = indexTo3D(index, uOutputDim)',
1562315623
' kernel()',
15624-
` gl_FragData[0].${channel} = kernelResult`,
15624+
` gl_FragData[0].${channel} = kernelResult`
1562515625
);
1562615626
}
1562715627

@@ -15631,11 +15631,11 @@ float integerCorrectionModulo(float number, float divisor) {
1563115631
const subKernel = this.subKernels[i];
1563215632
if (subKernel.returnType === 'Integer') {
1563315633
result.push(
15634-
` gl_FragData[${i + 1}].${channel} = float(subKernelResult_${this.subKernels[i].name})`,
15634+
` gl_FragData[${i + 1}].${channel} = float(subKernelResult_${this.subKernels[i].name})`
1563515635
);
1563615636
} else {
1563715637
result.push(
15638-
` gl_FragData[${i + 1}].${channel} = subKernelResult_${this.subKernels[i].name}`,
15638+
` gl_FragData[${i + 1}].${channel} = subKernelResult_${this.subKernels[i].name}`
1563915639
);
1564015640
}
1564115641
}
@@ -15656,11 +15656,11 @@ float integerCorrectionModulo(float number, float divisor) {
1565615656
const subKernel = this.subKernels[i];
1565715657
if (subKernel.returnType === 'Integer') {
1565815658
result.push(
15659-
` gl_FragData[${i + 1}][0] = float(subKernelResult_${subKernel.name})`,
15659+
` gl_FragData[${i + 1}][0] = float(subKernelResult_${subKernel.name})`
1566015660
);
1566115661
} else {
1566215662
result.push(
15663-
` gl_FragData[${i + 1}][0] = subKernelResult_${subKernel.name}`,
15663+
` gl_FragData[${i + 1}][0] = subKernelResult_${subKernel.name}`
1566415664
);
1566515665
}
1566615666
}
@@ -15682,7 +15682,7 @@ float integerCorrectionModulo(float number, float divisor) {
1568215682
for (let i = 0; i < this.subKernels.length; ++i) {
1568315683
result.push(
1568415684
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
15685-
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
15685+
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`
1568615686
);
1568715687
}
1568815688
return result;
@@ -15705,7 +15705,7 @@ float integerCorrectionModulo(float number, float divisor) {
1570515705
result.push(
1570615706
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
1570715707
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
15708-
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`,
15708+
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`
1570915709
);
1571015710
}
1571115711
return result;
@@ -15730,11 +15730,11 @@ float integerCorrectionModulo(float number, float divisor) {
1573015730
const subKernel = this.subKernels[i];
1573115731
if (subKernel.returnType === 'Integer') {
1573215732
result.push(
15733-
` gl_FragData[${i + 1}] = float(subKernelResult_${this.subKernels[i].name})`,
15733+
` gl_FragData[${i + 1}] = float(subKernelResult_${this.subKernels[i].name})`
1573415734
);
1573515735
} else {
1573615736
result.push(
15737-
` gl_FragData[${i + 1}] = subKernelResult_${this.subKernels[i].name}`,
15737+
` gl_FragData[${i + 1}] = subKernelResult_${this.subKernels[i].name}`
1573815738
);
1573915739
}
1574015740
}
@@ -15743,7 +15743,7 @@ float integerCorrectionModulo(float number, float divisor) {
1574315743
for (let i = 0; i < this.subKernels.length; ++i) {
1574415744
result.push(
1574515745
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
15746-
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
15746+
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`
1574715747
);
1574815748
}
1574915749
break;
@@ -15752,7 +15752,7 @@ float integerCorrectionModulo(float number, float divisor) {
1575215752
result.push(
1575315753
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
1575415754
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
15755-
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`,
15755+
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`
1575615756
);
1575715757
}
1575815758
break;
@@ -15762,7 +15762,7 @@ float integerCorrectionModulo(float number, float divisor) {
1576215762
` gl_FragData[${i + 1}][0] = subKernelResult_${this.subKernels[i].name}[0]`,
1576315763
` gl_FragData[${i + 1}][1] = subKernelResult_${this.subKernels[i].name}[1]`,
1576415764
` gl_FragData[${i + 1}][2] = subKernelResult_${this.subKernels[i].name}[2]`,
15765-
` gl_FragData[${i + 1}][3] = subKernelResult_${this.subKernels[i].name}[3]`,
15765+
` gl_FragData[${i + 1}][3] = subKernelResult_${this.subKernels[i].name}[3]`
1576615766
);
1576715767
}
1576815768
break;
@@ -17675,7 +17675,7 @@ class WebGL2Kernel extends WebGLKernel {
1767517675
result.push(
1767617676
' threadId = indexTo3D(index, uOutputDim)',
1767717677
' kernel()',
17678-
` data0.${channel} = kernelResult`,
17678+
` data0.${channel} = kernelResult`
1767917679
);
1768017680
}
1768117681

@@ -17685,11 +17685,11 @@ class WebGL2Kernel extends WebGLKernel {
1768517685
const subKernel = this.subKernels[i];
1768617686
if (subKernel.returnType === 'Integer') {
1768717687
result.push(
17688-
` data${i + 1}.${channel} = float(subKernelResult_${subKernel.name})`,
17688+
` data${i + 1}.${channel} = float(subKernelResult_${subKernel.name})`
1768917689
);
1769017690
} else {
1769117691
result.push(
17692-
` data${i + 1}.${channel} = subKernelResult_${subKernel.name}`,
17692+
` data${i + 1}.${channel} = subKernelResult_${subKernel.name}`
1769317693
);
1769417694
}
1769517695
}
@@ -17710,11 +17710,11 @@ class WebGL2Kernel extends WebGLKernel {
1771017710
const subKernel = this.subKernels[i];
1771117711
if (subKernel.returnType === 'Integer') {
1771217712
result.push(
17713-
` data${i + 1}[0] = float(subKernelResult_${subKernel.name})`,
17713+
` data${i + 1}[0] = float(subKernelResult_${subKernel.name})`
1771417714
);
1771517715
} else {
1771617716
result.push(
17717-
` data${i + 1}[0] = subKernelResult_${subKernel.name}`,
17717+
` data${i + 1}[0] = subKernelResult_${subKernel.name}`
1771817718
);
1771917719
}
1772017720
}
@@ -17737,7 +17737,7 @@ class WebGL2Kernel extends WebGLKernel {
1773717737
const subKernel = this.subKernels[i];
1773817738
result.push(
1773917739
` data${i + 1}[0] = subKernelResult_${subKernel.name}[0]`,
17740-
` data${i + 1}[1] = subKernelResult_${subKernel.name}[1]`,
17740+
` data${i + 1}[1] = subKernelResult_${subKernel.name}[1]`
1774117741
);
1774217742
}
1774317743
return result;
@@ -17761,7 +17761,7 @@ class WebGL2Kernel extends WebGLKernel {
1776117761
result.push(
1776217762
` data${i + 1}[0] = subKernelResult_${subKernel.name}[0]`,
1776317763
` data${i + 1}[1] = subKernelResult_${subKernel.name}[1]`,
17764-
` data${i + 1}[2] = subKernelResult_${subKernel.name}[2]`,
17764+
` data${i + 1}[2] = subKernelResult_${subKernel.name}[2]`
1776517765
);
1776617766
}
1776717767
return result;
@@ -17780,7 +17780,7 @@ class WebGL2Kernel extends WebGLKernel {
1778017780
if (!this.subKernels) return result;
1778117781
for (let i = 0; i < this.subKernels.length; ++i) {
1778217782
result.push(
17783-
` data${i + 1} = subKernelResult_${this.subKernels[i].name}`,
17783+
` data${i + 1} = subKernelResult_${this.subKernels[i].name}`
1778417784
);
1778517785
}
1778617786
return result;

‎src/backend/cpu/kernel-string.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ function cpuKernelString(cpuKernel, name) {
3737
' const { context, canvas, constants: incomingConstants } = settings;',
3838
` const output = new Int32Array(${JSON.stringify(Array.from(cpuKernel.output))});`,
3939
` const _constantTypes = ${JSON.stringify(cpuKernel.constantTypes)};`,
40-
` const _constants = ${constantsToString(cpuKernel.constants, cpuKernel.constantTypes)};`,
40+
` const _constants = ${constantsToString(cpuKernel.constants, cpuKernel.constantTypes)};`
4141
);
4242

4343
thisProperties.push(
4444
' constants: _constants,',
4545
' context,',
4646
' output,',
47-
' thread: {x: 0, y: 0, z: 0},',
47+
' thread: {x: 0, y: 0, z: 0},'
4848
);
4949

5050
if (cpuKernel.graphical) {
@@ -92,7 +92,7 @@ function cpuKernelString(cpuKernel, name) {
9292
thisProperties.push(
9393
' _imageData,',
9494
' _colorData,',
95-
` color: ${colorFn},`,
95+
` color: ${colorFn},`
9696
);
9797

9898
beforeReturn.push(

0 commit comments

Comments
 (0)