@luma.gl/webgl 9.1.9 → 9.2.0-alpha.2

package/dist/adapter/converters/device-parameters.js

@@ -304,23 +304,28 @@ function convertBlendOperationToEquation(parameter, value) {
         max: 32776
     });
 }
-function convertBlendFactorToFunction(parameter, value) {
+function convertBlendFactorToFunction(parameter, value, type = 'color') {
     return map(parameter, value, {
         one: 1,
         zero: 0,
-        'src-color': 768,
-        'one-minus-src-color': 769,
-        'dst-color': 774,
-        'one-minus-dst-color': 775,
+        src: 768,
+        'one-minus-src': 769,
+        dst: 774,
+        'one-minus-dst': 775,
         'src-alpha': 770,
         'one-minus-src-alpha': 771,
         'dst-alpha': 772,
         'one-minus-dst-alpha': 773,
         'src-alpha-saturated': 776,
-        'constant-color': 32769,
-        'one-minus-constant-color': 32770,
-        'constant-alpha': 32771,
-        'one-minus-constant-alpha': 32772
+        constant: type === 'color' ? 32769 : 32771,
+        'one-minus-constant': type === 'color' ? 32770 : 32772,
+        // 'constant-alpha': GL.CONSTANT_ALPHA,
+        // 'one-minus-constant-alpha': GL.ONE_MINUS_CONSTANT_ALPHA,
+        // TODO not supported in WebGL2
+        src1: 768,
+        'one-minus-src1': 769,
+        'src1-alpha': 770,
+        'one-minus-src1-alpha': 771
     });
 }
 function message(parameter, value) {

package/dist/adapter/converters/device-parameters.js.map

@@ -1 +1 @@
-{"version":3,"file":"device-parameters.js","sourceRoot":"","sources":["../../../src/adapter/converters/device-parameters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"device-parameters.js","sourceRoot":"","sources":["../../../src/adapter/converters/device-parameters.ts"],"names":[],"mappings":"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"}

package/dist/adapter/converters/sampler-parameters.js

@@ -77,9 +77,20 @@ function convertMinFilterMode(minFilter, mipmapFilter = 'none') {
         case 'none':
             return convertMaxFilterMode(minFilter);
         case 'nearest':
-            return minFilter === 'nearest' ? 9984 : 9986;
+            switch (minFilter) {
+                case 'nearest':
+                    return 9984;
+                case 'linear':
+                    return 9985;
+            }
+            break;
         case 'linear':
-            return minFilter === 'nearest' ? 9985 : 9987;
+            switch (minFilter) {
+                case 'nearest':
+                    return 9986;
+                case 'linear':
+                    return 9987;
+            }
     }
 }
 //# sourceMappingURL=sampler-parameters.js.map

package/dist/adapter/converters/sampler-parameters.js.map

@@ -1 +1 @@
-{"version":3,"file":"sampler-parameters.js","sourceRoot":"","sources":["../../../src/adapter/converters/sampler-parameters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sampler-parameters.js","sourceRoot":"","sources":["../../../src/adapter/converters/sampler-parameters.ts"],"names":[],"mappings":"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"}

package/dist/adapter/converters/shader-formats.d.ts

@@ -1,9 +1,68 @@
-import { GL } from '@luma.gl/constants';
-import { ShaderAttributeType, ShaderDataType } from '@luma.gl/core';
-/** Get shader attribute type from GL constants */
-export declare function getShaderAttributeTypeFromGL(type: GL, components: 1 | 2 | 3 | 4): ShaderAttributeType;
-/** Get shader data type from GL constants */
-export declare function getShaderDataTypeFromGL(type: GL): ShaderDataType;
-/** GetGL constant from shader data type */
-export declare function getGLFromShaderDataType(type: ShaderDataType): GL.INT | GL.UNSIGNED_INT | GL.FLOAT | GL.HALF_FLOAT;
+import { GLDataType, GLPixelType } from '@luma.gl/constants';
+import { SignedDataType } from '@luma.gl/core';
+/** Get shadertypes data type from GL constants */
+export declare function convertGLDataTypeToDataType(type: GLDataType | GLPixelType): SignedDataType;
+/** 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));
+  }
+}
+*/
 //# sourceMappingURL=shader-formats.d.ts.map

package/dist/adapter/converters/shader-formats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-formats.d.ts","sourceRoot":"","sources":["../../../src/adapter/converters/shader-formats.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAC,mBAAmB,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAElE,kDAAkD;AAClD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,EAAE,EACR,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GACxB,mBAAmB,CAcrB;AAED,6CAA6C;AAC7C,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,EAAE,GAAG,cAAc,CAqBhE;AAED,2CAA2C;AAC3C,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,cAAc,GACnB,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,UAAU,CAcrD"}
+{"version":3,"file":"shader-formats.d.ts","sourceRoot":"","sources":["../../../src/adapter/converters/shader-formats.ts"],"names":[],"mappings":"AAIA,OAAO,EAAK,UAAU,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAE7C,kDAAkD;AAClD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,UAAU,GAAG,WAAW,GAAG,cAAc,CAE1F;AAqBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2CE;AAEF;;;;;;;;;;;;;;;;;;EAkBE"}

package/dist/adapter/converters/shader-formats.js

@@ -2,59 +2,89 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { GL } from '@luma.gl/constants';
-/** Get shader attribute type from GL constants */
-export function getShaderAttributeTypeFromGL(type, components) {
-    const dataType = getShaderDataTypeFromGL(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));
-    }
+/** Get shadertypes data type from GL constants */
+export function convertGLDataTypeToDataType(type) {
+    return GL_DATA_TYPE_MAP[type];
 }
-/** Get shader data type from GL constants */
-export function getShaderDataTypeFromGL(type) {
-    switch (type) {
-        case 5124:
-            return 'i32';
-        case 5125:
-            return 'u32';
-        case 5122:
-            return 'i32';
-        case 5123:
-            return 'u32';
-        case 5120:
-            return 'i32';
-        case 5121:
-            return 'u32';
-        case 5126:
-            return 'f32';
-        case 5131:
-            return 'f16';
-        default:
-            throw new Error(String(type));
-    }
+const GL_DATA_TYPE_MAP = {
+    [5124]: 'sint32',
+    [5125]: 'uint32',
+    [5122]: 'sint16',
+    [5123]: 'uint16',
+    [5120]: 'sint8',
+    [5121]: 'uint8',
+    [5126]: 'float32',
+    [5131]: 'float16',
+    [33635]: 'uint16',
+    [32819]: 'uint16',
+    [32820]: 'uint16',
+    [33640]: 'uint32',
+    [35899]: 'uint32',
+    [35902]: 'uint32',
+    [34042]: 'uint32',
+    [36269]: '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));
+  }
 }
-/** GetGL constant from shader data type */
-export function getGLFromShaderDataType(type) {
-    switch (type) {
-        // TODO
-        case 'i32':
-            return 5124;
-        case 'u32':
-            return 5125;
-        case 'f32':
-            return 5126;
-        case 'f16':
-            return 5131;
-        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));
+  }
+}
+*/
 //# sourceMappingURL=shader-formats.js.map

package/dist/adapter/converters/shader-formats.js.map

@@ -1 +1 @@
-{"version":3,"file":"shader-formats.js","sourceRoot":"","sources":["../../../src/adapter/converters/shader-formats.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAGtC,kDAAkD;AAClD,MAAM,UAAU,4BAA4B,CAC1C,IAAQ,EACR,UAAyB;IAEzB,MAAM,QAAQ,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC/C,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,CAAC;YACJ,OAAO,QAAQ,CAAC;QAClB,KAAK,CAAC;YACJ,OAAO,QAAQ,QAAQ,GAAG,CAAC;QAC7B,KAAK,CAAC;YACJ,OAAO,QAAQ,QAAQ,GAAG,CAAC;QAC7B,KAAK,CAAC;YACJ,OAAO,QAAQ,QAAQ,GAAG,CAAC;QAC7B;YACE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,uBAAuB,CAAC,IAAQ;IAC9C,QAAQ,IAAI,EAAE,CAAC;QACb;YACE,OAAO,KAAK,CAAC;QACf;YACE,OAAO,KAAK,CAAC;QACf;YACE,OAAO,KAAK,CAAC;QACf;YACE,OAAO,KAAK,CAAC;QACf;YACE,OAAO,KAAK,CAAC;QACf;YACE,OAAO,KAAK,CAAC;QACf;YACE,OAAO,KAAK,CAAC;QACf;YACE,OAAO,KAAK,CAAC;QACf;YACE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED,2CAA2C;AAC3C,MAAM,UAAU,uBAAuB,CACrC,IAAoB;IAEpB,QAAQ,IAAI,EAAE,CAAC;QACb,OAAO;QACP,KAAK,KAAK;YACR,YAAc;QAChB,KAAK,KAAK;YACR,YAAuB;QACzB,KAAK,KAAK;YACR,YAAgB;QAClB,KAAK,KAAK;YACR,YAAqB;QACvB;YACE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;AACH,CAAC"}
+{"version":3,"file":"shader-formats.js","sourceRoot":"","sources":["../../../src/adapter/converters/shader-formats.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,EAAE,EAA0B,MAAM,oBAAoB,CAAC;AAG/D,kDAAkD;AAClD,MAAM,UAAU,2BAA2B,CAAC,IAA8B;IACxE,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,gBAAgB,GAAqD;IACzE,MAAQ,EAAE,QAAQ;IAClB,MAAiB,EAAE,QAAQ;IAC3B,MAAU,EAAE,QAAQ;IACpB,MAAmB,EAAE,QAAQ;IAC7B,MAAS,EAAE,OAAO;IAClB,MAAkB,EAAE,OAAO;IAC3B,MAAU,EAAE,SAAS;IACrB,MAAe,EAAE,SAAS;IAC1B,OAAyB,EAAE,QAAQ;IACnC,OAA2B,EAAE,QAAQ;IACrC,OAA2B,EAAE,QAAQ;IACrC,OAAgC,EAAE,QAAQ;IAC1C,OAAiC,EAAE,QAAQ;IAC3C,OAA6B,EAAE,QAAQ;IACvC,OAAsB,EAAE,QAAQ;IAChC,OAAmC,EAAE,QAAQ;CAC9C,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2CE;AAEF;;;;;;;;;;;;;;;;;;EAkBE"}

package/dist/adapter/converters/webgl-shadertypes.d.ts

@@ -0,0 +1,20 @@
+import { VariableShaderType, VertexFormat, NormalizedDataType } from '@luma.gl/core';
+import { GLUniformType, GLSamplerType, GLDataType } from '@luma.gl/constants';
+export type TextureBindingInfo = {
+    viewDimension: '1d' | '2d' | '2d-array' | 'cube' | 'cube-array' | '3d';
+    sampleType: 'float' | 'unfilterable-float' | 'depth' | 'sint' | 'uint';
+};
+/** Converts to a luma shadertype to a GL data type (GL.BYTE, GL.FLOAT32 etc)  */
+export declare function convertDataTypeToGLDataType(normalizedType: NormalizedDataType): GLDataType;
+/** Converts to a luma shadertype to a GL data type (GL.BYTE, GL.FLOAT32 etc)  */
+export declare function convertShaderVariableTypeToGLDataType(normalizedType: VariableShaderType): GLDataType;
+/** Convert a WebGL "compisite type (e.g. GL.VEC3) into the corresponding luma shader uniform type */
+export declare function convertGLUniformTypeToShaderVariableType(glUniformType: GLUniformType): VariableShaderType;
+/** Check if a WebGL "uniform:" is a texture binding */
+export declare function isGLSamplerType(type: GLUniformType | GLSamplerType): type is GLSamplerType;
+export declare function getTextureBindingFromGLSamplerType(glSamplerType: GLSamplerType): TextureBindingInfo;
+/** Get vertex format from GL constants */
+export declare function getVertexFormatFromGL(type: GLDataType, components: 1 | 2 | 3 | 4): VertexFormat;
+/** Get data type from GL constants */
+export declare function getVertexTypeFromGL(glType: GLDataType, normalized?: boolean): NormalizedDataType;
+//# sourceMappingURL=webgl-shadertypes.d.ts.map

package/dist/adapter/converters/webgl-shadertypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webgl-shadertypes.d.ts","sourceRoot":"","sources":["../../../src/adapter/converters/webgl-shadertypes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,kBAAkB,EAAkB,YAAY,EAAE,kBAAkB,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,EAAK,aAAa,EAAE,aAAa,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAEhF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,aAAa,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;IACvE,UAAU,EAAE,OAAO,GAAG,oBAAoB,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;CACxE,CAAC;AAEF,iFAAiF;AACjF,wBAAgB,2BAA2B,CAAC,cAAc,EAAE,kBAAkB,GAAG,UAAU,CAE1F;AAED,iFAAiF;AACjF,wBAAgB,qCAAqC,CACnD,cAAc,EAAE,kBAAkB,GACjC,UAAU,CAGZ;AAED,qGAAqG;AACrG,wBAAgB,wCAAwC,CACtD,aAAa,EAAE,aAAa,GAC3B,kBAAkB,CAEpB;AAED,uDAAuD;AACvD,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,GAAG,aAAa,GAAG,IAAI,IAAI,aAAa,CAG1F;AAGD,wBAAgB,kCAAkC,CAChD,aAAa,EAAE,aAAa,GAC3B,kBAAkB,CAEpB;AAED,0CAA0C;AAC1C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,YAAY,CAY/F;AAED,sCAAsC;AACtC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,UAAQ,GAAG,kBAAkB,CAG9F"}

package/dist/adapter/converters/webgl-shadertypes.js

@@ -0,0 +1,122 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { GL } from '@luma.gl/constants';
+/** Converts to a luma shadertype to a GL data type (GL.BYTE, GL.FLOAT32 etc)  */
+export function convertDataTypeToGLDataType(normalizedType) {
+    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) {
+    // @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) {
+    return WEBGL_SHADER_TYPES[glUniformType];
+}
+/** Check if a WebGL "uniform:" is a texture binding */
+export function isGLSamplerType(type) {
+    // @ts-ignore TODO
+    return Boolean(WEBGL_SAMPLER_TO_TEXTURE_BINDINGS[type]);
+}
+/* Get luma texture binding info (viewDimension and sampleType) from a WebGL "sampler" binding */
+export function getTextureBindingFromGLSamplerType(glSamplerType) {
+    return WEBGL_SAMPLER_TO_TEXTURE_BINDINGS[glSamplerType];
+}
+/** Get vertex format from GL constants */
+export function getVertexFormatFromGL(type, components) {
+    const base = getVertexTypeFromGL(type);
+    // prettier-ignore
+    switch (components) {
+        case 1: return base;
+        case 2: return `${base}x2`;
+        // @ts-expect-error - deal with lack of "unaligned" formats
+        case 3: return `${base}x3`;
+        case 4: return `${base}x4`;
+    }
+    // @ts-ignore unreachable
+    throw new Error(String(components));
+}
+/** Get data type from GL constants */
+export function getVertexTypeFromGL(glType, normalized = false) {
+    const index = normalized ? 1 : 0;
+    return WEBGL_TO_NORMALIZED_DATA_TYPE[glType][index];
+}
+// Composite types table
+// @ts-ignore TODO - fix the type confusion here
+const WEBGL_SHADER_TYPES = {
+    [5126]: 'f32',
+    [35664]: 'vec2<f32>',
+    [35665]: 'vec3<f32>',
+    [35666]: 'vec4<f32>',
+    [5124]: 'i32',
+    [35667]: 'vec2<i32>',
+    [35668]: 'vec3<i32>',
+    [35669]: 'vec4<i32>',
+    [5125]: 'u32',
+    [36294]: 'vec2<u32>',
+    [36295]: 'vec3<u32>',
+    [36296]: 'vec4<u32>',
+    [35670]: 'f32',
+    [35671]: 'vec2<f32>',
+    [35672]: 'vec3<f32>',
+    [35673]: 'vec4<f32>',
+    // TODO - are sizes/components below correct?
+    [35674]: 'mat2x2<f32>',
+    [35685]: 'mat2x3<f32>',
+    [35686]: 'mat2x4<f32>',
+    [35687]: 'mat3x2<f32>',
+    [35675]: 'mat3x3<f32>',
+    [35688]: 'mat3x4<f32>',
+    [35689]: 'mat4x2<f32>',
+    [35690]: 'mat4x3<f32>',
+    [35676]: 'mat4x4<f32>'
+};
+const WEBGL_SAMPLER_TO_TEXTURE_BINDINGS = {
+    [35678]: { viewDimension: '2d', sampleType: 'float' },
+    [35680]: { viewDimension: 'cube', sampleType: 'float' },
+    [35679]: { viewDimension: '3d', sampleType: 'float' },
+    [35682]: { viewDimension: '3d', sampleType: 'depth' },
+    [36289]: { viewDimension: '2d-array', sampleType: 'float' },
+    [36292]: { viewDimension: '2d-array', sampleType: 'depth' },
+    [36293]: { viewDimension: 'cube', sampleType: 'float' },
+    [36298]: { viewDimension: '2d', sampleType: 'sint' },
+    [36299]: { viewDimension: '3d', sampleType: 'sint' },
+    [36300]: { viewDimension: 'cube', sampleType: 'sint' },
+    [36303]: { viewDimension: '2d-array', sampleType: 'uint' },
+    [36306]: { viewDimension: '2d', sampleType: 'uint' },
+    [36307]: { viewDimension: '3d', sampleType: 'uint' },
+    [36308]: { viewDimension: 'cube', sampleType: 'uint' },
+    [36311]: { viewDimension: '2d-array', sampleType: 'uint' }
+};
+/** Map from WebGL normalized types to WebGL */
+const NORMALIZED_SHADER_TYPE_TO_WEBGL = {
+    uint8: 5121,
+    sint8: 5120,
+    unorm8: 5121,
+    snorm8: 5120,
+    uint16: 5123,
+    sint16: 5122,
+    unorm16: 5123,
+    snorm16: 5122,
+    uint32: 5125,
+    sint32: 5124,
+    // WebGPU does not support normalized 32 bit integer attributes
+    //  'unorm32': GL.UNSIGNED_INT,
+    //  'snorm32': GL.INT,
+    float16: 5131,
+    float32: 5126
+};
+/* Map from WebGL types to webgpu normalized types */
+const WEBGL_TO_NORMALIZED_DATA_TYPE = {
+    [5120]: ['sint8', 'snorm16'],
+    [5121]: ['uint8', 'unorm8'],
+    [5122]: ['sint16', 'unorm16'],
+    [5123]: ['uint16', 'unorm16'],
+    [5124]: ['sint32', 'sint32'],
+    [5125]: ['uint32', 'uint32'],
+    [5126]: ['float32', 'float32'],
+    [5131]: ['float16', 'float16']
+};
+//# sourceMappingURL=webgl-shadertypes.js.map

package/dist/adapter/converters/webgl-shadertypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webgl-shadertypes.js","sourceRoot":"","sources":["../../../src/adapter/converters/webgl-shadertypes.ts"],"names":[],"mappings":"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"}

package/dist/adapter/converters/webgl-texture-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webgl-texture-table.d.ts","sourceRoot":"","sources":["../../../src/adapter/converters/webgl-texture-table.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACb,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAyBpF,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAwBrE,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAEhE;AAED,wFAAwF;AACxF,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,sBAAsB,EAC1B,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,YAAY,GACvB,OAAO,CAGT;AAID,0CAA0C;AAC1C,KAAK,eAAe,GAAG;IACrB,EAAE,CAAC,EAAE,EAAE,CAAC;IACR,iBAAiB;IACjB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,0FAA0F;IAC1F,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,6DAA6D;IAC7D,EAAE,CAAC,EAAE,OAAO,CAAC;CACd,CAAC;AAIF;;;GAGG;AAEH,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,aAAa,EAAE,eAAe,CA0KxE,CAAC;AAIF,8CAA8C;AAC9C,wBAAgB,kCAAkC,CAChD,EAAE,EAAE,sBAAsB,EAC1B,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,YAAY,GACvB,OAAO,CAaT;AAED,0EAA0E;AAC1E,wBAAgB,iCAAiC,CAC/C,EAAE,EAAE,sBAAsB,EAC1B,aAAa,EAAE,yBAAyB,EACxC,UAAU,EAAE,YAAY,GACvB,+BAA+B,CA0BjC;AAED,2GAA2G;AAC3G,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG;IAC5D,cAAc,EAAE,EAAE,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB,CAeA;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,aAAa,GACpB,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,wBAAwB,CAY3E;AAED,uEAAuE;AACvE,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAG3E;AAID,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,GAAG,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,EAC9C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,EAAE,GACT,iBAAiB,CAcnB"}
+{"version":3,"file":"webgl-texture-table.d.ts","sourceRoot":"","sources":["../../../src/adapter/converters/webgl-texture-table.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACb,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAyBpF,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAwBrE,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAEhE;AAED,wFAAwF;AACxF,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,sBAAsB,EAC1B,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,YAAY,GACvB,OAAO,CAGT;AAID,0CAA0C;AAC1C,KAAK,eAAe,GAAG;IACrB,EAAE,CAAC,EAAE,EAAE,CAAC;IACR,iBAAiB;IACjB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,0FAA0F;IAC1F,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,6DAA6D;IAC7D,EAAE,CAAC,EAAE,OAAO,CAAC;CACd,CAAC;AAIF;;;GAGG;AAEH,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,aAAa,EAAE,eAAe,CA0KxE,CAAC;AAIF,8CAA8C;AAC9C,wBAAgB,kCAAkC,CAChD,EAAE,EAAE,sBAAsB,EAC1B,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,YAAY,GACvB,OAAO,CAaT;AAED,0EAA0E;AAC1E,wBAAgB,iCAAiC,CAC/C,EAAE,EAAE,sBAAsB,EAC1B,aAAa,EAAE,yBAAyB,EACxC,UAAU,EAAE,YAAY,GACvB,+BAA+B,CA0BjC;AAED,2GAA2G;AAC3G,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG;IAC5D,cAAc,EAAE,EAAE,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB,CAqBA;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,aAAa,GACpB,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,wBAAwB,CAY3E;AAED,uEAAuE;AACvE,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAG3E;AAID,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,GAAG,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,EAC9C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,EAAE,GACT,iBAAiB,CAcnB"}

package/dist/adapter/converters/webgl-texture-table.js

@@ -1,10 +1,10 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { decodeTextureFormat } from '@luma.gl/core';
+import { textureFormatDecoder } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
 import { getWebGLExtension } from "../../context/helpers/webgl-extensions.js";
-import { getGLFromVertexType } from "./vertex-formats.js";
+import { getGLFromVertexType } from "./webgl-vertex-formats.js";
 /* eslint-disable camelcase */
 // TEXTURE FEATURES
 // Define local webgl extension strings to optimize minification
@@ -72,8 +72,8 @@ export const WEBGL_TEXTURE_FORMATS = {
     'r16uint': { gl: 33332, rb: true },
     'r16sint': { gl: 33331, rb: true },
     'r16float': { gl: 33325, rb: true },
-    'r16unorm-webgl': { gl: 33322, rb: true },
-    'r16snorm-webgl': { gl: 36760 },
+    'r16unorm': { gl: 33322, rb: true },
+    'r16snorm': { gl: 36760 },
     // Packed 16-bit formats
     'rgba4unorm-webgl': { gl: 32854, rb: true },
     'rgb565unorm-webgl': { gl: 36194, rb: true },
@@ -81,7 +81,7 @@ export const WEBGL_TEXTURE_FORMATS = {
     // 24-bit formats
     'rgb8unorm-webgl': { gl: 32849 },
     'rgb8snorm-webgl': { gl: 36758 },
-    // 32-bit formats  
+    // 32-bit formats
     'rgba8unorm': { gl: 32856 },
     'rgba8unorm-srgb': { gl: 35907 },
     'rgba8snorm': { gl: 36759 },
@@ -93,8 +93,8 @@ export const WEBGL_TEXTURE_FORMATS = {
     'rg16uint': { gl: 33338 },
     'rg16sint': { gl: 33337 },
     'rg16float': { gl: 33327, rb: true },
-    'rg16unorm-webgl': { gl: 33324 },
-    'rg16snorm-webgl': { gl: 36761 },
+    'rg16unorm': { gl: 33324 },
+    'rg16snorm': { gl: 36761 },
     'r32uint': { gl: 33334, rb: true },
     'r32sint': { gl: 33333, rb: true },
     'r32float': { gl: 33326 },
@@ -102,7 +102,7 @@ export const WEBGL_TEXTURE_FORMATS = {
     'rgb9e5ufloat': { gl: 35901 }, // , filter: true},
     'rg11b10ufloat': { gl: 35898, rb: true },
     'rgb10a2unorm': { gl: 32857, rb: true },
-    'rgb10a2uint-webgl': { gl: 36975, rb: true },
+    'rgb10a2uint': { gl: 36975, rb: true },
     // 48-bit formats
     'rgb16unorm-webgl': { gl: 32852 }, // rgb not renderable
     'rgb16snorm-webgl': { gl: 36762 }, // rgb not renderable
@@ -113,8 +113,8 @@ export const WEBGL_TEXTURE_FORMATS = {
     'rgba16uint': { gl: 36214, rb: true },
     'rgba16sint': { gl: 36232, rb: true },
     'rgba16float': { gl: 34842 },
-    'rgba16unorm-webgl': { gl: 32859, rb: true },
-    'rgba16snorm-webgl': { gl: 36763 },
+    'rgba16unorm': { gl: 32859, rb: true },
+    'rgba16snorm': { gl: 36763 },
     // 96-bit formats (deprecated!)
     'rgb32float-webgl': { gl: 34837, x: EXT_color_buffer_float, dataFormat: 6407, types: [5126] },
     // 128-bit formats
@@ -244,7 +244,11 @@ export function getTextureFormatCapabilitiesWebGL(gl, formatSupport, extensions)
 export function getTextureFormatWebGL(format) {
     const formatData = WEBGL_TEXTURE_FORMATS[format];
     const webglFormat = convertTextureFormatToGL(format);
-    const decoded = decodeTextureFormat(format);
+    const decoded = textureFormatDecoder.getInfo(format);
+    if (decoded.compressed) {
+        // TODO: Unclear whether this is always valid, this may be why ETC2 RGBA8 fails.
+        formatData.dataFormat = webglFormat;
+    }
     return {
         internalFormat: webglFormat,
         format: formatData?.dataFormat ||
@@ -257,7 +261,7 @@ export function getTextureFormatWebGL(format) {
     };
 }
 export function getDepthStencilAttachmentWebGL(format) {
-    const formatInfo = decodeTextureFormat(format);
+    const formatInfo = textureFormatDecoder.getInfo(format);
     switch (formatInfo.attachment) {
         case 'depth':
             return 36096;
@@ -271,7 +275,7 @@ export function getDepthStencilAttachmentWebGL(format) {
 }
 /** TODO - VERY roundabout legacy way of calculating bytes per pixel */
 export function getTextureFormatBytesPerPixel(format) {
-    const formatInfo = decodeTextureFormat(format);
+    const formatInfo = textureFormatDecoder.getInfo(format);
     return formatInfo.bytesPerPixel;
 }
 // DATA TYPE HELPERS