Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working scissor proof of concept

Browse Source
This commit is contained in:
Aleksander
2025-09-24 21:53:43 +02:00
parent 8d41d8bbd1
commit 8f75d451e4
11 changed files with 175 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
wgui/src/renderer_vk/context.rs
View File

@@ -3,10 +3,10 @@ use std::{cell::RefCell, rc::Rc, sync::Arc};
use cosmic_text::Buffer;
use glam::{Mat4, Vec2, Vec3};
use slotmap::{SlotMap, new_key_type};
use vulkano::{buffer::view, pipeline::graphics::viewport};
use vulkano::pipeline::graphics::viewport;
use crate::{
drawing::{self, Scissor},
drawing::{self},
gfx::{WGfx, cmd::GfxCommandBuffer},
};
@@ -25,11 +25,17 @@ struct RendererPass<'a> {
text_areas: Vec<TextArea<'a>>,
text_renderer: TextRenderer,
rect_renderer: RectRenderer,
scissor: Option<Scissor>,
scissor: Option<drawing::Boundary>,
pixel_scale: f32,
}
impl RendererPass<'_> {
fn new(text_atlas: &mut TextAtlas, rect_pipeline: RectPipeline, scissor: Option<Scissor>) -> anyhow::Result<Self> {
fn new(
text_atlas: &mut TextAtlas,
rect_pipeline: RectPipeline,
scissor: Option<drawing::Boundary>,
pixel_scale: f32,
) -> anyhow::Result<Self> {
let text_renderer = TextRenderer::new(text_atlas)?;
let rect_renderer = RectRenderer::new(rect_pipeline)?;
@@ -39,6 +45,7 @@ impl RendererPass<'_> {
rect_renderer,
text_areas: Vec::new(),
scissor,
pixel_scale,
})
}
@@ -53,20 +60,34 @@ impl RendererPass<'_> {
return Ok(());
}
let vk_scissor = if let Some(scissor) = self.scissor {
viewport::Scissor {
offset: [scissor.x, scissor.y],
extent: [scissor.w, scissor.h],
let vk_scissor = match self.scissor {
Some(scissor) => {
let mut x = scissor.pos.x;
let mut y = scissor.pos.y;
let mut w = scissor.size.x;
let mut h = scissor.size.y;
// handle out-of-bounds scissors (x/y < 0)
if x < 0.0 {
w += x;
x = 0.0;
}
if y < 0.0 {
h += y;
y = 0.0;
}
viewport::Scissor {
offset: [(x * self.pixel_scale) as u32, (y * self.pixel_scale) as u32],
extent: [(w * self.pixel_scale) as u32, (h * self.pixel_scale) as u32],
}
}
} else {
viewport::Scissor::default()
None => viewport::Scissor::default(),
};
// TODO?
// cmd_buf.command_buffer.set_scissor(0, smallvec::smallvec![vk_scissor])?;
self.submitted = true;
self.rect_renderer.render(gfx, viewport, cmd_buf)?;
self.rect_renderer.render(gfx, viewport, &vk_scissor, cmd_buf)?;
{
let mut font_system = FONT_SYSTEM.lock();
@@ -81,7 +102,7 @@ impl RendererPass<'_> {
)?;
}
self.text_renderer.render(text_atlas, viewport, cmd_buf)?;
self.text_renderer.render(text_atlas, viewport, &vk_scissor, cmd_buf)?;
Ok(())
}
@@ -202,7 +223,7 @@ impl Context {
let mut passes = Vec::<RendererPass>::new();
let mut needs_new_pass = true;
let mut next_scissor: Option<Scissor> = None;
let mut next_scissor: Option<drawing::Boundary> = None;
for primitive in primitives {
if needs_new_pass {
@@ -210,54 +231,60 @@ impl Context {
&mut atlas.text_atlas,
shared.rect_pipeline.clone(),
next_scissor,
self.pixel_scale,
)?);
next_scissor = None;
needs_new_pass = false;
}
let pass = passes.last_mut().unwrap(); // always safe
match &primitive.payload {
drawing::PrimitivePayload::Rectangle(rectangle) => {
match &primitive {
drawing::RenderPrimitive::Rectangle(extent, rectangle) => {
pass
.rect_renderer
.add_rect(primitive.boundary, *rectangle, &primitive.transform, primitive.depth);
.add_rect(extent.boundary, *rectangle, &extent.transform, extent.depth);
}
drawing::PrimitivePayload::Text(text) => {
drawing::RenderPrimitive::Text(extent, text) => {
pass.text_areas.push(TextArea {
buffer: text.clone(),
left: primitive.boundary.pos.x * self.pixel_scale,
top: primitive.boundary.pos.y * self.pixel_scale,
left: extent.boundary.pos.x * self.pixel_scale,
top: extent.boundary.pos.y * self.pixel_scale,
bounds: TextBounds::default(), //FIXME: just using boundary coords here doesn't work
scale: self.pixel_scale,
default_color: cosmic_text::Color::rgb(0, 0, 0),
custom_glyphs: &[],
depth: primitive.depth,
transform: primitive.transform,
depth: extent.depth,
transform: extent.transform,
});
}
drawing::PrimitivePayload::Sprite(sprites) => {
drawing::RenderPrimitive::Sprite(extent, sprites) => {
pass.text_areas.push(TextArea {
buffer: self.empty_text.clone(),
left: primitive.boundary.pos.x * self.pixel_scale,
top: primitive.boundary.pos.y * self.pixel_scale,
left: extent.boundary.pos.x * self.pixel_scale,
top: extent.boundary.pos.y * self.pixel_scale,
bounds: TextBounds::default(),
scale: self.pixel_scale,
custom_glyphs: sprites.as_slice(),
default_color: cosmic_text::Color::rgb(255, 0, 255),
depth: primitive.depth,
transform: primitive.transform,
depth: extent.depth,
transform: extent.transform,
});
}
drawing::PrimitivePayload::Scissor(scissor) => {
next_scissor = Some(*scissor);
drawing::RenderPrimitive::ScissorEnable(boundary) => {
next_scissor = Some(*boundary);
needs_new_pass = true;
}
drawing::RenderPrimitive::ScissorDisable => {
next_scissor = None;
needs_new_pass = true;
}
}
}
log::info!("count {}", passes.len());
for mut pass in passes {
pass.submit(&shared.gfx, &mut self.viewport, cmd_buf, &mut atlas.text_atlas)?
pass.submit(&shared.gfx, &mut self.viewport, cmd_buf, &mut atlas.text_atlas)?;
}
Ok(())

4
wgui/src/renderer_vk/rect.rs
View File

@@ -4,7 +4,7 @@ use glam::Mat4;
use vulkano::{
buffer::{BufferContents, BufferUsage, Subbuffer},
format::Format,
pipeline::graphics::{input_assembly::PrimitiveTopology, vertex_input::Vertex},
pipeline::graphics::{self, input_assembly::PrimitiveTopology, vertex_input::Vertex},
};
use crate::{
@@ -136,6 +136,7 @@ impl RectRenderer {
&mut self,
gfx: &Arc<WGfx>,
viewport: &mut Viewport,
vk_scissor: &graphics::viewport::Scissor,
cmd_buf: &mut GfxCommandBuffer,
) -> anyhow::Result<()> {
let res = viewport.resolution();
@@ -154,6 +155,7 @@ impl RectRenderer {
0..4,
0..self.rect_vertices.len() as _,
vec![set0, set1],
vk_scissor,
)?;
CachedPass { pass, res }
}

33
wgui/src/renderer_vk/text/text_renderer.rs
View File

@@ -13,6 +13,7 @@ use glam::{Mat4, Vec2, Vec3};
use vulkano::{
buffer::{BufferUsage, Subbuffer},
command_buffer::CommandBufferUsage,
pipeline::graphics,
};
struct CachedPass {
@@ -78,12 +79,7 @@ impl TextRenderer {
let height = (glyph.height * text_area.scale).round() as u16;
let (x, y, x_bin, y_bin) = if glyph.snap_to_physical_pixel {
(
x.round() as i32,
y.round() as i32,
SubpixelBin::Zero,
SubpixelBin::Zero,
)
(x.round() as i32, y.round() as i32, SubpixelBin::Zero, SubpixelBin::Zero)
} else {
let (x, x_bin) = SubpixelBin::new(x);
let (y, y_bin) = SubpixelBin::new(y);
@@ -252,6 +248,7 @@ impl TextRenderer {
&mut self,
atlas: &TextAtlas,
viewport: &mut Viewport,
vk_scissor: &graphics::viewport::Scissor,
cmd_buf: &mut GfxCommandBuffer,
) -> anyhow::Result<()> {
if self.glyph_vertices.is_empty() {
@@ -277,6 +274,7 @@ impl TextRenderer {
0..4,
0..self.glyph_vertices.len() as u32,
descriptor_sets,
vk_scissor,
)?;
CachedPass { pass, res }
}
@@ -351,10 +349,7 @@ fn prepare_glyph(
if let Some(a) = inner.try_allocate(image.width as usize, image.height as usize) {
break a;
}
if !par
.atlas
.grow(par.font_system, par.cache, image.content_type)?
{
if !par.atlas.grow(par.font_system, par.cache, image.content_type)? {
anyhow::bail!(
"Atlas full. atlas: {:?} cache_key: {:?}",
image.content_type,
@@ -393,16 +388,14 @@ fn prepare_glyph(
inner.glyphs_in_use.insert(par.cache_key);
// Insert the glyph into the cache and return the details reference
inner
.glyph_cache
.get_or_insert(par.cache_key, || GlyphDetails {
width: image.width,
height: image.height,
gpu_cache,
atlas_id,
top: image.top,
left: image.left,
})
inner.glyph_cache.get_or_insert(par.cache_key, || GlyphDetails {
width: image.width,
height: image.height,
gpu_cache,
atlas_id,
top: image.top,
left: image.left,
})
};
let mut x = par.x + i32::from(details.left);