@luma.gl/webgl 9.0.0-beta.5 → 9.0.0-beta.7

package/dist/adapter/objects/webgl-resource.d.ts

@@ -1,7 +1,7 @@
-import { Resource } from '@luma.gl/core';
 import type { Device, ResourceProps } from '@luma.gl/core';
+import { Resource } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
-import { WebGLDevice } from '../webgl-device';
+import { WebGLDevice } from "../webgl-device.js";
 /**
  * Base class for WebGL object wrappers
  */
@@ -20,28 +20,6 @@ export declare abstract class WebGLResource<Props extends ResourceProps> extends
     }): this;
     bind(funcOrHandle?: any): any;
     unbind(): void;
-    /**
-     * Query a Resource parameter
-     *
-     * @param name
-     * @return param
-     */
-    getParameter(pname: number, props?: any): any;
-    getParameters(options?: {
-        parameters?: any;
-        keys?: any;
-    }): Record<string, any>;
-    /**
-     * Update a Resource setting
-     *
-     * @todo - cache parameter to avoid issuing WebGL calls?
-     *
-     * @param pname - parameter (GL constant, value or key)
-     * @param value {GLint|GLfloat|GLenum}
-     * @return returns self to enable chaining
-     */
-    setParameter(pname: GL | string, value: any): this;
-    setParameters(parameters: Record<GL, any>): this;
     stubRemovedMethods(className: string, version: string, methodNames: string[]): void;
     initialize(props: ResourceProps): void;
     _createHandle(): void;

package/dist/adapter/objects/webgl-resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-resource.d.ts","sourceRoot":"","sources":["../../../src/adapter/objects/webgl-resource.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,QAAQ,EAAkC,MAAM,eAAe,CAAC;AACxE,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACzD,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAO5C;;GAEG;AACH,8BAAsB,aAAa,CAAC,KAAK,SAAS,aAAa,CAAE,SAAQ,QAAQ,CAAC,KAAK,CAAC;IACtF,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,CAAC;IACrC,OAAO,CAAC,OAAO,CAAM;IAErB,OAAO,CAAC,MAAM,CAAS;IAEvB,UAAU,SAAK;gBAEH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC;IA2B9D,QAAQ,IAAI,MAAM;IAI3B,IAAI,MAAM,QAWT;IAEQ,MAAM,CAAC,EAAC,cAAsB,EAAC;;KAAK;IAmB7C,IAAI,CAAC,YAAY,MAAc;IAuB/B,MAAM;IAIN;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,GAAQ,GAAG,GAAG;IA2BjD,aAAa,CAAC,OAAO,GAAE;QAAC,UAAU,CAAC,EAAE,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,GAAG,CAAA;KAAM;IAiC1D;;;;;;;;OAQG;IACH,YAAY,CAAC,KAAK,EAAE,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAkClD,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC;IAQzC,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;IAK5E,UAAU,CAAC,KAAK,EAAE,aAAa;IAG/B,aAAa;IAIb,aAAa;IAIb,WAAW,CAAC,MAAM,EAAE,GAAG;IAIvB,kBAAkB;IAIlB,aAAa,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAI5D,aAAa,CAAC,KAAK,EAAE,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG;CAuC7C"}
+{"version":3,"file":"webgl-resource.d.ts","sourceRoot":"","sources":["../../../src/adapter/objects/webgl-resource.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACzD,OAAO,EAAC,QAAQ,EAA0B,MAAM,eAAe,CAAC;AAChE,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAI5C;;GAEG;AACH,8BAAsB,aAAa,CAAC,KAAK,SAAS,aAAa,CAAE,SAAQ,QAAQ,CAAC,KAAK,CAAC;IACtF,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,CAAC;IACrC,OAAO,CAAC,OAAO,CAAM;IAErB,OAAO,CAAC,MAAM,CAAS;IAEvB,UAAU,SAAK;gBAEH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC;IA2B9D,QAAQ,IAAI,MAAM;IAI3B,IAAI,MAAM,QAWT;IAEQ,MAAM,CAAC,EAAC,cAAsB,EAAC;;KAAK;IAmB7C,IAAI,CAAC,YAAY,MAAc;IAuB/B,MAAM;IAKN,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;IAK5E,UAAU,CAAC,KAAK,EAAE,aAAa;IAG/B,aAAa;IAIb,aAAa;IAIb,WAAW,CAAC,MAAM,EAAE,GAAG;IAIvB,kBAAkB;IAIlB,aAAa,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAI5D,aAAa,CAAC,KAAK,EAAE,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG;CAuC7C"}

package/dist/adapter/objects/webgl-resource.js

@@ -1,9 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { Resource, assert, uid, stubRemovedMethods } from '@luma.gl/core';
-import { WebGLDevice } from '../webgl-device';
-// Requires full GL enum to be bundled... Make these bindings dependent on dynamic import (debug)?
-import { getKeyValue } from './constants-to-keys';
+import { Resource, uid, stubRemovedMethods } from '@luma.gl/core';
 const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual methods';
 /**
  * Base class for WebGL object wrappers
@@ -18,9 +16,9 @@ export class WebGLResource extends Resource {
     byteLength = 0;
     constructor(device, props, defaultProps) {
         super(device, props, defaultProps);
-        this.device = WebGLDevice.attach(device);
+        this.device = device;
         const gl = this.device.gl;
-        // extends 
+        // extends
         const { id } = props || {};
         this.gl = gl;
         this.gl2 = gl;
@@ -63,7 +61,7 @@ export class WebGLResource extends Resource {
         // @ts-expect-error
         if (children && deleteChildren) {
             // @ts-expect-error
-            children.filter(Boolean).forEach((child) => child.destroy());
+            children.filter(Boolean).forEach(child => child.destroy());
         }
         return this;
     }
@@ -88,99 +86,6 @@ export class WebGLResource extends Resource {
     unbind() {
         this.bind(null);
     }
-    /**
-     * Query a Resource parameter
-     *
-     * @param name
-     * @return param
-     */
-    getParameter(pname, props = {}) {
-        pname = getKeyValue(this.gl, pname);
-        assert(pname);
-        // @ts-expect-error
-        const parameters = this.constructor.PARAMETERS || {};
-        // Use parameter definitions to handle unsupported parameters
-        const parameter = parameters[pname];
-        if (parameter) {
-            // Check if we can query for this parameter
-            const parameterAvailable = (!('extension' in parameter) || this.gl.getExtension(parameter.extension));
-            if (!parameterAvailable) {
-                return parameter.webgl2;
-            }
-        }
-        // If unknown parameter - Could be a valid parameter not covered by PARAMS
-        // Attempt to query for it and let WebGL report errors
-        return this._getParameter(pname, props);
-    }
-    // Many resources support a getParameter call -
-    // getParameters will get all parameters - slow but useful for debugging
-    // eslint-disable-next-line complexity
-    getParameters(options = {}) {
-        const { parameters, keys } = options;
-        // Get parameter definitions for this Resource
-        // @ts-expect-error
-        const PARAMETERS = this.constructor.PARAMETERS || {};
-        const values = {};
-        // Query all parameters if no list provided
-        const parameterKeys = parameters || Object.keys(PARAMETERS);
-        // WEBGL limits
-        for (const pname of parameterKeys) {
-            const parameter = PARAMETERS[pname];
-            // Check if this parameter is available on this platform
-            const parameterAvailable = parameter &&
-                (!('extension' in parameter) || this.gl.getExtension(parameter.extension));
-            if (parameterAvailable) {
-                const key = keys ? this.device.getGLKey(pname) : pname;
-                values[key] = this.getParameter(pname, options);
-                if (keys && parameter.type === 'GLenum') {
-                    values[key] = this.device.getGLKey(values[key]);
-                }
-            }
-        }
-        return values;
-    }
-    /**
-     * Update a Resource setting
-     *
-     * @todo - cache parameter to avoid issuing WebGL calls?
-     *
-     * @param pname - parameter (GL constant, value or key)
-     * @param value {GLint|GLfloat|GLenum}
-     * @return returns self to enable chaining
-     */
-    setParameter(pname, value) {
-        pname = getKeyValue(this.gl, pname);
-        assert(pname);
-        // @ts-expect-error
-        const parameters = this.constructor.PARAMETERS || {};
-        const parameter = parameters[pname];
-        if (parameter) {
-            // Check if this parameter is available on this platform
-            const parameterAvailable = (!('extension' in parameter) || this.gl.getExtension(parameter.extension));
-            if (!parameterAvailable) {
-                throw new Error('Parameter not available on this platform');
-            }
-            // Handle string keys
-            if (parameter.type === 'GLenum') {
-                // @ts-expect-error
-                value = getKeyValue(value);
-            }
-        }
-        // If unknown parameter - Could be a valid parameter not covered by PARAMS
-        // attempt to set it and let WebGL report errors
-        this._setParameter(pname, value);
-        return this;
-    }
-    /*
-     * Batch update resource parameters
-     * Assumes the subclass supports a setParameter call
-     */
-    setParameters(parameters) {
-        for (const pname in parameters) {
-            this.setParameter(pname, parameters[pname]);
-        }
-        return this;
-    }
     // Install stubs for removed methods
     stubRemovedMethods(className, version, methodNames) {
         return stubRemovedMethods(this, className, version, methodNames);

package/dist/adapter/resources/webgl-buffer.d.ts

@@ -1,7 +1,7 @@
 import type { BufferProps } from '@luma.gl/core';
 import { Buffer } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
-import { WebGLDevice } from '../webgl-device';
+import { WebGLDevice } from "../webgl-device.js";
 /** WebGL Buffer interface */
 export declare class WEBGLBuffer extends Buffer {
     readonly device: WebGLDevice;

package/dist/adapter/resources/webgl-buffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAC,MAAM,EAAS,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,6BAA6B;AAC7B,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,kDAAkD;IAClD,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,oBAAoB,GAAG,EAAE,CAAC,cAAc,CAAC;IACjF,mEAAmE;IACnE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC;IACnD,yEAAyE;IACzE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,YAAY,CAAqB;IAE9E,2DAA2D;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,SAAS,EAAE,MAAM,CAAC;gBAEN,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,WAAgB;IA2BxD,sEAAsE;IACtE,aAAa,CACX,IAAI,EAAE,WAAW,GAAG,eAAe,EACnC,UAAU,GAAE,MAAU,EACtB,UAAU,GAAE,MAAqC,GAChD,IAAI;IAgBP,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IA2BpC,OAAO,IAAI,IAAI;IAWf,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,GAAE,MAAU,GAAG,IAAI;IAmBnE,+CAA+C;IAChC,SAAS,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIlF,2DAA2D;IAClD,aAAa,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU;CAexE"}
+{"version":3,"file":"webgl-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAC,MAAM,EAAS,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,6BAA6B;AAC7B,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,kDAAkD;IAClD,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,oBAAoB,GAAG,EAAE,CAAC,cAAc,CAAC;IACjF,mEAAmE;IACnE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC;IACnD,yEAAyE;IACzE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,YAAY,CAAqB;IAE9E,2DAA2D;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,SAAS,EAAE,MAAM,CAAC;gBAEN,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,WAAgB;IA2BxD,sEAAsE;IACtE,aAAa,CACX,IAAI,EAAE,WAAW,GAAG,eAAe,EACnC,UAAU,GAAE,MAAU,EACtB,UAAU,GAAE,MAAqC,GAChD,IAAI;IAgBP,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IA2BpC,OAAO,IAAI,IAAI;IAWf,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,GAAE,MAAU,GAAG,IAAI;IAmBnE,+CAA+C;IAChC,SAAS,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIlF,2DAA2D;IAClD,aAAa,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU;CAexE"}

package/dist/adapter/resources/webgl-buffer.js

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { Buffer, assert } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
@@ -12,7 +13,7 @@ export class WEBGLBuffer extends Buffer {
     /** Usage is a hint on how frequently the buffer will be updates */
     glUsage;
     /** Index type is needed when issuing draw calls, so we pre-compute it */
-    glIndexType = GL.UNSIGNED_SHORT;
+    glIndexType = 5123;
     /** Number of bytes allocated on the GPU for this buffer */
     byteLength;
     /** Number of bytes used */
@@ -29,7 +30,7 @@ export class WEBGLBuffer extends Buffer {
         // - In WebGL2, we can use GL.COPY_READ_BUFFER which avoids locking the type here
         this.glTarget = getWebGLTarget(this.props.usage);
         this.glUsage = getWebGLUsage(this.props.usage);
-        this.glIndexType = this.props.indexType === 'uint32' ? GL.UNSIGNED_INT : GL.UNSIGNED_SHORT;
+        this.glIndexType = this.props.indexType === 'uint32' ? 5125 : 5123;
         // Set data: (re)initializes the buffer
         if (props.data) {
             this._initWithData(props.data, props.byteOffset, props.byteLength);
@@ -88,7 +89,7 @@ export class WEBGLBuffer extends Buffer {
         const byteLength = undefined; // data.byteLength;
         // Create the buffer - binding it here for the first time locks the type
         // In WebGL2, use GL.COPY_WRITE_BUFFER to avoid locking the type
-        const glTarget = GL.COPY_WRITE_BUFFER;
+        const glTarget = 36663;
         this.gl.bindBuffer(glTarget, this.handle);
         // WebGL2: subData supports additional srcOffset and length parameters
         if (srcOffset !== 0 || byteLength !== undefined) {
@@ -110,9 +111,9 @@ export class WEBGLBuffer extends Buffer {
         const data = new Uint8Array(byteLength);
         const dstOffset = 0;
         // Use GL.COPY_READ_BUFFER to avoid disturbing other targets and locking type
-        this.gl.bindBuffer(GL.COPY_READ_BUFFER, this.handle);
-        this.gl.getBufferSubData(GL.COPY_READ_BUFFER, byteOffset, data, dstOffset, byteLength);
-        this.gl.bindBuffer(GL.COPY_READ_BUFFER, null);
+        this.gl.bindBuffer(36662, this.handle);
+        this.gl.getBufferSubData(36662, byteOffset, data, dstOffset, byteLength);
+        this.gl.bindBuffer(36662, null);
         // Update local `data` if offsets are 0
         this._setDebugData(data, byteOffset, byteLength);
         return data;
@@ -144,28 +145,28 @@ export class WEBGLBuffer extends Buffer {
  */
 function getWebGLTarget(usage) {
     if (usage & Buffer.INDEX) {
-        return GL.ELEMENT_ARRAY_BUFFER;
+        return 34963;
     }
     if (usage & Buffer.VERTEX) {
-        return GL.ARRAY_BUFFER;
+        return 34962;
     }
     if (usage & Buffer.UNIFORM) {
-        return GL.UNIFORM_BUFFER;
+        return 35345;
     }
     // Binding a buffer for the first time locks the type
     // In WebGL2, we can use GL.COPY_WRITE_BUFFER to avoid locking the type
-    return GL.ARRAY_BUFFER;
+    return 34962;
 }
 /** @todo usage is not passed correctly */
 function getWebGLUsage(usage) {
     if (usage & Buffer.INDEX) {
-        return GL.STATIC_DRAW;
+        return 35044;
     }
     if (usage & Buffer.VERTEX) {
-        return GL.STATIC_DRAW;
+        return 35044;
     }
     if (usage & Buffer.UNIFORM) {
-        return GL.DYNAMIC_DRAW;
+        return 35048;
     }
-    return GL.STATIC_DRAW;
+    return 35044;
 }

package/dist/adapter/resources/webgl-command-buffer.d.ts

@@ -1,7 +1,7 @@
 import type { CopyBufferToBufferOptions, CopyBufferToTextureOptions, CopyTextureToBufferOptions, CopyTextureToTextureOptions } from '@luma.gl/core';
 import { CommandBuffer } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
-import { WebGLDevice } from '../webgl-device';
+import { WebGLDevice } from "../webgl-device.js";
 type CopyBufferToBufferCommand = {
     name: 'copy-buffer-to-buffer';
     options: CopyBufferToBufferOptions;

package/dist/adapter/resources/webgl-command-buffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-command-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,aAAa,EAAuB,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAEtC,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAU5C,KAAK,yBAAyB,GAAG;IAC/B,IAAI,EAAE,uBAAuB,CAAC;IAC9B,OAAO,EAAE,yBAAyB,CAAC;CACpC,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,IAAI,EAAE,yBAAyB,CAAC;IAChC,OAAO,EAAE,2BAA2B,CAAC;CACtC,CAAC;AAEF,KAAK,OAAO,GACR,yBAAyB,GACzB,0BAA0B,GAC1B,0BAA0B,GAC1B,2BAA2B,CAAC;AAEhC,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,OAAO,EAAE,CAAM;gBAEb,MAAM,EAAE,WAAW;IAK/B,cAAc,CAAC,QAAQ,GAAE,OAAO,EAAkB;CAkBnD;AA8PD,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAmB1D;AAGD,wBAAgB,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAcjD"}
+{"version":3,"file":"webgl-command-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,aAAa,EAAuB,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAEtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAU5C,KAAK,yBAAyB,GAAG;IAC/B,IAAI,EAAE,uBAAuB,CAAC;IAC9B,OAAO,EAAE,yBAAyB,CAAC;CACpC,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,IAAI,EAAE,yBAAyB,CAAC;IAChC,OAAO,EAAE,2BAA2B,CAAC;CACtC,CAAC;AAEF,KAAK,OAAO,GACR,yBAAyB,GACzB,0BAA0B,GAC1B,0BAA0B,GAC1B,2BAA2B,CAAC;AAEhC,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,OAAO,EAAE,CAAM;gBAEb,MAAM,EAAE,WAAW;IAK/B,cAAc,CAAC,QAAQ,GAAE,OAAO,EAAkB;CAkBnD;AA6PD,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAmB1D;AAGD,wBAAgB,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAcjD"}

package/dist/adapter/resources/webgl-command-buffer.js

@@ -1,9 +1,10 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { CommandBuffer, Texture } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
-import { WEBGLTexture } from './webgl-texture';
-import { getWebGLTextureParameters } from '../converters/texture-formats';
+import { WEBGLTexture } from "./webgl-texture.js";
+import { getWebGLTextureParameters } from "../converters/texture-formats.js";
 function cast(value) {
     return value;
 }
@@ -38,11 +39,11 @@ function _copyBufferToBuffer(device, options) {
     const destination = cast(options.destination);
     // {In WebGL2 we can p}erform the copy on the GPU
     // Use GL.COPY_READ_BUFFER+GL.COPY_WRITE_BUFFER avoid disturbing other targets and locking type
-    device.gl.bindBuffer(GL.COPY_READ_BUFFER, source.handle);
-    device.gl.bindBuffer(GL.COPY_WRITE_BUFFER, destination.handle);
-    device.gl.copyBufferSubData(GL.COPY_READ_BUFFER, GL.COPY_WRITE_BUFFER, options.sourceOffset ?? 0, options.destinationOffset ?? 0, options.size);
-    device.gl.bindBuffer(GL.COPY_READ_BUFFER, null);
-    device.gl.bindBuffer(GL.COPY_WRITE_BUFFER, null);
+    device.gl.bindBuffer(36662, source.handle);
+    device.gl.bindBuffer(36663, destination.handle);
+    device.gl.copyBufferSubData(36662, 36663, options.sourceOffset ?? 0, options.destinationOffset ?? 0, options.size);
+    device.gl.bindBuffer(36662, null);
+    device.gl.bindBuffer(36663, null);
 }
 /**
  * Copies data from a Buffer object into a Texture object
@@ -98,7 +99,7 @@ function _copyTextureToBuffer(device, options) {
         const webglBuffer = destination;
         const sourceWidth = width || framebuffer.width;
         const sourceHeight = height || framebuffer.height;
-        const sourceParams = getWebGLTextureParameters(framebuffer.texture.format);
+        const sourceParams = getWebGLTextureParameters(framebuffer.texture.props.format);
         const sourceFormat = sourceParams.dataFormat;
         const sourceType = sourceParams.type;
         // if (!target) {
@@ -108,13 +109,13 @@ function _copyTextureToBuffer(device, options) {
         //   const byteLength = byteOffset + sourceWidth * sourceHeight * components * byteCount;
         //   target = device.createBuffer({byteLength});
         // }
-        device.gl.bindBuffer(GL.PIXEL_PACK_BUFFER, webglBuffer.handle);
-        device.gl.bindFramebuffer(GL.FRAMEBUFFER, framebuffer.handle);
+        device.gl.bindBuffer(35051, webglBuffer.handle);
+        device.gl.bindFramebuffer(36160, framebuffer.handle);
         device.gl.readPixels(origin[0], origin[1], sourceWidth, sourceHeight, sourceFormat, sourceType, byteOffset);
     }
     finally {
-        device.gl.bindBuffer(GL.PIXEL_PACK_BUFFER, null);
-        device.gl.bindFramebuffer(GL.FRAMEBUFFER, null);
+        device.gl.bindBuffer(35051, null);
+        device.gl.bindFramebuffer(36160, null);
         if (destroyFramebuffer) {
             framebuffer.destroy();
         }
@@ -153,7 +154,7 @@ function _copyTextureToTexture(device, options) {
     /** Defines the origin of the copy - the minimum corner of the texture sub-region to copy to/from. */
     origin = [0, 0], 
     /** Texture to copy to/from. */
-    destination,
+    destination
     /**  Mip-map level of the texture to copy to/from. (Default 0) */
     // destinationMipLevel = options.mipLevel,
     /** Defines the origin of the copy - the minimum corner of the texture sub-region to copy to/from. */
@@ -161,11 +162,11 @@ function _copyTextureToTexture(device, options) {
     /** Defines which aspects of the texture to copy to/from. */
     // destinationAspect = options.aspect,
      } = options;
-    let { width = options.destination.width, height = options.destination.width,
+    let { width = options.destination.width, height = options.destination.width
     // depthOrArrayLayers = 0
      } = options;
     const destinationMipmaplevel = 0;
-    const destinationInternalFormat = GL.RGBA;
+    const destinationInternalFormat = 6408;
     const { framebuffer, destroyFramebuffer } = getFramebuffer(source);
     const [sourceX, sourceY] = origin;
     const isSubCopy = false;
@@ -175,7 +176,7 @@ function _copyTextureToTexture(device, options) {
     // destinationX = destinationX || 0;
     // destinationY = destinationY || 0;
     // destinationZ = destinationZ || 0;
-    device.gl.bindFramebuffer(GL.FRAMEBUFFER, framebuffer.handle);
+    device.gl.bindFramebuffer(36160, framebuffer.handle);
     // TODO - support gl.readBuffer (WebGL2 only)
     // const prevBuffer = gl.readBuffer(attachment);
     let texture = null;
@@ -239,18 +240,18 @@ function _copyTextureToTexture(device, options) {
 // Returns number of components in a specific readPixels WebGL format
 export function glFormatToComponents(format) {
     switch (format) {
-        case GL.ALPHA:
-        case GL.R32F:
-        case GL.RED:
+        case 6406:
+        case 33326:
+        case 6403:
             return 1;
-        case GL.RG32F:
-        case GL.RG:
+        case 33328:
+        case 33319:
             return 2;
-        case GL.RGB:
-        case GL.RGB32F:
+        case 6407:
+        case 34837:
             return 3;
-        case GL.RGBA:
-        case GL.RGBA32F:
+        case 6408:
+        case 34836:
             return 4;
         // TODO: Add support for additional WebGL2 formats
         default:
@@ -260,13 +261,13 @@ export function glFormatToComponents(format) {
 // Return byte count for given readPixels WebGL type
 export function glTypeToBytes(type) {
     switch (type) {
-        case GL.UNSIGNED_BYTE:
+        case 5121:
             return 1;
-        case GL.UNSIGNED_SHORT_5_6_5:
-        case GL.UNSIGNED_SHORT_4_4_4_4:
-        case GL.UNSIGNED_SHORT_5_5_5_1:
+        case 33635:
+        case 32819:
+        case 32820:
             return 2;
-        case GL.FLOAT:
+        case 5126:
             return 4;
         // TODO: Add support for additional WebGL2 types
         default:

package/dist/adapter/resources/webgl-command-encoder.d.ts

@@ -1,7 +1,7 @@
 import { CommandEncoder, CommandEncoderProps } from '@luma.gl/core';
-import type { CopyBufferToBufferOptions, CopyBufferToTextureOptions, CopyTextureToBufferOptions, CopyTextureToTextureOptions } from '@luma.gl/core';
-import { WEBGLCommandBuffer } from './webgl-command-buffer';
-import { WebGLDevice } from '../webgl-device';
+import type { CopyBufferToBufferOptions, CopyBufferToTextureOptions, CopyTextureToBufferOptions, CopyTextureToTextureOptions, QuerySet, Buffer } from '@luma.gl/core';
+import { WEBGLCommandBuffer } from "./webgl-command-buffer.js";
+import { WebGLDevice } from "../webgl-device.js";
 export declare class WEBGLCommandEncoder extends CommandEncoder {
     readonly device: WebGLDevice;
     readonly commandBuffer: WEBGLCommandBuffer;
@@ -15,5 +15,10 @@ export declare class WEBGLCommandEncoder extends CommandEncoder {
     pushDebugGroup(groupLabel: string): void;
     popDebugGroup(): void;
     insertDebugMarker(markerLabel: string): void;
+    resolveQuerySet(querySet: QuerySet, destination: Buffer, options?: {
+        firstQuery?: number;
+        queryCount?: number;
+        destinationOffset?: number;
+    }): void;
 }
 //# sourceMappingURL=webgl-command-encoder.d.ts.map

package/dist/adapter/resources/webgl-command-encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-command-encoder.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,kBAAkB,EAAC,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC;gBAE/B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAMlD,OAAO,IAAI,IAAI;IAEf,MAAM,IAAI,IAAI;IAQvB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,IAAI;IAI5D,mBAAmB,CAAC,OAAO,EAAE,0BAA0B;IAIvD,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAI9D,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,IAAI;IAIvD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa;IAEb,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;CAWtD"}
+{"version":3,"file":"webgl-command-encoder.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC3B,QAAQ,EACR,MAAM,EACP,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,kBAAkB,EAAC,kCAA+B;AAC1D,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC;gBAE/B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAMlD,OAAO,IAAI,IAAI;IAEf,MAAM,IAAI,IAAI;IAQvB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,IAAI;IAI5D,mBAAmB,CAAC,OAAO,EAAE,0BAA0B;IAIvD,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAI9D,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,IAAI;IAIvD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa;IAEb,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAE5C,eAAe,CACtB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;QACR,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,GACA,IAAI;CACR"}

package/dist/adapter/resources/webgl-command-encoder.js

@@ -1,7 +1,8 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { CommandEncoder } from '@luma.gl/core';
-import { WEBGLCommandBuffer } from './webgl-command-buffer';
+import { WEBGLCommandBuffer } from "./webgl-command-buffer.js";
 export class WEBGLCommandEncoder extends CommandEncoder {
     device;
     commandBuffer;
@@ -32,4 +33,5 @@ export class WEBGLCommandEncoder extends CommandEncoder {
     pushDebugGroup(groupLabel) { }
     popDebugGroup() { }
     insertDebugMarker(markerLabel) { }
+    resolveQuerySet(querySet, destination, options) { }
 }

package/dist/adapter/resources/webgl-external-texture.js

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 /*
 export class WEBGLExternalTexture extends WEBGLTexture {
@@ -51,12 +52,12 @@ export class WEBGLExternalTexture extends WEBGLTexture {
   }
 
   // eslint-disable-next-line max-statements
-  constructor(device: Device | WebGL2RenderingContext, props: TextureProps) {
-    super(WebGLDevice.attach(device), {id: uid('texture'), ...props});
+  constructor(device: Device , props: TextureProps) {
+    super(device as WebGLDevice, {id: uid('texture'), ...props});
 
     this.glTarget = getWebGLTextureTarget(props);
 
-    this.device = WebGLDevice.attach(device);
+    this.device = device as WebGLDevice;
     this.gl = this.device.gl;
     this.gl2 = this.device.gl2;
     this.handle = this.props.handle || this.gl.createTexture();
@@ -90,4 +91,4 @@ export class WEBGLExternalTexture extends WEBGLTexture {
   }
 
 
-*/ 
+*/

package/dist/adapter/resources/webgl-framebuffer.d.ts

@@ -1,22 +1,19 @@
 import type { FramebufferProps, TextureFormat } from '@luma.gl/core';
 import { Framebuffer, Texture } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
-import { WebGLDevice } from '../webgl-device';
-import { WEBGLTexture } from './webgl-texture';
-import { WEBGLRenderbuffer } from '../objects/webgl-renderbuffer';
-export type TextureAttachment = [Texture, number?, number?];
-export type Attachment = WEBGLTexture | WEBGLRenderbuffer | TextureAttachment;
+import { WebGLDevice } from "../webgl-device.js";
+import { WEBGLTexture } from "./webgl-texture.js";
+import { WEBGLTextureView } from "./webgl-texture-view.js";
+export type Attachment = WEBGLTextureView | WEBGLTexture;
 /** luma.gl Framebuffer, WebGL implementation  */
 export declare class WEBGLFramebuffer extends Framebuffer {
     device: WebGLDevice;
     gl: WebGL2RenderingContext;
     handle: WebGLFramebuffer;
-    get texture(): Texture<import("@luma.gl/core").TextureProps>;
+    get texture(): import("@luma.gl/core").TextureView;
     constructor(device: WebGLDevice, props: FramebufferProps);
     /** destroys any auto created resources etc. */
     destroy(): void;
-    /** Check the status */
-    protected _checkStatus(): void;
     /** In WebGL we must use renderbuffers for depth/stencil attachments (unless we have extensions) */
     protected createDepthStencilTexture(format: TextureFormat): Texture;
     /**
@@ -24,8 +21,7 @@ export declare class WEBGLFramebuffer extends Framebuffer {
      */
     protected resizeAttachments(width: number, height: number): this;
     /** Attach one attachment */
-    protected _attachOne(attachmentPoint: GL, attachment: Attachment): WEBGLTexture | WEBGLRenderbuffer;
-    protected _attachWEBGLRenderbuffer(attachment: GL, renderbuffer: WEBGLRenderbuffer): void;
+    protected _attachOne(attachmentPoint: GL, attachment: Attachment): WEBGLTexture;
     /**
      * @param attachment
      * @param texture

package/dist/adapter/resources/webgl-framebuffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-framebuffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-framebuffer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACnE,OAAO,EAAC,WAAW,EAAE,OAAO,EAAS,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAGhE,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAC5D,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;AAE9E,iDAAiD;AACjD,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,MAAM,EAAE,WAAW,CAAC;IACpB,EAAE,EAAE,sBAAsB,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IAEzB,IAAI,OAAO,kDAEV;gBAEW,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB;IA8CxD,+CAA+C;IACtC,OAAO,IAAI,IAAI;IAUxB,uBAAuB;IACvB,SAAS,CAAC,YAAY,IAAI,IAAI;IAW9B,mGAAmG;cAChF,yBAAyB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAW5E;;OAEG;cACgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IA2BzE,4BAA4B;IAC5B,SAAS,CAAC,UAAU,CAClB,eAAe,EAAE,EAAE,EACnB,UAAU,EAAE,UAAU,GACrB,YAAY,GAAG,iBAAiB;IAenC,SAAS,CAAC,wBAAwB,CAAC,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,iBAAiB,GAAG,IAAI;IASzF;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CACtB,UAAU,EAAE,EAAE,EACd,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,IAAI;CA0BR"}
+{"version":3,"file":"webgl-framebuffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-framebuffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AACnE,OAAO,EAAC,WAAW,EAAE,OAAO,EAAS,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,gBAAgB,EAAC,gCAA6B;AAMtD,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,YAAY,CAAC;AAEzD,iDAAiD;AACjD,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,MAAM,EAAE,WAAW,CAAC;IACpB,EAAE,EAAE,sBAAsB,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IAEzB,IAAI,OAAO,wCAEV;gBAEW,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB;IAkDxD,+CAA+C;IACtC,OAAO,IAAI,IAAI;IAUxB,mGAAmG;cAChF,yBAAyB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAW5E;;OAEG;cACgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IA2BzE,4BAA4B;IAC5B,SAAS,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,GAAG,YAAY;IAqC/E;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CACtB,UAAU,EAAE,EAAE,EACd,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,IAAI;CA2BR"}