update transcoder to 78790b5, fix some bugs with KTX2 (ECT1S) mipmaps

[ci skip]

Author: likangning93

Source/Core/loadKTX2.js

@@ -21,6 +21,9 @@ var supportedTranscoderFormats;
 var transcoderModule;
 var transcoderPromise;
 
+var ImageInfo;
+var BasisLzEtc1sImageTranscoder;
+
 loadKTX2.setKTX2SupportedFormats = function (etc1, s3tc, pvrtc) {
   supportedTranscoderFormats = {
     etc1: etc1,
@@ -91,6 +94,11 @@ function loadKTX2(resourceOrUrlOrBuffer) {
     // eslint-disable-next-line new-cap
     MSC_TRANSCODER().then(function (basisModule) {
       transcoderModule = basisModule;
+      basisModule.initTranscoders();
+
+      ImageInfo = basisModule.ImageInfo;
+      BasisLzEtc1sImageTranscoder = basisModule.BasisLzEtc1sImageTranscoder;
+
       deferred.resolve();
     });
   }
@@ -297,10 +305,8 @@ function parseKTX2(data) {
     parseUncompressed(data, header, levelIndex, result);
   } else if (header.vkFormat === 0x0 && dfd.colorModel === colorModelETC1S) {
     // Compressed, initialize transcoder module
-    var BasisTranscoder = transcoderModule.BasisTranscoder;
-    BasisTranscoder.init();
-    var transcoder = new BasisTranscoder();
-    parseCompressed(
+    var transcoder = new BasisLzEtc1sImageTranscoder();
+    transcodeEtc1s(
       data,
       view,
       header,
@@ -375,7 +381,7 @@ function parseUncompressed(data, header, levelIndex, result) {
   }
 }
 
-function parseCompressed(
+function transcodeEtc1s(
   data,
   view,
   header,
@@ -411,8 +417,8 @@ function parseCompressed(
       alphaSliceByteOffset: view.getUint32((byteOffset += sizeOfUint32), true),
       alphaSliceByteLength: view.getUint32((byteOffset += sizeOfUint32), true),
     });
+    byteOffset += sizeOfUint32;
   }
-  byteOffset += sizeOfUint32;
 
   var hasAlphaSlices = imageDescs[0].alphaSliceByteLength > 0;
 
@@ -441,7 +447,7 @@ function parseCompressed(
   }
 
   var dataBuffer = defined(data.buffer) ? data.buffer : data;
-  var endpoints = new Uint8Array(dataBuffer, byteOffset, selectorsByteLength);
+  var endpoints = new Uint8Array(dataBuffer, byteOffset, endpointsByteLength);
   byteOffset += endpointsByteLength;
   var selectors = new Uint8Array(dataBuffer, byteOffset, selectorsByteLength);
   byteOffset += selectorsByteLength;
@@ -457,49 +463,42 @@ function parseCompressed(
   for (var i = 0; i < levelIndex.length; ++i) {
     var level = (result[i] = {});
     var levelInfo = levelIndex[i];
-    var imageInfo = imageDescs[i];
-
-    // BasisU blocks are 4x4: https://github.com/BinomialLLC/basis_universal/wiki/.basis-File-Format-and-ETC1S-Texture-Video-Specification
-    var blockWidth = 4;
-    var blockHeight = 4;
-
-    // NumBlocks formula: http://github.khronos.org/KTX-Specification/#_supercompression_global_data
-    var numBlocksX = Math.ceil(header.pixelWidth / blockWidth);
-    var numBlocksY = Math.max(1, Math.ceil(header.pixelHeight / blockHeight));
+    var imageDesc = imageDescs[i];
 
     for (var j = 0; j < header.faceCount; ++j) {
       var width = header.pixelWidth >> i;
       var height = header.pixelWidth >> i;
       var levelOffset = ktx2Offset + levelInfo.byteOffset;
 
-      var transcoded;
-      var rgbData = new Uint8Array(
+      var levelData = new Uint8Array(
         dataBuffer,
-        levelOffset + imageInfo.rgbSliceByteOffset,
-        imageInfo.rgbSliceByteLength
-      );
-      var alphaData = new Uint8Array(
-        dataBuffer,
-        levelOffset + imageInfo.alphaSliceByteOffset,
-        imageInfo.alphaSliceByteLength
+        levelOffset + imageDesc.rgbSliceByteOffset,
+        imageDesc.rgbSliceByteLength + imageDesc.alphaSliceByteLength
       );
 
-      transcoded = transcoder.transcodeImage(
-        imageInfo.imageFlags,
-        rgbData,
-        alphaData,
-        transcoderFormat,
-        i,
+      var imageInfo = new ImageInfo(
+        transcoderModule.TextureFormat.ETC1S,
         width,
         height,
-        numBlocksX,
-        numBlocksY,
-        isVideo,
-        false
+        i
+      );
+      imageInfo.flags = imageDesc.imageFlags;
+      imageInfo.rgbByteOffset = 0;
+      imageInfo.rgbByteLength = imageDesc.rgbSliceByteLength;
+      imageInfo.alphaByteOffset =
+        imageDesc.alphaSliceByteOffset > 0 ? imageDesc.rgbSliceByteLength : 0;
+      imageInfo.alphaByteLength = imageDesc.alphaSliceByteLength;
+
+      var transcoded = transcoder.transcodeImage(
+        transcoderFormat,
+        levelData,
+        imageInfo,
+        0,
+        isVideo
       );
 
       // Check Error Here
-      if (transcoded.error) {
+      if (transcoded.transcodedImage === undefined) {
         throw new RuntimeError("Error transcoding Image");
       }
 

Source/Scene/Model.js

@@ -1907,13 +1907,24 @@ function imageLoad(model, textureId) {
   return function (image) {
     var loadResources = model._loadResources;
     --loadResources.pendingTextureLoads;
+
+    // Images transcoded from KTX2 can contain multiple mip levels:
+    // https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_texture_basisu
+    var mipLevels;
+    if (Array.isArray(image)) {
+      // hightest detail mip should be level 0
+      mipLevels = image.slice(1, image.length);
+      image = image[0];
+    }
+
     loadResources.texturesToCreate.enqueue({
       id: textureId,
       image: image,
       bufferView: image.bufferView,
       width: image.width,
       height: image.height,
       internalFormat: image.internalFormat,
+      mipLevels: mipLevels,
     });
   };
 }
@@ -2875,6 +2886,7 @@ function createTexture(gltfTexture, model, context) {
       height: gltfTexture.height,
       pixelFormat: internalFormat,
       sampler: sampler,
+      mipLevels: gltfTexture.mipLevels,
     });
   } else if (defined(source)) {
     var npot =