summaryrefslogtreecommitdiffstats
path: root/wgpu
diff options
context:
space:
mode:
Diffstat (limited to 'wgpu')
-rw-r--r--wgpu/Cargo.toml6
-rw-r--r--wgpu/src/buffer/dynamic.rs2
-rw-r--r--wgpu/src/image.rs7
-rw-r--r--wgpu/src/lib.rs2
-rw-r--r--wgpu/src/quad.rs2
-rw-r--r--wgpu/src/shader/quad.wgsl47
-rw-r--r--wgpu/src/triangle.rs6
7 files changed, 46 insertions, 26 deletions
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index b1fb0dd1..a40d9967 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "iced_wgpu"
-version = "0.6.1"
+version = "0.7.0"
authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
edition = "2021"
description = "A wgpu renderer for Iced"
@@ -42,11 +42,11 @@ version = "1.9"
features = ["derive"]
[dependencies.iced_native]
-version = "0.6"
+version = "0.7"
path = "../native"
[dependencies.iced_graphics]
-version = "0.4"
+version = "0.5"
path = "../graphics"
features = ["font-fallback", "font-icons"]
diff --git a/wgpu/src/buffer/dynamic.rs b/wgpu/src/buffer/dynamic.rs
index 18be03dd..88289b98 100644
--- a/wgpu/src/buffer/dynamic.rs
+++ b/wgpu/src/buffer/dynamic.rs
@@ -80,7 +80,7 @@ impl<T: ShaderType + WriteInto> Buffer<T> {
pub fn push(&mut self, value: &T) {
//this write operation on the cpu buffer will adjust for uniform alignment requirements
let offset = self.cpu.write(value);
- self.offsets.push(offset as u32);
+ self.offsets.push(offset);
}
/// Resize buffer contents if necessary. This will re-create the GPU buffer if current size is
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index d06815bb..390bad90 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -318,11 +318,16 @@ impl Pipeline {
layer::Image::Raster { .. } => {}
#[cfg(feature = "svg")]
- layer::Image::Vector { handle, bounds } => {
+ layer::Image::Vector {
+ handle,
+ color,
+ bounds,
+ } => {
let size = [bounds.width, bounds.height];
if let Some(atlas_entry) = vector_cache.upload(
handle,
+ *color,
size,
_scale,
&mut (device, encoder),
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 74152945..e4a38005 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -16,7 +16,7 @@
//! - Meshes of triangles, useful to draw geometry freely.
//!
//! [Iced]: https://github.com/iced-rs/iced
-//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.5/native
+//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.6/native
//! [`wgpu`]: https://github.com/gfx-rs/wgpu-rs
//! [WebGPU API]: https://gpuweb.github.io/gpuweb/
//! [`wgpu_glyph`]: https://github.com/hecrj/wgpu_glyph
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index a117df64..027a34be 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -91,7 +91,7 @@ impl Pipeline {
2 => Float32x2,
3 => Float32x4,
4 => Float32x4,
- 5 => Float32,
+ 5 => Float32x4,
6 => Float32,
),
},
diff --git a/wgpu/src/shader/quad.wgsl b/wgpu/src/shader/quad.wgsl
index 73edd97c..cf4f7e4d 100644
--- a/wgpu/src/shader/quad.wgsl
+++ b/wgpu/src/shader/quad.wgsl
@@ -11,7 +11,7 @@ struct VertexInput {
@location(2) scale: vec2<f32>,
@location(3) color: vec4<f32>,
@location(4) border_color: vec4<f32>,
- @location(5) border_radius: f32,
+ @location(5) border_radius: vec4<f32>,
@location(6) border_width: f32,
}
@@ -21,7 +21,7 @@ struct VertexOutput {
@location(1) border_color: vec4<f32>,
@location(2) pos: vec2<f32>,
@location(3) scale: vec2<f32>,
- @location(4) border_radius: f32,
+ @location(4) border_radius: vec4<f32>,
@location(5) border_width: f32,
}
@@ -32,9 +32,12 @@ fn vs_main(input: VertexInput) -> VertexOutput {
var pos: vec2<f32> = input.pos * globals.scale;
var scale: vec2<f32> = input.scale * globals.scale;
- var border_radius: f32 = min(
- input.border_radius,
- min(input.scale.x, input.scale.y) / 2.0
+ var min_border_radius = min(input.scale.x, input.scale.y) * 0.5;
+ var border_radius: vec4<f32> = vec4<f32>(
+ min(input.border_radius.x, min_border_radius),
+ min(input.border_radius.y, min_border_radius),
+ min(input.border_radius.z, min_border_radius),
+ min(input.border_radius.w, min_border_radius)
);
var transform: mat4x4<f32> = mat4x4<f32>(
@@ -76,6 +79,18 @@ fn distance_alg(
return sqrt(dist.x * dist.x + dist.y * dist.y);
}
+// Based on the fragement position and the center of the quad, select one of the 4 radi.
+// Order matches CSS border radius attribute:
+// radi.x = top-left, radi.y = top-right, radi.z = bottom-right, radi.w = bottom-left
+fn select_border_radius(radi: vec4<f32>, position: vec2<f32>, center: vec2<f32>) -> f32 {
+ var rx = radi.x;
+ var ry = radi.y;
+ rx = select(radi.x, radi.y, position.x > center.x);
+ ry = select(radi.w, radi.z, position.x > center.x);
+ rx = select(rx, ry, position.y > center.y);
+ return rx;
+}
+
@fragment
fn fs_main(
@@ -83,14 +98,17 @@ fn fs_main(
) -> @location(0) vec4<f32> {
var mixed_color: vec4<f32> = input.color;
+ var border_radius = select_border_radius(
+ input.border_radius,
+ input.position.xy,
+ (input.pos + input.scale * 0.5).xy
+ );
+
if (input.border_width > 0.0) {
- var internal_border: f32 = max(
- input.border_radius - input.border_width,
- 0.0
- );
+ var internal_border: f32 = max(border_radius - input.border_width, 0.0);
var internal_distance: f32 = distance_alg(
- vec2<f32>(input.position.x, input.position.y),
+ input.position.xy,
input.pos + vec2<f32>(input.border_width, input.border_width),
input.scale - vec2<f32>(input.border_width * 2.0, input.border_width * 2.0),
internal_border
@@ -109,13 +127,14 @@ fn fs_main(
vec2<f32>(input.position.x, input.position.y),
input.pos,
input.scale,
- input.border_radius
+ border_radius
);
var radius_alpha: f32 = 1.0 - smoothstep(
- max(input.border_radius - 0.5, 0.0),
- input.border_radius + 0.5,
- dist);
+ max(border_radius - 0.5, 0.0),
+ border_radius + 0.5,
+ dist
+ );
return vec4<f32>(mixed_color.x, mixed_color.y, mixed_color.z, mixed_color.w * radius_alpha);
}
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index b33b488a..061154b6 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -331,11 +331,7 @@ impl Pipeline {
wgpu::IndexFormat::Uint32,
);
- render_pass.draw_indexed(
- 0..(self.index_strides[index] as u32),
- 0,
- 0..1,
- );
+ render_pass.draw_indexed(0..self.index_strides[index], 0, 0..1);
}
}
generated by cgit (git 2.34.1) at 2025-05-16 16:45:36 +0000