2 files changed, 7 insertions, 6 deletions

diff --git a/tools/crunch-worker.js b/tools/crunch-worker.js
index 2af9a830..bc7eb95d 100644
--- a/tools/crunch-worker.js
+++ b/tools/crunch-worker.js
@@ -53,7 +53,7 @@
         dst.set(src.subarray(0, numBytes), dstByteOffset);
     }
 
-    function deCrunch(bytes) {
+    function deCrunch(bytes, filename) {
         var srcSize = bytes.length;
         var src = Module._malloc(srcSize),
             format, internalFormat, dst, dstSize,
@@ -64,7 +64,7 @@
         format = Module._crn_get_dxt_format(src, srcSize);
         
         if(format != cCRNFmtDXT1 && format != cCRNFmtDXT3 && format != cCRNFmtDXT5) {
-            throw "Unsupported image format";
+            throw "Unsupported image format " + format + " for " + filename;
         }
 
         width = Module._crn_get_width(src, srcSize);
@@ -105,7 +105,7 @@ function a(b){throw b}var aa=void 0,l=!0,pa=null,n=!1,za=[],Da="object"===typeof
 
 onmessage = function(msg) {
   var start = Date.now();
-  var data = deCrunch(new Uint8Array(msg.data.data));
+  var data = deCrunch(new Uint8Array(msg.data.data), msg.data.filename);
   postMessage({
     data: data,
     callbackID: msg.data.callbackID,
diff --git a/tools/file_packager.py b/tools/file_packager.py
index dfb9ec15..c81e8b9f 100644
--- a/tools/file_packager.py
+++ b/tools/file_packager.py
@@ -147,8 +147,9 @@ if crunch:
       console.log('decrunched in ' + msg.data.time + ' ms');
       decrunchCallbacks[msg.data.callbackID] = null;
     };
-    function requestDecrunch(data, callback) {
+    function requestDecrunch(filename, data, callback) {
       decrunchWorker.postMessage({
+        filename: filename,
         data: data,
         callbackID: decrunchCallbacks.length
       });
@@ -290,11 +291,11 @@ for file_ in data_files:
       # decompress crunch format into dds
       prepare = '''
         var ddsHeader = byteArray.subarray(0, %(dds_header_size)d);
-        requestDecrunch(byteArray.subarray(%(dds_header_size)d), function(ddsData) {
+        requestDecrunch('%(filename)s', byteArray.subarray(%(dds_header_size)d), function(ddsData) {
           byteArray = new Uint8Array(ddsHeader.length + ddsData.length);
           byteArray.set(ddsHeader, 0);
           byteArray.set(ddsData, %(dds_header_size)d);
-''' % { 'dds_header_size': DDS_HEADER_SIZE }
+''' % { 'filename': filename, 'dds_header_size': DDS_HEADER_SIZE }
 
       finish = '''
           Module['removeRunDependency']();