@geastack/native-webgl-angle 0.1.16 → 0.1.18

package/geatsc-plugin-uniforms.mjs

@@ -349,42 +349,86 @@ export function isUniformNumberArray( value ) {
 
 }
 
-/** @param {NativeUniformValue} value @return {value is Vector2[]} */
-function isVector2Array( value ) {
+/**
+ * One element of a uniform array whose first element is the given kind. Read
+ * through \`Array.isArray\` and \`instanceof\` on the element itself rather than
+ * through the value narrowed to that array type: the value is stored as the
+ * uniform union, and claiming one array arm for it is an array-to-array
+ * conversion with no runtime form.
+ */
+
+/** @param {NativeUniformValue} value @param {number} index @return {Vector2} */
+function vector2ArrayElement( value, index ) {
+
+\tif ( Array.isArray( value ) ) {
+
+\t\tconst element = value[ index ];
+
+\t\tif ( element instanceof Vector2 ) return element;
+
+\t}
 
-\treturn Array.isArray( value ) && value.length > 0 && value[ 0 ] instanceof Vector2;
+\tthrow new Error( 'THREE.UniformsUtils: a uniform array mixes Vector2 with other values.' );
 
 }
 
-/** @param {NativeUniformValue} value @return {value is Vector3[]} */
-function isVector3Array( value ) {
+/** @param {NativeUniformValue} value @param {number} index @return {Vector3} */
+function vector3ArrayElement( value, index ) {
+
+\tif ( Array.isArray( value ) ) {
 
-\treturn Array.isArray( value ) && value.length > 0 && value[ 0 ] instanceof Vector3;
+\t\tconst element = value[ index ];
+
+\t\tif ( element instanceof Vector3 ) return element;
+
+\t}
+
+\tthrow new Error( 'THREE.UniformsUtils: a uniform array mixes Vector3 with other values.' );
 
 }
 
-/** @param {NativeUniformValue} value @return {value is Vector4[]} */
-function isVector4Array( value ) {
+/** @param {NativeUniformValue} value @param {number} index @return {Vector4} */
+function vector4ArrayElement( value, index ) {
+
+\tif ( Array.isArray( value ) ) {
 
-\treturn Array.isArray( value ) && value.length > 0 && value[ 0 ] instanceof Vector4;
+\t\tconst element = value[ index ];
+
+\t\tif ( element instanceof Vector4 ) return element;
+
+\t}
+
+\tthrow new Error( 'THREE.UniformsUtils: a uniform array mixes Vector4 with other values.' );
 
 }
 
-/** @param {NativeUniformValue} value @return {value is Matrix4[]} */
-function isMatrix4Array( value ) {
+/** @param {NativeUniformValue} value @param {number} index @return {Matrix4} */
+function matrix4ArrayElement( value, index ) {
+
+\tif ( Array.isArray( value ) ) {
+
+\t\tconst element = value[ index ];
+
+\t\tif ( element instanceof Matrix4 ) return element;
 
-\treturn Array.isArray( value ) && value.length > 0 && value[ 0 ] instanceof Matrix4;
+\t}
+
+\tthrow new Error( 'THREE.UniformsUtils: a uniform array mixes Matrix4 with other values.' );
 
 }
 
-/** @param {NativeUniformValue} value @return {value is Array<Texture|null>} */
-export function isUniformTextureArray( value ) {
+/** @param {NativeUniformValue} value @param {number} index @return {Texture|null} */
+function textureArrayElement( value, index ) {
 
-\tif ( ! Array.isArray( value ) || value.length === 0 ) return false;
+\tif ( Array.isArray( value ) ) {
 
-\tconst first = value[ 0 ];
+\t\tconst element = value[ index ];
 
-\treturn first === null || first instanceof Texture;
+\t\tif ( element === null || element instanceof Texture ) return element;
+
+\t}
+
+\tthrow new Error( 'THREE.UniformsUtils: a uniform array mixes textures with other values.' );
 
 }
 
@@ -423,63 +467,70 @@ export function cloneUniformValue( value ) {
 
 \tif ( isUniformNumberArray( value ) ) return value.slice();
 
-\tif ( isVector2Array( value ) ) {
+\tif ( Array.isArray( value ) && value.length > 0 ) {
 
-\t\t/** @type {Vector2[]} */
-\t\tconst cloned = [];
+\t\tconst first = value[ 0 ];
+\t\tconst length = value.length;
 
-\t\tfor ( let i = 0, l = value.length; i < l; i ++ ) cloned.push( value[ i ].clone() );
+\t\tif ( first instanceof Vector2 ) {
 
-\t\treturn cloned;
+\t\t\t/** @type {Vector2[]} */
+\t\t\tconst cloned = [];
 
-\t}
+\t\t\tfor ( let i = 0; i < length; i ++ ) cloned.push( vector2ArrayElement( value, i ).clone() );
+
+\t\t\treturn cloned;
 
-\tif ( isVector3Array( value ) ) {
+\t\t}
 
-\t\t/** @type {Vector3[]} */
-\t\tconst cloned = [];
+\t\tif ( first instanceof Vector3 ) {
 
-\t\tfor ( let i = 0, l = value.length; i < l; i ++ ) cloned.push( value[ i ].clone() );
+\t\t\t/** @type {Vector3[]} */
+\t\t\tconst cloned = [];
 
-\t\treturn cloned;
+\t\t\tfor ( let i = 0; i < length; i ++ ) cloned.push( vector3ArrayElement( value, i ).clone() );
 
-\t}
+\t\t\treturn cloned;
 
-\tif ( isVector4Array( value ) ) {
+\t\t}
 
-\t\t/** @type {Vector4[]} */
-\t\tconst cloned = [];
+\t\tif ( first instanceof Vector4 ) {
 
-\t\tfor ( let i = 0, l = value.length; i < l; i ++ ) cloned.push( value[ i ].clone() );
+\t\t\t/** @type {Vector4[]} */
+\t\t\tconst cloned = [];
 
-\t\treturn cloned;
+\t\t\tfor ( let i = 0; i < length; i ++ ) cloned.push( vector4ArrayElement( value, i ).clone() );
 
-\t}
+\t\t\treturn cloned;
 
-\tif ( isMatrix4Array( value ) ) {
+\t\t}
 
-\t\t/** @type {Matrix4[]} */
-\t\tconst cloned = [];
+\t\tif ( first instanceof Matrix4 ) {
 
-\t\tfor ( let i = 0, l = value.length; i < l; i ++ ) cloned.push( value[ i ].clone() );
+\t\t\t/** @type {Matrix4[]} */
+\t\t\tconst cloned = [];
 
-\t\treturn cloned;
+\t\t\tfor ( let i = 0; i < length; i ++ ) cloned.push( matrix4ArrayElement( value, i ).clone() );
 
-\t}
+\t\t\treturn cloned;
+
+\t\t}
 
-\tif ( isUniformTextureArray( value ) ) {
+\t\tif ( first === null || first instanceof Texture ) {
 
-\t\t/** @type {Array<Texture|null>} */
-\t\tconst cloned = [];
+\t\t\t/** @type {Array<Texture|null>} */
+\t\t\tconst cloned = [];
 
-\t\tfor ( let i = 0, l = value.length; i < l; i ++ ) {
+\t\t\tfor ( let i = 0; i < length; i ++ ) {
 
-\t\t\tconst texture = value[ i ];
-\t\t\tcloned.push( texture === null ? null : texture.clone() );
+\t\t\t\tconst texture = textureArrayElement( value, i );
+\t\t\t\tcloned.push( texture === null ? null : texture.clone() );
 
-\t\t}
+\t\t\t}
 
-\t\treturn cloned;
+\t\t\treturn cloned;
+
+\t\t}
 
 \t}
 
@@ -856,8 +907,7 @@ function ${name}( gl, v, textures ) {
 
 \t}
 
-\tconst list = requireTextureArray( v );
-\tconst n = list.length;
+\tconst n = requireTextureArrayLength( v );
 
 \tconst units = allocTexUnits( manager, n );
 
@@ -887,7 +937,7 @@ ${
 }
 \tfor ( let i = 0; i !== n; ++ i ) {
 
-\t\tconst texture = list[ i ];
+\t\tconst texture = textureArrayElement( v, i );
 \t\tmanager.${setter}( texture === null ? ${shadowAware ? 'emptyTexture2D' : empty} : texture, units[ i ] );
 
 \t}
@@ -1033,7 +1083,7 @@ import { Matrix4 } from '../../math/Matrix4.js';
 import { Vector2 } from '../../math/Vector2.js';
 import { Vector3 } from '../../math/Vector3.js';
 import { Vector4 } from '../../math/Vector4.js';
-import { isUniformNumberArray, isUniformTextureArray } from '../shaders/UniformsUtils.js';
+import { isUniformNumberArray } from '../shaders/UniformsUtils.js';
 import {
 ${nativeLightUniformClassNames.map((name) => `\t${name},`).join('\n')}
 } from '../shaders/UniformsLib.js';
@@ -1124,10 +1174,39 @@ function requireUintUniformArray( value ) {
 
 }
 
-/** @param {NativeUniformValue} value @return {Array<Texture|null>} */
-function requireTextureArray( value ) {
+/**
+ * A sampler array value is read element by element, never returned as a
+ * narrowed \`Array<Texture|null>\`: a call site can hand the setter a value whose
+ * static carrier is another array arm (a \`number[]\` passed to \`setValue\` by
+ * name), and claiming that array for the texture arm is an array-to-array
+ * conversion with no runtime form. Validated up front, as before, so a value
+ * that is not a texture array throws before any texture unit is allocated.
+ * @param {NativeUniformValue} value @return {number}
+ */
+function requireTextureArrayLength( value ) {
+
+\tif ( Array.isArray( value ) && value.length > 0 ) {
+
+\t\tconst first = value[ 0 ];
+
+\t\tif ( first === null || first instanceof Texture ) return value.length;
+
+\t}
+
+\tthrow new Error( 'THREE.WebGLUniforms: sampler array uniform value must be an array of textures.' );
+
+}
+
+/** @param {NativeUniformValue} value @param {number} index @return {Texture|null} */
+function textureArrayElement( value, index ) {
+
+\tif ( Array.isArray( value ) ) {
 
-\tif ( isUniformTextureArray( value ) ) return value;
+\t\tconst element = value[ index ];
+
+\t\tif ( element === null || element instanceof Texture ) return element;
+
+\t}
 
 \tthrow new Error( 'THREE.WebGLUniforms: sampler array uniform value must be an array of textures.' );
 

package/geatsc-plugin-uploads.mjs

@@ -16,6 +16,9 @@ export const nativeUploadFunctions = [
   ['threeWebGLTexImage3D', 'gea_three_webgl_tex_image_3d_native', ['target', 'level', 'internalFormat', 'width', 'height', 'depth', 'format', 'type'], 'gea_three_webgl_tex_image_3d_bytes', ['target', 'level', 'internalFormat', 'width', 'height', 'depth', 'format', 'type'], textureElementKind],
   ['threeWebGLTexSubImage3D', 'gea_three_webgl_tex_sub_image_3d_native', ['target', 'level', 'xoffset', 'yoffset', 'zoffset', 'width', 'height', 'depth', 'format', 'type'], 'gea_three_webgl_tex_sub_image_3d_bytes', ['target', 'level', 'xoffset', 'yoffset', 'zoffset', 'width', 'height', 'depth', 'format', 'type'], textureElementKind],
   ['threeWebGLTexSubImage2D', 'gea_three_webgl_tex_sub_image_2d_native', ['target', 'level', 'xoffset', 'yoffset', 'width', 'height', 'format', 'type'], 'gea_three_webgl_tex_sub_image_2d_bytes', ['target', 'level', 'xoffset', 'yoffset', 'width', 'height', 'format', 'type'], textureElementKind],
+  // Compressed blocks are opaque bytes.
+  ['threeWebGLCompressedTexImage2D', 'gea_three_webgl_compressed_tex_image_2d_native', ['target', 'level', 'internalFormat', 'width', 'height'], 'gea_three_webgl_compressed_tex_image_2d_bytes', ['target', 'level', 'internalFormat', 'width', 'height'], '4'],
+  ['threeWebGLCompressedTexSubImage2D', 'gea_three_webgl_compressed_tex_sub_image_2d_native', ['target', 'level', 'xoffset', 'yoffset', 'width', 'height', 'format'], 'gea_three_webgl_compressed_tex_sub_image_2d_bytes', ['target', 'level', 'xoffset', 'yoffset', 'width', 'height', 'format'], '4'],
 ].map(([name, binding, parameters, raw, rawParameters, kind, range]) => {
   const declaration = `extern "C" void ${raw}(${rawParameters.map(p => `double ${p}`).join(', ')}, const void* bytes, double byteLength);
   template <typename Source> inline void ${binding}(${parameters.map(p => `double ${p}`).join(', ')}, const Source& values${range ? ', double sourceOffset, double length' : ''}) {

package/geatsc-plugin.mjs

@@ -138,6 +138,18 @@ inline double gea_three_resource_read_native(std::string name, const gea::Ref<ge
   ['threeWebGLTimerEnd','gea_three_webgl_timer_end','void','extern "C" void gea_three_webgl_timer_end();'],
   ['threeWebGLTimerResult','gea_three_webgl_timer_result','double','extern "C" double gea_three_webgl_timer_result(double);'],
   ['threeWebGLRenderbufferStorageMultisample','gea_three_webgl_renderbuffer_storage_multisample','void','extern "C" void gea_three_webgl_renderbuffer_storage_multisample(double,double,double,double,double);'],
+  [
+    "threeWebGLPushDebugGroup",
+    "gea_three_webgl_push_debug_group",
+    "void",
+    'extern "C" void gea_three_webgl_push_debug_group(std::string label);',
+  ],
+  [
+    "threeWebGLPopDebugGroup",
+    "gea_three_webgl_pop_debug_group",
+    "void",
+    'extern "C" void gea_three_webgl_pop_debug_group();',
+  ],
   [
     "threeNativeProfilePhase",
     "gea_three_native_profile_phase",
@@ -666,7 +678,7 @@ inline double gea_three_resource_read_native(std::string name, const gea::Ref<ge
     "threeWebGLDrawBuffers",
     "gea_three_webgl_draw_buffers",
     "void",
-    'extern "C" void gea_three_webgl_draw_buffers(double attachment);',
+    'extern "C" void gea_three_webgl_draw_buffers(double count, double a0, double a1, double a2, double a3, double a4, double a5, double a6, double a7);',
   ],
 
   [
@@ -2123,8 +2135,29 @@ const transformSource = ({ fileName, text }) => {
   if (normalized.endsWith("/three/src/renderers/WebGLRenderer.js")) {
     transformed =
       // Forward slashes: a Windows path's backslashes would be escapes in this literal.
-      `import { nativeProfilePhase } from '${fileURLToPath(new URL("./src/nativeWebGLHost.ts", import.meta.url)).replaceAll("\\", "/")}';\n` +
+      `import { nativeProfilePhase, nativePushDebugGroup, nativePopDebugGroup } from '${fileURLToPath(new URL("./src/nativeWebGLHost.ts", import.meta.url)).replaceAll("\\", "/")}';\n` +
       transformed;
+    transformed = replaceOne(
+      transformed,
+      "\t\t\tif ( _isContextLost === true ) return;\n",
+      "\t\t\tif ( _isContextLost === true ) return;\n\n\t\t\tnativePushDebugGroup( scene.name !== '' ? scene.name : ( camera.name !== '' ? camera.name : scene.type ) );\n",
+      fileName,
+      "WebGLRenderer render debug group begin",
+    );
+    transformed = replaceOne(
+      transformed,
+      "\t\t\t\t_nodesHandler.renderEnd();\n\n\t\t\t}\n\n\t\t};",
+      "\t\t\t\t_nodesHandler.renderEnd();\n\n\t\t\t}\n\n\t\t\tnativePopDebugGroup();\n\n\t\t};",
+      fileName,
+      "WebGLRenderer render debug group end",
+    );
+    transformed = replaceOne(
+      transformed,
+      "\t\t\tif ( opaqueObjects.length > 0 ) renderObjects( opaqueObjects, scene, camera );\n\t\t\tif ( transmissiveObjects.length > 0 ) renderObjects( transmissiveObjects, scene, camera );\n\t\t\tif ( transparentObjects.length > 0 ) renderObjects( transparentObjects, scene, camera );\n",
+      "\t\t\tif ( opaqueObjects.length > 0 ) {\n\n\t\t\t\tnativePushDebugGroup( 'opaque' );\n\t\t\t\trenderObjects( opaqueObjects, scene, camera );\n\t\t\t\tnativePopDebugGroup();\n\n\t\t\t}\n\n\t\t\tif ( transmissiveObjects.length > 0 ) {\n\n\t\t\t\tnativePushDebugGroup( 'transmissive' );\n\t\t\t\trenderObjects( transmissiveObjects, scene, camera );\n\t\t\t\tnativePopDebugGroup();\n\n\t\t\t}\n\n\t\t\tif ( transparentObjects.length > 0 ) {\n\n\t\t\t\tnativePushDebugGroup( 'transparent' );\n\t\t\t\trenderObjects( transparentObjects, scene, camera );\n\t\t\t\tnativePopDebugGroup();\n\n\t\t\t}\n",
+      fileName,
+      "WebGLRenderer render list debug groups",
+    );
     transformed = replaceOne(
       transformed,
       "if ( scene.matrixWorldAutoUpdate === true ) scene.updateMatrixWorld();",
@@ -6426,6 +6459,23 @@ ${wiringText.replace(/\t\t\t\t/g, "\t\t\t\t")}
     );
   }
   if (normalized.endsWith("/three/src/renderers/webgl/WebGLShadowMap.js")) {
+    transformed =
+      `import { nativePushDebugGroup, nativePopDebugGroup } from '${fileURLToPath(new URL("./src/nativeWebGLHost.ts", import.meta.url)).replaceAll("\\", "/")}';\n` +
+      transformed;
+    transformed = replaceOne(
+      transformed,
+      "\t\tif ( lights.length === 0 ) return;\n",
+      "\t\tif ( lights.length === 0 ) return;\n\n\t\tnativePushDebugGroup( 'shadow map' );\n",
+      fileName,
+      "WebGLShadowMap debug group begin",
+    );
+    transformed = replaceOne(
+      transformed,
+      "\t\tscope.needsUpdate = false;\n\n\t\trenderer.setRenderTarget( currentRenderTarget, activeCubeFace, activeMipmapLevel );\n",
+      "\t\tscope.needsUpdate = false;\n\n\t\trenderer.setRenderTarget( currentRenderTarget, activeCubeFace, activeMipmapLevel );\n\n\t\tnativePopDebugGroup();\n",
+      fileName,
+      "WebGLShadowMap debug group end",
+    );
     // An app that replaces `shadowMap.render` (the browser's cached sun shadow)
     // cannot do so natively: the field holds a `this`-bound function expression
     // no app function converts to. This hook is an ordinary function-typed

package/native/angle_webgl_host.mm

@@ -433,6 +433,8 @@ using PFNGLTEXSUBIMAGE3DPROC = void (*)(GLenum, GLint, GLint, GLint, GLint, GLsi
 using PFNGLTEXSTORAGE3DPROC = void (*)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
 using PFNGLFRAMEBUFFERTEXTURELAYERPROC = void (*)(GLenum, GLenum, GLuint, GLint, GLint);
 using PFNGLTEXSTORAGE2DPROC = void (*)(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+using PFNGLCOMPRESSEDTEXIMAGE2DPROC = void (*)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const void *);
+using PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC = void (*)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const void *);
 using PFNGLUNIFORM1FPROC = void (*)(GLint, GLfloat);
 using PFNGLUNIFORM1FVPROC = void (*)(GLint, GLsizei, const GLfloat *);
 using PFNGLUNIFORM1IPROC = void (*)(GLint, GLint);
@@ -503,6 +505,8 @@ struct AngleWebGLState {
   PFNGLBINDBUFFERRANGEPROC glBindBufferRange = nullptr;
   PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex = nullptr;
   PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding = nullptr;
+  void (*glPushGroupMarkerEXT)(GLsizei, const GLchar *) = nullptr;
+  void (*glPopGroupMarkerEXT)() = nullptr;
   PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer = nullptr;
   PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer = nullptr;
   PFNGLBINDTEXTUREPROC glBindTexture = nullptr;
@@ -587,6 +591,9 @@ struct AngleWebGLState {
   PFNGLTEXPARAMETERIPROC glTexParameteri = nullptr;
   PFNGLTEXSUBIMAGE2DPROC glTexSubImage2D = nullptr;
   PFNGLTEXSTORAGE2DPROC glTexStorage2D = nullptr;
+  // Compressed uploads are optional too: a GLES without them drops the call.
+  PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D = nullptr;
+  PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC glCompressedTexSubImage2D = nullptr;
   // Array/3D entry points are optional: a GLES without them still starts,
   // and uploads to those targets report GL_INVALID_OPERATION in the log.
   PFNGLTEXIMAGE3DPROC glTexImage3D = nullptr;
@@ -1038,10 +1045,15 @@ static bool loadGlSymbols() {
   LOAD_GL(glActiveTexture, PFNGLACTIVETEXTUREPROC)
   LOAD_GL(glAttachShader, PFNGLATTACHSHADERPROC)
   LOAD_GL(glBindBuffer, PFNGLBINDBUFFERPROC)
-  LOAD_GL(glBindBufferBase, PFNGLBINDBUFFERBASEPROC)
-  LOAD_GL(glBindBufferRange, PFNGLBINDBUFFERRANGEPROC)
-  LOAD_GL(glGetUniformBlockIndex, PFNGLGETUNIFORMBLOCKINDEXPROC)
-  LOAD_GL(glUniformBlockBinding, PFNGLUNIFORMBLOCKBINDINGPROC)
+  // Uniform-buffer entry points are optional like the array/3D ones: a GLES
+  // without them (threejs-rendozer exports none) still starts, and only a
+  // program that uses uniform groups loses them, with a log line per call.
+  gWebGL.glBindBufferBase = loadGl<PFNGLBINDBUFFERBASEPROC>("glBindBufferBase");
+  gWebGL.glBindBufferRange = loadGl<PFNGLBINDBUFFERRANGEPROC>("glBindBufferRange");
+  gWebGL.glGetUniformBlockIndex = loadGl<PFNGLGETUNIFORMBLOCKINDEXPROC>("glGetUniformBlockIndex");
+  gWebGL.glUniformBlockBinding = loadGl<PFNGLUNIFORMBLOCKBINDINGPROC>("glUniformBlockBinding");
+  gWebGL.glPushGroupMarkerEXT = loadGl<decltype(gWebGL.glPushGroupMarkerEXT)>("glPushGroupMarkerEXT");
+  gWebGL.glPopGroupMarkerEXT = loadGl<decltype(gWebGL.glPopGroupMarkerEXT)>("glPopGroupMarkerEXT");
   LOAD_GL(glBindFramebuffer, PFNGLBINDFRAMEBUFFERPROC)
   LOAD_GL(glBindRenderbuffer, PFNGLBINDRENDERBUFFERPROC)
   LOAD_GL(glBindTexture, PFNGLBINDTEXTUREPROC)
@@ -1129,6 +1141,8 @@ static bool loadGlSymbols() {
   LOAD_GL(glTexParameteri, PFNGLTEXPARAMETERIPROC)
   LOAD_GL(glTexSubImage2D, PFNGLTEXSUBIMAGE2DPROC)
   LOAD_GL(glTexStorage2D, PFNGLTEXSTORAGE2DPROC)
+  gWebGL.glCompressedTexImage2D = loadGl<PFNGLCOMPRESSEDTEXIMAGE2DPROC>("glCompressedTexImage2D");
+  gWebGL.glCompressedTexSubImage2D = loadGl<PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC>("glCompressedTexSubImage2D");
   gWebGL.glTexImage3D = loadGl<PFNGLTEXIMAGE3DPROC>("glTexImage3D");
   gWebGL.glTexSubImage3D = loadGl<PFNGLTEXSUBIMAGE3DPROC>("glTexSubImage3D");
   gWebGL.glTexStorage3D = loadGl<PFNGLTEXSTORAGE3DPROC>("glTexStorage3D");
@@ -2313,8 +2327,11 @@ extern "C" void gea_three_webgl_renderbuffer_storage(double target, double inter
   geaTrapCheck("gea_three_webgl_renderbuffer_storage"); GEA_WEBGL_VOID("renderbufferStorage"); gWebGL.glRenderbufferStorage(asGLenum(target), asGLenum(internalFormat), asGLsizei(width), asGLsizei(height)); }
 extern "C" void gea_three_webgl_framebuffer_renderbuffer(double target, double attachment, double renderbuffertarget, double renderbuffer) {
   geaTrapCheck("gea_three_webgl_framebuffer_renderbuffer"); GEA_WEBGL_VOID("framebufferRenderbuffer"); gWebGL.glFramebufferRenderbuffer(asGLenum(target), asGLenum(attachment), asGLenum(renderbuffertarget), asGLuint(renderbuffer)); }
-extern "C" void gea_three_webgl_draw_buffers(double attachment) {
-  geaTrapCheck("gea_three_webgl_draw_buffers"); GEA_WEBGL_VOID("drawBuffers"); const GLenum glAttachment = asGLenum(attachment); gWebGL.glDrawBuffers(1, &glAttachment); }
+extern "C" void gea_three_webgl_draw_buffers(double count, double a0, double a1, double a2, double a3, double a4, double a5, double a6, double a7) {
+  geaTrapCheck("gea_three_webgl_draw_buffers"); GEA_WEBGL_VOID("drawBuffers");
+  const GLenum attachments[8] = {asGLenum(a0), asGLenum(a1), asGLenum(a2), asGLenum(a3), asGLenum(a4), asGLenum(a5), asGLenum(a6), asGLenum(a7)};
+  const GLsizei n = std::max<GLsizei>(0, std::min<GLsizei>(asGLsizei(count), 8));
+  gWebGL.glDrawBuffers(n, attachments); }
 
 extern "C" void gea_three_webgl_clear_color(double r, double g, double b, double a) {
   geaTrapCheck("gea_three_webgl_clear_color"); GEA_WEBGL_VOID("clearColor");
@@ -2414,23 +2431,35 @@ extern "C" void gea_three_webgl_draw_arrays(double mode, double first, double co
 extern "C" void gea_three_webgl_vertex_attrib_divisor(double index, double divisor) {
   geaTrapCheck("gea_three_webgl_vertex_attrib_divisor"); GEA_WEBGL_VOID("vertexAttribDivisor");
   gWebGL.glVertexAttribDivisor(asGLuint(index), asGLuint(divisor)); }
+static bool requireGl(const void *fn, const char *name);
 // Indexed binds also set the target's generic binding. The host shadows only the
 // ARRAY_BUFFER and COPY_READ/WRITE bindings (bindNativeBuffer), and the uniform
 // staging path queries UNIFORM_BUFFER_BINDING instead of shadowing it, so neither
 // call needs to update a shadow.
 extern "C" void gea_three_webgl_bind_buffer_base(double target, double index, double buffer) {
   geaTrapCheck("gea_three_webgl_bind_buffer_base"); GEA_WEBGL_VOID("bindBufferBase");
+  if (!requireGl(reinterpret_cast<const void *>(gWebGL.glBindBufferBase), "glBindBufferBase")) return;
   gWebGL.glBindBufferBase(asGLenum(target), asGLuint(index), asGLuint(buffer)); }
 extern "C" void gea_three_webgl_bind_buffer_range(double target, double index, double buffer, double offset, double size) {
   geaTrapCheck("gea_three_webgl_bind_buffer_range"); GEA_WEBGL_VOID("bindBufferRange");
+  if (!requireGl(reinterpret_cast<const void *>(gWebGL.glBindBufferRange), "glBindBufferRange")) return;
   gWebGL.glBindBufferRange(asGLenum(target), asGLuint(index), asGLuint(buffer),
     static_cast<GLintptr>(offset), static_cast<GLsizeiptr>(size)); }
 extern "C" double gea_three_webgl_get_uniform_block_index(double program, std::string name) {
   geaTrapCheck("gea_three_webgl_get_uniform_block_index"); GEA_WEBGL_DOUBLE("getUniformBlockIndex");
+  // GL_INVALID_INDEX: the block is reported as absent.
+  if (!requireGl(reinterpret_cast<const void *>(gWebGL.glGetUniformBlockIndex), "glGetUniformBlockIndex")) return 4294967295.0;
   return gWebGL.glGetUniformBlockIndex(asGLuint(program), name.c_str()); }
 extern "C" void gea_three_webgl_uniform_block_binding(double program, double blockIndex, double binding) {
   geaTrapCheck("gea_three_webgl_uniform_block_binding"); GEA_WEBGL_VOID("uniformBlockBinding");
+  if (!requireGl(reinterpret_cast<const void *>(gWebGL.glUniformBlockBinding), "glUniformBlockBinding")) return;
   gWebGL.glUniformBlockBinding(asGLuint(program), asGLuint(blockIndex), asGLuint(binding)); }
+extern "C" void gea_three_webgl_push_debug_group(std::string label) {
+  geaTrapCheck("gea_three_webgl_push_debug_group"); GEA_WEBGL_VOID("pushDebugGroup");
+  if (gWebGL.glPushGroupMarkerEXT) gWebGL.glPushGroupMarkerEXT(static_cast<GLsizei>(label.size()), label.c_str()); }
+extern "C" void gea_three_webgl_pop_debug_group() {
+  geaTrapCheck("gea_three_webgl_pop_debug_group"); GEA_WEBGL_VOID("popDebugGroup");
+  if (gWebGL.glPopGroupMarkerEXT) gWebGL.glPopGroupMarkerEXT(); }
 extern "C" void gea_three_webgl_draw_elements_instanced(double mode, double count, double type, double offset, double instanceCount) {
   geaTrapCheck("gea_three_webgl_draw_elements_instanced"); GEA_WEBGL_VOID("drawElementsInstanced");
   gWebGL.glDrawElementsInstanced(asGLenum(mode), asGLsizei(count), asGLenum(type),
@@ -2679,6 +2708,18 @@ extern "C" void gea_three_webgl_tex_sub_image_3d_bytes(double target, double lev
   gWebGL.glTexSubImage3D(asGLenum(target), asGLint(level), asGLint(xoffset), asGLint(yoffset), asGLint(zoffset), asGLsizei(width), asGLsizei(height), asGLsizei(depth), asGLenum(format), asGLenum(type), bytes);
 }
 
+extern "C" void gea_three_webgl_compressed_tex_image_2d_bytes(double target, double level, double internalFormat, double width, double height, const void* bytes, double byteLength) {
+  GEA_WEBGL_VOID("compressedTexImage2DBytes");
+  if (!requireGl(reinterpret_cast<const void *>(gWebGL.glCompressedTexImage2D), "glCompressedTexImage2D")) return;
+  gWebGL.glCompressedTexImage2D(asGLenum(target), asGLint(level), asGLenum(internalFormat), asGLsizei(width), asGLsizei(height), 0, asGLsizei(byteLength), bytes);
+}
+
+extern "C" void gea_three_webgl_compressed_tex_sub_image_2d_bytes(double target, double level, double xoffset, double yoffset, double width, double height, double format, const void* bytes, double byteLength) {
+  GEA_WEBGL_VOID("compressedTexSubImage2DBytes");
+  if (!requireGl(reinterpret_cast<const void *>(gWebGL.glCompressedTexSubImage2D), "glCompressedTexSubImage2D")) return;
+  gWebGL.glCompressedTexSubImage2D(asGLenum(target), asGLint(level), asGLint(xoffset), asGLint(yoffset), asGLsizei(width), asGLsizei(height), asGLenum(format), asGLsizei(byteLength), bytes);
+}
+
 extern "C" void gea_three_webgl_tex_storage_3d(double target, double levels, double internalFormat, double width, double height, double depth) {
   GEA_WEBGL_VOID("texStorage3D");
   if (!requireGl(reinterpret_cast<const void *>(gWebGL.glTexStorage3D), "glTexStorage3D")) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geastack/native-webgl-angle",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Typed native WebGL compatibility layer backed by ANGLE/Metal",
   "license": "Apache-2.0",
   "repository": {

package/src/nativeWebGL.ts

@@ -277,6 +277,10 @@ declare function threeWebGLTexImage2D(target: number, level: number, internalFor
 /** @gea-host-inert Reads its arguments, writes GL state only; never calls back into script. */
 declare function threeWebGLTexSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, type: number, values: BufferSourceLike): void
 /** @gea-host-inert Reads its arguments, writes GL state only; never calls back into script. */
+declare function threeWebGLCompressedTexImage2D(target: number, level: number, internalFormat: number, width: number, height: number, values: BufferSourceLike): void
+/** @gea-host-inert Reads its arguments, writes GL state only; never calls back into script. */
+declare function threeWebGLCompressedTexSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, values: BufferSourceLike): void
+/** @gea-host-inert Reads its arguments, writes GL state only; never calls back into script. */
 declare function threeWebGLTexStorage2D(target: number, levels: number, internalFormat: number, width: number, height: number): void
 /** @gea-host-inert Reads its arguments, writes GL state only; never calls back into script. */
 declare function threeWebGLTexImage3D(target: number, level: number, internalFormat: number, width: number, height: number, depth: number, format: number, type: number, values: BufferSourceLike): void
@@ -943,7 +947,10 @@ export class NativeWebGL2RenderingContext {
   }
 
   isContextLost(): boolean { return false }
-  getSupportedExtensions(): string[] { return ['EXT_texture_filter_anisotropic', 'OES_texture_float_linear', 'EXT_color_buffer_float'] }
+  getSupportedExtensions(): string[] {
+    return ['EXT_texture_filter_anisotropic', 'OES_texture_float_linear', 'EXT_color_buffer_float', 'WEBGL_compressed_texture_s3tc',
+      'WEBGL_compressed_texture_s3tc_srgb', 'EXT_texture_compression_rgtc', 'EXT_texture_compression_bptc']
+  }
 
   getExtension(name: string): WebGLExtension | null {
     // One shared shape for every supported name -- see `WebGLExtension`. The
@@ -955,7 +962,11 @@ export class NativeWebGL2RenderingContext {
       name === 'WEBGL_debug_renderer_info' ||
       name === 'OES_texture_float_linear' ||
       name === 'EXT_color_buffer_float' ||
-      name === 'EXT_color_buffer_half_float'
+      name === 'EXT_color_buffer_half_float' ||
+      name === 'WEBGL_compressed_texture_s3tc' ||
+      name === 'WEBGL_compressed_texture_s3tc_srgb' ||
+      name === 'EXT_texture_compression_rgtc' ||
+      name === 'EXT_texture_compression_bptc'
     ) {
       return new WebGLExtension()
     }
@@ -1154,8 +1165,12 @@ export class NativeWebGL2RenderingContext {
   texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, type: number, pixels: BufferSourceLike): void {
     threeWebGLTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels)
   }
-  compressedTexImage2D(_target: number, _level: number, _internalFormat: number, _width: number, _height: number, _border: number, _data: BufferSourceLike): void {}
-  compressedTexSubImage2D(_target: number, _level: number, _xoffset: number, _yoffset: number, _width: number, _height: number, _format: number, _data: BufferSourceLike): void {}
+  compressedTexImage2D(target: number, level: number, internalFormat: number, width: number, height: number, _border: number, data: BufferSourceLike): void {
+    threeWebGLCompressedTexImage2D(target, level, internalFormat, width, height, data)
+  }
+  compressedTexSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, data: BufferSourceLike): void {
+    threeWebGLCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, data)
+  }
   compressedTexImage3D(_target: number, _level: number, _internalFormat: number, _width: number, _height: number, _depth: number, _border: number, _data: BufferSourceLike): void {}
   compressedTexSubImage3D(_target: number, _level: number, _xoffset: number, _yoffset: number, _zoffset: number, _width: number, _height: number, _depth: number, _format: number, _data: BufferSourceLike): void {}
   texStorage2D(target: number, levels: number, internalFormat: number, width: number, height: number): void {
@@ -1198,7 +1213,12 @@ export class NativeWebGL2RenderingContext {
   framebufferTextureLayer(target: number, attachment: number, texture: NativeHandle | null, level: number, layer: number): void {
     threeWebGLFramebufferTextureLayer(target, attachment, nullableNativeHandle(texture), level, layer)
   }
-  drawBuffers(buffers: number[]): void { nativeWebGLDrawBuffers(buffers[0] ?? this.COLOR_ATTACHMENT0) }
+  /** Every listed buffer reaches GL (up to 8, the MRT limit the host passes), so multiple render targets write all their attachments. */
+  drawBuffers(buffers: number[]): void {
+    const count = Math.min(buffers.length, 8)
+    const at = (index: number): number => index < count ? buffers[index] : this.NONE
+    nativeWebGLDrawBuffers(count, at(0), at(1), at(2), at(3), at(4), at(5), at(6), at(7))
+  }
 
   clearColor(r: number, g: number, b: number, a: number): void { nativeWebGLClearColor(r, g, b, a) }
   clear(mask: number): void { nativeWebGLClear(mask) }

package/src/nativeWebGLHost.ts

@@ -148,7 +148,7 @@ export function nativeWebGLBindRenderbuffer(target: number, renderbuffer: number
 export function nativeWebGLDeleteRenderbuffer(renderbuffer: number): void { threeWebGLDeleteRenderbuffer(renderbuffer) }
 export function nativeWebGLRenderbufferStorage(target: number, internalFormat: number, width: number, height: number): void { threeWebGLRenderbufferStorage(target, internalFormat, width, height) }
 export function nativeWebGLFramebufferRenderbuffer(target: number, attachment: number, renderbuffertarget: number, renderbuffer: number): void { threeWebGLFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer) }
-export function nativeWebGLDrawBuffers(attachment: number): void { threeWebGLDrawBuffers(attachment) }
+export function nativeWebGLDrawBuffers(count: number, a0: number, a1: number, a2: number, a3: number, a4: number, a5: number, a6: number, a7: number): void { threeWebGLDrawBuffers(count, a0, a1, a2, a3, a4, a5, a6, a7) }
 
 export function nativeWebGLClearColor(r: number, g: number, b: number, a: number): void { threeWebGLClearColor(r, g, b, a) }
 export function nativeWebGLClear(mask: number): void { threeWebGLClear(mask) }
@@ -303,7 +303,7 @@ declare function threeWebGLRenderbufferStorage(target: number, internalFormat: n
 /** @gea-host-inert Native state only; retains no script references and invokes no script. */
 declare function threeWebGLFramebufferRenderbuffer(target: number, attachment: number, renderbuffertarget: number, renderbuffer: number): void
 /** @gea-host-inert Native state only; retains no script references and invokes no script. */
-declare function threeWebGLDrawBuffers(attachment: number): void
+declare function threeWebGLDrawBuffers(count: number, a0: number, a1: number, a2: number, a3: number, a4: number, a5: number, a6: number, a7: number): void
 /** @gea-host-inert Copies scalar arguments into GL state; retains no script references and invokes no script. */
 declare function threeWebGLClearColor(r: number, g: number, b: number, a: number): void
 /** @gea-host-inert Native state only; retains no script references and invokes no script. */
@@ -366,6 +366,13 @@ declare function threeWebGLGetError(): number
 declare function threeNativeProfilePhase(phase: number): void
 export function nativeProfilePhase(phase: number): void { threeNativeProfilePhase(phase) }
 
+export function nativePushDebugGroup(label: string): void { threeWebGLPushDebugGroup(label) }
+/** @gea-host-inert Native state only; retains no script references and invokes no script. */
+declare function threeWebGLPushDebugGroup(label: string): void
+export function nativePopDebugGroup(): void { threeWebGLPopDebugGroup() }
+/** @gea-host-inert Native state only; retains no script references and invokes no script. */
+declare function threeWebGLPopDebugGroup(): void
+
 export function nativeWebGLBindBufferBase(target: number, index: number, buffer: number): void { threeWebGLBindBufferBase(target, index, buffer) }
 /** @gea-host-inert Native state only; retains no script references and invokes no script. */
 declare function threeWebGLBindBufferBase(target: number, index: number, buffer: number): void