Indexing additions

gl2.rs

@@ -577,6 +577,28 @@ pub fn draw_elements(mode: GLenum, count: GLsizei, element_type: GLenum, indices
     }
 }
 
+pub fn draw_arrays_instanced(mode: GLenum, first: GLint, count: GLsizei, primcount: GLsizei) {
+    unsafe {
+        ll::glDrawArraysInstanced(mode, first, count, primcount);
+    }
+}
+
+pub fn draw_elements_instanced(mode: GLenum, count: GLsizei, element_type: GLenum, indices: Option<&[u8]>, primcount: GLsizei) {
+    unsafe {
+        ll::glDrawElementsInstanced(mode,
+                                    match indices {
+                                      Some(ref i) => cmp::min(count, i.len() as GLsizei),
+                                      None => count,
+                                    },
+                                    element_type,
+                                    match indices {
+                                      Some(ref i) => cast::transmute(&i[0]),
+                                      None => ptr::null(),
+                                    }, 
+                                    primcount);
+    }
+}
+
 pub fn enable(cap: GLenum) {
     unsafe {
         ll::glEnable(cap);
@@ -933,6 +955,21 @@ pub fn vertex_attrib_pointer_f32(index: GLuint,
     }
 }
 
+pub fn vertex_attrib_pointer_i8(index: GLuint,
+                                 size: GLint,
+                                 normalized: bool,
+                                 stride: GLsizei,
+                                 offset: GLuint) {
+    unsafe {
+        ll::glVertexAttribPointer(index,
+                                  size,
+                                  BYTE,
+                                  normalized as GLboolean,
+                                  stride,
+                                  transmute(offset as uint));
+    }
+}
+
 pub fn vertex_attrib_pointer_u8(index: GLuint,
                                  size: GLint,
                                  normalized: bool,
@@ -948,6 +985,12 @@ pub fn vertex_attrib_pointer_u8(index: GLuint,
     }
 }
 
+pub fn vertex_attrib_divisor(index: GLuint, divisor: GLuint) {
+    unsafe {
+        ll::glVertexAttribDivisor(index, divisor);
+    }
+}
+
 pub fn viewport(x: GLint, y: GLint, width: GLsizei, height: GLsizei) {
     unsafe {
         ll::glViewport(x, y, width, height);
@@ -1060,6 +1103,10 @@ pub fn glDrawArrays(++mode: GLenum, ++first: GLint, ++count: GLsizei);
 
 pub fn glDrawElements(++mode: GLenum, ++count: GLsizei, ++_type: GLenum, ++indices: *GLvoid);
 
+pub fn glDrawArraysInstanced(++mode: GLenum, ++first: GLint, ++count: GLsizei, ++primcount: GLsizei);
+
+pub fn glDrawElementsInstanced(++mode: GLenum, ++count: GLsizei, ++_type: GLenum, ++indices: *GLvoid, ++primcount: GLsizei);
+
 pub fn glEnable(++cap: GLenum);
 
 pub fn glEnableVertexAttribArray(++index: GLuint);
@@ -1266,6 +1313,8 @@ pub fn glVertexAttrib4fv(++indx: GLuint, ++values: *GLfloat);
 
 pub fn glVertexAttribPointer(++indx: GLuint, ++size: GLint, ++_type: GLenum, ++normalized: GLboolean, ++stride: GLsizei, ++ptr: *GLvoid);
 
+pub fn glVertexAttribDivisor(++indx: GLuint, ++divisor: GLuint);
+
 pub fn glViewport(++x: GLint, ++y: GLint, ++width: GLsizei, ++height: GLsizei);