@luma.gl/webgl 9.0.9 → 9.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.0.9",
+  "version": "9.0.11",
   "description": "WebGL2 adapter for the luma.gl core API",
   "type": "module",
   "license": "MIT",
@@ -43,8 +43,8 @@
     "@luma.gl/core": "^9.0.0"
   },
   "dependencies": {
-    "@luma.gl/constants": "9.0.9",
+    "@luma.gl/constants": "9.0.11",
     "@probe.gl/env": "^4.0.2"
   },
-  "gitHead": "1715a33d52c6d23227cd3f62e163a40ea9acec9e"
+  "gitHead": "82c56392f73c3f7b258e2928d687a4beca2e2838"
 }

package/src/adapter/resources/webgl-render-pipeline.ts

@@ -169,6 +169,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
     parameters?: RenderPipelineParameters;
     topology?: PrimitiveTopology;
     vertexArray: VertexArray;
+    isInstanced?: boolean;
     vertexCount?: number;
     indexCount?: number;
     instanceCount?: number;
@@ -186,6 +187,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
       vertexCount,
       // indexCount,
       instanceCount,
+      isInstanced = false,
       firstVertex = 0,
       // firstIndex,
       // firstInstance,
@@ -196,7 +198,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
     const glDrawMode = getGLDrawMode(topology);
     const isIndexed: boolean = Boolean(vertexArray.indexBuffer);
     const glIndexType = (vertexArray.indexBuffer as WEBGLBuffer)?.glIndexType;
-    const isInstanced: boolean = Number(instanceCount) > 0;
+    // Note that we sometimes get called with 0 instances
 
     // If we are using async linking, we need to wait until linking completes
     if (this.linkStatus !== 'success') {
@@ -328,7 +330,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
           throw new Error(`Error during compilation of shader ${this.vs.id}`);
         }
         if (this.fs?.compilationStatus === 'error') {
-          this.vs.debugShader();
+          this.fs.debugShader();
           throw new Error(`Error during compilation of shader ${this.fs.id}`);
         }
         throw new Error(`Error during ${status}: ${this.device.gl.getProgramInfoLog(this.handle)}`);

package/LICENSE

@@ -1,34 +0,0 @@
-luma.gl is provided under the MIT license
-
-Copyright (c) 2020 vis.gl contributors
-
-This software includes parts initially developed by Uber and open sourced under MIT license.
-Copyright (c) 2015 Uber Technologies, Inc.
-
-This software includes parts of PhiloGL (https://github.com/philogb/philogl)
-under MIT license. PhiloGL parts Copyright © 2013 Sencha Labs.
-
-This software includes adaptations of some postprocessing code from 
-THREE.js (https://github.com/mrdoob/three.js/) under MIT license. 
-THREE.js parts Copyright © 2010-2018 three.js authors. 
-
-Additional attribution given in specific source files. 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-