Skip to content

Commit c09e0b6

Browse files
fix: Merge master in, bump, and build
2 parents bee7178 + c27ed9b commit c09e0b6

File tree

8 files changed

+209
-122
lines changed

8 files changed

+209
-122
lines changed

dist/gpu-browser-core.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* GPU Accelerated JavaScript
66
*
7-
* @version 2.9.3
8-
* @date Mon Aug 24 2020 13:12:42 GMT-0400 (Eastern Daylight Time)
7+
* @version 2.10.0
8+
* @date Tue Aug 25 2020 14:05:30 GMT-0400 (Eastern Daylight Time)
99
*
1010
* @license MIT
1111
* The MIT License
@@ -1206,7 +1206,6 @@ class CPUFunctionNode extends FunctionNode {
12061206
module.exports = {
12071207
CPUFunctionNode
12081208
};
1209-
12101209
},{"../function-node":9}],6:[function(require,module,exports){
12111210
const { utils } = require('../../utils');
12121211

@@ -4039,8 +4038,21 @@ class FunctionTracer {
40394038
}
40404039

40414040
getDeclaration(name) {
4042-
const { currentContext, currentFunctionContext } = this;
4043-
return currentContext[name] || currentFunctionContext[name] || null;
4041+
const { currentContext, currentFunctionContext, runningContexts } = this;
4042+
const declaration = currentContext[name] || currentFunctionContext[name] || null;
4043+
4044+
if (
4045+
!declaration &&
4046+
currentContext === currentFunctionContext &&
4047+
runningContexts.length > 0
4048+
) {
4049+
const previousRunningContext = runningContexts[runningContexts.length - 2];
4050+
if (previousRunningContext[name]) {
4051+
return previousRunningContext[name];
4052+
}
4053+
}
4054+
4055+
return declaration;
40444056
}
40454057

40464058
scan(ast) {
@@ -4578,7 +4590,6 @@ function findKernelValue(argument, kernelValues, values, context, uploadedValues
45784590
module.exports = {
45794591
glKernelString
45804592
};
4581-
45824593
},{"../../utils":113,"gl-wiretap":2}],12:[function(require,module,exports){
45834594
const { Kernel } = require('../kernel');
45844595
const { utils } = require('../../utils');
@@ -15068,6 +15079,5 @@ const _systemEndianness = utils.getSystemEndianness();
1506815079
module.exports = {
1506915080
utils
1507015081
};
15071-
1507215082
},{"./input":109,"./texture":112,"acorn":1}]},{},[106])(106)
1507315083
});

dist/gpu-browser-core.min.js

Lines changed: 3 additions & 3 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: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* GPU Accelerated JavaScript
66
*
7-
* @version 2.9.3
8-
* @date Mon Aug 24 2020 13:12:42 GMT-0400 (Eastern Daylight Time)
7+
* @version 2.10.0
8+
* @date Tue Aug 25 2020 14:05:30 GMT-0400 (Eastern Daylight Time)
99
*
1010
* @license MIT
1111
* The MIT License
@@ -5815,7 +5815,6 @@ class CPUFunctionNode extends FunctionNode {
58155815
module.exports = {
58165816
CPUFunctionNode
58175817
};
5818-
58195818
},{"../function-node":10}],7:[function(require,module,exports){
58205819
const { utils } = require('../../utils');
58215820

@@ -8648,8 +8647,21 @@ class FunctionTracer {
86488647
}
86498648

86508649
getDeclaration(name) {
8651-
const { currentContext, currentFunctionContext } = this;
8652-
return currentContext[name] || currentFunctionContext[name] || null;
8650+
const { currentContext, currentFunctionContext, runningContexts } = this;
8651+
const declaration = currentContext[name] || currentFunctionContext[name] || null;
8652+
8653+
if (
8654+
!declaration &&
8655+
currentContext === currentFunctionContext &&
8656+
runningContexts.length > 0
8657+
) {
8658+
const previousRunningContext = runningContexts[runningContexts.length - 2];
8659+
if (previousRunningContext[name]) {
8660+
return previousRunningContext[name];
8661+
}
8662+
}
8663+
8664+
return declaration;
86538665
}
86548666

86558667
scan(ast) {
@@ -9187,7 +9199,6 @@ function findKernelValue(argument, kernelValues, values, context, uploadedValues
91879199
module.exports = {
91889200
glKernelString
91899201
};
9190-
91919202
},{"../../utils":114,"gl-wiretap":3}],13:[function(require,module,exports){
91929203
const { Kernel } = require('../kernel');
91939204
const { utils } = require('../../utils');
@@ -19677,6 +19688,5 @@ const _systemEndianness = utils.getSystemEndianness();
1967719688
module.exports = {
1967819689
utils
1967919690
};
19680-
1968119691
},{"./input":110,"./texture":113,"acorn":1}]},{},[107])(107)
1968219692
});

dist/gpu-browser.min.js

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

0 commit comments

Comments
 (0)