maplibre-gl 6.2.0 → 6.4.0

package/src/webgl/vertex_buffer.test.ts

@@ -40,7 +40,7 @@ describe('VertexBuffer', () => {
         const array = new TestArray();
         const buffer = new VertexBuffer(context, array, attributes);
         const spy = vi.spyOn(context.gl, 'enableVertexAttribArray').mockImplementation(() => {});
-        buffer.enableAttributes(context.gl, {attributes: {map: 5, box: 6}} as any);
+        buffer.enableAttributes(context.gl, {attributes: {map: {location: 5, isInteger: false}, box: {location: 6, isInteger: false}}} as any);
         expect(spy.mock.calls).toEqual([[5], [6]]);
     });
 
@@ -49,13 +49,28 @@ describe('VertexBuffer', () => {
         const array = new TestArray();
         const buffer = new VertexBuffer(context, array, attributes);
         const spy = vi.spyOn(context.gl, 'vertexAttribPointer').mockImplementation(() => {});
-        buffer.setVertexAttribPointers(context.gl, {attributes: {map: 5, box: 6}} as any, 50);
+        buffer.setVertexAttribPointers(context.gl, {attributes: {map: {location: 5, isInteger: false}, box: {location: 6, isInteger: false}}} as any, 50);
         expect(spy.mock.calls).toEqual([
             [5, 1, context.gl['SHORT'], false, 6, 300],
             [6, 2, context.gl['SHORT'], false, 6, 304]
         ]);
     });
 
+    test('setVertexAttribPointers uses vertexAttribIPointer for integer attributes', () => {
+        const context = new Context(gl);
+        const array = new TestArray();
+        const buffer = new VertexBuffer(context, array, attributes);
+        const integerSpy = vi.spyOn(context.gl, 'vertexAttribIPointer').mockImplementation(() => {});
+        const floatSpy = vi.spyOn(context.gl, 'vertexAttribPointer').mockImplementation(() => {});
+        buffer.setVertexAttribPointers(context.gl, {attributes: {map: {location: 5, isInteger: false}, box: {location: 6, isInteger: true}}} as any, 50);
+        expect(integerSpy.mock.calls).toEqual([
+            [6, 2, context.gl['SHORT'], 6, 304]
+        ]);
+        expect(floatSpy.mock.calls).toEqual([
+            [5, 1, context.gl['SHORT'], false, 6, 300]
+        ]);
+    });
+
     test('static buffer frees StructArray typed views after upload', () => {
         const context = new Context(gl);
         const array = new TestArray();

package/src/webgl/vertex_buffer.ts

@@ -66,9 +66,9 @@ export class VertexBuffer {
 
     enableAttributes(gl: WebGL2RenderingContext, program: Program<any>): void {
         for (const member of this.attributes) {
-            const attribIndex: number | void = program.attributes[member.name];
-            if (attribIndex !== undefined) {
-                gl.enableVertexAttribArray(attribIndex);
+            const attribute = program.attributes[member.name];
+            if (attribute !== undefined) {
+                gl.enableVertexAttribArray(attribute.location);
             }
         }
     }
@@ -81,17 +81,28 @@ export class VertexBuffer {
      */
     setVertexAttribPointers(gl: WebGL2RenderingContext, program: Program<any>, vertexOffset?: number | null): void {
         for (const member of this.attributes) {
-            const attribIndex: number | void = program.attributes[member.name];
+            const attribute = program.attributes[member.name];
 
-            if (attribIndex !== undefined) {
-                gl.vertexAttribPointer(
-                    attribIndex,
-                    member.components,
-                    gl[AttributeType[member.type]],
-                    false,
-                    this.itemSize,
-                    member.offset + (this.itemSize * (vertexOffset || 0))
-                );
+            if (attribute !== undefined) {
+                const offset = member.offset + (this.itemSize * (vertexOffset || 0));
+                if (attribute.isInteger) {
+                    gl.vertexAttribIPointer(
+                        attribute.location,
+                        member.components,
+                        gl[AttributeType[member.type]],
+                        this.itemSize,
+                        offset
+                    );
+                } else {
+                    gl.vertexAttribPointer(
+                        attribute.location,
+                        member.components,
+                        gl[AttributeType[member.type]],
+                        false,
+                        this.itemSize,
+                        offset
+                    );
+                }
             }
         }
     }