@luma.gl/webgl 9.0.0-alpha.21 → 9.0.0-alpha.24

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

@@ -1,19 +1,42 @@
 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 { GL, GLSamplerParameters } from '@luma.gl/constants';
 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 = {
+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 +67,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 +85,7 @@ declare type SetSubImageDataOptions = {
     /** @deprecated */
     pixels?: any;
 };
-declare type SetImageData3DOptions = {
+type SetImageData3DOptions = {
     level?: number;
     dataFormat?: any;
     width?: number;
@@ -74,18 +97,16 @@ declare type SetImageData3DOptions = {
     data: any;
     parameters?: Record<GL, any>;
 };
-export declare 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 handle: WebGLTexture;
-    data: any;
-    width: number;
-    height: number;
-    depth: number;
-    format: GL;
+    /** Sampler object (currently unused) */
+    sampler: WEBGLSampler;
+    glFormat: GL;
     type: GL;
     dataFormat: GL;
     mipmaps: boolean;
@@ -100,8 +121,6 @@ export declare 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,11 @@ export declare 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;
+    initialize(props?: WEBGLTextureProps): this;
+    initializeCube(props?: WEBGLTextureProps): this;
     setSampler(sampler?: Sampler | SamplerProps): this;
     /**
      * If size has changed, reinitializes with current format
@@ -137,7 +156,7 @@ export declare 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,13 +176,13 @@ export declare 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;
+        format: import("@luma.gl/api").TextureFormat;
         data: string | HTMLVideoElement | import("@luma.gl/api").TextureData | Promise<import("@luma.gl/api").TextureData> | import("modules/api/dist/adapter/resources/texture").CubeTextureData;
     };
     _deduceImageSize(data: any, width: any, height: any): {
@@ -190,4 +209,5 @@ export declare class WEBGLTexture extends Texture {
     /** @deprecated For LegacyTexture subclass */
     protected _getWebGL1NPOTParameterOverride(pname: number, value: number): number;
 }
+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":"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"}

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

@@ -1,17 +1,27 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { isObjectEmpty } from '@luma.gl/api';
 import { Texture, cast, log, assert, isPowerOfTwo, loadImage } from '@luma.gl/api';
-import GL from '@luma.gl/constants';
+import { GL } from '@luma.gl/constants';
 import { withParameters } from "../../context/state-tracker/with-parameters.js";
-import { getWebGLTextureFormat, getWebGLTextureParameters, getTextureFormatBytesPerPixel } from "../converters/texture-formats.js";
+import { convertTextureFormatToGL, getWebGLTextureParameters, getTextureFormatBytesPerPixel } from "../converters/texture-formats.js";
 import { convertSamplerParametersToWebGL, updateSamplerParametersForNPOT } from "../converters/sampler-parameters.js";
 import { WEBGLBuffer } from "./webgl-buffer.js";
 import { WEBGLSampler } from "./webgl-sampler.js";
+export const DEFAULT_WEBGL_TEXTURE_PROPS = {
+  parameters: {},
+  pixelStore: {},
+  pixels: null,
+  border: 0,
+  dataFormat: undefined,
+  textureUnit: undefined,
+  target: undefined
+};
 export class WEBGLTexture extends Texture {
   constructor(device, props) {
     var _this$props;
     super(device, {
-      format: GL.RGBA,
+      ...DEFAULT_WEBGL_TEXTURE_PROPS,
+      format: 'rgba8unorm',
       ...props
     });
     _defineProperty(this, "MAX_ATTRIBUTES", void 0);
@@ -19,17 +29,13 @@ export class WEBGLTexture extends Texture {
     _defineProperty(this, "gl", void 0);
     _defineProperty(this, "gl2", void 0);
     _defineProperty(this, "handle", void 0);
-    _defineProperty(this, "data", void 0);
-    _defineProperty(this, "width", undefined);
-    _defineProperty(this, "height", undefined);
-    _defineProperty(this, "depth", undefined);
-    _defineProperty(this, "format", undefined);
+    _defineProperty(this, "sampler", undefined);
+    _defineProperty(this, "glFormat", undefined);
     _defineProperty(this, "type", undefined);
     _defineProperty(this, "dataFormat", undefined);
     _defineProperty(this, "mipmaps", undefined);
     _defineProperty(this, "target", void 0);
     _defineProperty(this, "textureUnit", undefined);
-    _defineProperty(this, "sampler", undefined);
     _defineProperty(this, "loaded", false);
     _defineProperty(this, "_video", void 0);
     this.device = cast(device);
@@ -40,6 +46,7 @@ export class WEBGLTexture extends Texture {
       ...this.props,
       data: typeof this.props.data
     });
+    this.glFormat = GL.RGBA;
     this.target = getWebGLTextureTarget(this.props);
     this.loaded = false;
     if (typeof ((_this$props = this.props) === null || _this$props === void 0 ? void 0 : _this$props.data) === 'string') {
@@ -85,7 +92,6 @@ export class WEBGLTexture extends Texture {
     } = props;
     const {
       pixels = null,
-      recreate = false,
       pixelStore = {},
       textureUnit = undefined
     } = props;
@@ -103,6 +109,7 @@ export class WEBGLTexture extends Texture {
     const {
       depth = 0
     } = props;
+    const glFormat = convertTextureFormatToGL(props.format, this.device.isWebGL2);
     ({
       width,
       height,
@@ -118,11 +125,9 @@ export class WEBGLTexture extends Texture {
       width,
       height
     }));
-    const format = getWebGLTextureFormat(this.gl, props.format);
     this.width = width;
     this.height = height;
-    this.depth = depth;
-    this.format = format;
+    this.glFormat = glFormat;
     this.type = type;
     this.dataFormat = dataFormat;
     this.textureUnit = textureUnit;
@@ -140,7 +145,7 @@ export class WEBGLTexture extends Texture {
       width,
       height,
       depth,
-      format,
+      format: glFormat,
       type,
       dataFormat,
       parameters: pixelStore,
@@ -151,9 +156,6 @@ export class WEBGLTexture extends Texture {
     if (mipmaps) {
       this.generateMipmap();
     }
-    if (recreate) {
-      this.data = data;
-    }
     if (isVideo) {
       this._video = {
         video: data,
@@ -245,7 +247,7 @@ export class WEBGLTexture extends Texture {
     return this;
   }
   setImageData(options) {
-    if (this.props.dimension === '3d') {
+    if (this.props.dimension === '3d' || this.props.dimension === '2d-array') {
       return this.setImageData3D(options);
     }
     this.trackDeallocatedMemory('Texture');
@@ -253,7 +255,7 @@ export class WEBGLTexture extends Texture {
       target = this.target,
       pixels = null,
       level = 0,
-      format = this.format,
+      glFormat = this.glFormat,
       offset = 0,
       parameters = {}
     } = options;
@@ -299,22 +301,22 @@ export class WEBGLTexture extends Texture {
     withParameters(this.gl, parameters, () => {
       switch (dataType) {
         case 'null':
-          gl.texImage2D(target, level, format, width, height, 0, dataFormat, type, data);
+          gl.texImage2D(target, level, glFormat, width, height, 0, dataFormat, type, data);
           break;
         case 'typed-array':
-          gl.texImage2D(target, level, format, width, height, 0, dataFormat, type, data, offset);
+          gl.texImage2D(target, level, glFormat, width, height, 0, dataFormat, type, data, offset);
           break;
         case 'buffer':
           gl2 = this.device.assertWebGL2();
           gl2.bindBuffer(GL.PIXEL_UNPACK_BUFFER, data.handle || data);
-          gl2.texImage2D(target, level, format, width, height, 0, dataFormat, type, offset);
+          gl2.texImage2D(target, level, glFormat, width, height, 0, dataFormat, type, offset);
           gl2.bindBuffer(GL.PIXEL_UNPACK_BUFFER, null);
           break;
         case 'browser-object':
           if (this.device.isWebGL2) {
-            gl.texImage2D(target, level, format, width, height, 0, dataFormat, type, data);
+            gl.texImage2D(target, level, glFormat, width, height, 0, dataFormat, type, data);
           } else {
-            gl.texImage2D(target, level, format, dataFormat, type, data);
+            gl.texImage2D(target, level, glFormat, dataFormat, type, data);
           }
           break;
         case 'compressed':
@@ -329,7 +331,7 @@ export class WEBGLTexture extends Texture {
     if (data && data.byteLength) {
       this.trackAllocatedMemory(data.byteLength, 'Texture');
     } else {
-      const bytesPerPixel = getTextureFormatBytesPerPixel(this.gl, this.props.format);
+      const bytesPerPixel = getTextureFormatBytesPerPixel(this.props.format, this.device.isWebGL2);
       this.trackAllocatedMemory(this.width * this.height * bytesPerPixel, 'Texture');
     }
     this.loaded = true;
@@ -345,7 +347,7 @@ export class WEBGLTexture extends Texture {
       width = this.width,
       height = this.height,
       level = 0,
-      format = this.format,
+      glFormat = this.glFormat,
       type = this.type,
       dataFormat = this.dataFormat,
       compressed = false,
@@ -383,7 +385,7 @@ export class WEBGLTexture extends Texture {
     this.gl.bindTexture(this.target, this.handle);
     withParameters(this.gl, parameters, () => {
       if (compressed) {
-        this.gl.compressedTexSubImage2D(target, level, x, y, width, height, format, data);
+        this.gl.compressedTexSubImage2D(target, level, x, y, width, height, glFormat, data);
       } else if (data === null) {
         this.gl.texSubImage2D(target, level, x, y, width, height, dataFormat, type, null);
       } else if (ArrayBuffer.isView(data)) {
@@ -486,7 +488,7 @@ export class WEBGLTexture extends Texture {
       type,
       compressed
     } = opts;
-    const parameters = getWebGLTextureParameters(this.gl, format);
+    const parameters = getWebGLTextureParameters(format, this.device.isWebGL2);
     dataFormat = dataFormat || parameters.dataFormat;
     type = type || parameters.type;
     compressed = compressed || parameters.compressed;
@@ -622,7 +624,7 @@ export class WEBGLTexture extends Texture {
     } = options;
     this.trackDeallocatedMemory('Texture');
     this.gl.bindTexture(this.target, this.handle);
-    const webglTextureFormat = getWebGLTextureParameters(this.gl, format);
+    const webglTextureFormat = getWebGLTextureParameters(format, this.device.isWebGL2);
     withParameters(this.gl, parameters, () => {
       if (ArrayBuffer.isView(data)) {
         this.gl.texImage3D(this.target, level, webglTextureFormat.format, width, height, depth, 0, webglTextureFormat.dataFormat, webglTextureFormat.type, data);
@@ -635,7 +637,7 @@ export class WEBGLTexture extends Texture {
     if (data && data.byteLength) {
       this.trackAllocatedMemory(data.byteLength, 'Texture');
     } else {
-      const bytesPerPixel = getTextureFormatBytesPerPixel(this.gl, this.props.format);
+      const bytesPerPixel = getTextureFormatBytesPerPixel(this.props.format, this.device.isWebGL2);
       this.trackAllocatedMemory(this.width * this.height * this.depth * bytesPerPixel, 'Texture');
     }
     this.loaded = true;