Ktx2 compressed textures support

h3d/impl/GlDriver.hx

@@ -1,8 +1,8 @@
 package h3d.impl;
 import h3d.impl.Driver;
+import h3d.mat.Data;
 import h3d.mat.Pass;
 import h3d.mat.Stencil;
-import h3d.mat.Data;
 
 #if (js||hlsdl||usegl)
 
@@ -87,6 +87,7 @@ class GlDriver extends Driver {
 	static var UID = 0;
 	public var gl : GL;
 	public static var ALLOW_WEBGL2 = true;
+	public var textureSupport:{astc:Bool, astcHDR:Bool, etc1:Bool, etc2:Bool, dxt:Bool, bptc:Bool};
 	#end
 
 	#if (hlsdl||usegl)
@@ -992,8 +993,9 @@ class GlDriver extends Driver {
 		case GL.RGB10_A2: GL.RGBA;
 		case GL.RED, GL.R8, GL.R16F, GL.R32F, 0x822A: GL.RED;
 		case GL.RG, GL.RG8, GL.RG16F, GL.RG32F, 0x822C: GL.RG;
-		case GL.RGB16F, GL.RGB32F, 0x8054, 0x8E8F: GL.RGB;
-		case 0x83F1, 0x83F2, 0x83F3, 0x805B, 0x8E8C: GL.RGBA;
+		case GL.RGB16F, GL.RGB32F, 0x8054, 0x8E8F, hxd.PixelFormat.ETC_FORMAT.RGB_ETC1: GL.RGB;
+		case 0x805B, hxd.PixelFormat.DXT_FORMAT.RGBA_DXT1,hxd.PixelFormat.DXT_FORMAT.RGBA_DXT3,
+		hxd.PixelFormat.DXT_FORMAT.RGBA_DXT5,hxd.PixelFormat.ASTC_FORMAT.RGBA_4x4, hxd.PixelFormat.BPTC_FORMAT.RGBA_BPTC : GL.RGBA;
 		default: throw "Invalid format " + t.internalFmt;
 		}
 	}
@@ -1005,6 +1007,7 @@ class GlDriver extends Driver {
 		case SRGB, SRGB_ALPHA: hasFeature(SRGBTextures);
 		case R8, RG8, RGB8, R16F, RG16F, RGB16F, R32F, RG32F, RGB32F, RG11B10UF, RGB10A2: #if js glES >= 3 #else true #end;
 		case S3TC(n): n <= maxCompressedTexturesSupport;
+		case ASTC(_), ETC(_): #if js true #else false #end;
 		default: false;
 		}
 	}
@@ -1083,8 +1086,7 @@ class GlDriver extends Driver {
 			tt.internalFmt = GL.R11F_G11F_B10F;
 			tt.pixelFmt = GL.UNSIGNED_INT_10F_11F_11F_REV;
 		case S3TC(n) if( n <= maxCompressedTexturesSupport ):
-			if( t.width&3 != 0 || t.height&3 != 0 )
-				throw "Compressed texture "+t+" has size "+t.width+"x"+t.height+" - must be a multiple of 4";
+			checkMult4(t);
 			switch( n ) {
 			case 1: tt.internalFmt = 0x83F1; // COMPRESSED_RGBA_S3TC_DXT1_EXT
 			case 2:	tt.internalFmt = 0x83F2; // COMPRESSED_RGBA_S3TC_DXT3_EXT
@@ -1093,6 +1095,18 @@ class GlDriver extends Driver {
 			case 7: tt.internalFmt = 0x8E8C; // COMPRESSED_RGBA_BPTC_UNORM
 			default: throw "Unsupported texture format "+t.format;
 			}
+		case ASTC(n):
+			checkMult4(t);
+			switch( n ) {
+			case 10: tt.internalFmt = hxd.PixelFormat.ASTC_FORMAT.RGBA_4x4;
+			default: throw "Unsupported texture format "+t.format;
+			}
+		case ETC(n):
+			checkMult4(t);
+			switch( n ) {
+			case 0: tt.internalFmt = hxd.PixelFormat.ETC_FORMAT.RGB_ETC1;
+			case 1: tt.internalFmt = hxd.PixelFormat.ETC_FORMAT.RGBA_ETC2;
+			}
 		default:
 			throw "Unsupported texture format "+t.format;
 		}
@@ -1169,6 +1183,11 @@ class GlDriver extends Driver {
 		return tt;
 	}
 
+	inline function checkMult4(t:h3d.mat.Texture) {
+		if( t.width&3 != 0 || t.height&3 != 0 )
+			throw "Compressed texture "+t+" has size "+t.width+"x"+t.height+" - must be a multiple of 4";
+	}
+
 	function restoreBind() {
 		var t = boundTextures[lastActiveIndex];
 		if( t == null )
@@ -1409,12 +1428,13 @@ class GlDriver extends Driver {
 		case RGB10A2, RG11B10UF: new Uint32Array(@:privateAccess pixels.bytes.b.buffer, pixels.offset, dataLen>>2);
 		default: new Uint8Array(@:privateAccess pixels.bytes.b.buffer, pixels.offset, dataLen);
 		}
-		if( t.format.match(S3TC(_)) ) {
+		switch (t.format) {
+		case S3TC(_), ASTC(_), ETC(_):
 			if( t.flags.has(IsArray) || t.flags.has(Is3D) )
 				gl.compressedTexSubImage3D(face, mipLevel, 0, 0, side, pixels.width, pixels.height, 1, t.t.internalFmt, buffer);
 			else
 				gl.compressedTexSubImage2D(face, mipLevel, 0, 0, pixels.width, pixels.height, t.t.internalFmt, buffer);
-		} else {
+		default:
 			if( t.flags.has(IsArray) || t.flags.has(Is3D) )
 				gl.texSubImage3D(face, mipLevel, 0, 0, side, pixels.width, pixels.height, 1, getChannels(t.t), t.t.pixelFmt, buffer);
 			else
@@ -1893,16 +1913,28 @@ class GlDriver extends Driver {
 	}
 
 	#if js
+	public function checkTextureSupport() {
+		final checkExtension = ext -> {
+			gl.getExtension(ext) != null;
+		}
+		return {
+			astc: checkExtension('WEBGL_compressed_texture_astc'),
+			astcHDR: checkExtension( 'WEBGL_compressed_texture_astc' )
+					&& gl.getExtension( 'WEBGL_compressed_texture_astc' ).getSupportedProfiles().includes( 'hdr' ),
+			etc1: false, // Not supported on WebGL2  (https://registry.khronos.org/OpenGL-Refpages/es3/html/glCompressedTexSubImage2D.xhtml); checkExtension('WEBGL_compressed_texture_etc1'),
+			etc2: checkExtension('WEBGL_compressed_texture_etc'),
+			dxt: checkExtension('WEBGL_compressed_texture_s3tc'),
+			bptc: checkExtension('EXT_texture_compression_bptc'),
+		}
+	}
+
 	var features : Map<Feature,Bool> = new Map();
 	var has16Bits : Bool;
 	function makeFeatures() {
 		for( f in Type.allEnums(Feature) )
 			features.set(f,checkFeature(f));
-		if( gl.getExtension("WEBGL_compressed_texture_s3tc") != null ) {
-			maxCompressedTexturesSupport = 3;
-			if( gl.getExtension("EXT_texture_compression_bptc") != null )
-				maxCompressedTexturesSupport = 7;
-		}
+		textureSupport = checkTextureSupport();
+		maxCompressedTexturesSupport = textureSupport.bptc ? 7 : 3;
 		if( glES < 3 )
 			gl.getExtension("WEBGL_depth_texture");
 		has16Bits = gl.getExtension("EXT_texture_norm16") != null; // 16 bit textures

hxd/PixelFormat.hx

@@ -23,9 +23,33 @@ enum PixelFormat {
 	RG16U;
 	RGB16U;
 	RGBA16U;
-	S3TC( v : Int );
+	ASTC( ?v : Int );
+	ETC( ?v : Int );
+	S3TC( ?v : Int );
 	Depth16;
 	Depth24;
 	Depth24Stencil8;
 	Depth32;
-}
+}
+
+enum abstract ASTC_FORMAT(Int) from Int to Int {
+	final RGBA_4x4 = 0x93B0;
+}
+
+enum abstract DXT_FORMAT(Int) from Int to Int {
+	final RGB_DXT1 = 0x83F0;
+	final RGBA_DXT1 = 0x83F1;
+	final RGBA_DXT3 = 0x83F2;
+	final RGBA_DXT5 = 0x83F3;
+}
+
+enum abstract ETC_FORMAT(Int) from Int to Int {
+	final RGB_ETC1 = 0x8D64;
+	final RGBA_ETC2 = 0x9278;
+}
+
+enum abstract BPTC_FORMAT(Int) from Int to Int {
+	final RGB_BPTC_UNSIGNED = 0x8E8F;
+	final RGBA_BPTC = 0x8E8C;
+}
+

hxd/Pixels.hx

@@ -391,6 +391,8 @@ class Pixels {
 			this.bytes = nbytes;
 
 		case [S3TC(a),S3TC(b)] if( a == b ):
+		case [ASTC(a),ASTC(b)] if( a == b ):
+		case [ETC(a),ETC(b)] if( a == b ):
 			// nothing
 
 		#if (hl && hl_ver >= "1.10")
@@ -536,8 +538,33 @@ class Pixels {
 
 	public static function calcDataSize( width : Int, height : Int, format : PixelFormat ) {
 		return switch( format ) {
-		case S3TC(_):
-			(((height + 3) >> 2) << 2) * calcStride(width, format);
+		case S3TC(n):
+			var w = ((width + 3) >> 2) << 2; // Round up width to next multiple of 4
+			var h = ((height + 3) >> 2) << 2; // Round up height to next multiple of 4
+			var blocks = (w >> 2) * (h >> 2); // Total number of blocks
+			if (n == 3) { // DXT5
+				blocks * 16; // 16 bytes per block
+			} else if (n == 1 || n == 4) {
+				blocks * 8; // DXT1 or BC4, 8 bytes per block
+			} else { 
+				blocks * 16; // DXT3 or BC5, 16 bytes per block, but handling like DXT5 for simplicity
+			}
+		case ASTC(n):
+			var w = ((width + 3) >> 2) << 2;
+			var h = ((height + 3) >> 2) << 2;
+			(w >> 2) * (h >> 2) * 16;
+		case ETC(n):
+			if (n == 0) { // RGB_ETC1_Format or RGB_ETC2_Format
+				var w = ((width + 3) >> 2) << 2;
+				var h = ((height + 3) >> 2) << 2;
+				(w >> 2) * (h >> 2) * 8;
+			} else if (n == 1 || n == 2) { // RGBA_ETC2_EAC_Format
+				var w = ((width + 3) >> 2) << 2;
+				var h = ((height + 3) >> 2) << 2;
+				(w >> 2) * (h >> 2) * 16;
+			} else {
+				throw "Unsupported ETC format";
+			}
 		default:
 			height * calcStride(width, format);
 		}
@@ -559,11 +586,26 @@ class Pixels {
 		case RGB32F: 12;
 		case RGB10A2: 4;
 		case RG11B10UF: 4;
+		case ASTC(n): 
+			var blocks = ((width + 3) >> 2) * 16;
+			blocks << 4;
+		case ETC(n):
+			if (n == 0) { // ETC1 and ETC2 RGB
+				((width + 3) >> 2) << 3;
+			} else if (n == 1) {  // ETC2 EAC RGBA
+				((width + 3) >> 2) << 4;
+			} else {
+				throw "Unsupported ETC format";
+			}
 		case S3TC(n):
 			var blocks = (width + 3) >> 2;
-			if( n == 1 || n == 4 )
-				return blocks << 1;
-			return blocks << 2;
+			if (n == 3) { // DXT5
+				blocks << 4; // 16 bytes per block
+			} else if (n == 1 || n == 4) { 
+				blocks << 1; // DXT1 or BC4, 8 bytes per block
+			} else { 
+				blocks << 2; // DXT3 or BC5, 16 bytes per block, but handling like DXT5 for simplicity
+			}
 		case Depth16: 2;
 		case Depth24: 3;
 		case Depth24Stencil8, Depth32: 4;
@@ -605,13 +647,13 @@ class Pixels {
 			channel.toInt() * 4;
 		case RGB10A2, RG11B10UF:
 			throw "Bit packed format";
-		case S3TC(_), Depth16, Depth24, Depth24Stencil8, Depth32:
+		case S3TC(_), ASTC(_), ETC(_), Depth16, Depth24, Depth24Stencil8, Depth32:
 			throw "Not supported";
 		}
 	}
 
 	public static function alloc( width, height, format : PixelFormat ) {
-		return new Pixels(width, height, haxe.io.Bytes.alloc(calcDataSize(width, height, format)), format);
+		return new Pixels(width, height, haxe.io.Bytes.alloc(calcDataSize(width, height, format)), format); 
 	}
 
 	/**

hxd/net/BinaryLoader.hx

@@ -18,7 +18,7 @@ class BinaryLoader {
 		throw msg;
 	}
 
-	public function load() {
+	public function load(raw = false) {
 		#if js
 
 		var xhr = new js.html.XMLHttpRequest();
@@ -32,7 +32,7 @@ class BinaryLoader {
 				onError(xhr.statusText);
 				return;
 			}
-			onLoaded(haxe.io.Bytes.ofData(xhr.response));
+			onLoaded(raw ? xhr.response : haxe.io.Bytes.ofData(xhr.response));
 		}
 
 		xhr.onprogress = function(e) {

hxd/res/Image.hx

@@ -8,6 +8,7 @@ enum abstract ImageFormat(Int) {
 	var Dds = 4;
 	var Raw = 5;
 	var Hdr = 6;
+	var Ktx2 = 7;
 
 	/*
 		Tells if we might not be able to directly decode the image without going through a loadBitmap async call.
@@ -35,6 +36,7 @@ enum abstract ImageFormat(Int) {
 			case Dds: "DDS";
 			case Raw: "RAW";
 			case Hdr: "HDR";
+			case Ktx2: "KTX2";
 		};
 	}
 }
@@ -241,7 +243,21 @@ class Image extends Resource {
 						fid = "" + fourCC;
 					throw entry.path + " has unsupported 4CC " + fid;
 				}
-
+			#if js
+			case 0x4273:
+				throw 'Use .ktx2 files for GPU compressed textures instead of .basis';
+			case 0x4BAB:
+				final ktx2 = hxd.res.Ktx2.readFile(new haxe.io.BytesInput(@:privateAccess f.cache));
+				inf.pixelFormat = switch ktx2.dfd.colorModel {
+					case hxd.res.Ktx2.DFDModel.ETC1S: ETC(hxd.res.Ktx2.TranscoderFormat.ETC1);
+					case hxd.res.Ktx2.DFDModel.UASTC: ASTC(hxd.res.Ktx2.TranscoderFormat.ASTC_4x4);
+					default: throw 'Unsupported colorModel in ktx2 file ${ktx2.dfd.colorModel}';
+				}
+				inf.mipLevels = ktx2.header.levelCount;
+				inf.width = ktx2.header.pixelWidth;
+				inf.height = ktx2.header.pixelHeight;
+				inf.dataFormat = Ktx2;
+			#end
 			case 0x3F23: // HDR RADIANCE
 
 				inf.dataFormat = Hdr;
@@ -435,6 +451,9 @@ class Image extends Resource {
 			case Hdr:
 				var data = hxd.fmt.hdr.Reader.decode(entry.getBytes(), false);
 				pixels = new hxd.Pixels(data.width, data.height, data.bytes, inf.pixelFormat);
+			case Ktx2:
+				var bytes = entry.getBytes();
+				pixels = new hxd.Pixels(inf.width, inf.height, bytes, inf.pixelFormat);
 		}
 		if (fmt != null)
 			pixels.convert(fmt);
@@ -610,6 +629,8 @@ class Image extends Resource {
 							pos += size;
 						}
 					}
+				case Ktx2:
+					throw 'Ktx2 loading using heaps resource system not implemented';
 				default:
 					for (layer in 0...tex.layerCount) {
 						for (mip in 0...inf.mipLevels) {
@@ -668,8 +689,8 @@ class Image extends Resource {
 	}
 
 	public function toTile():h2d.Tile {
-		getInfo();
-		return h2d.Tile.fromTexture(toTexture()).sub(0, 0, inf.width, inf.height);
+		final tex = toTexture();
+		return h2d.Tile.fromTexture(tex).sub(0, 0, tex.width, tex.height);
 	}
 
 	public static dynamic function setupTextureFlags(tex:h3d.mat.Texture) {}