@loaders.gl/textures 4.4.0-alpha.16 → 4.4.0-alpha.17

package/dist/basis-worker.js

@@ -22,7 +22,7 @@
         globalThis._loadersgl_.version = NPM_TAG;
         warningIssued = true;
       } else {
-        globalThis._loadersgl_.version = "4.4.0-alpha.16";
+        globalThis._loadersgl_.version = "4.4.0-alpha.17";
       }
     }
     return globalThis._loadersgl_.version;
@@ -372,7 +372,7 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION2 = true ? "4.4.0-alpha.16" : "latest";
+  var VERSION2 = true ? "4.4.0-alpha.17" : "latest";
 
   // src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
@@ -452,104 +452,117 @@
   }
 
   // src/lib/gl-extensions.ts
-  var GL_EXTENSIONS_CONSTANTS = {
-    // WEBGL_compressed_texture_s3tc
-    COMPRESSED_RGB_S3TC_DXT1_EXT: 33776,
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: 33777,
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: 33778,
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: 33779,
-    // WEBGL_compressed_texture_es3
-    COMPRESSED_R11_EAC: 37488,
-    COMPRESSED_SIGNED_R11_EAC: 37489,
-    COMPRESSED_RG11_EAC: 37490,
-    COMPRESSED_SIGNED_RG11_EAC: 37491,
-    COMPRESSED_RGB8_ETC2: 37492,
-    COMPRESSED_RGBA8_ETC2_EAC: 37493,
-    COMPRESSED_SRGB8_ETC2: 37494,
-    COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: 37495,
-    COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2: 37496,
-    COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2: 37497,
-    // WEBGL_compressed_texture_pvrtc
-    COMPRESSED_RGB_PVRTC_4BPPV1_IMG: 35840,
-    COMPRESSED_RGBA_PVRTC_4BPPV1_IMG: 35842,
-    COMPRESSED_RGB_PVRTC_2BPPV1_IMG: 35841,
-    COMPRESSED_RGBA_PVRTC_2BPPV1_IMG: 35843,
-    // WEBGL_compressed_texture_etc1
-    COMPRESSED_RGB_ETC1_WEBGL: 36196,
-    // WEBGL_compressed_texture_atc
-    COMPRESSED_RGB_ATC_WEBGL: 35986,
-    COMPRESSED_RGBA_ATC_EXPLICIT_ALPHA_WEBGL: 35987,
-    COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL: 34798,
-    // WEBGL_compressed_texture_astc
-    COMPRESSED_RGBA_ASTC_4X4_KHR: 37808,
-    COMPRESSED_RGBA_ASTC_5X4_KHR: 37809,
-    COMPRESSED_RGBA_ASTC_5X5_KHR: 37810,
-    COMPRESSED_RGBA_ASTC_6X5_KHR: 37811,
-    COMPRESSED_RGBA_ASTC_6X6_KHR: 37812,
-    COMPRESSED_RGBA_ASTC_8X5_KHR: 37813,
-    COMPRESSED_RGBA_ASTC_8X6_KHR: 37814,
-    COMPRESSED_RGBA_ASTC_8X8_KHR: 37815,
-    COMPRESSED_RGBA_ASTC_10X5_KHR: 37816,
-    COMPRESSED_RGBA_ASTC_10X6_KHR: 37817,
-    COMPRESSED_RGBA_ASTC_10X8_KHR: 37818,
-    COMPRESSED_RGBA_ASTC_10X10_KHR: 37819,
-    COMPRESSED_RGBA_ASTC_12X10_KHR: 37820,
-    COMPRESSED_RGBA_ASTC_12X12_KHR: 37821,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_4X4_KHR: 37840,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_5X4_KHR: 37841,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_5X5_KHR: 37842,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_6X5_KHR: 37843,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_6X6_KHR: 37844,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_8X5_KHR: 37845,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_8X6_KHR: 37846,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_8X8_KHR: 37847,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_10X5_KHR: 37848,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_10X6_KHR: 37849,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_10X8_KHR: 37850,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_10X10_KHR: 37851,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_12X10_KHR: 37852,
-    COMPRESSED_SRGB8_ALPHA8_ASTC_12X12_KHR: 37853,
-    // EXT_texture_compression_rgtc
-    COMPRESSED_RED_RGTC1_EXT: 36283,
-    COMPRESSED_SIGNED_RED_RGTC1_EXT: 36284,
-    COMPRESSED_RED_GREEN_RGTC2_EXT: 36285,
-    COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT: 36286,
-    // WEBGL_compressed_texture_s3tc_srgb
-    COMPRESSED_SRGB_S3TC_DXT1_EXT: 35916,
-    COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: 35917,
-    COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: 35918,
-    COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: 35919
-  };
+  var GL_RGBA4 = 32854;
+  var GL_RGBA8 = 32856;
+  var GL_RGB565 = 36194;
+  var GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 33776;
+  var GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 33779;
+  var GL_COMPRESSED_RGBA8_ETC2_EAC = 37493;
+  var GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG = 35840;
+  var GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG = 35842;
+  var GL_COMPRESSED_RGB_ETC1_WEBGL = 36196;
+  var GL_COMPRESSED_RGB_ATC_WEBGL = 35986;
+  var GL_COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL = 34798;
+  var GL_COMPRESSED_RGBA_ASTC_4x4_KHR = 37808;
+  var GL_COMPRESSED_RED_RGTC1_EXT = 36283;
+  var GL_COMPRESSED_RED_GREEN_RGTC2_EXT = 36285;
+  var GL_COMPRESSED_RGBA_BPTC_UNORM_EXT = 36492;
 
-  // src/lib/utils/texture-formats.ts
+  // src/lib/utils/detect-supported-texture-formats.ts
   var BROWSER_PREFIXES = ["", "WEBKIT_", "MOZ_"];
-  var WEBGL_EXTENSIONS = {
+  var WEBGL_TEXTURE_FORMATS = {
     /* eslint-disable camelcase */
-    WEBGL_compressed_texture_s3tc: "dxt",
-    WEBGL_compressed_texture_s3tc_srgb: "dxt-srgb",
-    WEBGL_compressed_texture_etc1: "etc1",
-    WEBGL_compressed_texture_etc: "etc2",
-    WEBGL_compressed_texture_pvrtc: "pvrtc",
-    WEBGL_compressed_texture_atc: "atc",
-    WEBGL_compressed_texture_astc: "astc",
-    EXT_texture_compression_rgtc: "rgtc"
+    WEBGL_compressed_texture_s3tc: [
+      "bc1-rgb-unorm-webgl",
+      "bc1-rgba-unorm",
+      "bc2-rgba-unorm",
+      "bc3-rgba-unorm"
+    ],
+    WEBGL_compressed_texture_s3tc_srgb: [
+      "bc1-rgb-unorm-srgb-webgl",
+      "bc1-rgba-unorm-srgb",
+      "bc2-rgba-unorm-srgb",
+      "bc3-rgba-unorm-srgb"
+    ],
+    EXT_texture_compression_rgtc: ["bc4-r-unorm", "bc4-r-snorm", "bc5-rg-unorm", "bc5-rg-snorm"],
+    EXT_texture_compression_bptc: [
+      "bc6h-rgb-ufloat",
+      "bc6h-rgb-float",
+      "bc7-rgba-unorm",
+      "bc7-rgba-unorm-srgb"
+    ],
+    WEBGL_compressed_texture_etc1: ["etc1-rbg-unorm-webgl"],
+    WEBGL_compressed_texture_etc: [
+      "etc2-rgb8unorm",
+      "etc2-rgb8unorm-srgb",
+      "etc2-rgb8a1unorm",
+      "etc2-rgb8a1unorm-srgb",
+      "etc2-rgba8unorm",
+      "etc2-rgba8unorm-srgb",
+      "eac-r11unorm",
+      "eac-r11snorm",
+      "eac-rg11unorm",
+      "eac-rg11snorm"
+    ],
+    WEBGL_compressed_texture_pvrtc: [
+      "pvrtc-rgb4unorm-webgl",
+      "pvrtc-rgba4unorm-webgl",
+      "pvrtc-rbg2unorm-webgl",
+      "pvrtc-rgba2unorm-webgl"
+    ],
+    WEBGL_compressed_texture_atc: [
+      "atc-rgb-unorm-webgl",
+      "atc-rgba-unorm-webgl",
+      "atc-rgbai-unorm-webgl"
+    ],
+    WEBGL_compressed_texture_astc: [
+      "astc-4x4-unorm",
+      "astc-4x4-unorm-srgb",
+      "astc-5x4-unorm",
+      "astc-5x4-unorm-srgb",
+      "astc-5x5-unorm",
+      "astc-5x5-unorm-srgb",
+      "astc-6x5-unorm",
+      "astc-6x5-unorm-srgb",
+      "astc-6x6-unorm",
+      "astc-6x6-unorm-srgb",
+      "astc-8x5-unorm",
+      "astc-8x5-unorm-srgb",
+      "astc-8x6-unorm",
+      "astc-8x6-unorm-srgb",
+      "astc-8x8-unorm",
+      "astc-8x8-unorm-srgb",
+      "astc-10x5-unorm",
+      "astc-10x5-unorm-srgb",
+      "astc-10x6-unorm",
+      "astc-10x6-unorm-srgb",
+      "astc-10x8-unorm",
+      "astc-10x8-unorm-srgb",
+      "astc-10x10-unorm",
+      "astc-10x10-unorm-srgb",
+      "astc-12x10-unorm",
+      "astc-12x10-unorm-srgb",
+      "astc-12x12-unorm",
+      "astc-12x12-unorm-srgb"
+    ]
     /* eslint-enable camelcase */
   };
-  var formats = null;
-  function getSupportedGPUTextureFormats(gl) {
-    if (!formats) {
+  var textureFormats = null;
+  function detectSupportedTextureFormats(gl) {
+    if (!textureFormats) {
       gl = gl || getWebGLContext() || void 0;
-      formats = /* @__PURE__ */ new Set();
+      textureFormats = /* @__PURE__ */ new Set();
       for (const prefix of BROWSER_PREFIXES) {
-        for (const extension in WEBGL_EXTENSIONS) {
+        for (const extension in WEBGL_TEXTURE_FORMATS) {
           if (gl && gl.getExtension(`${prefix}${extension}`)) {
-            const gpuTextureFormat = WEBGL_EXTENSIONS[extension];
-            formats.add(gpuTextureFormat);
+            for (const textureFormat of WEBGL_TEXTURE_FORMATS[extension]) {
+              textureFormats.add(textureFormat);
+            }
           }
         }
       }
     }
-    return formats;
+    return textureFormats;
   }
   function getWebGLContext() {
     try {
@@ -594,49 +607,113 @@
   }
 
   // src/lib/parsers/parse-basis.ts
-  var OutputFormat = {
+  var BASIS_FORMAT_TO_OUTPUT_OPTIONS = {
     etc1: {
       basisFormat: 0,
       compressed: true,
-      format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGB_ETC1_WEBGL
+      format: GL_COMPRESSED_RGB_ETC1_WEBGL,
+      textureFormat: "etc1-rbg-unorm-webgl"
+    },
+    etc2: {
+      basisFormat: 1,
+      compressed: true,
+      format: GL_COMPRESSED_RGBA8_ETC2_EAC,
+      textureFormat: "etc2-rgba8unorm"
     },
-    etc2: { basisFormat: 1, compressed: true },
     bc1: {
       basisFormat: 2,
       compressed: true,
-      format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGB_S3TC_DXT1_EXT
+      format: GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
+      textureFormat: "bc1-rgb-unorm-webgl"
     },
     bc3: {
       basisFormat: 3,
       compressed: true,
-      format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_S3TC_DXT5_EXT
+      format: GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,
+      textureFormat: "bc3-rgba-unorm"
+    },
+    bc4: {
+      basisFormat: 4,
+      compressed: true,
+      format: GL_COMPRESSED_RED_RGTC1_EXT,
+      textureFormat: "bc4-r-unorm"
+    },
+    bc5: {
+      basisFormat: 5,
+      compressed: true,
+      format: GL_COMPRESSED_RED_GREEN_RGTC2_EXT,
+      textureFormat: "bc5-rg-unorm"
+    },
+    "bc7-m6-opaque-only": {
+      basisFormat: 6,
+      compressed: true,
+      format: GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
+      textureFormat: "bc7-rgba-unorm"
+    },
+    "bc7-m5": {
+      basisFormat: 7,
+      compressed: true,
+      format: GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
+      textureFormat: "bc7-rgba-unorm"
     },
-    bc4: { basisFormat: 4, compressed: true },
-    bc5: { basisFormat: 5, compressed: true },
-    "bc7-m6-opaque-only": { basisFormat: 6, compressed: true },
-    "bc7-m5": { basisFormat: 7, compressed: true },
     "pvrtc1-4-rgb": {
       basisFormat: 8,
       compressed: true,
-      format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGB_PVRTC_4BPPV1_IMG
+      format: GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG,
+      textureFormat: "pvrtc-rgb4unorm-webgl"
     },
     "pvrtc1-4-rgba": {
       basisFormat: 9,
       compressed: true,
-      format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_PVRTC_4BPPV1_IMG
+      format: GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG,
+      textureFormat: "pvrtc-rgba4unorm-webgl"
     },
     "astc-4x4": {
       basisFormat: 10,
       compressed: true,
-      format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_ASTC_4X4_KHR
+      format: GL_COMPRESSED_RGBA_ASTC_4x4_KHR,
+      textureFormat: "astc-4x4-unorm"
+    },
+    "atc-rgb": {
+      basisFormat: 11,
+      compressed: true,
+      format: GL_COMPRESSED_RGB_ATC_WEBGL,
+      textureFormat: "atc-rgb-unorm-webgl"
+    },
+    "atc-rgba-interpolated-alpha": {
+      basisFormat: 12,
+      compressed: true,
+      format: GL_COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL,
+      textureFormat: "atc-rgbai-unorm-webgl"
     },
-    "atc-rgb": { basisFormat: 11, compressed: true },
-    "atc-rgba-interpolated-alpha": { basisFormat: 12, compressed: true },
-    rgba32: { basisFormat: 13, compressed: false },
-    rgb565: { basisFormat: 14, compressed: false },
-    bgr565: { basisFormat: 15, compressed: false },
-    rgba4444: { basisFormat: 16, compressed: false }
+    rgba32: {
+      basisFormat: 13,
+      compressed: false,
+      format: GL_RGBA8,
+      textureFormat: "rgba8unorm"
+    },
+    rgb565: {
+      basisFormat: 14,
+      compressed: false,
+      format: GL_RGB565,
+      textureFormat: "rgb565unorm-webgl"
+    },
+    bgr565: {
+      basisFormat: 15,
+      compressed: false,
+      format: GL_RGB565,
+      textureFormat: "rgb565unorm-webgl"
+    },
+    rgba4444: {
+      basisFormat: 16,
+      compressed: false,
+      format: GL_RGBA4,
+      textureFormat: "rgba4unorm-webgl"
+    }
   };
+  var BASIS_FORMATS = Object.freeze(
+    Object.keys(BASIS_FORMAT_TO_OUTPUT_OPTIONS)
+  );
   async function parseBasis(data, options = {}) {
     if (!options.basis?.containerFormat || options.basis.containerFormat === "auto") {
       if (isKTX(data)) {
@@ -690,7 +767,7 @@
     const hasAlpha = basisFile.getHasAlpha(
       /* imageIndex, levelIndex */
     );
-    const { compressed, format, basisFormat } = getBasisOptions(options, hasAlpha);
+    const { compressed, format, basisFormat, textureFormat } = getBasisOptions(options, hasAlpha);
     const decodedSize = basisFile.getImageTranscodedSizeInBytes(imageIndex, levelIndex, basisFormat);
     const decodedData = new Uint8Array(decodedSize);
     if (!basisFile.transcodeImage(decodedData, imageIndex, levelIndex, basisFormat, 0, 0)) {
@@ -698,11 +775,13 @@
     }
     return {
       // standard loaders.gl image category payload
+      shape: "texture-level",
       width,
       height,
       data: decodedData,
       compressed,
-      format,
+      ...format !== void 0 ? { format } : {},
+      ...textureFormat !== void 0 ? { textureFormat } : {},
       // Additional fields
       // Add levelSize field.
       hasAlpha
@@ -727,7 +806,7 @@
   }
   function transcodeKTX2Image(ktx2File, levelIndex, options) {
     const { alphaFlag, height, width } = ktx2File.getImageLevelInfo(levelIndex, 0, 0);
-    const { compressed, format, basisFormat } = getBasisOptions(options, alphaFlag);
+    const { compressed, format, basisFormat, textureFormat } = getBasisOptions(options, alphaFlag);
     const decodedSize = ktx2File.getImageTranscodedSizeInBytes(
       levelIndex,
       0,
@@ -750,48 +829,98 @@
     }
     return {
       // standard loaders.gl image category payload
+      shape: "texture-level",
       width,
       height,
       data: decodedData,
       compressed,
+      ...format !== void 0 ? { format } : {},
+      ...textureFormat !== void 0 ? { textureFormat } : {},
       // Additional fields
       levelSize: decodedSize,
-      hasAlpha: alphaFlag,
-      format
+      hasAlpha: alphaFlag
     };
   }
   function getBasisOptions(options, hasAlpha) {
-    let format = options.basis?.format;
+    let format = options.basis?.format || "auto";
     if (format === "auto") {
-      format = selectSupportedBasisFormat();
+      format = options.basis?.supportedTextureFormats ? selectSupportedBasisFormat(options.basis.supportedTextureFormats) : selectSupportedBasisFormat();
     }
     if (typeof format === "object") {
       format = hasAlpha ? format.alpha : format.noAlpha;
     }
-    format = format.toLowerCase();
-    return OutputFormat[format];
+    const normalizedFormat = format.toLowerCase();
+    const basisOutputOptions = BASIS_FORMAT_TO_OUTPUT_OPTIONS[normalizedFormat];
+    if (!basisOutputOptions) {
+      throw new Error(`Unknown Basis format ${format}`);
+    }
+    return basisOutputOptions;
   }
-  function selectSupportedBasisFormat() {
-    const supportedFormats = getSupportedGPUTextureFormats();
-    if (supportedFormats.has("astc")) {
+  function selectSupportedBasisFormat(supportedTextureFormats = detectSupportedTextureFormats()) {
+    const textureFormats2 = new Set(supportedTextureFormats);
+    if (hasSupportedTextureFormat(textureFormats2, ["astc-4x4-unorm", "astc-4x4-unorm-srgb"])) {
       return "astc-4x4";
-    } else if (supportedFormats.has("dxt")) {
+    } else if (hasSupportedTextureFormat(textureFormats2, ["bc7-rgba-unorm", "bc7-rgba-unorm-srgb"])) {
+      return {
+        alpha: "bc7-m5",
+        noAlpha: "bc7-m6-opaque-only"
+      };
+    } else if (hasSupportedTextureFormat(textureFormats2, [
+      "bc1-rgb-unorm-webgl",
+      "bc1-rgb-unorm-srgb-webgl",
+      "bc1-rgba-unorm",
+      "bc1-rgba-unorm-srgb",
+      "bc2-rgba-unorm",
+      "bc2-rgba-unorm-srgb",
+      "bc3-rgba-unorm",
+      "bc3-rgba-unorm-srgb"
+    ])) {
       return {
         alpha: "bc3",
         noAlpha: "bc1"
       };
-    } else if (supportedFormats.has("pvrtc")) {
+    } else if (hasSupportedTextureFormat(textureFormats2, [
+      "pvrtc-rgb4unorm-webgl",
+      "pvrtc-rgba4unorm-webgl",
+      "pvrtc-rbg2unorm-webgl",
+      "pvrtc-rgba2unorm-webgl"
+    ])) {
       return {
         alpha: "pvrtc1-4-rgba",
         noAlpha: "pvrtc1-4-rgb"
       };
-    } else if (supportedFormats.has("etc1")) {
-      return "etc1";
-    } else if (supportedFormats.has("etc2")) {
+    } else if (hasSupportedTextureFormat(textureFormats2, [
+      "etc2-rgb8unorm",
+      "etc2-rgb8unorm-srgb",
+      "etc2-rgb8a1unorm",
+      "etc2-rgb8a1unorm-srgb",
+      "etc2-rgba8unorm",
+      "etc2-rgba8unorm-srgb",
+      "eac-r11unorm",
+      "eac-r11snorm",
+      "eac-rg11unorm",
+      "eac-rg11snorm"
+    ])) {
       return "etc2";
+    } else if (textureFormats2.has("etc1-rbg-unorm-webgl")) {
+      return "etc1";
+    } else if (hasSupportedTextureFormat(textureFormats2, [
+      "atc-rgb-unorm-webgl",
+      "atc-rgba-unorm-webgl",
+      "atc-rgbai-unorm-webgl"
+    ])) {
+      return {
+        alpha: "atc-rgba-interpolated-alpha",
+        noAlpha: "atc-rgb"
+      };
     }
     return "rgb565";
   }
+  function hasSupportedTextureFormat(supportedTextureFormats, candidateTextureFormats) {
+    return candidateTextureFormats.some(
+      (textureFormat) => supportedTextureFormats.has(textureFormat)
+    );
+  }
 
   // src/basis-loader.ts
   var BasisWorkerLoader = {