chore: Update to OpenJS recommended license, SPDX identifiers (#1974)

examples/portable/two-cubes/app.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Buffer, glsl} from '@luma.gl/core';
 import {AnimationLoopTemplate, AnimationProps, Model, CubeGeometry} from '@luma.gl/engine';
 import '@luma.gl/webgpu';

examples/tutorials/hello-cube/app.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {glsl, UniformStore, NumberArray, ShaderUniformType, loadImage} from '@luma.gl/core';
 import {AnimationLoopTemplate, AnimationProps, Model, CubeGeometry} from '@luma.gl/engine';
 import {Matrix4} from '@math.gl/core';

examples/tutorials/shader-hooks/app.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {Buffer, NumberArray, UniformStore} from '@luma.gl/core';

examples/tutorials/shader-modules/app.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Buffer, NumberArray} from '@luma.gl/core';
 import {AnimationLoopTemplate, AnimationProps, Model, _ShaderInputs} from '@luma.gl/engine';
 import {ShaderModule} from '@luma.gl/shadertools';

modules/constants/src/webgl-constants.ts

@@ -622,9 +622,13 @@ enum GLEnum {
   // Queries
 
   CURRENT_QUERY = 0x8865,
+  /** Returns a GLuint containing the query result. */
   QUERY_RESULT = 0x8866,
+  /** Whether query result is available. */
   QUERY_RESULT_AVAILABLE = 0x8867,
+  /** Occlusion query (if drawing passed depth test)  */
   ANY_SAMPLES_PASSED = 0x8c2f,
+  /** Occlusion query less accurate/faster version */
   ANY_SAMPLES_PASSED_CONSERVATIVE = 0x8d6a,
 
   // Draw buffers
@@ -964,7 +968,7 @@ enum GLEnum {
   TIME_ELAPSED_EXT = 0x88bf,
   /** The current time. */
   TIMESTAMP_EXT = 0x8e28,
-  /** A Boolean indicating whether or not the GPU performed any disjoint operation. */
+  /** A Boolean indicating whether or not the GPU performed any disjoint operation (lost context) */
   GPU_DISJOINT_EXT = 0x8fbb,
 
   // KHR_parallel_shader_compile https://registry.khronos.org/webgl/extensions/KHR_parallel_shader_compile

modules/core-tests/src/index.ts

@@ -1 +1,5 @@
-// intentionally empty
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+// intentionally empty, this is a test-only module

modules/core-tests/test/adapter/canvas-context.spec.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import test from 'tape-promise/tape';
 import {getWebGLTestDevices} from '@luma.gl/test-utils';
 

modules/core-tests/test/adapter/device-helpers/device-features.spec.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import test from 'tape-promise/tape';

modules/core-tests/test/adapter/device-helpers/device-info.spec.ts

@@ -1,3 +1,7 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import test from 'tape-promise/tape';
 import {getTestDevices} from '@luma.gl/test-utils';
 

modules/core-tests/test/adapter/device-helpers/device-limits.spec.ts

@@ -1,3 +1,7 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import test from 'tape-promise/tape';
 import {GL} from '@luma.gl/constants';
 import {getTestDevices} from '@luma.gl/test-utils';

modules/core-tests/test/adapter/device-helpers/set-device-parameters.spec.ts

@@ -1,3 +1,7 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import test, {Test} from 'tape-promise/tape';
 import {webglDevice} from '@luma.gl/test-utils';
 

modules/core-tests/test/adapter/device.spec.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import test from 'tape-promise/tape';
 import {getWebGLTestDevices, getTestDevices} from '@luma.gl/test-utils';
 

modules/core-tests/test/adapter/helpers/parse-shader-compiler-log.spec.ts

@@ -1,3 +1,7 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import test from 'tape-promise/tape';
 import {parseShaderCompilerLog} from '@luma.gl/webgl/adapter/helpers/parse-shader-compiler-log';
 

modules/core-tests/test/adapter/resources/buffer.spec.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {Buffer, TypedArray} from '@luma.gl/core';

modules/core-tests/test/adapter/resources/command-buffer.spec.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import test, {Test} from 'tape-promise/tape';

modules/core-tests/test/adapter/resources/render-pipeline.spec.ts

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

modules/core-tests/test/adapter/resources/sampler.spec.ts

@@ -1,3 +1,7 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import test, {Test} from 'tape-promise/tape';
 import {webglDevice} from '@luma.gl/test-utils';
 

modules/core-tests/test/adapter/resources/shader.spec.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import test from 'tape-promise/tape';

modules/core-tests/test/adapter/resources/vertex-array.spec.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import test from 'tape-promise/tape';

modules/core-tests/test/adapter/texture-formats.spec.ts

@@ -1,3 +1,7 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import test from 'tape-promise/tape';
 import {getTestDevices} from '@luma.gl/test-utils';
 

modules/core-tests/test/index.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // Note that we do two test runs on luma.gl, with and without headless-gl
 // This file imports tests that should run *with* headless-gl included
 

modules/core/src/adapter/attribute-utils/get-attribute-from-layouts.ts

@@ -1,4 +1,5 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {log} from '../../utils/log';

modules/core/src/adapter/canvas-context.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {isBrowser} from '@probe.gl/env';
 import type {Device} from './device';
 import type {Framebuffer} from './resources/framebuffer';

modules/core/src/adapter/device.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {VERSION} from '../init';
 import {StatsManager, lumaStats} from '../utils/stats-manager';
 import {log} from '../utils/log';

modules/core/src/adapter/resources/buffer.ts

@@ -1,4 +1,6 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 
 import type {Device} from '../device';
 import {Resource, ResourceProps} from './resource';

modules/core/src/adapter/resources/command-buffer.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Device} from '../device';
 import {Resource, ResourceProps} from './resource';
 

modules/core/src/adapter/resources/command-encoder.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Device} from '../device';
 import {Resource, ResourceProps} from './resource';
 import {Buffer} from './buffer';
@@ -159,14 +162,4 @@ export abstract class CommandEncoder extends Resource<CommandEncoderProps> {
   popDebugGroup() {}
 
   insertDebugMarker(markerLabel: string): void {}
-
-  // writeTimestamp(querySet: Query, queryIndex: number): void;
-
-  // resolveQuerySet(options: {
-  //   querySet: GPUQuerySet,
-  //   firstQuery: number,
-  //   queryCount: number,
-  //   destination: Buffer,
-  //   destinationOffset?: number;
-  // }): void;
 }

modules/core/src/adapter/resources/compute-pass.ts

@@ -1,7 +1,11 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Resource, ResourceProps} from './resource';
 import {ComputePipeline} from './compute-pipeline';
-import {Buffer} from './buffer';
 import type {Device} from '../device';
+import {Buffer} from './buffer';
 
 export type ComputePassProps = ResourceProps & {};
 
@@ -15,7 +19,7 @@ export abstract class ComputePass extends Resource<ComputePassProps> {
   }
 
   constructor(device: Device, props: ComputePassProps) {
-    super(device, props, Resource.defaultProps);
+    super(device, props, ComputePass.defaultProps);
   }
 
   abstract override destroy(): void;
@@ -45,8 +49,4 @@ export abstract class ComputePass extends Resource<ComputePassProps> {
   abstract pushDebugGroup(groupLabel: string): void;
   abstract popDebugGroup(): void;
   abstract insertDebugMarker(markerLabel: string): void;
-
-  // writeTimestamp(querySet: GPUQuerySet, queryIndex: number): void;
-  // beginPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;
-  // endPipelineStatisticsQuery(querySet: GPUQuerySet, queryIndex: number): void;
 }

modules/core/src/adapter/resources/compute-pipeline.ts

@@ -1,4 +1,7 @@
-//
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Resource, ResourceProps} from './resource';
 import {BindingDeclaration} from '../types/shader-layout';
 import type {Device} from '../device';

modules/core/src/adapter/resources/external-texture.ts

@@ -1,3 +1,7 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {Device} from '../device';
 import {Resource, ResourceProps} from './resource';
 

modules/core/src/adapter/resources/framebuffer.ts

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

modules/core/src/adapter/resources/render-pass.ts

@@ -1,11 +1,11 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {Device} from '../device';
 import type {RenderPassParameters} from '../types/parameters';
 // import {Binding} from '../types/shader-layout';
 import {Resource, ResourceProps} from './resource';
-// import {Buffer} from './buffer';
-// import {RenderPipeline} from './render-pipeline';
-// import {CommandEncoder} from './command-encoder';
 import {Framebuffer} from './framebuffer';
 import {NumberArray} from '../..';
 
@@ -74,43 +74,35 @@ export abstract class RenderPass extends Resource<RenderPassProps> {
   abstract popDebugGroup(): void;
   abstract insertDebugMarker(markerLabel: string): void;
 
-  // writeTimestamp(querySet: GPUQuerySet, queryIndex: number): void;
-
-  // beginOcclusionQuery(queryIndex: number): void;
-  // endOcclusionQuery(): void;
-
   // executeBundles(bundles: Iterable<GPURenderBundle>): void;
 
-  // In WebGPU the following methods are on the renderpass.
+  // TODO - In WebGPU the following methods are on the renderpass.
   // luma.gl keeps them on the pipeline for now
+  // setPipeline(pipeline: RenderPipeline): void {}
 
-  /*
-  setPipeline(pipeline: RenderPipeline): void {}
-
-  setIndexBuffer(
-    buffer: Buffer,
-    indexFormat: 'uint16' | 'uint32',
-    offset?: number,
-    size?: number
-  ): void {}
+  // setIndexBuffer(
+  //   buffer: Buffer,
+  //   indexFormat: 'uint16' | 'uint32',
+  //   offset?: number,
+  //   size?: number
+  // ): void {}
 
-  abstract setVertexBuffer(slot: number, buffer: Buffer, offset: number): void;
+  // abstract setVertexBuffer(slot: number, buffer: Buffer, offset: number): void;
 
-  abstract setBindings(bindings: Record<string, Binding>): void;
+  // abstract setBindings(bindings: Record<string, Binding>): void;
 
-  abstract setParameters(parameters: RenderPassParameters);
+  // abstract setParameters(parameters: RenderPassParameters);
 
-  draw(options: {
-    vertexCount?: number; // Either vertexCount or indexCount must be provided
-    indexCount?: number;  // Activates indexed drawing (call setIndexBuffer())
-    instanceCount?: number; //
-    firstVertex?: number;
-    firstIndex?: number; // requires device.features.has('indirect-first-instance')?
-    firstInstance?: number;
-    baseVertex?: number;
-  }): void {}
+  // draw(options: {
+  //   vertexCount?: number; // Either vertexCount or indexCount must be provided
+  //   indexCount?: number;  // Activates indexed drawing (call setIndexBuffer())
+  //   instanceCount?: number; //
+  //   firstVertex?: number;
+  //   firstIndex?: number; // requires device.features.has('indirect-first-instance')?
+  //   firstInstance?: number;
+  //   baseVertex?: number;
+  // }): void {}
 
-  drawIndirect(indirectBuffer: GPUBuffer, indirectOffset: number): void;
-  drawIndexedIndirect(indirectBuffer: GPUBuffer, indirectOffset: number): void;
-  */
+  // drawIndirect(indirectBuffer: GPUBuffer, indirectOffset: number): void;
+  // drawIndexedIndirect(indirectBuffer: GPUBuffer, indirectOffset: number): void;
 }

modules/core/src/adapter/resources/render-pipeline.ts

@@ -1,4 +1,7 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {Device} from '../device';
 import type {UniformValue} from '../types/types';
 import type {PrimitiveTopology, RenderPipelineParameters} from '../types/parameters';