Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gleam"
version = "0.15.1"
version = "0.16.0"
authors = ["The Servo Project Developers"]
description = "Generated OpenGL bindings and wrapper for Servo."
documentation = "https://docs.rs/gleam"
Expand Down
2 changes: 2 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ fn main() {
"GL_KHR_blend_equation_advanced_coherent",
"GL_KHR_blend_equation_advanced_coherent",
"GL_ARB_shader_storage_buffer_object",
"GL_ARB_base_instance",
];
let gl_reg = Registry::new(
Api::Gl,
Expand Down Expand Up @@ -67,6 +68,7 @@ fn main() {
"GL_KHR_blend_equation_advanced_coherent",
"GL_ANGLE_copy_texture_3d",
"GL_QCOM_tiled_rendering",
"GL_EXT_base_instance",
];
let gles_reg = Registry::new(
Api::Gles2,
Expand Down
27 changes: 27 additions & 0 deletions src/gl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,33 @@ declare_gl_apis! {

fn start_tiling_qcom(&self, x: GLuint, y: GLuint, width: GLuint, height: GLuint, preserve_mask: GLbitfield);
fn end_tiling_qcom(&self, preserve_mask: GLbitfield);

fn draw_arrays_instanced_base_instance(&self,
mode: GLenum,
first: GLint,
count: GLsizei,
instance_count: GLsizei,
base_instance: GLuint
);

fn draw_elements_instanced_base_instance(&self,
mode: GLenum,
count: GLsizei,
element_type: GLenum,
indices_offset: GLuint,
instance_count: GLsizei,
base_instance: GLuint
);

fn draw_elements_instanced_base_vertex_base_instance(&self,
mode: GLenum,
count: GLsizei,
element_type: GLenum,
indices_offset: GLuint,
instance_count: GLsizei,
base_vertex: GLint,
base_instance: GLuint
);
}

//#[deprecated(since = "0.6.11", note = "use ErrorReactingGl instead")]
Expand Down
62 changes: 62 additions & 0 deletions src/gl_fns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2294,4 +2294,66 @@ impl Gl for GlFns {

fn end_tiling_qcom(&self, _preserve_mask: GLbitfield) {
}

fn draw_arrays_instanced_base_instance(
&self,
mode: GLenum,
first: GLint,
count: GLsizei,
instance_count: GLsizei,
base_instance: GLuint
) {
unsafe {
self.ffi_gl_.DrawArraysInstancedBaseInstance(
mode,
first,
count,
instance_count,
base_instance
);
}
}

fn draw_elements_instanced_base_instance(
&self,
mode: GLenum,
count: GLsizei,
element_type: GLenum,
indices_offset: GLuint,
instance_count: GLsizei,
base_instance: GLuint
) {
unsafe {
self.ffi_gl_.DrawElementsInstancedBaseInstance(
mode,
count,
element_type,
indices_offset as *const GLvoid,
instance_count,
base_instance
);
}
}

fn draw_elements_instanced_base_vertex_base_instance(
&self, mode: GLenum,
count: GLsizei,
element_type: GLenum,
indices_offset: GLuint,
instance_count: GLsizei,
base_vertex: GLint,
base_instance: GLuint
) {
unsafe {
self.ffi_gl_.DrawElementsInstancedBaseVertexBaseInstance(
mode,
count,
element_type,
indices_offset as *const GLvoid,
instance_count,
base_vertex,
base_instance
);
}
}
}
62 changes: 62 additions & 0 deletions src/gles_fns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2302,4 +2302,66 @@ impl Gl for GlesFns {
self.ffi_gl_.EndTilingQCOM(preserve_mask);
}
}

fn draw_arrays_instanced_base_instance(
&self,
mode: GLenum,
first: GLint,
count: GLsizei,
instance_count: GLsizei,
base_instance: GLuint
) {
unsafe {
self.ffi_gl_.DrawArraysInstancedBaseInstanceEXT(
mode,
first,
count,
instance_count,
base_instance
);
}
}

fn draw_elements_instanced_base_instance(
&self,
mode: GLenum,
count: GLsizei,
element_type: GLenum,
indices_offset: GLuint,
instance_count: GLsizei,
base_instance: GLuint
) {
unsafe {
self.ffi_gl_.DrawElementsInstancedBaseInstanceEXT(
mode,
count,
element_type,
indices_offset as *const GLvoid,
instance_count,
base_instance
);
}
}

fn draw_elements_instanced_base_vertex_base_instance(
&self, mode: GLenum,
count: GLsizei,
element_type: GLenum,
indices_offset: GLuint,
instance_count: GLsizei,
base_vertex: GLint,
base_instance: GLuint
) {
unsafe {
self.ffi_gl_.DrawElementsInstancedBaseVertexBaseInstanceEXT(
mode,
count,
element_type,
indices_offset as *const GLvoid,
instance_count,
base_vertex,
base_instance
);
}
}
}
Loading