Skip to content

Allow updating a part of a buffer #584

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

Open
StepanTheGreat wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow updating a part of a buffer #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/graphics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,15 @@ pub trait RenderingBackend {
/// ```
fn new_buffer(&mut self, type_: BufferType, usage: BufferUsage, data: BufferSource)
-> BufferId;
fn buffer_update(&mut self, buffer: BufferId, data: BufferSource);

fn buffer_update(&mut self, buffer: BufferId, data: BufferSource) {
self.buffer_update_part(buffer, 0, data);
}

/// Update only a part of a buffer.
///
/// The offset is given in bytes
fn buffer_update_part(&mut self, buffer: BufferId, offset: usize, data: BufferSource);

/// Size of buffer in bytes.
/// For 1 element, u16 buffer this will return 2.
Expand Down
14 changes: 10 additions & 4 deletions src/graphics/gl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,11 +1383,12 @@ impl RenderingBackend for GlContext {
BufferId(self.buffers.add(buffer))
}

fn buffer_update(&mut self, buffer: BufferId, data: BufferSource) {
fn buffer_update_part(&mut self, buffer: BufferId, offset: usize, data: BufferSource) {
let data = match data {
BufferSource::Slice(data) => data,
_ => panic!("buffer_update expects BufferSource::slice"),
_ => panic!("buffer_update_part expects BufferSource::slice"),
};

debug_assert!(data.is_slice);
let buffer = &self.buffers[buffer.0];

Expand All @@ -1398,13 +1399,18 @@ impl RenderingBackend for GlContext {

let size = data.size;

assert!(size <= buffer.size);
// Make sure that the offset isn't larger than the buffer's size itself
assert!(offset < buffer.size);

// And that our data actually fits into the buffer with this offset
assert!(size <= buffer.size-offset);

let gl_target = gl_buffer_target(&buffer.buffer_type);
self.cache.store_buffer_binding(gl_target);
self.cache
.bind_buffer(gl_target, buffer.gl_buf, buffer.index_type);
unsafe { glBufferSubData(gl_target, 0, size as _, data.ptr as _) };

unsafe { glBufferSubData(gl_target, offset as _, size as _, data.ptr as _) };
self.cache.restore_buffer_binding(gl_target);
}

Expand Down
11 changes: 8 additions & 3 deletions src/graphics/metal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,20 +634,25 @@ impl RenderingBackend for MetalContext {
BufferId(self.buffers.len() - 1)
}

fn buffer_update(&mut self, buffer: BufferId, data: BufferSource) {
fn buffer_update_part(&mut self, buffer: BufferId, offset: usize, data: BufferSource) {
let data = match data {
BufferSource::Slice(data) => data,
_ => panic!("buffer_update expects BufferSource::slice"),
_ => panic!("buffer_update_part expects BufferSource::slice"),
};
let buffer = &mut self.buffers[buffer.0];

// Make sure that the offset isn't larger than the buffer's size itself
assert!(offset < buffer.size);

// And that our data actually fits into the buffer with this offset
assert!(data.size <= buffer.size);

unsafe {
let dest: *mut std::ffi::c_void = msg_send![buffer.raw[buffer.next_value], contents];
std::ptr::copy(data.ptr, dest, data.size);

#[cfg(target_os = "macos")]
msg_send_![buffer.raw[buffer.next_value], didModifyRange:NSRange::new(0, data.size as u64)];
msg_send_![buffer.raw[buffer.next_value], didModifyRange:NSRange::new(offset as u64, data.size as u64)];
}
buffer.value = buffer.next_value;
}
Expand Down
Loading