@ringozz/godot 4.7.2-641 → 4.7.2-643

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ringozz/godot",
   "author": "Vladimir Davidovich",
-  "version": "4.7.2-641",
+  "version": "4.7.2-643",
   "description": "Node-API bindings for Godot Engine — call Godot classes from JavaScript",
   "publishConfig": {
     "access": "public"
@@ -65,9 +65,9 @@
     "precision": "single"
   },
   "optionalDependencies": {
-    "@ringozz/godot-macos-arm64": "^4.7.2-641",
-    "@ringozz/godot-windows-x86_64": "^4.7.2-641",
-    "@ringozz/godot-web-wasm32": "^4.7.2-641"
+    "@ringozz/godot-macos-arm64": "^4.7.2-643",
+    "@ringozz/godot-windows-x86_64": "^4.7.2-643",
+    "@ringozz/godot-web-wasm32": "^4.7.2-643"
   },
   "peerDependencies": {
     "@types/bun": "*"

package/src/web-image.ts

@@ -12,8 +12,8 @@
 // a single parse/allocate pair covers everything — a container is just a list of
 // layers.
 //
-// Exposes the container/format helpers, `pickGodotFormats` (probing the WebGL2
-// extensions GLES3 checks) and `decodeCtex` — the default staging path, which
+// Exposes the container/format helpers, `pickGodotFormats` (the driver's
+// compressed-format list) and `decodeCtex` — the default staging path, which
 // decodes the PNG/WebP payloads with the browser and rebuilds a raw RGBA8
 // container so no image codec runs in wasm. The optional compressed-transcode
 // hook lives in load.ts.
@@ -209,16 +209,50 @@ export function allocateCtex(
 }
 
 // ---------------------------------------------------------------------------
-// Capability probing. Godot's Compatibility (GLES3) renderer is what the web
-// wasm build uses, and it only uploads a compressed format natively when the
-// matching GL extension is present; this build compiles in NO decompressors, so
-// a format the device can't upload breaks the texture rather than degrading.
-// It selects formats for layered/3D textures exactly as for 2D — the
-// `astc_layered_supported`/`astc_3d_supported` flags it computes are only used
-// to derive `astc_supported`/`astc_hdr_supported` — so this probe covers texture
-// arrays and cubemaps too.
+// Capability probing. GLES3 uploads a compressed format only when its config
+// reports it supported, and this build compiles in NO decompressors, so a format
+// the device can't upload breaks the texture rather than degrading. Ask the
+// driver (`COMPRESSED_TEXTURE_FORMATS`) rather than reading extension names:
+// Chrome on Windows lists no ETC2/EAC and rejects those uploads, while
+// `config.cpp` would still route one to it. RGTC arrays are the one place 2D and
+// layered differ — `_texture_set_data` force-decompresses them for
+// `TEXTURE_2D_ARRAY`, gated here on `Image::can_decompress("s3tc")`.
 // ---------------------------------------------------------------------------
 
+// `CompressedTexture` GL enums -> Godot `Image::Format`, for the targets the
+// encoder can emit; only the unsigned-normal variants (their siblings share it).
+const GL_TO_GODOT_FORMAT: Record<number, number> = {
+	0x83f0: FORMAT_DXT1, // COMPRESSED_RGB_S3TC_DXT1_EXT
+	0x8dbb: FORMAT_RGTC_R, // COMPRESSED_RED_RGTC1_EXT
+	0x8dbd: FORMAT_RGTC_RG, // COMPRESSED_RED_GREEN_RGTC2_EXT
+	0x8e8c: FORMAT_BPTC_RGBA, // COMPRESSED_RGBA_BPTC_UNORM_EXT
+	0x9270: FORMAT_ETC2_R11, // COMPRESSED_R11_EAC
+	0x9272: FORMAT_ETC2_RG11, // COMPRESSED_RG11_EAC
+	0x9274: FORMAT_ETC2_RGB8, // COMPRESSED_RGB8_ETC2
+	0x93b0: FORMAT_ASTC_4x4, // COMPRESSED_RGBA_ASTC_4x4_KHR
+};
+
+/** Enabled before reading the list — a browser may only list a format once its extension is enabled. */
+const PROBED_EXTENSIONS = [
+	'EXT_texture_compression_bptc',
+	'EXT_texture_compression_rgtc',
+	'WEBGL_compressed_texture_s3tc',
+	'WEBGL_compressed_texture_astc',
+	'WEBGL_compressed_texture_etc',
+];
+
+/** The Godot targets among a driver's `COMPRESSED_TEXTURE_FORMATS` list, in list order and deduplicated (pure). */
+export function godotFormatsFor(glFormats: ArrayLike<number>): number[] {
+	const formats = new Set<number>();
+	for (let i = 0; i < glFormats.length; i++) {
+		const godot = GL_TO_GODOT_FORMAT[glFormats[i]!];
+		if (godot !== undefined) {
+			formats.add(godot);
+		}
+	}
+	return [...formats];
+}
+
 /**
  * Compressed `Image::Format` targets the running device can upload. A list
  * because the encoder may also reject a format the browser exposes (e.g. spark
@@ -248,31 +282,15 @@ export function pickGodotFormats(): number[] {
 	if (!gl) {
 		return [];
 	}
-	const formats: number[] = [];
 	try {
-		const exts = new Set(gl.getSupportedExtensions() ?? []);
-		if (exts.has('EXT_texture_compression_bptc')) {
-			formats.push(FORMAT_BPTC_RGBA);
-		}
-		if (exts.has('EXT_texture_compression_rgtc')) {
-			formats.push(FORMAT_RGTC_RG);
-			formats.push(FORMAT_RGTC_R);
-		}
-		if (exts.has('WEBGL_compressed_texture_astc')) {
-			formats.push(FORMAT_ASTC_4x4);
-		}
-		if (exts.has('WEBGL_compressed_texture_s3tc')) {
-			formats.push(FORMAT_DXT1);
+		for (const name of PROBED_EXTENSIONS) {
+			gl.getExtension(name);
 		}
-		// ETC2/EAC is core WebGL2 (ES 3.0), which is how Godot's web config
-		// reports it (`etc2_supported = true` for non-GLES-over-GL) — so these
-		// are always uploadable, independent of any extension.
-		formats.push(FORMAT_ETC2_RGB8, FORMAT_ETC2_RG11, FORMAT_ETC2_R11);
+		return godotFormatsFor(gl.getParameter(gl.COMPRESSED_TEXTURE_FORMATS) as ArrayLike<number>);
 	} finally {
 		// Don't retain the probe context for the page's lifetime.
 		gl.getExtension('WEBGL_lose_context')?.loseContext();
 	}
-	return formats;
 }
 
 /**