@luma.gl/webgl 9.3.0-alpha.6 → 9.3.0-alpha.9

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 export type { WebGLDeviceLimits } from "./adapter/device-helpers/webgl-device-limits.js";
+export { GL } from "./constants/webgl-constants.js";
+export type { GLTextureTarget, GLTextureCubeMapTarget, GLTexelDataFormat, GLPrimitiveTopology, GLPrimitive, GLDataType, GLPixelType, GLUniformType, GLSamplerType, GLFunction, GLBlendEquation, GLBlendFunction, GLStencilOp, GLSamplerParameters, GLValueParameters, GLPackParameters, GLUnpackParameters, GLFunctionParameters, GLParameters, GLLimits, GLExtensions, GLPolygonMode, GLProvokingVertex } from "./constants/webgl-types.js";
 export { webgl2Adapter } from "./adapter/webgl-adapter.js";
 export type { WebGLAdapter } from "./adapter/webgl-adapter.js";
 export { WebGLDevice } from "./adapter/webgl-device.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,YAAY,EAAC,iBAAiB,EAAC,wDAAqD;AAGpF,OAAO,EAAC,aAAa,EAAC,mCAAgC;AACtD,YAAY,EAAC,YAAY,EAAC,mCAAgC;AAG1D,OAAO,EAAC,WAAW,EAAC,kCAA+B;AACnD,OAAO,EAAC,kBAAkB,EAAC,0CAAuC;AAGlE,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAC7D,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAE/D,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAC7D,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAC/D,OAAO,EAAC,gBAAgB,EAAC,iDAA8C;AACvE,OAAO,EAAC,UAAU,EAAC,2CAAwC;AAE3D,OAAO,EAAC,mBAAmB,EAAC,qDAAkD;AAE9E,OAAO,EAAC,mBAAmB,EAAC,qDAAkD;AAC9E,OAAO,EAAC,eAAe,EAAC,iDAA8C;AAEtE,OAAO,EAAC,gBAAgB,EAAC,kDAA+C;AAGxE,OAAO,EAAC,sBAAsB,EAAC,wDAAqD;AAIpF,OAAO,EAAC,mBAAmB,EAAE,oBAAoB,EAAC,kDAA+C;AAGjG,OAAO,EAAC,uBAAuB,EAAC,yDAAsD;AACtF,OAAO,EAAC,iBAAiB,EAAC,uDAAoD;AAG9E,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,sDAAmD;AAEpD,OAAO,EAAC,gBAAgB,EAAC,mDAAgD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,YAAY,EAAC,iBAAiB,EAAC,wDAAqD;AACpF,OAAO,EAAC,EAAE,EAAC,uCAAoC;AAC/C,YAAY,EACV,eAAe,EACf,sBAAsB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,EACX,UAAU,EACV,WAAW,EACX,aAAa,EACb,aAAa,EACb,UAAU,EACV,eAAe,EACf,eAAe,EACf,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,iBAAiB,EAClB,mCAAgC;AAGjC,OAAO,EAAC,aAAa,EAAC,mCAAgC;AACtD,YAAY,EAAC,YAAY,EAAC,mCAAgC;AAG1D,OAAO,EAAC,WAAW,EAAC,kCAA+B;AACnD,OAAO,EAAC,kBAAkB,EAAC,0CAAuC;AAGlE,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAC7D,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAE/D,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAC7D,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAC/D,OAAO,EAAC,gBAAgB,EAAC,iDAA8C;AACvE,OAAO,EAAC,UAAU,EAAC,2CAAwC;AAE3D,OAAO,EAAC,mBAAmB,EAAC,qDAAkD;AAE9E,OAAO,EAAC,mBAAmB,EAAC,qDAAkD;AAC9E,OAAO,EAAC,eAAe,EAAC,iDAA8C;AAEtE,OAAO,EAAC,gBAAgB,EAAC,kDAA+C;AAGxE,OAAO,EAAC,sBAAsB,EAAC,wDAAqD;AAIpF,OAAO,EAAC,mBAAmB,EAAE,oBAAoB,EAAC,kDAA+C;AAGjG,OAAO,EAAC,uBAAuB,EAAC,yDAAsD;AACtF,OAAO,EAAC,iBAAiB,EAAC,uDAAoD;AAG9E,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,sDAAmD;AAEpD,OAAO,EAAC,gBAAgB,EAAC,mDAAgD"}

package/dist/index.js

@@ -1,6 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+export { GL } from "./constants/webgl-constants.js";
 // WebGL adapter classes
 export { webgl2Adapter } from "./adapter/webgl-adapter.js";
 // WebGL Device classes

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAWpC,wBAAwB;AACxB,OAAO,EAAC,aAAa,EAAC,mCAAgC;AAGtD,uBAAuB;AACvB,OAAO,EAAC,WAAW,EAAC,kCAA+B;AACnD,OAAO,EAAC,kBAAkB,EAAC,0CAAuC;AAElE,yBAAyB;AACzB,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAC7D,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAC/D,mFAAmF;AACnF,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAC7D,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAC/D,OAAO,EAAC,gBAAgB,EAAC,iDAA8C;AACvE,OAAO,EAAC,UAAU,EAAC,2CAAwC;AAE3D,OAAO,EAAC,mBAAmB,EAAC,qDAAkD;AAC9E,mFAAmF;AACnF,OAAO,EAAC,mBAAmB,EAAC,qDAAkD;AAC9E,OAAO,EAAC,eAAe,EAAC,iDAA8C;AACtE,2EAA2E;AAC3E,OAAO,EAAC,gBAAgB,EAAC,kDAA+C;AAExE,wBAAwB;AACxB,OAAO,EAAC,sBAAsB,EAAC,wDAAqD;AAEpF,wBAAwB;AAExB,OAAO,EAAC,mBAAmB,EAAE,oBAAoB,EAAC,kDAA+C;AAEjG,yBAAyB;AACzB,OAAO,EAAC,uBAAuB,EAAC,yDAAsD;AACtF,OAAO,EAAC,iBAAiB,EAAC,uDAAoD;AAE9E,0BAA0B;AAC1B,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,sDAAmD;AAEpD,OAAO,EAAC,gBAAgB,EAAC,mDAAgD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAUpC,OAAO,EAAC,EAAE,EAAC,uCAAoC;AA2B/C,wBAAwB;AACxB,OAAO,EAAC,aAAa,EAAC,mCAAgC;AAGtD,uBAAuB;AACvB,OAAO,EAAC,WAAW,EAAC,kCAA+B;AACnD,OAAO,EAAC,kBAAkB,EAAC,0CAAuC;AAElE,yBAAyB;AACzB,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAC7D,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAC/D,mFAAmF;AACnF,OAAO,EAAC,WAAW,EAAC,4CAAyC;AAC7D,OAAO,EAAC,YAAY,EAAC,6CAA0C;AAC/D,OAAO,EAAC,gBAAgB,EAAC,iDAA8C;AACvE,OAAO,EAAC,UAAU,EAAC,2CAAwC;AAE3D,OAAO,EAAC,mBAAmB,EAAC,qDAAkD;AAC9E,mFAAmF;AACnF,OAAO,EAAC,mBAAmB,EAAC,qDAAkD;AAC9E,OAAO,EAAC,eAAe,EAAC,iDAA8C;AACtE,2EAA2E;AAC3E,OAAO,EAAC,gBAAgB,EAAC,kDAA+C;AAExE,wBAAwB;AACxB,OAAO,EAAC,sBAAsB,EAAC,wDAAqD;AAEpF,wBAAwB;AAExB,OAAO,EAAC,mBAAmB,EAAE,oBAAoB,EAAC,kDAA+C;AAEjG,yBAAyB;AACzB,OAAO,EAAC,uBAAuB,EAAC,yDAAsD;AACtF,OAAO,EAAC,iBAAiB,EAAC,uDAAoD;AAE9E,0BAA0B;AAC1B,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,sDAAmD;AAEpD,OAAO,EAAC,gBAAgB,EAAC,mDAAgD"}

package/dist/webgl-constants.d.ts

@@ -0,0 +1,2 @@
+export { GL } from "./constants/webgl-constants.js";
+//# sourceMappingURL=webgl-constants.d.ts.map

package/dist/webgl-constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webgl-constants.d.ts","sourceRoot":"","sources":["../src/webgl-constants.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,EAAE,EAAC,uCAAoC"}

package/dist/webgl-constants.js

@@ -0,0 +1,5 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+export { GL } from "./constants/webgl-constants.js";
+//# sourceMappingURL=webgl-constants.js.map

package/dist/webgl-constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webgl-constants.js","sourceRoot":"","sources":["../src/webgl-constants.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,EAAE,EAAC,uCAAoC"}

package/dist/webgl-types.d.ts

@@ -0,0 +1,2 @@
+export type { GLTextureTarget, GLTextureCubeMapTarget, GLTexelDataFormat, GLPrimitiveTopology, GLPrimitive, GLDataType, GLPixelType, GLUniformType, GLSamplerType, GLFunction, GLBlendEquation, GLBlendFunction, GLStencilOp, GLSamplerParameters, GLValueParameters, GLPackParameters, GLUnpackParameters, GLFunctionParameters, GLParameters, GLLimits, GLExtensions, GLPolygonMode, GLProvokingVertex } from "./constants/webgl-types.js";
+//# sourceMappingURL=webgl-types.d.ts.map

package/dist/webgl-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webgl-types.d.ts","sourceRoot":"","sources":["../src/webgl-types.ts"],"names":[],"mappings":"AAIA,YAAY,EACV,eAAe,EACf,sBAAsB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,EACX,UAAU,EACV,WAAW,EACX,aAAa,EACb,aAAa,EACb,UAAU,EACV,eAAe,EACf,eAAe,EACf,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,iBAAiB,EAClB,mCAAgC"}

package/dist/{types.js → webgl-types.js}

@@ -2,4 +2,4 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 export {};
-//# sourceMappingURL=types.js.map
+//# sourceMappingURL=webgl-types.js.map

package/dist/webgl-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webgl-types.js","sourceRoot":"","sources":["../src/webgl-types.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/webgl",
-  "version": "9.3.0-alpha.6",
+  "version": "9.3.0-alpha.9",
   "description": "WebGL2 adapter for the luma.gl core API",
   "type": "module",
   "license": "MIT",
@@ -25,6 +25,21 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
+    },
+    "./constants": {
+      "types": "./dist/constants/index.d.ts",
+      "import": "./dist/constants/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./webgl-constants": {
+      "types": "./dist/webgl-constants.d.ts",
+      "import": "./dist/webgl-constants.js",
+      "require": "./dist/index.cjs"
+    },
+    "./webgl-types": {
+      "types": "./dist/webgl-types.d.ts",
+      "import": "./dist/webgl-types.js",
+      "require": "./dist/index.cjs"
     }
   },
   "files": [
@@ -40,12 +55,11 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "9.2.0-alpha.6"
+    "@luma.gl/core": "9.3.0-alpha.6"
   },
   "dependencies": {
-    "@luma.gl/constants": "9.3.0-alpha.6",
     "@math.gl/types": "^4.1.0",
     "@probe.gl/env": "^4.1.1"
   },
-  "gitHead": "59fda5480c4d0bb3d64545d4621175221f2b6c7c"
+  "gitHead": "737b0f752b3f8a6ae920b394d5ca028427275b37"
 }

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

@@ -4,7 +4,7 @@
 
 import type {CompareFunction, StencilOperation, BlendOperation, BlendFactor} from '@luma.gl/core';
 import {Device, log, Parameters, PolygonMode, ProvokingVertex} from '@luma.gl/core';
-import {GL} from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl/constants';
 import type {
   GLBlendEquation,
   GLBlendFunction,
@@ -13,7 +13,7 @@ import type {
   GLPolygonMode,
   GLProvokingVertex,
   GLStencilOp
-} from '@luma.gl/constants';
+} from '@luma.gl/webgl/constants';
 import {setGLParameters} from '../../context/parameters/unified-parameter-api';
 import {WebGLDevice} from '../webgl-device';
 
@@ -232,6 +232,10 @@ export function setDeviceParameters(device: Device, parameters: Parameters) {
     gl.depthFunc(convertCompareFunction('depthCompare', parameters.depthCompare));
   }
 
+  if (parameters.clearDepth !== undefined) {
+    gl.clearDepth(parameters.clearDepth);
+  }
+
   if (parameters.stencilWriteMask) {
     const mask = parameters.stencilWriteMask;
     gl.stencilMaskSeparate(GL.FRONT, mask);

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

@@ -4,7 +4,7 @@
 
 // SAMPLER FILTERS
 import {SamplerProps} from '@luma.gl/core';
-import {GL, GLSamplerParameters} from '@luma.gl/constants';
+import {GL, GLSamplerParameters} from '@luma.gl/webgl/constants';
 import {convertCompareFunction} from './device-parameters';
 
 /**

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {GL, GLDataType, GLPixelType} from '@luma.gl/constants';
+import {GL, GLDataType, GLPixelType} from '@luma.gl/webgl/constants';
 import {SignedDataType} from '@luma.gl/core';
 
 /** Get shadertypes data type from GL constants */
@@ -28,68 +28,3 @@ const GL_DATA_TYPE_MAP: Record<GLDataType | GLPixelType, SignedDataType> = {
   [GL.UNSIGNED_INT_24_8]: 'uint32',
   [GL.FLOAT_32_UNSIGNED_INT_24_8_REV]: 'uint32'
 };
-
-/** Get shader data type from GL constants *
-export function getPrimitiveTypeFromGL(type: GL): PrimitiveDataType {
-  switch (type) {
-    case GL.INT:
-      return 'i32';
-    case GL.UNSIGNED_INT:
-      return 'u32';
-    case GL.SHORT:
-      return 'i32';
-    case GL.UNSIGNED_SHORT:
-      return 'u32';
-    case GL.BYTE:
-      return 'i32';
-    case GL.UNSIGNED_BYTE:
-      return 'u32';
-    case GL.FLOAT:
-      return 'f32';
-    case GL.HALF_FLOAT:
-      return 'f16';
-    default:
-      throw new Error(String(type));
-  }
-}
-
-/** Get shader attribute type from GL constants *
-export function getShaderAttributeTypeFromGL(
-  type: GL,
-  components: 1 | 2 | 3 | 4
-): AttributeShaderType {
-  const dataType = getPrimitiveTypeFromGL(type);
-  switch (components) {
-    case 1:
-      return dataType;
-    case 2:
-      return `vec2<${dataType}>`;
-    case 3:
-      return `vec2<${dataType}>`;
-    case 4:
-      return `vec2<${dataType}>`;
-    default:
-      throw new Error(String(components));
-  }
-}
-*/
-
-/** GetGL constant from shader data type
-export function getGLFromShaderDataType(
-  type: PrimitiveDataType
-): GL.INT | GL.UNSIGNED_INT | GL.FLOAT | GL.HALF_FLOAT {
-  switch (type) {
-    // TODO
-    case 'i32':
-      return GL.INT;
-    case 'u32':
-      return GL.UNSIGNED_INT;
-    case 'f32':
-      return GL.FLOAT;
-    case 'f16':
-      return GL.HALF_FLOAT;
-    default:
-      throw new Error(String(type));
-  }
-}
-*/

package/src/adapter/converters/webgl-shadertypes.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {VariableShaderType, SignedDataType, VertexFormat, NormalizedDataType} from '@luma.gl/core';
-import {GL, GLUniformType, GLSamplerType, GLDataType} from '@luma.gl/constants';
+import {GL, GLUniformType, GLSamplerType, GLDataType} from '@luma.gl/webgl/constants';
 
 export type TextureBindingInfo = {
   viewDimension: '1d' | '2d' | '2d-array' | 'cube' | 'cube-array' | '3d';
@@ -15,14 +15,6 @@ export function convertDataTypeToGLDataType(normalizedType: NormalizedDataType):
   return NORMALIZED_SHADER_TYPE_TO_WEBGL[normalizedType];
 }
 
-/** Converts to a luma shadertype to a GL data type (GL.BYTE, GL.FLOAT32 etc)  */
-export function convertShaderVariableTypeToGLDataType(
-  normalizedType: VariableShaderType
-): GLDataType {
-  // @ts-ignore TODO
-  return NORMALIZED_SHADER_TYPE_TO_WEBGL[normalizedType];
-}
-
 /** Convert a WebGL "compisite type (e.g. GL.VEC3) into the corresponding luma shader uniform type */
 export function convertGLUniformTypeToShaderVariableType(
   glUniformType: GLUniformType

package/src/adapter/converters/webgl-texture-table.ts

@@ -9,7 +9,7 @@ import type {
   DeviceTextureFormatCapabilities
 } from '@luma.gl/core';
 import {textureFormatDecoder} from '@luma.gl/core';
-import {GL, GLPixelType, GLExtensions, GLTexelDataFormat} from '@luma.gl/constants';
+import {GL, GLPixelType, GLExtensions, GLTexelDataFormat} from '@luma.gl/webgl/constants';
 import {getWebGLExtension} from '../../context/helpers/webgl-extensions';
 import {getGLFromVertexType} from './webgl-vertex-formats';
 
@@ -312,26 +312,6 @@ export const WEBGL_TEXTURE_FORMATS: Record<TextureFormat, WebGLFormatInfo> = {
 
 // FUNCTIONS
 
-/** Checks if a texture format is supported */
-export function isWebGLTextureFormatCapabilitiesed(
-  gl: WebGL2RenderingContext,
-  format: TextureFormat,
-  extensions: GLExtensions
-): boolean {
-  const webglTextureInfo = WEBGL_TEXTURE_FORMATS[format];
-  // Check that we have a GL constant
-  if (!webglTextureInfo?.gl) {
-    return false;
-  }
-
-  // Check extensions
-  const extension = webglTextureInfo.x;
-  if (extension) {
-    return Boolean(getWebGLExtension(gl, extension, extensions));
-  }
-  return true;
-}
-
 /** Checks if a texture format is supported, renderable, filterable etc */
 export function getTextureFormatCapabilitiesWebGL(
   gl: WebGL2RenderingContext,

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {GL} from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl/constants';
 import {VertexFormat, NormalizedDataType} from '@luma.gl/core';
 
 type GLDataType =

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

@@ -6,7 +6,7 @@
 // Provides a function that enables simple checking of which WebGL features are
 
 import {DeviceFeature, DeviceFeatures} from '@luma.gl/core';
-import {GLExtensions} from '@luma.gl/constants';
+import {GLExtensions} from '@luma.gl/webgl/constants';
 import {getWebGLExtension} from '../../context/helpers/webgl-extensions';
 import {
   isTextureFeature,

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

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {DeviceInfo} from '@luma.gl/core';
-import {GL, GLExtensions} from '@luma.gl/constants';
+import {GL, GLExtensions} from '@luma.gl/webgl/constants';
 import {getWebGLExtension} from '../../context/helpers/webgl-extensions';
 
 /** @returns strings identifying the GPU vendor and driver. */

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

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {DeviceLimits} from '@luma.gl/core';
-import {GL} from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl/constants';
 
 // prettier-ignore
 export class WebGLDeviceLimits extends DeviceLimits {

package/src/adapter/helpers/format-utils.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {GL} from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl/constants';
 
 // Returns number of components in a specific readPixels WebGL format
 export function glFormatToComponents(format: GL): 0 | 1 | 2 | 3 | 4 {

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

@@ -10,9 +10,9 @@ import type {
   VaryingBinding,
   AttributeShaderType
 } from '@luma.gl/core';
-import {getVariableShaderTypeInfo, assertDefined} from '@luma.gl/core';
+import {getVariableShaderTypeInfo, assertDefined, log} from '@luma.gl/core';
 
-import {GL, GLUniformType} from '@luma.gl/constants';
+import {GL, GLUniformType} from '@luma.gl/webgl/constants';
 import {
   isGLSamplerType,
   getTextureBindingFromGLSamplerType,
@@ -274,6 +274,25 @@ function readUniformBlocks(
       }
     }
 
+    const uniformInstancePrefixes = new Set(
+      blockInfo.uniforms
+        .map(uniform => uniform.name.split('.')[0])
+        .filter((instanceName): instanceName is string => Boolean(instanceName))
+    );
+    const blockAlias = blockInfo.name.replace(/Uniforms$/, '');
+    if (
+      uniformInstancePrefixes.size === 1 &&
+      !uniformInstancePrefixes.has(blockInfo.name) &&
+      !uniformInstancePrefixes.has(blockAlias)
+    ) {
+      const [instanceName] = uniformInstancePrefixes;
+      log.warn(
+        `Uniform block "${blockInfo.name}" uses GLSL instance "${instanceName}". ` +
+          `luma.gl binds uniform buffers by block name ("${blockInfo.name}") and alias ("${blockAlias}"). ` +
+          'Prefer matching the instance name to one of those to avoid confusing silent mismatches.'
+      )();
+    }
+
     uniformBlocks.push(blockInfo);
   }
 

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

@@ -6,7 +6,7 @@
 
 // Uniforms
 import type {UniformValue} from '@luma.gl/core';
-import {GL, GLUniformType, GLSamplerType} from '@luma.gl/constants';
+import {GL, GLUniformType, GLSamplerType} from '@luma.gl/webgl/constants';
 
 /** Set a raw uniform (without type conversion and caching) */
 /* eslint-disable max-len */

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

@@ -5,7 +5,7 @@
 // @ts-nocheck This file will be deleted in upcoming refactor
 
 import type {Buffer, Texture, FramebufferProps} from '@luma.gl/core';
-import {Framebuffer, getTypedArrayConstructor, getDataType} from '@luma.gl/core';
+import {Framebuffer, dataTypeDecoder} from '@luma.gl/core';
 import {
   GL,
   GLTextureTarget,
@@ -13,7 +13,7 @@ import {
   GLTexelDataFormat,
   GLPixelType,
   GLDataType
-} from '@luma.gl/constants';
+} from '@luma.gl/webgl/constants';
 
 import {convertDataTypeToGLDataType} from '../converters/webgl-shadertypes';
 import {WEBGLFramebuffer} from '../resources/webgl-framebuffer';
@@ -232,7 +232,7 @@ export function readPixelsToArray(
   target = getPixelArray(target, sourceType, sourceFormat, sourceWidth, sourceHeight, sourceDepth);
 
   // Pixel array available, if necessary, deduce type from it.
-  const signedType = getDataType(target);
+  const signedType = dataTypeDecoder.getDataType(target);
   sourceType = sourceType || convertDataTypeToGLDataType(signedType);
 
   // Note: luma.gl overrides bindFramebuffer so that we can reliably restore the previous framebuffer (this is the only function for which we do that)
@@ -484,7 +484,7 @@ function getPixelArray(
   // Allocate pixel array if not already available, using supplied type
   glType ||= GL.UNSIGNED_BYTE;
   const shaderType = convertGLDataTypeToDataType(glType);
-  const ArrayType = getTypedArrayConstructor(shaderType);
+  const ArrayType = dataTypeDecoder.getTypedArrayConstructor(shaderType);
   const components = glFormatToComponents(glFormat);
   // TODO - check for composite type (components = 1).
   return new ArrayType(width * height * components) as Uint8Array | Uint16Array | Float32Array;

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {GL, GLPrimitiveTopology, GLPrimitive} from '@luma.gl/constants';
+import {GL, GLPrimitiveTopology, GLPrimitive} from '@luma.gl/webgl/constants';
 import {PrimitiveTopology} from '@luma.gl/core';
 
 // Counts the number of complete primitives given a number of vertices and a drawMode

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

@@ -4,7 +4,7 @@
 
 import type {BufferMapCallback, BufferProps} from '@luma.gl/core';
 import {Buffer} from '@luma.gl/core';
-import {GL} from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl/constants';
 import {WebGLDevice} from '../webgl-device';
 
 /** WebGL Buffer interface */

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

@@ -8,20 +8,20 @@ import {
   type CopyBufferToTextureOptions,
   type CopyTextureToBufferOptions,
   type CopyTextureToTextureOptions,
+  type TextureReadOptions,
   // type ClearTextureOptions,
-  // type TextureReadOptions
   CommandBuffer,
   Texture,
   Framebuffer,
   assertDefined
 } from '@luma.gl/core';
-import {GL, type GLTextureTarget, type GLTextureCubeMapTarget} from '@luma.gl/constants';
+import {GL, type GLTextureTarget, type GLTextureCubeMapTarget} from '@luma.gl/webgl/constants';
 
+import {getTextureFormatWebGL} from '../converters/webgl-texture-table';
 import {WebGLDevice} from '../webgl-device';
 import {WEBGLBuffer} from './webgl-buffer';
 import {WEBGLTexture} from './webgl-texture';
 import {WEBGLFramebuffer} from './webgl-framebuffer';
-import {getTextureFormatWebGL} from '../converters/webgl-texture-table';
 
 type CopyBufferToBufferCommand = {
   name: 'copy-buffer-to-buffer';
@@ -119,8 +119,8 @@ function _copyBufferToBuffer(device: WebGLDevice, options: CopyBufferToBufferOpt
  * Copies data from a Buffer object into a Texture object
  * NOTE: doesn't wait for copy to be complete
  */
-function _copyBufferToTexture(device: WebGLDevice, options: CopyBufferToTextureOptions): void {
-  throw new Error('Not implemented');
+function _copyBufferToTexture(_device: WebGLDevice, _options: CopyBufferToTextureOptions): void {
+  throw new Error('copyBufferToTexture is not supported in WebGL');
 }
 
 /**
@@ -129,45 +129,44 @@ function _copyBufferToTexture(device: WebGLDevice, options: CopyBufferToTextureO
  */
 function _copyTextureToBuffer(device: WebGLDevice, options: CopyTextureToBufferOptions): void {
   const {
-    /** Texture to copy to/from. */
     sourceTexture,
-    /**  Mip-map level of the texture to copy to/from. (Default 0) */
     mipLevel = 0,
-    /** Defines which aspects of the texture to copy to/from. */
     aspect = 'all',
-
-    /** Width to copy */
     width = options.sourceTexture.width,
-    /** Height to copy */
     height = options.sourceTexture.height,
-    depthOrArrayLayers = 0,
-    /** Defines the origin of the copy - the minimum corner of the texture sub-region to copy to/from. */
+    depthOrArrayLayers,
     origin = [0, 0, 0],
-
-    /** Destination buffer */
     destinationBuffer,
-    /** Offset, in bytes, from the beginning of the buffer to the start of the image data (default 0) */
     byteOffset = 0,
-    /**
-     * The stride, in bytes, between the beginning of each block row and the subsequent block row.
-     * Required if there are multiple block rows (i.e. the copy height or depth is more than one block).
-     */
     bytesPerRow,
-    /**
-     * Number of block rows per single image of the texture.
-     * rowsPerImage × bytesPerRow is the stride, in bytes, between the beginning of each image of data and the subsequent image.
-     * Required if there are multiple images (i.e. the copy depth is more than one).
-     */
     rowsPerImage
   } = options;
 
+  if (sourceTexture instanceof Texture) {
+    sourceTexture.readBuffer(
+      {
+        x: origin[0] ?? 0,
+        y: origin[1] ?? 0,
+        z: origin[2] ?? 0,
+        width,
+        height,
+        depthOrArrayLayers,
+        mipLevel,
+        aspect,
+        byteOffset
+      } as TextureReadOptions & {byteOffset?: number},
+      destinationBuffer
+    );
+    return;
+  }
+
   // TODO - Not possible to read just stencil or depth part in WebGL?
   if (aspect !== 'all') {
     throw new Error('aspect not supported in WebGL');
   }
 
   // TODO - mipLevels are set when attaching texture to framebuffer
-  if (mipLevel !== 0 || depthOrArrayLayers !== 0 || bytesPerRow || rowsPerImage) {
+  if (mipLevel !== 0 || depthOrArrayLayers !== undefined || bytesPerRow || rowsPerImage) {
     throw new Error('not implemented');
   }
 

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

@@ -83,14 +83,16 @@ export class WEBGLCommandEncoder extends CommandEncoder {
   override insertDebugMarker(markerLabel: string): void {}
 
   override resolveQuerySet(
-    querySet: QuerySet,
-    destination: Buffer,
-    options?: {
+    _querySet: QuerySet,
+    _destination: Buffer,
+    _options?: {
       firstQuery?: number;
       queryCount?: number;
       destinationOffset?: number;
     }
-  ): void {}
+  ): void {
+    throw new Error('resolveQuerySet is not supported in WebGL');
+  }
 
   writeTimestamp(querySet: QuerySet, queryIndex: number): void {
     const webglQuerySet = querySet as WEBGLQuerySet;

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

@@ -4,7 +4,7 @@
 
 import type {FramebufferProps} from '@luma.gl/core';
 import {Framebuffer} from '@luma.gl/core';
-import {GL} from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl/constants';
 import {WebGLDevice} from '../webgl-device';
 import {WEBGLTexture} from './webgl-texture';
 import {WEBGLTextureView} from './webgl-texture-view';
@@ -137,6 +137,17 @@ export class WEBGLFramebuffer extends Framebuffer {
 
     gl.bindTexture(texture.glTarget, null);
   }
+
+  /** Default framebuffer resize is managed by canvas size and should be a no-op. */
+  protected override resizeAttachments(width: number, height: number): void {
+    if (this.handle === null) {
+      this.width = width;
+      this.height = height;
+      return;
+    }
+
+    super.resizeAttachments(width, height);
+  }
 }
 
 // Helper functions