alex/vello
1
0
Fork 0
mirror of https://github.com/italicsjenga/vello.git synced 2025-01-10 12:41:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

better naming

Browse source
This commit is contained in:
Chad Brokaw 2023-01-08 18:36:14 -05:00
parent ec956d859b
commit 3606184cf6
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/render.rs
View file

@ -140,7 +140,7 @@ pub fn render_full(
} }
pub fn render_encoding_full( pub fn render_encoding_full(
data: &Encoding, encoding: &Encoding,
shaders: &FullShaders, shaders: &FullShaders,
width: u32, width: u32,
height: u32, height: u32,
@ -148,10 +148,10 @@ pub fn render_encoding_full(
use crate::encoding::{resource::ResourceCache, PackedEncoding}; use crate::encoding::{resource::ResourceCache, PackedEncoding};
let mut recording = Recording::default(); let mut recording = Recording::default();
let mut resources = ResourceCache::new(); let mut resources = ResourceCache::new();
let mut packed_scene = PackedEncoding::default(); let mut packed = PackedEncoding::default();
packed_scene.pack(&data, &mut resources); packed.pack(&encoding, &mut resources);
let (ramp_data, ramps_width, ramps_height) = resources.ramps(packed_scene.resources).unwrap(); let (ramp_data, ramps_width, ramps_height) = resources.ramps(packed.resources).unwrap();
let gradient_image = if data.patches.is_empty() { let gradient_image = if encoding.patches.is_empty() {
ResourceProxy::new_image(1, 1, ImageFormat::Rgba8) ResourceProxy::new_image(1, 1, ImageFormat::Rgba8)
} else { } else {
let data: &[u8] = bytemuck::cast_slice(ramp_data); let data: &[u8] = bytemuck::cast_slice(ramp_data);
@ -163,11 +163,11 @@ pub fn render_encoding_full(
)) ))
}; };
// TODO: calculate for real when we do rectangles // TODO: calculate for real when we do rectangles
let n_pathtag = data.path_tags.len(); let n_pathtag = encoding.path_tags.len();
let pathtag_padded = align_up(data.path_tags.len(), 4 * shaders::PATHTAG_REDUCE_WG); let pathtag_padded = align_up(encoding.path_tags.len(), 4 * shaders::PATHTAG_REDUCE_WG);
let n_paths = data.n_paths; let n_paths = encoding.n_paths;
let n_drawobj = n_paths; let n_drawobj = n_paths;
let n_clip = data.n_clips; let n_clip = encoding.n_clips;
let new_width = next_multiple_of(width, 16); let new_width = next_multiple_of(width, 16);
let new_height = next_multiple_of(height, 16); let new_height = next_multiple_of(height, 16);
@ -177,10 +177,10 @@ pub fn render_encoding_full(
height_in_tiles: new_height / 16, height_in_tiles: new_height / 16,
target_width: width, target_width: width,
target_height: height, target_height: height,
layout: packed_scene.layout, layout: packed.layout,
}; };
// println!("{:?}", config); // println!("{:?}", config);
let scene_buf = ResourceProxy::Buf(recording.upload(packed_scene.data)); let scene_buf = ResourceProxy::Buf(recording.upload(packed.data));
let config_buf = ResourceProxy::Buf(recording.upload_uniform(bytemuck::bytes_of(&config))); let config_buf = ResourceProxy::Buf(recording.upload_uniform(bytemuck::bytes_of(&config)));
let pathtag_wgs = pathtag_padded / (4 * shaders::PATHTAG_REDUCE_WG as usize); let pathtag_wgs = pathtag_padded / (4 * shaders::PATHTAG_REDUCE_WG as usize);
@ -229,7 +229,7 @@ pub fn render_encoding_full(
); );
let draw_monoid_buf = ResourceProxy::new_buf(n_drawobj as u64 * DRAWMONOID_SIZE); let draw_monoid_buf = ResourceProxy::new_buf(n_drawobj as u64 * DRAWMONOID_SIZE);
let info_bin_data_buf = ResourceProxy::new_buf(1 << 20); let info_bin_data_buf = ResourceProxy::new_buf(1 << 20);
let clip_inp_buf = ResourceProxy::new_buf(data.n_clips as u64 * CLIP_INP_SIZE); let clip_inp_buf = ResourceProxy::new_buf(encoding.n_clips as u64 * CLIP_INP_SIZE);
recording.dispatch( recording.dispatch(
shaders.draw_leaf, shaders.draw_leaf,
(drawobj_wgs, 1, 1), (drawobj_wgs, 1, 1),
@ -243,7 +243,7 @@ pub fn render_encoding_full(
clip_inp_buf, clip_inp_buf,
], ],
); );
let clip_el_buf = ResourceProxy::new_buf(data.n_clips as u64 * CLIP_EL_SIZE); let clip_el_buf = ResourceProxy::new_buf(encoding.n_clips as u64 * CLIP_EL_SIZE);
let clip_bic_buf = let clip_bic_buf =
ResourceProxy::new_buf((n_clip / shaders::CLIP_REDUCE_WG) as u64 * CLIP_BIC_SIZE); ResourceProxy::new_buf((n_clip / shaders::CLIP_REDUCE_WG) as u64 * CLIP_BIC_SIZE);
let clip_wg_reduce = n_clip.saturating_sub(1) / shaders::CLIP_REDUCE_WG; let clip_wg_reduce = n_clip.saturating_sub(1) / shaders::CLIP_REDUCE_WG;