@luma.gl/webgl 9.0.0-alpha.39 → 9.0.0-alpha.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.0.0-alpha.39",
+  "version": "9.0.0-alpha.40",
   "description": "WebGL2 adapter for the luma.gl API",
   "type": "module",
   "license": "MIT",
@@ -44,12 +44,12 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@luma.gl/constants": "9.0.0-alpha.39",
-    "@luma.gl/core": "9.0.0-alpha.39",
+    "@luma.gl/constants": "9.0.0-alpha.40",
+    "@luma.gl/core": "9.0.0-alpha.40",
     "@probe.gl/env": "^4.0.2"
   },
   "devDependencies": {
-    "@luma.gl/test-utils": "9.0.0-alpha.39"
+    "@luma.gl/test-utils": "9.0.0-alpha.40"
   },
-  "gitHead": "23bf413d42ebbc224e4f7afac135c4cf805af85f"
+  "gitHead": "5a6f2bc7a4d24a65b74ae905844ad5bfc36c5645"
 }

package/src/adapter/converters/device-parameters.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {
   Device,
   Parameters,

package/src/adapter/converters/sampler-parameters.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 // SAMPLER FILTERS
 import {SamplerParameters} from '@luma.gl/core';
 import {GL, GLSamplerParameters} from '@luma.gl/constants';

package/src/adapter/converters/shader-formats.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {GL} from '@luma.gl/constants';
 import {ShaderAttributeType, ShaderDataType} from '@luma.gl/core';
 

package/src/adapter/converters/texture-formats.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import type {TextureFormat, DeviceFeature} from '@luma.gl/core';
 import {decodeTextureFormat} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';

package/src/adapter/converters/vertex-formats.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {GL} from '@luma.gl/constants';
 import {VertexFormat, VertexType} from '@luma.gl/core';
 

package/src/adapter/device-helpers/device-features.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 // Feature detection for WebGL
 // Provides a function that enables simple checking of which WebGL features are
 // available in an WebGL1 or WebGL2 environment.

package/src/adapter/device-helpers/device-limits.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import type {DeviceLimits} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {getWebGL2Context} from '../../context/context/webgl-checks';

package/src/adapter/device-helpers/get-device-info.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {DeviceInfo} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {isWebGL2} from '../../context/context/webgl-checks';

package/src/adapter/device-helpers/is-old-ie.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 // opts allows user agent to be overridden for testing
 export function isOldIE(opts = {}) {
   const navigator = typeof window !== 'undefined' ? window.navigator || {} : {};

package/src/adapter/helpers/decode-webgl-types.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {ShaderUniformType, ShaderAttributeType, VertexFormat} from '@luma.gl/core';
 import {GL, GLUniformType, GLSamplerType, GLCompositeType, GLDataType} from '@luma.gl/constants';
 

package/src/adapter/helpers/get-shader-info.ts

@@ -1,4 +1,5 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 // Note: This was the only dependency that made @luma.gl/webgl depend on @luma.gl/shadertools
 // This file was coped from shadertools to avoid the dependency

package/src/adapter/helpers/get-shader-layout.ts

@@ -1,4 +1,5 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 import type {
   ShaderLayout,

package/src/adapter/helpers/parse-shader-compiler-log.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import type {CompilerMessage} from '@luma.gl/core';
 
 const MESSAGE_TYPES = ['warning', 'error', 'info'];

package/src/adapter/helpers/set-uniform.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 /* eslint-disable */
 
 // Uniforms

package/src/adapter/helpers/webgl-topology-utils.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {GL, GLPrimitiveTopology, GLPrimitive} from '@luma.gl/constants';
 
 // Counts the number of complete primitives given a number of vertices and a drawMode

package/src/adapter/objects/constants-to-keys.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 

package/src/adapter/objects/webgl-renderbuffer.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {assert, ResourceProps, TextureFormat} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {WebGLDevice} from '../webgl-device';

package/src/adapter/objects/webgl-resource.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {Resource, assert, uid, stubRemovedMethods} from '@luma.gl/core';
 import type {Device, ResourceProps} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';

package/src/adapter/resources/webgl-buffer.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import type {BufferProps} from '@luma.gl/core';
 import {Buffer, assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';

package/src/adapter/resources/webgl-command-buffer.ts

@@ -1,4 +1,5 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 import type {
   CopyBufferToBufferOptions,

package/src/adapter/resources/webgl-command-encoder.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {CommandEncoder, CommandEncoderProps} from '@luma.gl/core';
 import type {
   CopyBufferToBufferOptions,

package/src/adapter/resources/webgl-external-texture.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 /*
 export class WEBGLExternalTexture extends WEBGLTexture {
   readonly device: WebGLDevice;

package/src/adapter/resources/webgl-framebuffer.ts

@@ -1,4 +1,5 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 import type {FramebufferProps, TextureFormat} from '@luma.gl/core';
 import {Framebuffer, Texture, assert} from '@luma.gl/core';

package/src/adapter/resources/webgl-render-pass.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {RenderPass, RenderPassProps, NumberArray, RenderPassParameters} from '@luma.gl/core';
 import {WebGLDevice} from '../webgl-device';
 import {GL, GLParameters} from '@luma.gl/constants';

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

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import type {UniformValue, RenderPipelineProps, Binding} from '@luma.gl/core';
 import type {ShaderLayout, PrimitiveTopology} from '@luma.gl/core';
 import type {RenderPass, VertexArray} from '@luma.gl/core';
@@ -15,6 +17,7 @@ import {setUniform} from '../helpers/set-uniform';
 import {WebGLDevice} from '../webgl-device';
 import {WEBGLBuffer} from './webgl-buffer';
 import {WEBGLShader} from './webgl-shader';
+import {WEBGLFramebuffer} from './webgl-framebuffer';
 import {WEBGLTexture} from './webgl-texture';
 // import {WEBGLVertexArray} from './webgl-vertex-array';
 import {WEBGLRenderPass} from './webgl-render-pass';
@@ -144,7 +147,7 @@ export class WEBGLRenderPipeline extends RenderPipeline {
           }
           break;
         case 'texture':
-          if (!(value instanceof WEBGLTexture)) {
+          if (!(value instanceof WEBGLTexture || value instanceof WEBGLFramebuffer)) {
             throw new Error('texture value');
           }
           break;
@@ -405,10 +408,19 @@ export class WEBGLRenderPipeline extends RenderPipeline {
           break;
 
         case 'texture':
-          if (!(value instanceof WEBGLTexture)) {
+          if (!(value instanceof WEBGLTexture || value instanceof WEBGLFramebuffer)) {
             throw new Error('texture');
           }
-          const texture: WEBGLTexture = value;
+          let texture: WEBGLTexture;
+          if (value instanceof WEBGLTexture) {
+            texture = value;
+          } else if (value instanceof WEBGLFramebuffer && value.colorAttachments[0] instanceof WEBGLTexture) {
+            log.warn('Passing framebuffer in texture binding may be deprecated. Use fbo.colorAttachments[0] instead')();
+            texture = value.colorAttachments[0];
+          } else {
+            throw new Error('No texture');
+          }
+
           gl2.activeTexture(GL.TEXTURE0 + textureUnit);
           gl2.bindTexture(texture.target, texture.handle);
           // gl2.bindSampler(textureUnit, sampler.handle);

package/src/adapter/resources/webgl-sampler.ts

@@ -1,4 +1,5 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 import {Sampler, SamplerProps} from '@luma.gl/core';
 import {GL, GLSamplerParameters} from '@luma.gl/constants';

package/src/adapter/resources/webgl-shader.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {log, uid, Shader, ShaderProps, CompilerMessage, formatCompilerLog} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {getShaderInfo} from '../helpers/get-shader-info';

package/src/adapter/resources/webgl-texture.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 // Texture class.
 // @todo
 // - [ ] cube texture init params

package/src/adapter/resources/webgl-vertex-array.ts

@@ -1,4 +1,5 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 import type {Device, Buffer, VertexArrayProps, TypedArray, NumberArray} from '@luma.gl/core';
 import {VertexArray, getScratchArray, fillArray} from '@luma.gl/core';

package/src/adapter/webgl-canvas-context.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import type {CanvasContextProps} from '@luma.gl/core';
 import {CanvasContext} from '@luma.gl/core';
 import {WebGLDevice} from './webgl-device';

package/src/adapter/webgl-device.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import type {
   DeviceProps,
   DeviceInfo,

package/src/classic/accessor.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {assert, checkProps, Buffer, AccessorObject} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {getTypedArrayFromGLType} from './typed-array-utils';

package/src/classic/buffer-with-accessor.ts

@@ -1,4 +1,5 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 import type {Device, BufferProps, TypedArray} from '@luma.gl/core';
 import {assert, checkProps} from '@luma.gl/core';

package/src/classic/clear.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {Device, Framebuffer, assert} from '@luma.gl/core';
 import {WebGLDevice} from '../adapter/webgl-device';
 import {withGLParameters} from '../context/state-tracker/with-parameters';

package/src/classic/copy-and-blit.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {assert, Texture, Framebuffer, FramebufferProps} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 

package/src/classic/format-utils.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 

package/src/classic/typed-array-utils.ts

@@ -1,4 +1,5 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 import {TypedArray, TypedArrayConstructor} from '@luma.gl/core';
 import {GL, GLDataType, GLPixelType} from '@luma.gl/constants';

package/src/context/context/create-browser-context.ts

@@ -1,4 +1,5 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 /**
  * ContextProps

package/src/context/context/create-headless-context.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 const ERR_HEADLESSGL_FAILED =
   'Failed to create WebGL context in Node.js, headless gl returned null';
 

package/src/context/context/webgl-checks.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {assert} from '@luma.gl/core';
 
 const ERR_CONTEXT = 'Invalid WebGLRenderingContext';

package/src/context/debug/spector.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {log, loadScript} from '@luma.gl/core';
 
 /** Spector debug initialization options */

package/src/context/debug/webgl-developer-tools.ts

@@ -1,4 +1,6 @@
 // luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {log, loadScript} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {isBrowser} from '@probe.gl/env'

package/src/context/parameters/unified-parameter-api.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 // Provides a unified API for getting and setting any WebGL parameter
 // Also knows default values of all parameters, enabling fast cache initialization
 // Provides base functionality for the state caching.

package/src/context/parameters/webgl-parameter-tables.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 // Tables describing WebGL parameters
 import {GL, GLParameters} from '@luma.gl/constants';
 import {isWebGL2} from '../context/webgl-checks';

package/src/context/polyfill/context-data.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 /**
  * Stores luma.gl specific state associated with a context
  */

package/src/context/polyfill/get-parameter-polyfill.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 /* eslint-disable no-inline-comments, max-len, camelcase */
 import {GL} from '@luma.gl/constants';
 import {isWebGL2} from '../context/webgl-checks';

package/src/context/polyfill/polyfill-context.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 // WebGL1/WebGL2 extension polyfill support
 //
 // Provides a function that creates polyfills for WebGL2 functions based

package/src/context/polyfill/polyfill-table.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import {assert} from '@luma.gl/core';
 import {GL} from '@luma.gl/constants';
 import {isWebGL2} from '../context/webgl-checks';

package/src/context/polyfill/polyfill-vertex-array-object.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 /*
  ** Copyright (c) 2015 The Khronos Group Inc.
  **

package/src/context/state-tracker/deep-array-equal.ts

@@ -1,3 +1,5 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
 
 /** deeply compare two arrays */
 export function deepArrayEqual(x: any, y: any): boolean {

package/src/context/state-tracker/track-context-state.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 // Support for listening to context state changes and intercepting state queries
 // NOTE: this system does not handle buffer bindings
 import {assert} from '@luma.gl/core';

package/src/context/state-tracker/with-parameters.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 import type {Device} from '@luma.gl/core';
 import {WebGLDevice} from '../../adapter/webgl-device';
 import {GLParameters, setGLParameters} from '../parameters/unified-parameter-api';

package/src/index.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 // luma.gl Base WebGL wrapper library
 // Provides simple class/function wrappers around the low level webgl objects
 // These classes are intentionally close to the WebGL API

package/src/types.ts

@@ -1,3 +1,6 @@
+// luma.gl, MIT license
+// Copyright (c) vis.gl contributors
+
 export type AccessorObject = {
   size?: number;
   index?: number;