@geastack/native-webgl-angle 0.1.15 → 0.1.16

package/geatsc-plugin.mjs

@@ -77,6 +77,30 @@ function nativeVoidMemberCallContract(
 const hostFunctions = [
  ['threeWebGLCopyTexImage2D','gea_three_webgl_copy_tex_image_2d','void','extern "C" void gea_three_webgl_copy_tex_image_2d(double,double,double,double,double,double,double,double);'],
  ['threeWebGLCopyTexSubImage2D','gea_three_webgl_copy_tex_sub_image_2d','void','extern "C" void gea_three_webgl_copy_tex_sub_image_2d(double,double,double,double,double,double,double,double);'],
+  [
+    "threeWebGLBindBufferBase",
+    "gea_three_webgl_bind_buffer_base",
+    "void",
+    'extern "C" void gea_three_webgl_bind_buffer_base(double target, double index, double buffer);',
+  ],
+  [
+    "threeWebGLBindBufferRange",
+    "gea_three_webgl_bind_buffer_range",
+    "void",
+    'extern "C" void gea_three_webgl_bind_buffer_range(double target, double index, double buffer, double offset, double size);',
+  ],
+  [
+    "threeWebGLGetUniformBlockIndex",
+    "gea_three_webgl_get_uniform_block_index",
+    "double",
+    'extern "C" double gea_three_webgl_get_uniform_block_index(double program, std::string name);',
+  ],
+  [
+    "threeWebGLUniformBlockBinding",
+    "gea_three_webgl_uniform_block_binding",
+    "void",
+    'extern "C" void gea_three_webgl_uniform_block_binding(double program, double blockIndex, double binding);',
+  ],
   [
     "threeWebGLVertexAttribDivisor",
     "gea_three_webgl_vertex_attrib_divisor",

package/native/angle_webgl_host.mm

@@ -347,6 +347,10 @@ using PFNEGLSWAPINTERVALPROC = EGLBoolean (*)(EGLDisplay, EGLint);
 using PFNGLACTIVETEXTUREPROC = void (*)(GLenum);
 using PFNGLATTACHSHADERPROC = void (*)(GLuint, GLuint);
 using PFNGLBINDBUFFERPROC = void (*)(GLenum, GLuint);
+using PFNGLBINDBUFFERBASEPROC = void (*)(GLenum, GLuint, GLuint);
+using PFNGLBINDBUFFERRANGEPROC = void (*)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+using PFNGLGETUNIFORMBLOCKINDEXPROC = GLuint (*)(GLuint, const char *);
+using PFNGLUNIFORMBLOCKBINDINGPROC = void (*)(GLuint, GLuint, GLuint);
 using PFNGLBINDFRAMEBUFFERPROC = void (*)(GLenum, GLuint);
 using PFNGLBINDRENDERBUFFERPROC = void (*)(GLenum, GLuint);
 using PFNGLBINDTEXTUREPROC = void (*)(GLenum, GLuint);
@@ -495,6 +499,10 @@ struct AngleWebGLState {
   PFNGLACTIVETEXTUREPROC glActiveTexture = nullptr;
   PFNGLATTACHSHADERPROC glAttachShader = nullptr;
   PFNGLBINDBUFFERPROC glBindBuffer = nullptr;
+  PFNGLBINDBUFFERBASEPROC glBindBufferBase = nullptr;
+  PFNGLBINDBUFFERRANGEPROC glBindBufferRange = nullptr;
+  PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex = nullptr;
+  PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding = nullptr;
   PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer = nullptr;
   PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer = nullptr;
   PFNGLBINDTEXTUREPROC glBindTexture = nullptr;
@@ -1030,6 +1038,10 @@ 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)
   LOAD_GL(glBindFramebuffer, PFNGLBINDFRAMEBUFFERPROC)
   LOAD_GL(glBindRenderbuffer, PFNGLBINDRENDERBUFFERPROC)
   LOAD_GL(glBindTexture, PFNGLBINDTEXTUREPROC)
@@ -2402,6 +2414,23 @@ 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)); }
+// 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");
+  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");
+  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");
+  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");
+  gWebGL.glUniformBlockBinding(asGLuint(program), asGLuint(blockIndex), asGLuint(binding)); }
 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),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geastack/native-webgl-angle",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "Typed native WebGL compatibility layer backed by ANGLE/Metal",
   "license": "Apache-2.0",
   "repository": {
@@ -54,7 +54,7 @@
     "test:host-effects": "node test/native-host-effects-contract.test.mjs",
     "test:allocation-contracts": "node test/render-sort-contract.test.mjs && node test/upload-array-contract.test.mjs && node test/draw-dispatch-contract.test.mjs && node test/native-upload-transport.test.mjs && node test/fixed-uniform-contract.test.mjs && node test/uniform-binding-contract.test.mjs && node test/buffer-streaming-contract.test.mjs",
     "check": "tsc -p tsconfig.json --noEmit",
-    "test": "node test/native-blending-contract.test.mjs && node test/native-transform-contract.test.mjs && node test/troika-three-text.test.mjs && node test/typed-void-contract.test.mjs && node test/info-log-contract.test.mjs && node test/resource-host-contract.test.mjs && node test/instancing-transport-contract.test.mjs && node test/automatic-instancing-contract.test.mjs && node test/jsdoc-fold-contract.test.mjs && node test/gea-native-declaration.test.mjs",
+    "test": "node test/native-blending-contract.test.mjs && node test/native-transform-contract.test.mjs && node test/troika-three-text.test.mjs && node test/typed-void-contract.test.mjs && node test/info-log-contract.test.mjs && node test/resource-host-contract.test.mjs && node test/instancing-transport-contract.test.mjs && node test/automatic-instancing-contract.test.mjs && node test/jsdoc-fold-contract.test.mjs && node test/gea-native-declaration.test.mjs && node test/native-host-effects-contract.test.mjs && node test/uniform-buffer-contract.test.mjs",
     "test:package": "node --experimental-vm-modules test/package.test.mjs"
   },
   "dependencies": {

package/src/nativeWebGL.ts

@@ -47,6 +47,10 @@ import {
   nativeWebGLDrawArraysInstanced,
   nativeWebGLDrawElementsInstanced,
   nativeWebGLVertexAttribDivisor,
+  nativeWebGLBindBufferBase,
+  nativeWebGLBindBufferRange,
+  nativeWebGLGetUniformBlockIndex,
+  nativeWebGLUniformBlockBinding,
   nativeWebGLDrawBuffers,
   nativeWebGLDrawElements,
   nativeWebGLEnable,
@@ -1260,10 +1264,18 @@ export class NativeWebGL2RenderingContext {
   getVertexAttrib(_index: number, _pname: number): number { return 0 }
   getVertexAttribOffset(_index: number, _pname: number): number { return 0 }
   getUniform(_program: NativeProgram | null, _location: NativeHandle | null): number { return 0 }
-  getUniformBlockIndex(_program: NativeProgram | null, _uniformBlockName: string): number { return 0 }
-  uniformBlockBinding(_program: NativeProgram | null, _uniformBlockIndex: number, _uniformBlockBinding: number): void {}
-  bindBufferBase(_target: number, _index: number, _buffer: NativeHandle | null): void {}
-  bindBufferRange(_target: number, _index: number, _buffer: NativeHandle | null, _offset: number, _size: number): void {}
+  getUniformBlockIndex(program: NativeProgram | null, uniformBlockName: string): number {
+    return nativeWebGLGetUniformBlockIndex(nullableNativeHandle(program), uniformBlockName)
+  }
+  uniformBlockBinding(program: NativeProgram | null, uniformBlockIndex: number, uniformBlockBinding: number): void {
+    nativeWebGLUniformBlockBinding(nullableNativeHandle(program), uniformBlockIndex, uniformBlockBinding)
+  }
+  bindBufferBase(target: number, index: number, buffer: NativeHandle | null): void {
+    nativeWebGLBindBufferBase(target, index, nullableNativeHandle(buffer))
+  }
+  bindBufferRange(target: number, index: number, buffer: NativeHandle | null, offset: number, size: number): void {
+    nativeWebGLBindBufferRange(target, index, nullableNativeHandle(buffer), offset, size)
+  }
   fenceSync(_condition: number, _flags: number): NativeHandle | null {
     const sync = threeWebGLFenceSync()
     return sync ? createHandle('sync', sync) : null

package/src/nativeWebGLHost.ts

@@ -366,6 +366,23 @@ declare function threeWebGLGetError(): number
 declare function threeNativeProfilePhase(phase: number): void
 export function nativeProfilePhase(phase: number): void { threeNativeProfilePhase(phase) }
 
+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
+export function nativeWebGLBindBufferRange(target: number, index: number, buffer: number, offset: number, size: number): void {
+  threeWebGLBindBufferRange(target, index, buffer, offset, size)
+}
+/** @gea-host-inert Native state only; retains no script references and invokes no script. */
+declare function threeWebGLBindBufferRange(target: number, index: number, buffer: number, offset: number, size: number): void
+export function nativeWebGLGetUniformBlockIndex(program: number, name: string): number { return threeWebGLGetUniformBlockIndex(program, name) }
+/** @gea-host-inert Native state only; retains no script references and invokes no script. */
+declare function threeWebGLGetUniformBlockIndex(program: number, name: string): number
+export function nativeWebGLUniformBlockBinding(program: number, blockIndex: number, binding: number): void {
+  threeWebGLUniformBlockBinding(program, blockIndex, binding)
+}
+/** @gea-host-inert Native state only; retains no script references and invokes no script. */
+declare function threeWebGLUniformBlockBinding(program: number, blockIndex: number, binding: number): void
+
 export function nativeWebGLVertexAttribDivisor(index: number, divisor: number): void { threeWebGLVertexAttribDivisor(index, divisor) }
 /** @gea-host-inert Native state only; retains no script references and invokes no script. */
 declare function threeWebGLVertexAttribDivisor(index: number, divisor: number): void