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

Armotize cpu drawcalls #807

Merged
merged 3 commits into from
Sep 12, 2024
Merged

Armotize cpu drawcalls #807

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a7d214
Draft impl of the megabuffer optimisation
InnocentusLime Sep 12, 2024
d591e1e
Patch-up indices
InnocentusLime Sep 12, 2024
d821c27
Cleanup
InnocentusLime Sep 12, 2024
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
58 changes: 27 additions & 31 deletions src/quad_gl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ pub enum DrawMode {
pub struct GlPipeline(usize);

struct DrawCall {
vertices: Vec<Vertex>,
indices: Vec<u16>,

vertices_count: usize,
indices_count: usize,
vertices_start: usize,
indices_start: usize,

clip: Option<(i32, i32, i32, i32)>,
viewport: Option<(i32, i32, i32, i32)>,
Expand All @@ -47,15 +46,10 @@ impl DrawCall {
pipeline: GlPipeline,
uniforms: Option<Vec<u8>>,
render_pass: Option<RenderPass>,
max_vertices: usize,
max_indices: usize,
) -> DrawCall {
DrawCall {
vertices: vec![
Vertex::new(0., 0., 0., 0., 0., Color::new(0.0, 0.0, 0.0, 0.0));
max_vertices
],
indices: vec![0; max_indices],
vertices_start: 0,
indices_start: 0,
vertices_count: 0,
indices_count: 0,
viewport: None,
Expand All @@ -69,14 +63,6 @@ impl DrawCall {
capture: false,
}
}

fn vertices(&self) -> &[Vertex] {
&self.vertices[0..self.vertices_count]
}

fn indices(&self) -> &[u16] {
&self.indices[0..self.indices_count]
}
}

struct MagicSnapshotter {
Expand Down Expand Up @@ -578,6 +564,9 @@ pub struct QuadGl {
pub(crate) white_texture: miniquad::TextureId,
max_vertices: usize,
max_indices: usize,

batch_vertex_buffer: Vec<Vertex>,
batch_index_buffer: Vec<u16>,
}

impl QuadGl {
Expand Down Expand Up @@ -607,6 +596,10 @@ impl QuadGl {
white_texture: white_texture,
max_vertices: 10000,
max_indices: 5000,

// Good first estimates. Vec will scale exponentially if needed
batch_vertex_buffer: Vec::with_capacity(10000),
batch_index_buffer: Vec::with_capacity(5000),
}
}

Expand Down Expand Up @@ -735,9 +728,9 @@ impl QuadGl {

ctx.buffer_update(
bindings.vertex_buffers[0],
BufferSource::slice(dc.vertices()),
BufferSource::slice(&self.batch_vertex_buffer[dc.vertices_start..(dc.vertices_start + dc.vertices_count)]),
);
ctx.buffer_update(bindings.index_buffer, BufferSource::slice(dc.indices()));
ctx.buffer_update(bindings.index_buffer, BufferSource::slice(&self.batch_index_buffer[dc.indices_start..(dc.indices_start + dc.indices_count)]));

bindings.images[0] = dc.texture.unwrap_or(white_texture);
bindings.images[1] = self
Expand Down Expand Up @@ -789,9 +782,13 @@ impl QuadGl {

dc.vertices_count = 0;
dc.indices_count = 0;
dc.vertices_start = 0;
dc.indices_start = 0;
}

self.draw_calls_count = 0;
self.batch_index_buffer.clear();
self.batch_vertex_buffer.clear();
}

pub(crate) fn capture(&mut self, capture: bool) {
Expand Down Expand Up @@ -917,8 +914,6 @@ impl QuadGl {
pip,
uniforms.clone(),
self.state.render_pass,
self.max_vertices,
self.max_indices,
));
}
self.draw_calls[self.draw_calls_count].texture = self.state.texture;
Expand All @@ -931,21 +926,23 @@ impl QuadGl {
self.draw_calls[self.draw_calls_count].pipeline = pip;
self.draw_calls[self.draw_calls_count].render_pass = self.state.render_pass;
self.draw_calls[self.draw_calls_count].capture = self.state.capture;
self.draw_calls[self.draw_calls_count].indices_start = self.batch_index_buffer.len();
self.draw_calls[self.draw_calls_count].vertices_start = self.batch_vertex_buffer.len();

self.draw_calls_count += 1;
self.state.break_batching = false;
};
let dc = &mut self.draw_calls[self.draw_calls_count - 1];

for i in 0..vertices.len() {
dc.vertices[dc.vertices_count + i] = vertices[i];
}
self.batch_vertex_buffer.extend(vertices);
self.batch_index_buffer.extend(
indices.iter()
.map(|x| *x + dc.vertices_count as u16)
);

for i in 0..indices.len() {
dc.indices[dc.indices_count + i] = indices[i] + dc.vertices_count as u16;
}
dc.vertices_count += vertices.len();
dc.indices_count += indices.len();

dc.texture = self.state.texture;
}

Expand Down Expand Up @@ -1002,9 +999,8 @@ impl QuadGl {
self.max_indices = max_indices;

for draw_call in &mut self.draw_calls {
draw_call.vertices =
vec![Vertex::new(0., 0., 0., 0., 0., Color::new(0.0, 0.0, 0.0, 0.0)); max_vertices];
draw_call.indices = vec![0; max_indices];
draw_call.indices_start = 0;
draw_call.vertices_start = 0;
}
for binding in &mut self.draw_calls_bindings {
let vertex_buffer = ctx.new_buffer(
Expand Down
Loading