@luma.gl/webgl 9.0.0-alpha.9 → 9.0.0-beta.10

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

@@ -1,19 +1,18 @@
-import { Sampler, SamplerProps } from '@luma.gl/api';
-import type { GLSamplerParameters } from '../../types/webgl';
-import type WebGLDevice from '../webgl-device';
+import { Sampler, SamplerProps } from '@luma.gl/core';
+import { GLSamplerParameters } from '@luma.gl/constants';
+import type { WebGLDevice } from "../webgl-device.js";
 /**
  * Sampler object -
- * Under WebGL2 we create an actual WebGL sampler
- * Under WebGL1, we just store the sampler parameters
  * so that they can be set directly on the texture
  * https://github.com/WebGLSamples/WebGL2Samples/blob/master/samples/sampler_object.html
  */
-export default class WEBGLSampler extends Sampler {
+export declare class WEBGLSampler extends Sampler {
     readonly device: WebGLDevice;
     readonly handle: WebGLSampler;
     readonly parameters: GLSamplerParameters;
     constructor(device: WebGLDevice, props: SamplerProps);
     destroy(): void;
+    toString(): string;
     /** Set sampler parameters on the sampler */
     private _setSamplerParameters;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-sampler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,mBAAmB,CAAC;AAE3D,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAC/C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;gBAE7B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY;IAUpD,OAAO,IAAI,IAAI;IAQf,4CAA4C;IAC5C,OAAO,CAAC,qBAAqB;CAgB9B"}
+{"version":3,"file":"webgl-sampler.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-sampler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,EAAK,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAE3D,OAAO,KAAK,EAAC,WAAW,EAAC,2BAAwB;AAEjD;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,OAAO;IACvC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;gBAE7B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY;IAQ3C,OAAO,IAAI,IAAI;IAQf,QAAQ,IAAI,MAAM;IAI3B,4CAA4C;IAC5C,OAAO,CAAC,qBAAqB;CAgB9B"}

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

@@ -1,50 +1,50 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { Sampler } from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-import { convertSamplerParametersToWebGL } from '../converters/sampler-parameters';
-export default class WEBGLSampler extends Sampler {
-  constructor(device, props) {
-    super(device, props);
-
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "handle", void 0);
-
-    _defineProperty(this, "parameters", void 0);
-
-    this.device = device;
-    this.parameters = convertSamplerParametersToWebGL(props);
-
-    if (this.device.isWebGL2) {
-      this.handle = this.handle || this.device.gl2.createSampler();
-
-      this._setSamplerParameters(this.parameters);
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { Sampler } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+import { convertSamplerParametersToWebGL } from "../converters/sampler-parameters.js";
+/**
+ * Sampler object -
+ * so that they can be set directly on the texture
+ * https://github.com/WebGLSamples/WebGL2Samples/blob/master/samples/sampler_object.html
+ */
+export class WEBGLSampler extends Sampler {
+    device;
+    handle;
+    parameters;
+    constructor(device, props) {
+        super(device, props);
+        this.device = device;
+        this.parameters = convertSamplerParametersToWebGL(props);
+        this.handle = this.handle || this.device.gl.createSampler();
+        this._setSamplerParameters(this.parameters);
     }
-  }
-
-  destroy() {
-    if (this.handle) {
-      this.device.gl2.deleteSampler(this.handle);
-      this.handle = undefined;
+    destroy() {
+        if (this.handle) {
+            this.device.gl.deleteSampler(this.handle);
+            // @ts-expect-error read-only/undefined
+            this.handle = undefined;
+        }
     }
-  }
-
-  _setSamplerParameters(parameters) {
-    for (const [pname, value] of Object.entries(parameters)) {
-      const param = Number(pname);
-
-      switch (param) {
-        case GL.TEXTURE_MIN_LOD:
-        case GL.TEXTURE_MAX_LOD:
-          this.device.gl2.samplerParameterf(this.handle, param, value);
-          break;
-
-        default:
-          this.device.gl2.samplerParameteri(this.handle, param, value);
-          break;
-      }
+    toString() {
+        return `Sampler(${this.id},${JSON.stringify(this.props)})`;
+    }
+    /** Set sampler parameters on the sampler */
+    _setSamplerParameters(parameters) {
+        for (const [pname, value] of Object.entries(parameters)) {
+            // Apparently there are integer/float conversion issues requires two parameter setting functions in JavaScript.
+            // For now, pick the float version for parameters specified as GLfloat.
+            const param = Number(pname);
+            switch (param) {
+                case 33082:
+                case 33083:
+                    this.device.gl.samplerParameterf(this.handle, param, value);
+                    break;
+                default:
+                    this.device.gl.samplerParameteri(this.handle, param, value);
+                    break;
+            }
+        }
     }
-  }
-
 }
-//# sourceMappingURL=webgl-sampler.js.map

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

@@ -1,15 +1,25 @@
-import { Shader, ShaderProps } from '@luma.gl/api';
-import { CompilerMessage } from '@luma.gl/shadertools';
-import WebGLDevice from '../webgl-device';
+import { Shader, ShaderProps, CompilerMessage } from '@luma.gl/core';
+import { WebGLDevice } from "../webgl-device.js";
 /**
  * An immutable compiled shader program that execute portions of the GPU Pipeline
  */
-export default class WEBGLShader extends Shader {
+export declare class WEBGLShader extends Shader {
     readonly device: WebGLDevice;
     readonly handle: WebGLShader;
     constructor(device: WebGLDevice, props: ShaderProps);
     destroy(): void;
-    compilationInfo(): Promise<readonly CompilerMessage[]>;
-    _compile(source: string): void;
+    getCompilationInfo(): Promise<readonly CompilerMessage[]>;
+    getCompilationInfoSync(): readonly CompilerMessage[];
+    getTranslatedSource(): string | null;
+    /** Compile a shader and get compilation status */
+    protected _compile(source: string): Promise<void>;
+    /** Use KHR_parallel_shader_compile extension if available */
+    protected _waitForCompilationComplete(): Promise<void>;
+    /**
+     * Get the shader compilation status
+     * TODO - Load log even when no error reported, to catch warnings?
+     * https://gamedev.stackexchange.com/questions/30429/how-to-detect-glsl-warnings
+     */
+    protected _getCompilationStatus(): void;
 }
 //# sourceMappingURL=webgl-shader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-shader.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,MAAM,EAAE,WAAW,EAAC,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAgB,eAAe,EAAoB,MAAM,sBAAsB,CAAC;AAEvF,OAAO,WAAW,MAAM,iBAAiB,CAAC;AAE1C;;GAEG;AACF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,MAAM;IAC9C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW;IAgBnD,OAAO,IAAI,IAAI;IAST,eAAe,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAO5D,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAuB/B"}
+{"version":3,"file":"webgl-shader.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-shader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAM,MAAM,eAAe,CAAC;AAGxE,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C;;GAEG;AACH,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;gBAEjB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW;IAgB1C,OAAO,IAAI,IAAI;IAST,kBAAkB,IAAI,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC;IAK/D,sBAAsB;IAKtB,mBAAmB,IAAI,MAAM,GAAG,IAAI;IAQ7C,kDAAkD;cAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCvD,6DAA6D;cAC7C,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5D;;;;OAIG;IACH,SAAS,CAAC,qBAAqB;CAKhC"}

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

@@ -1,76 +1,117 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { log, uid, Shader } from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-import { getShaderInfo, formatCompilerLog } from '@luma.gl/shadertools';
-import { parseShaderCompilerLog } from '../helpers/parse-shader-compiler-log';
-export default class WEBGLShader extends Shader {
-  constructor(device, props) {
-    super(device, {
-      id: getShaderIdFromProps(props),
-      ...props
-    });
-
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "handle", void 0);
-
-    this.device = device;
-
-    switch (this.props.stage) {
-      case 'vertex':
-        this.handle = this.props.handle || this.device.gl.createShader(GL.VERTEX_SHADER);
-        break;
-
-      case 'fragment':
-        this.handle = this.props.handle || this.device.gl.createShader(GL.FRAGMENT_SHADER);
-        break;
-
-      default:
-        throw new Error(this.props.stage);
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { Shader, log } from '@luma.gl/core';
+import { GL } from '@luma.gl/constants';
+import { parseShaderCompilerLog } from "../helpers/parse-shader-compiler-log.js";
+/**
+ * An immutable compiled shader program that execute portions of the GPU Pipeline
+ */
+export class WEBGLShader extends Shader {
+    device;
+    handle;
+    constructor(device, props) {
+        super(device, props);
+        this.device = device;
+        switch (this.props.stage) {
+            case 'vertex':
+                this.handle = this.props.handle || this.device.gl.createShader(35633);
+                break;
+            case 'fragment':
+                this.handle = this.props.handle || this.device.gl.createShader(35632);
+                break;
+            default:
+                throw new Error(this.props.stage);
+        }
+        this._compile(this.source);
     }
-
-    this._compile(this.source);
-  }
-
-  destroy() {
-    if (this.handle) {
-      this.removeStats();
-      this.device.gl.deleteShader(this.handle);
-      this.destroyed = true;
+    destroy() {
+        if (this.handle) {
+            this.removeStats();
+            this.device.gl.deleteShader(this.handle);
+            // this.handle = null;
+            this.destroyed = true;
+        }
     }
-  }
-
-  async compilationInfo() {
-    const log = this.device.gl.getShaderInfoLog(this.handle);
-    return log ? parseShaderCompilerLog(log) : [];
-  }
-
-  _compile(source) {
-    const addGLSLVersion = source => source.startsWith('#version ') ? source : "#version 100\n".concat(source);
-
-    source = addGLSLVersion(source);
-    const {
-      gl
-    } = this.device;
-    gl.shaderSource(this.handle, source);
-    gl.compileShader(this.handle);
-    const compileStatus = gl.getShaderParameter(this.handle, GL.COMPILE_STATUS);
-
-    if (!compileStatus) {
-      const shaderLog = gl.getShaderInfoLog(this.handle);
-      const parsedLog = shaderLog ? parseShaderCompilerLog(shaderLog) : [];
-      const messages = parsedLog.filter(message => message.type === 'error');
-      const formattedLog = formatCompilerLog(messages, source);
-      const shaderName = getShaderInfo(source).name;
-      const shaderDescription = "".concat(this.stage, " shader ").concat(shaderName);
-      log.error("GLSL compilation errors in ".concat(shaderDescription, "\n").concat(formattedLog))();
-      throw new Error("GLSL compilation errors in ".concat(shaderName));
+    async getCompilationInfo() {
+        await this._waitForCompilationComplete();
+        return this.getCompilationInfoSync();
+    }
+    getCompilationInfoSync() {
+        const log = this.device.gl.getShaderInfoLog(this.handle);
+        return parseShaderCompilerLog(log);
+    }
+    getTranslatedSource() {
+        const extensions = this.device.getExtension('WEBGL_debug_shaders');
+        const ext = extensions.WEBGL_debug_shaders;
+        return ext?.getTranslatedShaderSource(this.handle);
+    }
+    // PRIVATE METHODS
+    /** Compile a shader and get compilation status */
+    async _compile(source) {
+        const addGLSLVersion = (source) => source.startsWith('#version ') ? source : `#version 100\n${source}`;
+        source = addGLSLVersion(source);
+        const { gl } = this.device;
+        gl.shaderSource(this.handle, source);
+        gl.compileShader(this.handle);
+        // For performance reasons, avoid checking shader compilation errors on production
+        if (log.level === 0) {
+            this.compilationStatus = 'pending';
+            return;
+        }
+        // Sync case - slower, but advantage is that it throws in the constructor, making break on error more useful
+        if (!this.device.features.has('compilation-status-async-webgl')) {
+            this._getCompilationStatus();
+            if (this.compilationStatus === 'error') {
+                throw new Error(`GLSL compilation errors in ${this.props.stage} shader ${this.props.id}`);
+            }
+            // The `Shader` base class will determine if debug window should be opened based on this.compilationStatus
+            this.debugShader();
+            return;
+        }
+        // async case
+        log.once(1, 'Shader compilation is asynchronous')();
+        await this._waitForCompilationComplete();
+        log.info(2, `Shader ${this.id} - async compilation complete: ${this.compilationStatus}`)();
+        this._getCompilationStatus();
+        // The `Shader` base class will determine if debug window should be opened based on this.compilationStatus
+        this.debugShader();
+    }
+    /** Use KHR_parallel_shader_compile extension if available */
+    async _waitForCompilationComplete() {
+        const waitMs = async (ms) => await new Promise(resolve => setTimeout(resolve, ms));
+        const DELAY_MS = 10; // Shader compilation is typically quite fast (with some exceptions)
+        // If status polling is not available, we can't wait for completion. Just wait a little to minimize blocking
+        if (!this.device.features.has('compilation-status-async-webgl')) {
+            await waitMs(DELAY_MS);
+            return;
+        }
+        const { gl } = this.device;
+        for (;;) {
+            const complete = gl.getShaderParameter(this.handle, 37297);
+            if (complete) {
+                return;
+            }
+            await waitMs(DELAY_MS);
+        }
+    }
+    /**
+     * Get the shader compilation status
+     * TODO - Load log even when no error reported, to catch warnings?
+     * https://gamedev.stackexchange.com/questions/30429/how-to-detect-glsl-warnings
+     */
+    _getCompilationStatus() {
+        this.compilationStatus = this.device.gl.getShaderParameter(this.handle, 35713)
+            ? 'success'
+            : 'error';
     }
-  }
-
-}
-
-function getShaderIdFromProps(props) {
-  return getShaderInfo(props.source).name || props.id || uid("unnamed ".concat(props.stage, "-shader"));
 }
-//# sourceMappingURL=webgl-shader.js.map
+// TODO - Original code from luma.gl v8 - keep until new debug functionality has matured
+// if (!compilationSuccess) {
+//   const parsedLog = shaderLog ? parseShaderCompilerLog(shaderLog) : [];
+//   const messages = parsedLog.filter(message => message.type === 'error');
+//   const formattedLog = formatCompilerLog(messages, source, {showSourceCode: 'all', html: true});
+//   const shaderDescription = `${this.stage} shader ${shaderName}`;
+//   log.error(`GLSL compilation errors in ${shaderDescription}\n${formattedLog}`)();
+//   displayShaderLog(parsedLog, source, shaderName);
+// }

package/dist/adapter/resources/webgl-texture-view.d.ts

@@ -0,0 +1,14 @@
+import type { Device, TextureViewProps } from '@luma.gl/core';
+import { TextureView } from '@luma.gl/core';
+import { WebGLDevice } from "../webgl-device.js";
+import { WEBGLTexture } from "./webgl-texture.js";
+export declare class WEBGLTextureView extends TextureView {
+    readonly device: WebGLDevice;
+    readonly gl: WebGL2RenderingContext;
+    readonly handle: WebGLTexture;
+    readonly texture: WEBGLTexture;
+    constructor(device: Device, props: TextureViewProps & {
+        texture: WEBGLTexture;
+    });
+}
+//# sourceMappingURL=webgl-texture-view.d.ts.map

package/dist/adapter/resources/webgl-texture-view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webgl-texture-view.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-texture-view.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAC,WAAW,EAAU,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAC5C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAE7C,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAE9B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;gBAEnB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG;QAAC,OAAO,EAAE,YAAY,CAAA;KAAC;CAS9E"}

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

@@ -0,0 +1,18 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+// import {decodeTextureFormat} from '@luma.gl/core';
+import { TextureView, Texture } from '@luma.gl/core';
+export class WEBGLTextureView extends TextureView {
+    device;
+    gl;
+    handle;
+    texture;
+    constructor(device, props) {
+        super(device, { ...Texture.defaultProps, ...props });
+        this.device = device;
+        this.gl = this.device.gl;
+        this.handle = null;
+        this.texture = props.texture;
+    }
+}

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

@@ -1,19 +1,43 @@
-import { Device, TextureProps, Sampler, SamplerProps, TypedArray } from '@luma.gl/api';
-import { Texture } from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-import type { GLSamplerParameters } from '../../types/webgl';
-import WebGLDevice from '../webgl-device';
-import WEBGLSampler from './webgl-sampler';
-export type { TextureProps };
-export declare type TextureSourceData = TypedArray | ImageData | HTMLImageElement | HTMLCanvasElement | ImageBitmap | HTMLVideoElement;
-declare type SetImageDataOptions = {
+import { Device, TextureProps, TextureViewProps, Sampler, SamplerProps, TypedArray } from '@luma.gl/core';
+import { Texture } from '@luma.gl/core';
+import { GL, GLSamplerParameters } from '@luma.gl/constants';
+import { WebGLDevice } from "../webgl-device.js";
+import { WEBGLSampler } from "./webgl-sampler.js";
+import { WEBGLTextureView } from "./webgl-texture-view.js";
+export type WEBGLTextureProps = TextureProps & {
+    /** @deprecated use props.sampler */
+    parameters?: Record<number, number>;
+    /** @deprecated use props.data */
+    pixels?: any;
+    /** @deprecated use props.format */
+    dataFormat?: number | null;
+    /** @deprecated rarely supported */
+    border?: number;
+    /** @deprecated WebGL only. */
+    pixelStore?: object;
+    /** @deprecated WebGL only. */
+    textureUnit?: number;
+    /** @deprecated WebGL only. Use dimension. */
+    target?: number;
+};
+export declare const DEFAULT_WEBGL_TEXTURE_PROPS: {
+    parameters: {};
+    pixelStore: {};
+    pixels: any;
+    border: number;
+    dataFormat: any;
+    textureUnit: any;
+    target: any;
+};
+export type TextureSourceData = TypedArray | ImageData | HTMLImageElement | HTMLCanvasElement | ImageBitmap | HTMLVideoElement;
+type SetImageDataOptions = {
     target?: number;
     level?: number;
     dataFormat?: any;
     width?: number;
     height?: number;
     depth?: number;
-    format?: any;
+    glFormat?: GL;
     type?: any;
     offset?: number;
     data: any;
@@ -44,14 +68,14 @@ declare type SetImageDataOptions = {
  * @param {Number} offset - (WEBGL2) offset from start of buffer
  * @parameters - temporary settings to be applied, can be used to supply pixel store settings.
  */
-declare type SetSubImageDataOptions = {
+type SetSubImageDataOptions = {
     target?: number;
     level?: number;
     dataFormat?: any;
     width?: number;
     height?: number;
     depth?: number;
-    format?: any;
+    glFormat?: any;
     type?: any;
     offset?: number;
     data: any;
@@ -62,7 +86,7 @@ declare type SetSubImageDataOptions = {
     /** @deprecated */
     pixels?: any;
 };
-declare type SetImageData3DOptions = {
+type SetImageData3DOptions = {
     level?: number;
     dataFormat?: any;
     width?: number;
@@ -74,18 +98,15 @@ declare type SetImageData3DOptions = {
     data: any;
     parameters?: Record<GL, any>;
 };
-export default class WEBGLTexture extends Texture {
+export declare class WEBGLTexture extends Texture<WEBGLTextureProps> {
     static FACES: number[];
     readonly MAX_ATTRIBUTES: number;
     readonly device: WebGLDevice;
-    readonly gl: WebGLRenderingContext;
-    readonly gl2: WebGL2RenderingContext | null;
+    readonly gl: WebGL2RenderingContext;
     readonly handle: WebGLTexture;
-    data: any;
-    width: number;
-    height: number;
-    depth: number;
-    format: GL;
+    sampler: WEBGLSampler;
+    view: WEBGLTextureView;
+    glFormat: GL;
     type: GL;
     dataFormat: GL;
     mipmaps: boolean;
@@ -100,8 +121,6 @@ export default class WEBGLTexture extends Texture {
      * */
     target: GL;
     textureUnit: number;
-    /** Sampler object (currently unused) */
-    sampler: WEBGLSampler;
     /**
      * Program.draw() checks the loaded flag of all textures to avoid
      * Textures that are still loading from promises
@@ -113,11 +132,12 @@ export default class WEBGLTexture extends Texture {
         parameters: any;
         lastTime: number;
     };
-    constructor(device: Device, props: TextureProps);
+    constructor(device: Device, props: WEBGLTextureProps);
     destroy(): void;
     toString(): string;
-    initialize(props?: TextureProps): this;
-    initializeCube(props?: TextureProps): this;
+    createView(props: TextureViewProps): WEBGLTextureView;
+    initialize(props?: WEBGLTextureProps): this;
+    initializeCube(props?: WEBGLTextureProps): this;
     setSampler(sampler?: Sampler | SamplerProps): this;
     /**
      * If size has changed, reinitializes with current format
@@ -129,7 +149,7 @@ export default class WEBGLTexture extends Texture {
         mipmaps?: boolean;
     }): this;
     /** Update external texture (video frame) */
-    update(): this;
+    update(): void;
     generateMipmap(params?: {}): this;
     setImageData(options: SetImageDataOptions): this;
     /**
@@ -137,7 +157,7 @@ export default class WEBGLTexture extends Texture {
      * Note: does not allocate storage
      * Redefines an area of an existing texture
      */
-    setSubImageData({ target, pixels, data, x, y, width, height, level, format, type, dataFormat, compressed, offset, parameters }: SetSubImageDataOptions): void;
+    setSubImageData({ target, pixels, data, x, y, width, height, level, glFormat, type, dataFormat, compressed, offset, parameters }: SetSubImageDataOptions): void;
     /**
      * Defines a two-dimensional texture image or cube-map texture image with
      * pixels from the current framebuffer (rather than from client memory).
@@ -157,14 +177,14 @@ export default class WEBGLTexture extends Texture {
         data: any;
         dataType: string;
     };
-    _deduceParameters(opts: TextureProps): {
+    _deduceParameters(opts: WEBGLTextureProps): {
         dataFormat: number;
         type: number;
         compressed: boolean;
         width: number;
         height: number;
-        format: number | import("@luma.gl/api").TextureFormat;
-        data: string | HTMLVideoElement | import("@luma.gl/api").TextureData | Promise<import("@luma.gl/api").TextureData> | import("@luma.gl/api/adapter/resources/texture").CubeTextureData;
+        format: import("@luma.gl/core").TextureFormat;
+        data: string | import("@luma.gl/core").TextureData | Promise<import("@luma.gl/core").TextureData> | import("modules/core/dist/adapter/resources/texture").CubeTextureData | HTMLVideoElement;
     };
     _deduceImageSize(data: any, width: any, height: any): {
         width: number;
@@ -184,10 +204,8 @@ export default class WEBGLTexture extends Texture {
     setImageData3D(options: SetImageData3DOptions): this;
     /**
      * Sets sampler parameters on texture
-     * @note: Applies NPOT workaround if appropriate
      */
-    _setSamplerParameters(parameters: GLSamplerParameters): this;
-    /** @deprecated For LegacyTexture subclass */
-    protected _getWebGL1NPOTParameterOverride(pname: number, value: number): number;
+    _setSamplerParameters(parameters: GLSamplerParameters): void;
 }
+export {};
 //# sourceMappingURL=webgl-texture.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"webgl-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-texture.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webgl-texture.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-texture.ts"],"names":[],"mappings":"AASA,OAAO,EACL,MAAM,EACN,YAAY,EACZ,gBAAgB,EAChB,OAAO,EACP,YAAY,EAEZ,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,OAAO,EAAwC,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAC,EAAE,EAAE,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAQ3D,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,gBAAgB,EAAC,gCAA6B;AAEtD,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG;IAC7C,oCAAoC;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,iCAAiC;IACjC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,mCAAmC;IACnC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8BAA8B;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,2BAA2B;;;;;;;;CASvC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GACzB,UAAU,GACV,SAAS,GACT,gBAAgB,GAChB,iBAAiB,GACjB,WAAW,GACX,gBAAgB,CAAC;AAErB,KAAK,mBAAmB,GAAG;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,EAAE,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC7B,kBAAkB;IAClB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,KAAK,sBAAsB,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,kBAAkB;IAClB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,GAAG,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;CAC9B,CAAC;AAGF,qBAAa,YAAa,SAAQ,OAAO,CAAC,iBAAiB,CAAC;IAE1D,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,CAOpB;IAEF,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAG9B,OAAO,EAAE,YAAY,CAAa;IAElC,IAAI,EAAE,gBAAgB,CAAa;IAInC,QAAQ,EAAE,EAAE,CAAa;IACzB,IAAI,EAAE,EAAE,CAAa;IACrB,UAAU,EAAE,EAAE,CAAa;IAC3B,OAAO,EAAE,OAAO,CAAa;IAE7B;;;;;;;;SAQK;IACL,MAAM,EAAE,EAAE,CAAC;IACX,WAAW,EAAE,MAAM,CAAa;IAEhC;;;;OAIG;IACH,MAAM,EAAE,OAAO,CAAS;IACxB,MAAM,EAAE;QACN,KAAK,EAAE,gBAAgB,CAAC;QACxB,UAAU,EAAE,GAAG,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;gBAEU,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB;IAwB3C,OAAO,IAAI,IAAI;IAUf,QAAQ,IAAI,MAAM;IAI3B,UAAU,CAAC,KAAK,EAAE,gBAAgB,GAAG,gBAAgB;IAKrD,UAAU,CAAC,KAAK,GAAE,iBAAsB,GAAG,IAAI;IA4G/C,cAAc,CAAC,KAAK,CAAC,EAAE,iBAAiB,GAAG,IAAI;IAsB/C,UAAU,CAAC,OAAO,GAAE,OAAO,GAAG,YAAiB,GAAG,IAAI;IAetD;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,IAAI;IAezE,4CAA4C;IAC5C,MAAM,IAAI,IAAI;IAmBd,cAAc,CAAC,MAAM,KAAK,GAAG,IAAI;IAgCjC,YAAY,CAAC,OAAO,EAAE,mBAAmB;IAuIzC;;;;OAIG;IACH,eAAe,CAAC,EACd,MAAoB,EACpB,MAAa,EACb,IAAW,EACX,CAAK,EACL,CAAK,EACL,KAAkB,EAClB,MAAoB,EACpB,KAAS,EACT,QAAwB,EACxB,IAAgB,EAChB,UAA4B,EAC5B,UAAkB,EAClB,MAAU,EACV,UAAkC,EACnC,EAAE,sBAAsB;IAwDzB;;;;;;;OAOG;IACH,eAAe,CAAC,IAAI,KAAK;IAOzB,aAAa,IAAI,MAAM;IAIvB,IAAI,CAAC,WAAW,SAAmB;IAYnC,MAAM,CAAC,WAAW,SAAmB;IAcrC,YAAY,CAAC,EAAC,IAAI,EAAE,UAAkB,EAAC;;;KAAA;;;;IAuBvC,iBAAiB,CAAC,IAAI,EAAE,iBAAiB;;;;;;;;;IAgBzC,gBAAgB,CAAC,IAAI,KAAA,EAAE,KAAK,KAAA,EAAE,MAAM,KAAA,GAAG;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC;IAmChE,mBAAmB,CAAC,OAAO,EAAE;QACjC,KAAK,EAAE,GAAG,CAAC;QACX,MAAM,EAAE,GAAG,CAAC;QACZ,MAAM,EAAE,GAAG,CAAC;QACZ,IAAI,EAAE,GAAG,CAAC;QACV,MAAM,CAAC,EAAE,GAAG,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,CAAC;KACZ,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CjB,8CAA8C;IAC9C,mBAAmB,CAAC,OAAO,KAAA;IAoC3B,sDAAsD;IACtD,cAAc,CAAC,OAAO,EAAE,qBAAqB;IAmE7C;;OAEG;IACH,qBAAqB,CAAC,UAAU,EAAE,mBAAmB,GAAG,IAAI;CA6B7D"}