zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 10:29:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Call did_modify_range on only once per render

Browse Source
This commit is contained in:
Nathan Sobo 2021-03-30 23:07:14 -06:00
parent dbf9a5a466
commit 5c444b2bfa
1 changed files with 11 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gpui/src/platform/mac/renderer.rs
View File

@ -91,7 +91,7 @@ impl Renderer {
"sprite_fragment", "sprite_fragment",
pixel_format, pixel_format,
)?; )?;
let path_stencil_pipeline_state = build_stencil_pipeline_state( let path_stencil_pipeline_state = build_path_atlas_pipeline_state(
&device, &device,
&library, &library,
"path_winding", "path_winding",
@ -129,6 +129,10 @@ impl Renderer {
command_buffer, command_buffer,
output, output,
); );
self.instances.did_modify_range(NSRange {
location: 0,
length: offset as NSUInteger,
});
} }
fn render_path_stencils( fn render_path_stencils(
@ -243,18 +247,13 @@ impl Renderer {
} }
} }
self.instances.did_modify_range(NSRange {
location: *offset as u64,
length: (next_offset - *offset) as u64,
});
*offset = next_offset;
winding_command_encoder.draw_primitives( winding_command_encoder.draw_primitives(
metal::MTLPrimitiveType::Triangle, metal::MTLPrimitiveType::Triangle,
0, 0,
vertices.len() as u64, vertices.len() as u64,
); );
winding_command_encoder.end_encoding(); winding_command_encoder.end_encoding();
*offset = next_offset;
} }
fn render_layers( fn render_layers(
@ -381,18 +380,13 @@ impl Renderer {
} }
} }
self.instances.did_modify_range(NSRange {
location: *offset as u64,
length: (next_offset - *offset) as u64,
});
*offset = next_offset;
command_encoder.draw_primitives_instanced( command_encoder.draw_primitives_instanced(
metal::MTLPrimitiveType::Triangle, metal::MTLPrimitiveType::Triangle,
0, 0,
6, 6,
layer.shadows().len() as u64, layer.shadows().len() as u64,
); );
*offset = next_offset;
} }
fn render_quads( fn render_quads(
@ -463,18 +457,13 @@ impl Renderer {
} }
} }
self.instances.did_modify_range(NSRange {
location: *offset as u64,
length: (next_offset - *offset) as u64,
});
*offset = next_offset;
command_encoder.draw_primitives_instanced( command_encoder.draw_primitives_instanced(
metal::MTLPrimitiveType::Triangle, metal::MTLPrimitiveType::Triangle,
0, 0,
6, 6,
layer.quads().len() as u64, layer.quads().len() as u64,
); );
*offset = next_offset;
} }
fn render_glyph_sprites( fn render_glyph_sprites(
@ -556,11 +545,6 @@ impl Renderer {
as *mut shaders::GPUISprite; as *mut shaders::GPUISprite;
std::ptr::copy_nonoverlapping(sprites.as_ptr(), buffer_contents, sprites.len()); std::ptr::copy_nonoverlapping(sprites.as_ptr(), buffer_contents, sprites.len());
} }
self.instances.did_modify_range(NSRange {
location: *offset as u64,
length: (next_offset - *offset) as u64,
});
*offset = next_offset;
command_encoder.draw_primitives_instanced( command_encoder.draw_primitives_instanced(
metal::MTLPrimitiveType::Triangle, metal::MTLPrimitiveType::Triangle,
@ -568,6 +552,7 @@ impl Renderer {
6, 6,
sprites.len() as u64, sprites.len() as u64,
); );
*offset = next_offset;
} }
} }
@ -667,18 +652,13 @@ impl Renderer {
as *const c_void, as *const c_void,
); );
self.instances.did_modify_range(NSRange {
location: *offset as u64,
length: (next_offset - *offset) as u64,
});
*offset = next_offset;
command_encoder.draw_primitives_instanced( command_encoder.draw_primitives_instanced(
metal::MTLPrimitiveType::Triangle, metal::MTLPrimitiveType::Triangle,
0, 0,
6, 6,
sprite_count as u64, sprite_count as u64,
); );
*offset = next_offset;
} }
} }
@ -738,7 +718,7 @@ fn build_pipeline_state(
.map_err(|message| anyhow!("could not create render pipeline state: {}", message)) .map_err(|message| anyhow!("could not create render pipeline state: {}", message))
} }
fn build_stencil_pipeline_state( fn build_path_atlas_pipeline_state(
device: &metal::DeviceRef, device: &metal::DeviceRef,
library: &metal::LibraryRef, library: &metal::LibraryRef,
label: &str, label: &str,
@ -772,32 +752,6 @@ fn build_stencil_pipeline_state(
.map_err(|message| anyhow!("could not create render pipeline state: {}", message)) .map_err(|message| anyhow!("could not create render pipeline state: {}", message))
} }
// fn build_stencil_pipeline_state(
// device: &metal::DeviceRef,
// library: &metal::LibraryRef,
// label: &str,
// vertex_fn_name: &str,
// fragment_fn_name: &str,
// pixel_format: metal::MTLPixelFormat,
// ) -> Result<metal::RenderPipelineState> {
// let vertex_fn = library
// .get_function(vertex_fn_name, None)
// .map_err(|message| anyhow!("error locating vertex function: {}", message))?;
// let fragment_fn = library
// .get_function(fragment_fn_name, None)
// .map_err(|message| anyhow!("error locating fragment function: {}", message))?;
// let descriptor = metal::RenderPipelineDescriptor::new();
// descriptor.set_label(label);
// descriptor.set_vertex_function(Some(vertex_fn.as_ref()));
// descriptor.set_fragment_function(Some(fragment_fn.as_ref()));
// descriptor.set_stencil_attachment_pixel_format(pixel_format);
// device
// .new_render_pipeline_state(&descriptor)
// .map_err(|message| anyhow!("could not create render pipeline state: {}", message))
// }
mod shaders { mod shaders {
#![allow(non_upper_case_globals)] #![allow(non_upper_case_globals)]
#![allow(non_camel_case_types)] #![allow(non_camel_case_types)]