ktx: support the same etc2 formats available in amd compressonator

Author: Shivansps

code/bmpman/bmpman.cpp

@@ -1059,14 +1059,20 @@ int bm_is_compressed(int num) {
 	case BM_TYPE_ETC2_RGB:
 		return KTX_ETC2_RGB;
 
+	case BM_TYPE_ETC2_SRGB:
+		return KTX_ETC2_SRGB;
+
 	case BM_TYPE_ETC2_RGBA_EAC:
 		return KTX_ETC2_RGBA_EAC;
 
-	case BM_TYPE_EAC_R11:
-		return KTX_EAC_R11;
+	case BM_TYPE_ETC2_SRGBA_EAC:
+		return KTX_ETC2_SRGBA_EAC;
+
+	case BM_TYPE_ETC2_RGBA1:
+		return KTX_ETC2_RGB_A1;
 
-	case BM_TYPE_EAC_RG11:
-		return KTX_EAC_RG11;
+	case BM_TYPE_ETC2_SRGBA1:
+		return KTX_ETC2_SRGB_A1;
 
 	default:
 		return 0;
@@ -2797,19 +2803,18 @@ void bm_page_in_texture(int bitmapnum, int nframes) {
 			continue;
 
 		case BM_TYPE_ETC2_RGB:
-			frame_entry->used_flags = BMP_TEX_ETC2_RGB;
-			continue;
-
-		case BM_TYPE_ETC2_RGBA_EAC:
-			frame_entry->used_flags = BMP_TEX_ETC2_RGBA_EAC;
+		case BM_TYPE_ETC2_SRGB:
+			frame_entry->used_flags = BMP_TEX_ETC2_RGB8;
 			continue;
 
-		case BM_TYPE_EAC_R11:
-			frame_entry->used_flags = BMP_TEX_EAC_R11;
+		case BM_TYPE_ETC2_RGBA1:
+		case BM_TYPE_ETC2_SRGBA1:
+			frame_entry->used_flags = BMP_TEX_ETC2_RGBA1;
 			continue;
 
-		case BM_TYPE_EAC_RG11:
-			frame_entry->used_flags = BMP_TEX_EAC_RG11;
+		case BM_TYPE_ETC2_RGBA_EAC:
+		case BM_TYPE_ETC2_SRGBA_EAC:
+			frame_entry->used_flags = BMP_TEX_ETC2_RGBA8;
 			continue;
 
 		default:
@@ -2858,19 +2863,18 @@ void bm_page_in_xparent_texture(int bitmapnum, int nframes) {
 			continue;
 
 		case BM_TYPE_ETC2_RGB:
-			entry->used_flags = BMP_TEX_ETC2_RGB;
+		case BM_TYPE_ETC2_SRGB:
+			entry->used_flags = BMP_TEX_ETC2_RGB8;
 			continue;
 
-		case BM_TYPE_ETC2_RGBA_EAC:
-			entry->used_flags = BMP_TEX_ETC2_RGBA_EAC;
+		case BM_TYPE_ETC2_RGBA1:
+		case BM_TYPE_ETC2_SRGBA1:
+			entry->used_flags = BMP_TEX_ETC2_RGBA1;
 			continue;
 
-		case BM_TYPE_EAC_R11:
-			entry->used_flags = BMP_TEX_EAC_R11;
-			continue;
-
-		case BM_TYPE_EAC_RG11:
-			entry->used_flags = BMP_TEX_EAC_RG11;
+		case BM_TYPE_ETC2_RGBA_EAC:
+		case BM_TYPE_ETC2_SRGBA_EAC:
+			entry->used_flags = BMP_TEX_ETC2_RGBA8;
 			continue;
 
 		default:

code/bmpman/bmpman.h

@@ -34,7 +34,7 @@
 
 // Flag positions for bitmap.flags
 // ***** NOTE:  bitmap.flags is an 8-bit value, no more BMP_TEX_* flags can be added unless the type is changed!! ******
-// Update: type changed to 16-bit
+// Update: bitmap.flags type changed to 16-bit
 #define	BMP_AABITMAP        (1<<0)      //!< antialiased bitmap
 #define	BMP_TEX_XPARENT     (1<<1)      //!< transparent texture
 #define	BMP_TEX_OTHER       (1<<2)      //!< so we can identify all "normal" textures
@@ -44,14 +44,14 @@
 #define BMP_TEX_BC7			(1<<6)		//!< BC7  compressed 8r8g8b8a (32bit)
 #define BMP_TEX_CUBEMAP     (1<<7)      //!< a texture made for cubic environment map
 #define BMP_MASK_BITMAP     (1<<8)      //!< a bitmap that will be used for masking mouse interaction. Typically not used in render operations
-#define BMP_TEX_ETC2_RGB		(1 << 9)
-#define BMP_TEX_ETC2_RGBA_EAC	(1 << 10)
-#define BMP_TEX_EAC_R11			(1 << 11)
-#define BMP_TEX_EAC_RG11		(1 << 12)
+#define BMP_TEX_ETC2_RGB8	(1 << 9)	//!< ETC2 RGB compressed	(24bit, no alpha)
+#define BMP_TEX_ETC2_RGBA1	(1 << 10)	//!< ETC2 RGBA1 compressed	(24bit, 1 alpha)
+#define BMP_TEX_ETC2_RGBA8	(1 << 11)	//!< ETC2 RGBA8 compressed	(32bit, 8 alpha)
+
 
 // Combined flags
-#define BMP_TEX_COMP		( BMP_TEX_DXT1 | BMP_TEX_DXT3 | BMP_TEX_DXT5 | BMP_TEX_BC7 | BMP_TEX_ETC2_RGB |\
-							  BMP_TEX_ETC2_RGBA_EAC | BMP_TEX_EAC_R11 | BMP_TEX_EAC_RG11 )  //!< Compressed textures
+#define BMP_TEX_COMP		( BMP_TEX_DXT1 | BMP_TEX_DXT3 | BMP_TEX_DXT5 | BMP_TEX_BC7 | BMP_TEX_ETC2_RGB8 |\
+							  BMP_TEX_ETC2_RGBA1 | BMP_TEX_ETC2_RGBA8 )		//!< Compressed textures
 #define BMP_TEX_NONCOMP     ( BMP_TEX_XPARENT | BMP_TEX_OTHER )             //!< Non-compressed textures
 #define	BMP_TEX_ANY         ( BMP_TEX_COMP | BMP_TEX_NONCOMP )              //!< Any texture
 
@@ -88,11 +88,14 @@ enum BM_TYPE
 	BM_TYPE_CUBEMAP_DXT5,    //!< 32-bit cubemap        (compressed cubemap surface)
 
 	BM_TYPE_3D,				//!< 3D in-memory
-	BM_TYPE_KTX,			//!< generic identifier for KTX
-	BM_TYPE_ETC2_RGB,		//!< 24 bit without alpha
-	BM_TYPE_ETC2_RGBA_EAC,	//!< 32 bit with alpha
-	BM_TYPE_EAC_R11,		//!< BC4 equivalent
-	BM_TYPE_EAC_RG11		//!< BC5 equivalent
+
+	BM_TYPE_KTX,			//!< generic identifier for KTX1
+	BM_TYPE_ETC2_RGB,		//!< 24 bit, no alpha
+	BM_TYPE_ETC2_SRGB,      //!< 24 bit, no alpha, signed
+	BM_TYPE_ETC2_RGBA1,		//!< 24 bit, 1 bit alpha
+	BM_TYPE_ETC2_SRGBA1,    //!< 24 bit, 1 bit alpha, signed
+	BM_TYPE_ETC2_RGBA_EAC,	//!< 32 bit, 8 bit alpha
+	BM_TYPE_ETC2_SRGBA_EAC  //!< 32 bit, 8 bit alpha, signed
 };
 
 /**

code/graphics/opengl/gropengltexture.cpp

@@ -447,14 +447,10 @@ static int opengl_texture_set_level(int bitmap_handle, int bitmap_type, int bmap
 
 	case KTX_ETC2_RGB:
 	case KTX_ETC2_RGBA_EAC:
-	case KTX_EAC_R11:
-	case KTX_EAC_RG11:
 	case KTX_ETC2_SRGB:
 	case KTX_ETC2_SRGBA_EAC:
 	case KTX_ETC2_RGB_A1:
 	case KTX_ETC2_SRGB_A1:
-	case KTX_EAC_R11_SNORM:
-	case KTX_EAC_RG11_SNORM:
 		intFormat = ktx_map_ktx_format_to_gl_internal(bm_handle);
 		block_size = ktx_etc_block_bytes(intFormat);
 		break;
@@ -776,14 +772,10 @@ static GLenum opengl_get_internal_format(int handle, int bitmap_type, int bpp) {
 
 		case KTX_ETC2_RGB:
 		case KTX_ETC2_RGBA_EAC:
-		case KTX_EAC_R11:
-		case KTX_EAC_RG11:
 		case KTX_ETC2_SRGB:
 		case KTX_ETC2_SRGBA_EAC:
 		case KTX_ETC2_RGB_A1:
 		case KTX_ETC2_SRGB_A1:
-		case KTX_EAC_R11_SNORM:
-		case KTX_EAC_RG11_SNORM:
 			return ktx_map_ktx_format_to_gl_internal(bm_handle);
 
 		default:
@@ -874,23 +866,21 @@ void opengl_determine_bpp_and_flags(int bitmap_handle, int bitmap_type, ushort&
 					break;
 
 				case KTX_ETC2_RGB:
+				case KTX_ETC2_SRGB:
 					bpp = 24;
-					flags |= BMP_TEX_ETC2_RGB;
+					flags |= BMP_TEX_ETC2_RGB8;
 					break;
 
-				case KTX_ETC2_RGBA_EAC:
-					bpp = 32;
-					flags |= BMP_TEX_ETC2_RGBA_EAC;
-					break;
-
-				case KTX_EAC_R11:
-					bpp = 8;
-					flags |= BMP_TEX_EAC_R11;
+				case KTX_ETC2_RGB_A1:
+				case KTX_ETC2_SRGB_A1:
+					bpp = 24;
+					flags |= BMP_TEX_ETC2_RGBA1;
 					break;
 
-				case KTX_EAC_RG11:
-					bpp = 16;
-					flags |= BMP_TEX_EAC_RG11;
+				case KTX_ETC2_RGBA_EAC:
+				case KTX_ETC2_SRGBA_EAC:
+					bpp = 32;
+					flags |= BMP_TEX_ETC2_RGBA8;
 					break;
 
 				default:

code/ktxutils/ktxutils.cpp

@@ -3,6 +3,13 @@
 #include "cfile/cfile.h"
 //KTX1 Spec definition https://registry.khronos.org/KTX/specs/1.0/ktxspec.v1.html
 //ETC2 formats spec https://registry.khronos.org/DataFormat/specs/1.4/dataformat.1.4.inline.html#ETC2
+/*
+	KTX 1 Parser - Format supported by Etc2Comp and AMD Compressonator
+	ETC2 support for the formats supported by AMD compressonator and their signed alternatives:
+	ETC2_RGB / ETC2_SRGB -> 24 bit no alpha
+	ETC2_RGBA1 / ETC2_SRGBA1 -> 24 bit with 1 bit punchthrough alpha
+	ETC2_RGBA / ETC2_SRGBA -> 32 bit with 8 bit alpha
+*/
 
 static const uint8_t KTX_ID[12] = { 0xAB, 'K', 'T', 'X', ' ', '1', '1', 0xBB, '\r', '\n', 0x1A, '\n' };
 
@@ -15,14 +22,10 @@ uint32_t ktx_etc_block_bytes(const int internal_format)
 		case GL_COMPRESSED_SRGB8_ETC2:
 		case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
 		case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-		case GL_COMPRESSED_R11_EAC:
-		case GL_COMPRESSED_SIGNED_R11_EAC:
 			return 8;
 
 		case GL_COMPRESSED_RGBA8_ETC2_EAC:
 		case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
-		case GL_COMPRESSED_RG11_EAC:
-		case GL_COMPRESSED_SIGNED_RG11_EAC:
 			return 16;
 
 		default:
@@ -39,10 +42,6 @@ int ktx_map_ktx_format_to_gl_internal(const int ktx_format)
 			return GL_COMPRESSED_RGB8_ETC2;
 		case KTX_ETC2_RGBA_EAC:
 			return GL_COMPRESSED_RGBA8_ETC2_EAC;
-		case KTX_EAC_R11:
-			return GL_COMPRESSED_R11_EAC;
-		case KTX_EAC_RG11:
-			return GL_COMPRESSED_RG11_EAC;
 		case KTX_ETC2_SRGB:
 			return GL_COMPRESSED_SRGB8_ETC2;
 		case KTX_ETC2_SRGBA_EAC:
@@ -51,10 +50,6 @@ int ktx_map_ktx_format_to_gl_internal(const int ktx_format)
 			return GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2;
 		case KTX_ETC2_SRGB_A1:
 			return GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2;
-		case KTX_EAC_R11_SNORM:
-			return GL_COMPRESSED_SIGNED_R11_EAC;
-		case KTX_EAC_RG11_SNORM:
-			return GL_COMPRESSED_SIGNED_RG11_EAC;
 
 		default: return 0;
 	}
@@ -65,22 +60,19 @@ int ktx_map_gl_internal_to_bm(const int internal_format)
 	switch (internal_format) 
 	{
 		case GL_COMPRESSED_RGB8_ETC2:
+			return BM_TYPE_ETC2_RGB;
 		case GL_COMPRESSED_SRGB8_ETC2:
+			return BM_TYPE_ETC2_SRGB;
+
 		case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+			return BM_TYPE_ETC2_RGBA1;
 		case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-			return BM_TYPE_ETC2_RGB;
+			return BM_TYPE_ETC2_SRGBA1;
 
 		case GL_COMPRESSED_RGBA8_ETC2_EAC:
-		case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
 			return BM_TYPE_ETC2_RGBA_EAC;
-
-		case GL_COMPRESSED_R11_EAC:
-		case GL_COMPRESSED_SIGNED_R11_EAC:
-			return BM_TYPE_EAC_R11;
-
-		case GL_COMPRESSED_RG11_EAC:
-		case GL_COMPRESSED_SIGNED_RG11_EAC:
-			return BM_TYPE_EAC_RG11;
+		case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
+			return BM_TYPE_ETC2_SRGBA_EAC;
 
 		default:
 			return BM_TYPE_NONE;
@@ -91,6 +83,7 @@ int ktx1_read_header(const char* filename, CFILE* img_cfp, int* w, int* h, int*
 {
 	CFILE* cf;
 	char real_name[MAX_FILENAME_LEN];
+	//copied from ddsutils
 	if (img_cfp == nullptr) {
 		// this better not happen.. ever
 		Assert(filename != nullptr);
@@ -187,17 +180,16 @@ int ktx1_read_header(const char* filename, CFILE* img_cfp, int* w, int* h, int*
 		switch (bm_ct) 
 		{
 			case BM_TYPE_ETC2_RGB:
+			case BM_TYPE_ETC2_SRGB:
+			case BM_TYPE_ETC2_RGBA1:
+			case BM_TYPE_ETC2_SRGBA1:
 				*bpp = 24;
 				break;
 			case BM_TYPE_ETC2_RGBA_EAC:
+			case BM_TYPE_ETC2_SRGBA_EAC:
 				*bpp = 32;
 				break;
-			case BM_TYPE_EAC_R11:
-				*bpp = 8;
-				break;
-			case BM_TYPE_EAC_RG11:
-				*bpp = 16;
-				break;
+
 			default:
 				*bpp = 0;
 				break;
@@ -217,6 +209,7 @@ int ktx1_read_bitmap(const char* filename, ubyte* dst, ubyte* out_bpp)
 {
 	CFILE* cf;
 	char real_name[MAX_FILENAME_LEN];
+	// copied from ddsutils
 	// this better not happen.. ever
 	Assert(filename != nullptr);
 

code/ktxutils/ktxutils.h

@@ -9,14 +9,10 @@
 enum KTX_Format {
 	KTX_ETC2_RGB = 100,
 	KTX_ETC2_RGBA_EAC,
-	KTX_EAC_R11,
-	KTX_EAC_RG11,
 	KTX_ETC2_SRGB,
 	KTX_ETC2_SRGBA_EAC,
 	KTX_ETC2_RGB_A1,
-	KTX_ETC2_SRGB_A1,
-	KTX_EAC_R11_SNORM,
-	KTX_EAC_RG11_SNORM
+	KTX_ETC2_SRGB_A1
 };
 
 // GLenum definitions, ETC2 is guarranted on ES 3.2, but in desktop GL it is supported from 4.3
@@ -40,18 +36,6 @@ enum KTX_Format {
 #ifndef GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC
 #define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
 #endif
-#ifndef GL_COMPRESSED_R11_EAC
-#define GL_COMPRESSED_R11_EAC 0x9270
-#endif
-#ifndef GL_COMPRESSED_SIGNED_R11_EAC
-#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271
-#endif
-#ifndef GL_COMPRESSED_RG11_EAC
-#define GL_COMPRESSED_RG11_EAC 0x9272
-#endif
-#ifndef GL_COMPRESSED_SIGNED_RG11_EAC
-#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273
-#endif
 
 enum KTX1_Error {
 	KTX1_ERROR_NONE = 0,