@luma.gl/core 9.0.9 → 9.0.10

package/dist/init.js

@@ -11,7 +11,7 @@ import { lumaStats } from "./utils/stats-manager.js";
 function initializeLuma() {
     // Version detection using babel plugin
     // @ts-expect-error
-    const VERSION = typeof "9.0.9" !== 'undefined' ? "9.0.9" : 'running from source';
+    const VERSION = typeof "9.0.10" !== 'undefined' ? "9.0.10" : 'running from source';
     const STARTUP_MESSAGE = 'set luma.log.level=1 (or higher) to trace rendering';
     // Assign luma.log.level in console to control logging: \
     // 0: none, 1: minimal, 2: verbose, 3: attribute/uniforms, 4: gl logs

package/dist/lib/luma.d.ts

@@ -33,5 +33,6 @@ export declare class luma {
     static attachDevice(props: AttachDeviceProps): Promise<Device>;
     /** Creates a device. Asynchronously. */
     static createDevice(props?: CreateDeviceProps): Promise<Device>;
+    static enforceWebGL2(enforce?: boolean): void;
 }
 //# sourceMappingURL=luma.d.ts.map

package/dist/lib/luma.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"luma.d.ts","sourceRoot":"","sources":["../../src/lib/luma.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,KAAK,EAAC,WAAW,EAAC,6BAA0B;AACnD,OAAO,EAAC,MAAM,EAAC,6BAA0B;AACzC,OAAO,EAAC,YAAY,EAAC,kCAA+B;AAOpD,2CAA2C;AAC3C,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC5C,yFAAyF;IACzF,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,gBAAgB,CAAC;IACzD,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB,CAAC;AAEF,+FAA+F;AAC/F,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC5C,wDAAwD;IACxD,MAAM,EAAE,sBAAsB,CAAC;IAC/B,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,IAAI;IACf,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAI9C;IAEF,mCAAmC;IACnC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAa;IAEvC,iBAAiB;IACjB,MAAM,CAAC,GAAG,EAAE,GAAG,CAAO;IAEtB,MAAM,CAAC,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,GAAyB,IAAI;IAOxE,MAAM,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAKtC,MAAM,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAUtC,MAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAI5D,kFAAkF;WACrE,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgCpE,wCAAwC;WAC3B,YAAY,CAAC,KAAK,GAAE,iBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC;CA6C1E"}
+{"version":3,"file":"luma.d.ts","sourceRoot":"","sources":["../../src/lib/luma.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,KAAK,EAAC,WAAW,EAAC,6BAA0B;AACnD,OAAO,EAAC,MAAM,EAAC,6BAA0B;AACzC,OAAO,EAAC,YAAY,EAAC,kCAA+B;AAOpD,2CAA2C;AAC3C,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC5C,yFAAyF;IACzF,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,gBAAgB,CAAC;IACzD,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB,CAAC;AAEF,+FAA+F;AAC/F,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC5C,wDAAwD;IACxD,MAAM,EAAE,sBAAsB,CAAC;IAC/B,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,IAAI;IACf,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAI9C;IAEF,mCAAmC;IACnC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAa;IAEvC,iBAAiB;IACjB,MAAM,CAAC,GAAG,EAAE,GAAG,CAAO;IAEtB,MAAM,CAAC,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,GAAyB,IAAI;IAOxE,MAAM,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAKtC,MAAM,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAUtC,MAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAI5D,kFAAkF;WACrE,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgCpE,wCAAwC;WAC3B,YAAY,CAAC,KAAK,GAAE,iBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC;IA8CzE,MAAM,CAAC,aAAa,CAAC,OAAO,GAAE,OAAc,GAAG,IAAI;CAsBpD"}

package/dist/lib/luma.js

@@ -106,6 +106,26 @@ export class luma {
         }
         throw new Error('No matching device found. Ensure `@luma.gl/webgl` and/or `@luma.gl/webgpu` modules are imported.');
     }
+    static enforceWebGL2(enforce = true) {
+        const prototype = HTMLCanvasElement.prototype;
+        if (!enforce && prototype.originalGetContext) {
+            // Reset the original getContext function
+            prototype.getContext = prototype.originalGetContext;
+            prototype.originalGetContext = undefined;
+            return;
+        }
+        // Store the original getContext function
+        prototype.originalGetContext = prototype.getContext;
+        // Override the getContext function
+        prototype.getContext = function (contextId, options) {
+            // Attempt to force WebGL2 for all WebGL1 contexts
+            if (contextId === 'webgl' || contextId === 'experimental-webgl') {
+                return this.originalGetContext('webgl2', options);
+            }
+            // For any other type, return the original context
+            return this.originalGetContext(contextId, options);
+        };
+    }
 }
 /** Convert a list of devices to a map */
 function getDeviceMap(deviceClasses /* : typeof Device */) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/core",
-  "version": "9.0.9",
+  "version": "9.0.10",
   "description": "The luma.gl core Device API",
   "license": "MIT",
   "type": "module",
@@ -46,5 +46,5 @@
     "@probe.gl/stats": "^4.0.2",
     "@types/offscreencanvas": "^2019.6.4"
   },
-  "gitHead": "1715a33d52c6d23227cd3f62e163a40ea9acec9e"
+  "gitHead": "aa5e354fd9502a84e43c9e312ad33d9c155fed01"
 }

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

@@ -43,13 +43,12 @@ export type RenderPipelineProps = ResourceProps & {
   /** Parameters that are controlled by pipeline */
   parameters?: RenderPipelineParameters;
 
-  // Can be changed after creation
-  // TODO make pipeline immutable? these could be supplied to draw as parameters, in WebGPU they are set on the render pass
-
-  /** Number of vertices */
-  vertexCount?: number;
-  /** Number of instances */
-  instanceCount?: number;
+  // /** Use instanced rendering? */
+  // isInstanced?: boolean;
+  // /** Number of instances */
+  // instanceCount?: number;
+  // /** Number of vertices */
+  // vertexCount?: number;
 
   /** Buffers, Textures, Samplers for the shader bindings */
   bindings?: Record<string, Binding>;
@@ -77,8 +76,9 @@ export abstract class RenderPipeline extends Resource<RenderPipelineProps> {
     topology: 'triangle-list',
     parameters: {},
 
-    vertexCount: 0,
-    instanceCount: 0,
+    // isInstanced: false,
+    // instanceCount: 0,
+    // vertexCount: 0,
 
     bindings: {},
     uniforms: {}
@@ -122,12 +122,14 @@ export abstract class RenderPipeline extends Resource<RenderPipelineProps> {
     topology?: PrimitiveTopology;
     /** vertex attributes */
     vertexArray: VertexArray;
-    /** Number of "rows" in index buffer */
-    indexCount?: number;
-    /** Number of "rows" in 'vertex' buffers */
-    vertexCount?: number;
+    /** Use instanced rendering? */
+    isInstanced?: boolean;
     /** Number of "rows" in 'instance' buffers */
     instanceCount?: number;
+    /** Number of "rows" in 'vertex' buffers */
+    vertexCount?: number;
+    /** Number of "rows" in index buffer */
+    indexCount?: number;
     /** First vertex to draw from */
     firstVertex?: number;
     /** First index to draw from */

package/src/lib/luma.ts

@@ -149,6 +149,29 @@ export class luma {
       'No matching device found. Ensure `@luma.gl/webgl` and/or `@luma.gl/webgpu` modules are imported.'
     );
   }
+
+  static enforceWebGL2(enforce: boolean = true): void {
+    const prototype = HTMLCanvasElement.prototype as any;
+    if (!enforce && prototype.originalGetContext) {
+      // Reset the original getContext function
+      prototype.getContext = prototype.originalGetContext;
+      prototype.originalGetContext = undefined;
+      return;
+    }
+
+    // Store the original getContext function
+    prototype.originalGetContext = prototype.getContext;
+
+    // Override the getContext function
+    prototype.getContext = function (contextId: string, options?: WebGLContextAttributes) {
+      // Attempt to force WebGL2 for all WebGL1 contexts
+      if (contextId === 'webgl' || contextId === 'experimental-webgl') {
+        return this.originalGetContext('webgl2', options);
+      }
+      // For any other type, return the original context
+      return this.originalGetContext(contextId, options);
+    };
+  }
 }
 
 /** Convert a list of devices to a map */