Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Buffer::dynamic buffer constructor #347

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add Buffer::dynamic buffer constructor #347

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d12100d
Refactor Buffer ctors
Speykious Mar 10, 2023
dfec3f9
Add dynamic Buffer ctor
Speykious Mar 10, 2023
55a8839
woops, it's `std::os::raw::c_void`
Speykious Mar 10, 2023
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
139 changes: 86 additions & 53 deletions src/graphics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::os::raw::c_void;
use std::{ffi::CString, mem};

mod texture;
Expand Down Expand Up @@ -1703,14 +1704,14 @@ pub enum Usage {
Stream,
}

fn gl_buffer_target(buffer_type: &BufferType) -> GLenum {
fn gl_buffer_target(buffer_type: BufferType) -> GLenum {
match buffer_type {
BufferType::VertexBuffer => GL_ARRAY_BUFFER,
BufferType::IndexBuffer => GL_ELEMENT_ARRAY_BUFFER,
}
}

fn gl_usage(usage: &Usage) -> GLenum {
fn gl_usage(usage: Usage) -> GLenum {
match usage {
Usage::Immutable => GL_STATIC_DRAW,
Usage::Dynamic => GL_DYNAMIC_DRAW,
Expand All @@ -1727,6 +1728,37 @@ pub struct Buffer {
}

impl Buffer {
fn new(
ctx: &mut Context,
index_type: Option<IndexType>,
buffer_type: BufferType,
usage: Usage,
size: usize,
data: *const c_void,
) -> Buffer {
let gl_target = gl_buffer_target(buffer_type);
let gl_usage = gl_usage(usage);
let mut gl_buf: u32 = 0;

unsafe {
glGenBuffers(1, &mut gl_buf as *mut _);
ctx.cache.store_buffer_binding(gl_target);
ctx.cache.bind_buffer(gl_target, gl_buf, index_type);
glBufferData(gl_target, size as _, std::ptr::null() as *const _, gl_usage);
if !data.is_null() {
glBufferSubData(gl_target, 0, size as _, data);
}
ctx.cache.restore_buffer_binding(gl_target);
}

Buffer {
gl_buf,
buffer_type,
size,
index_type,
}
}

/// Create an immutable buffer resource object.
/// ```ignore
/// #[repr(C)]
Expand All @@ -1749,26 +1781,46 @@ impl Buffer {
None
};

let gl_target = gl_buffer_target(&buffer_type);
let gl_usage = gl_usage(&Usage::Immutable);
let size = mem::size_of_val(data);
let mut gl_buf: u32 = 0;
Self::new(
ctx,
index_type,
buffer_type,
Usage::Immutable,
mem::size_of_val(data),
data.as_ptr() as *const _,
)
}

unsafe {
glGenBuffers(1, &mut gl_buf as *mut _);
ctx.cache.store_buffer_binding(gl_target);
ctx.cache.bind_buffer(gl_target, gl_buf, index_type);
glBufferData(gl_target, size as _, std::ptr::null() as *const _, gl_usage);
glBufferSubData(gl_target, 0, size as _, data.as_ptr() as *const _);
ctx.cache.restore_buffer_binding(gl_target);
}
/// Create a dynamic buffer resource object.
/// ```ignore
/// #[repr(C)]
/// struct Vertex {
/// pos: Vec2,
/// uv: Vec2,
/// }
/// let vertices: [Vertex; 4] = [
/// Vertex { pos : Vec2 { x: -0.5, y: -0.5 }, uv: Vec2 { x: 0., y: 0. } },
/// Vertex { pos : Vec2 { x: 0.5, y: -0.5 }, uv: Vec2 { x: 1., y: 0. } },
/// Vertex { pos : Vec2 { x: 0.5, y: 0.5 }, uv: Vec2 { x: 1., y: 1. } },
/// Vertex { pos : Vec2 { x: -0.5, y: 0.5 }, uv: Vec2 { x: 0., y: 1. } },
/// ];
/// let buffer = Buffer::dynamic(ctx, BufferType::VertexBuffer, &vertices);
/// ```
pub fn dynamic<T>(ctx: &mut Context, buffer_type: BufferType, data: &[T]) -> Buffer {
let index_type = if buffer_type == BufferType::IndexBuffer {
Some(IndexType::for_type::<T>())
} else {
None
};

Buffer {
gl_buf,
buffer_type,
size,
Self::new(
ctx,
index_type,
}
buffer_type,
Usage::Dynamic,
mem::size_of_val(data),
data.as_ptr() as *const _,
)
}

pub fn stream(ctx: &mut Context, buffer_type: BufferType, size: usize) -> Buffer {
Expand All @@ -1778,46 +1830,27 @@ impl Buffer {
None
};

let gl_target = gl_buffer_target(&buffer_type);
let gl_usage = gl_usage(&Usage::Stream);
let mut gl_buf: u32 = 0;

unsafe {
glGenBuffers(1, &mut gl_buf as *mut _);
ctx.cache.store_buffer_binding(gl_target);
ctx.cache.bind_buffer(gl_target, gl_buf, None);
glBufferData(gl_target, size as _, std::ptr::null() as *const _, gl_usage);
ctx.cache.restore_buffer_binding(gl_target);
}

Buffer {
gl_buf,
Self::new(
ctx,
index_type,
buffer_type,
Usage::Stream,
size,
index_type,
}
std::ptr::null(),
)
}

pub fn index_stream(ctx: &mut Context, index_type: IndexType, size: usize) -> Buffer {
let gl_target = gl_buffer_target(&BufferType::IndexBuffer);
let gl_usage = gl_usage(&Usage::Stream);
let mut gl_buf: u32 = 0;

unsafe {
glGenBuffers(1, &mut gl_buf as *mut _);
ctx.cache.store_buffer_binding(gl_target);
ctx.cache.bind_buffer(gl_target, gl_buf, None);
glBufferData(gl_target, size as _, std::ptr::null() as *const _, gl_usage);
ctx.cache.restore_buffer_binding(gl_target);
}

Buffer {
gl_buf,
buffer_type: BufferType::IndexBuffer,
Self::new(
ctx,
Some(index_type),
BufferType::IndexBuffer,
Usage::Stream,
size,
index_type: Some(index_type),
}
std::ptr::null(),
)
}

pub fn update<T>(&self, ctx: &mut Context, data: &[T]) {
if self.buffer_type == BufferType::IndexBuffer {
assert!(self.index_type.is_some());
Expand All @@ -1828,7 +1861,7 @@ impl Buffer {

assert!(size <= self.size);

let gl_target = gl_buffer_target(&self.buffer_type);
let gl_target = gl_buffer_target(self.buffer_type);
ctx.cache.store_buffer_binding(gl_target);
ctx.cache
.bind_buffer(gl_target, self.gl_buf, self.index_type);
Expand Down