@luma.gl/webgl 9.1.0-beta.8 → 9.1.0

package/dist/index.cjs

@@ -963,7 +963,7 @@ var WEBGL_TEXTURE_FORMATS = {
   // , filter: true},
   "rg11b10ufloat": { gl: 35898, rb: true },
   "rgb10a2unorm": { gl: 32857, rb: true },
-  "rgb10a2uint": { gl: 36975, rb: true },
+  "rgb10a2uint-webgl": { gl: 36975, rb: true },
   // 48-bit formats
   "rgb16unorm-webgl": { gl: 32852 },
   // rgb not renderable
@@ -1345,7 +1345,7 @@ var WEBGLFramebuffer = class extends import_core4.Framebuffer {
     this.gl = device.gl;
     this.handle = this.props.handle || isDefaultFramebuffer ? this.props.handle : this.gl.createFramebuffer();
     if (!isDefaultFramebuffer) {
-      device._setWebGLDebugMetadata(this.handle, this, { spector: this.props });
+      device.setSpectorMetadata(this.handle, { id: this.props.id, props: this.props });
       this.autoCreateAttachmentTextures();
       this.updateAttachments();
     }
@@ -1445,7 +1445,9 @@ function _getFrameBufferStatus(status) {
 // dist/adapter/webgl-canvas-context.js
 var WebGLCanvasContext = class extends import_core5.CanvasContext {
   device;
-  handle = null;
+  format = "rgba8unorm";
+  depthStencilFormat = "depth24plus";
+  presentationSize;
   _framebuffer = null;
   get [Symbol.toStringTag]() {
     return "WebGLCanvasContext";
@@ -1453,14 +1455,23 @@ var WebGLCanvasContext = class extends import_core5.CanvasContext {
   constructor(device, props) {
     super(props);
     this.device = device;
+    this.presentationSize = [-1, -1];
     this._setAutoCreatedCanvasId(`${this.device.id}-canvas`);
-    this.updateSize([this.drawingBufferWidth, this.drawingBufferHeight]);
+    this.update();
   }
   getCurrentFramebuffer() {
+    this.update();
     this._framebuffer = this._framebuffer || new WEBGLFramebuffer(this.device, { handle: null });
     return this._framebuffer;
   }
-  updateSize(size) {
+  /** Resizes and updates render targets if necessary */
+  update() {
+    const size = this.getPixelSize();
+    const sizeChanged = size[0] !== this.presentationSize[0] || size[1] !== this.presentationSize[1];
+    if (sizeChanged) {
+      this.presentationSize = size;
+      this.resize();
+    }
   }
   /**
    * Resize the canvas' drawing buffer.
@@ -1479,7 +1490,7 @@ var WebGLCanvasContext = class extends import_core5.CanvasContext {
       return;
     if (this.canvas) {
       const devicePixelRatio = this.getDevicePixelRatio(options == null ? void 0 : options.useDevicePixels);
-      this._setDevicePixelRatio(devicePixelRatio, options);
+      this.setDevicePixelRatio(devicePixelRatio, options);
       return;
     }
   }
@@ -1681,9 +1692,7 @@ var WEBGLBuffer = class extends import_core8.Buffer {
     this.gl = this.device.gl;
     const handle = typeof props === "object" ? props.handle : void 0;
     this.handle = handle || this.gl.createBuffer();
-    device._setWebGLDebugMetadata(this.handle, this, {
-      spector: { ...this.props, data: typeof this.props.data }
-    });
+    device.setSpectorMetadata(this.handle, { ...this.props, data: typeof this.props.data });
     this.glTarget = getWebGLTarget(this.props.usage);
     this.glUsage = getWebGLUsage(this.props.usage);
     this.glIndexType = this.props.indexType === "uint32" ? 5125 : 5123;
@@ -1850,7 +1859,6 @@ var WEBGLShader = class extends import_core9.Shader {
       default:
         throw new Error(this.props.stage);
     }
-    device._setWebGLDebugMetadata(this.handle, this, { spector: this.props });
     this._compile(this.source);
   }
   destroy() {
@@ -1858,7 +1866,6 @@ var WEBGLShader = class extends import_core9.Shader {
       this.removeStats();
       this.device.gl.deleteShader(this.handle);
       this.destroyed = true;
-      this.handle.destroyed = true;
     }
   }
   get asyncCompilationStatus() {
@@ -2664,12 +2671,7 @@ var WEBGLTexture = class extends import_core14.Texture {
   // eslint-disable-next-line max-statements
   _initialize(propsWithData) {
     this.handle = this.props.handle || this.gl.createTexture();
-    this.device._setWebGLDebugMetadata(this.handle, this, {
-      spector: {
-        ...this.props,
-        data: propsWithData.data
-      }
-    });
+    this.device.setSpectorMetadata(this.handle, { ...this.props, data: propsWithData.data });
     let { width, height } = propsWithData;
     if (!width || !height) {
       const textureSize = import_core14.Texture.getTextureDataSize(propsWithData.data);
@@ -2995,14 +2997,13 @@ var WEBGLRenderPass = class extends import_core15.RenderPass {
         const { width, height } = props.framebuffer;
         viewport = [0, 0, width, height];
       } else {
-        const [width, height] = device.getDefaultCanvasContext().getDrawingBufferSize();
+        const [width, height] = device.getCanvasContext().getDrawingBufferSize();
         viewport = [0, 0, width, height];
       }
     }
     this.device.pushState();
     this.setParameters({ viewport, ...this.props.parameters });
-    const webglFramebuffer = this.props.framebuffer;
-    if (webglFramebuffer == null ? void 0 : webglFramebuffer.handle) {
+    if (this.props.framebuffer) {
       const drawBuffers = this.props.framebuffer.colorAttachments.map((_, i) => 36064 + i);
       this.device.gl.drawBuffers(drawBuffers);
     } else {
@@ -3587,14 +3588,11 @@ var WEBGLRenderPipeline = class extends import_core16.RenderPipeline {
   _uniformCount = 0;
   _uniformSetters = {};
   // TODO are these used?
-  get [Symbol.toStringTag]() {
-    return "WEBGLRenderPipeline";
-  }
   constructor(device, props) {
     super(device, props);
     this.device = device;
     this.handle = this.props.handle || this.device.gl.createProgram();
-    this.device._setWebGLDebugMetadata(this.handle, this, { spector: { id: this.props.id } });
+    this.device.setSpectorMetadata(this.handle, { id: this.props.id });
     this.vs = props.vs;
     this.fs = props.fs;
     const { varyings, bufferMode = 35981 } = props;
@@ -3603,18 +3601,15 @@ var WEBGLRenderPipeline = class extends import_core16.RenderPipeline {
       this.device.gl.transformFeedbackVaryings(this.handle, varyings, bufferMode);
     }
     this._linkShaders();
-    import_core16.log.time(3, `RenderPipeline ${this.id} - shaderLayout introspection`)();
+    import_core16.log.time(1, `RenderPipeline ${this.id} - shaderLayout introspection`)();
     this.introspectedLayout = getShaderLayoutFromGLSL(this.device.gl, this.handle);
-    import_core16.log.timeEnd(3, `RenderPipeline ${this.id} - shaderLayout introspection`)();
+    import_core16.log.timeEnd(1, `RenderPipeline ${this.id} - shaderLayout introspection`)();
     this.shaderLayout = mergeShaderLayout(this.introspectedLayout, props.shaderLayout);
   }
   destroy() {
     if (this.handle) {
-      this.device.gl.useProgram(null);
       this.device.gl.deleteProgram(this.handle);
       this.destroyed = true;
-      this.handle.destroyed = true;
-      this.handle = null;
     }
   }
   /**
@@ -4654,7 +4649,9 @@ var WEBGLQuerySet = class extends import_core21.QuerySet {
 
 // dist/adapter/webgl-device.js
 var WebGLDevice = class extends import_core22.Device {
+  //
   // Public `Device` API
+  //
   /** type of this device */
   type = "webgl";
   /** The underlying WebGL context */
@@ -4663,8 +4660,6 @@ var WebGLDevice = class extends import_core22.Device {
   limits;
   info;
   canvasContext;
-  preferredColorFormat = "rgba8unorm";
-  preferredDepthFormat = "depth24plus";
   lost;
   _resolveContextLost;
   /** WebGL2 context. */
@@ -4702,7 +4697,8 @@ var WebGLDevice = class extends import_core22.Device {
     if (props.powerPreference !== void 0) {
       webglContextAttributes.powerPreference = props.powerPreference;
     }
-    const gl = createBrowserContext(this.canvasContext.canvas, {
+    const externalGLContext = this.props._handle;
+    const gl = externalGLContext || createBrowserContext(this.canvasContext.canvas, {
       onContextLost: (event) => {
         var _a2;
         return (_a2 = this._resolveContextLost) == null ? void 0 : _a2.call(this, {
@@ -4731,6 +4727,9 @@ var WebGLDevice = class extends import_core22.Device {
     if (this.props._initializeFeatures) {
       this.features.initializeFeatures();
     }
+    if (canvasContextProps.autoResize !== false) {
+      this.canvasContext.resize();
+    }
     const glState = new WebGLStateTracker(this.gl, {
       log: (...args) => import_core22.log.log(1, ...args)()
     });
@@ -4871,6 +4870,13 @@ var WebGLDevice = class extends import_core22.Device {
     const webglState = WebGLStateTracker.get(this.gl);
     webglState.pop();
   }
+  /**
+   * Storing data on a special field on WebGLObjects makes that data visible in SPECTOR chrome debug extension
+   * luma.gl ids and props can be inspected
+   */
+  setSpectorMetadata(handle, props) {
+    handle.__SPECTOR_Metadata = props;
+  }
   /**
    * Returns the GL.<KEY> constant that corresponds to a numeric value of a GL constant
    * Be aware that there are some duplicates especially for constants that are 0,
@@ -4930,16 +4936,6 @@ var WebGLDevice = class extends import_core22.Device {
     getWebGLExtension(this.gl, name, this._extensions);
     return this._extensions;
   }
-  // INTERNAL SUPPORT METHODS FOR WEBGL RESOURCES
-  /**
-   * Storing data on a special field on WebGLObjects makes that data visible in SPECTOR chrome debug extension
-   * luma.gl ids and props can be inspected
-   */
-  _setWebGLDebugMetadata(handle, resource, options) {
-    handle.luma = resource;
-    const spectorMetadata = { props: options.spector, id: options.spector.id };
-    handle.__SPECTOR_Metadata = spectorMetadata;
-  }
 };
 function setConstantFloatArray(device, location, array) {
   switch (array.length) {
@@ -5101,7 +5097,8 @@ var WebGLAdapter = class extends import_core23.Adapter {
   }
   /**
    * Get a device instance from a GL context
-   * Creates and instruments the device if not already created
+   * Creates a WebGLCanvasContext against the contexts canvas
+   * @note autoResize will be disabled, assuming that whoever created the external context will be handling resizes.
    * @param gl
    * @returns
    */
@@ -5115,7 +5112,10 @@ var WebGLAdapter = class extends import_core23.Adapter {
     if (!isWebGL(gl)) {
       throw new Error("Invalid WebGL2RenderingContext");
     }
-    return new WebGLDevice({ _handle: gl });
+    return new WebGLDevice({
+      _handle: gl,
+      createCanvasContext: { canvas: gl.canvas, autoResize: false }
+    });
   }
   async create(props = {}) {
     import_core23.log.groupCollapsed(LOG_LEVEL2, "WebGLDevice created")();