[GL] Add support for glVertexAttribIPointer (support signed/unsigned …

…byte, short, int attributes)
not-fl3 · Jun 22, 2024 · a359a34 · a359a34
1 parent fbadb64
commit a359a34
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/js/gl.js b/js/gl.js
@@ -781,6 +781,9 @@ var importObject = {
         glVertexAttribPointer: function (index, size, type, normalized, stride, ptr) {
             gl.vertexAttribPointer(index, size, type, !!normalized, stride, ptr);
         },
+        glVertexAttribIPointer: function (index, size, type, stride, ptr) {
+            gl.vertexAttribIPointer(index, size, type, stride, ptr);
+        },
         glGetUniformLocation: function (program, name) {
             GL.validateGLObjectID(GL.programs, program, 'glGetUniformLocation', 'program');
             name = UTF8ToString(name);

diff --git a/src/graphics/gl.rs b/src/graphics/gl.rs
@@ -1317,14 +1317,24 @@ impl RenderingBackend for GlContext {
                         .bind_buffer(GL_ARRAY_BUFFER, vb.gl_buf, vb.index_type);
 
                     unsafe {
-                        glVertexAttribPointer(
-                            attr_index as GLuint,
-                            attribute.size,
-                            attribute.type_,
-                            GL_FALSE as u8,
-                            attribute.stride,
-                            attribute.offset as *mut _,
-                        );
+                        match attribute.type_ {
+                            GL_INT | GL_UNSIGNED_INT | GL_SHORT | GL_UNSIGNED_SHORT
+                            | GL_UNSIGNED_BYTE | GL_BYTE => glVertexAttribIPointer(
+                                attr_index as GLuint,
+                                attribute.size,
+                                attribute.type_,
+                                attribute.stride,
+                                attribute.offset as *mut _,
+                            ),
+                            _ => glVertexAttribPointer(
+                                attr_index as GLuint,
+                                attribute.size,
+                                attribute.type_,
+                                GL_FALSE as u8,
+                                attribute.stride,
+                                attribute.offset as *mut _,
+                            ),
+                        }
                         if self.features.instancing {
                             glVertexAttribDivisor(attr_index as GLuint, attribute.divisor as u32);
                         }

diff --git a/src/native/gl.rs b/src/native/gl.rs
@@ -541,6 +541,13 @@ gl_loader!(
         stride: GLsizei,
         pointer: *const ::std::os::raw::c_void
     ) -> (),
+    fn glVertexAttribIPointer(
+        index: GLuint,
+        size: GLint,
+        type_: GLenum,
+        stride: GLsizei,
+        pointer: *const ::std::os::raw::c_void
+    ) -> (),
     fn glDisable(cap: GLenum) -> (),
     fn glColorMask(red: GLboolean, green: GLboolean, blue: GLboolean, alpha: GLboolean) -> (),
     fn glBindBuffer(target: GLenum, buffer: GLuint) -> (),

diff --git a/src/native/wasm/webgl.rs b/src/native/wasm/webgl.rs
@@ -918,6 +918,15 @@ extern "C" {
         pointer: *const ::std::os::raw::c_void,
     );
 }
+extern "C" {
+    pub fn glVertexAttribIPointer(
+        index: GLuint,
+        size: GLint,
+        type_: GLenum,
+        stride: GLsizei,
+        pointer: *const ::std::os::raw::c_void,
+    );
+}
 extern "C" {
     pub fn glViewport(x: GLint, y: GLint, width: GLsizei, height: GLsizei);
 }