fix: Merge master in, bump, and build

gpujs · Aug 25, 2020 · c09e0b6 · c09e0b6
2 parents bee7178 + c27ed9b
commit c09e0b6
Show file tree

Hide file tree

Showing 8 changed files with 209 additions and 122 deletions.
diff --git a/dist/gpu-browser-core.js b/dist/gpu-browser-core.js
@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.9.3
- * @date Mon Aug 24 2020 13:12:42 GMT-0400 (Eastern Daylight Time)
+ * @version 2.10.0
+ * @date Tue Aug 25 2020 14:05:30 GMT-0400 (Eastern Daylight Time)
  *
  * @license MIT
  * The MIT License
@@ -1206,7 +1206,6 @@ class CPUFunctionNode extends FunctionNode {
 module.exports = {
   CPUFunctionNode
 };
-
 },{"../function-node":9}],6:[function(require,module,exports){
 const { utils } = require('../../utils');
 
@@ -4039,8 +4038,21 @@ class FunctionTracer {
   }
 
   getDeclaration(name) {
-    const { currentContext, currentFunctionContext } = this;
-    return currentContext[name] || currentFunctionContext[name] || null;
+    const { currentContext, currentFunctionContext, runningContexts } = this;
+    const declaration = currentContext[name] || currentFunctionContext[name] || null;
+
+    if (
+      !declaration &&
+      currentContext === currentFunctionContext &&
+      runningContexts.length > 0
+    ) {
+      const previousRunningContext = runningContexts[runningContexts.length - 2];
+      if (previousRunningContext[name]) {
+        return previousRunningContext[name];
+      }
+    }
+
+    return declaration;
   }
 
   scan(ast) {
@@ -4578,7 +4590,6 @@ function findKernelValue(argument, kernelValues, values, context, uploadedValues
 module.exports = {
   glKernelString
 };
-
 },{"../../utils":113,"gl-wiretap":2}],12:[function(require,module,exports){
 const { Kernel } = require('../kernel');
 const { utils } = require('../../utils');
@@ -15068,6 +15079,5 @@ const _systemEndianness = utils.getSystemEndianness();
 module.exports = {
   utils
 };
-
 },{"./input":109,"./texture":112,"acorn":1}]},{},[106])(106)
 });
diff --git a/dist/gpu-browser-core.min.js b/dist/gpu-browser-core.min.js
diff --git a/dist/gpu-browser.js b/dist/gpu-browser.js
@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.9.3
- * @date Mon Aug 24 2020 13:12:42 GMT-0400 (Eastern Daylight Time)
+ * @version 2.10.0
+ * @date Tue Aug 25 2020 14:05:30 GMT-0400 (Eastern Daylight Time)
  *
  * @license MIT
  * The MIT License
@@ -5815,7 +5815,6 @@ class CPUFunctionNode extends FunctionNode {
 module.exports = {
   CPUFunctionNode
 };
-
 },{"../function-node":10}],7:[function(require,module,exports){
 const { utils } = require('../../utils');
 
@@ -8648,8 +8647,21 @@ class FunctionTracer {
   }
 
   getDeclaration(name) {
-    const { currentContext, currentFunctionContext } = this;
-    return currentContext[name] || currentFunctionContext[name] || null;
+    const { currentContext, currentFunctionContext, runningContexts } = this;
+    const declaration = currentContext[name] || currentFunctionContext[name] || null;
+
+    if (
+      !declaration &&
+      currentContext === currentFunctionContext &&
+      runningContexts.length > 0
+    ) {
+      const previousRunningContext = runningContexts[runningContexts.length - 2];
+      if (previousRunningContext[name]) {
+        return previousRunningContext[name];
+      }
+    }
+
+    return declaration;
   }
 
   scan(ast) {
@@ -9187,7 +9199,6 @@ function findKernelValue(argument, kernelValues, values, context, uploadedValues
 module.exports = {
   glKernelString
 };
-
 },{"../../utils":114,"gl-wiretap":3}],13:[function(require,module,exports){
 const { Kernel } = require('../kernel');
 const { utils } = require('../../utils');
@@ -19677,6 +19688,5 @@ const _systemEndianness = utils.getSystemEndianness();
 module.exports = {
   utils
 };
-
 },{"./input":110,"./texture":113,"acorn":1}]},{},[107])(107)
 });
diff --git a/dist/gpu-browser.min.js b/dist/gpu-browser.min.js