me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reworked wgpu buffers, updated glow side to have proper transform location storage, attempting to fix visibility modifiers, implemented some of the feedback received in initial PR.

Browse source
This commit is contained in:
shan 2022-10-04 18:24:46 -07:00
parent 5d0fffc626
commit 6e7b3ced0b
20 changed files with 411 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

92
glow/src/triangle/gradient.rs
View file

@ -1,18 +1,42 @@
use crate::program::Version;
use crate::triangle::{simple_triangle_program, update_transform};
use crate::triangle::{simple_triangle_program, set_transform};
use glow::{Context, HasContext, NativeProgram};
use iced_graphics::gradient::Linear;
use iced_graphics::gradient::Gradient;
use iced_graphics::widget::canvas::gradient::Linear;
use iced_graphics::Transformation;
#[derive(Debug)]
pub(super) struct GradientProgram {
pub(super) program: <Context as HasContext>::Program,
pub(super) uniform_data: GradientUniformData,
pub struct GradientProgram {
pub program: <Context as HasContext>::Program,
pub uniform_data: GradientUniformData,
}
#[derive(Debug)]
pub struct GradientUniformData {
gradient: Gradient,
transform: Transformation,
uniform_locations: GradientUniformLocations,
}
#[derive(Debug)]
struct GradientUniformLocations {
gradient_start_location: <Context as HasContext>::UniformLocation,
gradient_end_location: <Context as HasContext>::UniformLocation,
color_stops_size_location: <Context as HasContext>::UniformLocation,
//currently the maximum number of stops is 64 due to needing to allocate the
//memory for the array of stops with a const value in GLSL
color_stops_locations: [ColorStopLocation; 64],
transform_location: <Context as HasContext>::UniformLocation,
}
#[derive(Copy, Debug, Clone)]
struct ColorStopLocation {
color: <Context as HasContext>::UniformLocation,
offset: <Context as HasContext>::UniformLocation,
}
impl GradientProgram {
pub(super) fn new(gl: &Context, shader_version: &Version) -> Self {
pub fn new(gl: &Context, shader_version: &Version) -> Self {
let program = simple_triangle_program(
gl,
shader_version,
@ -25,15 +49,17 @@ impl GradientProgram {
}
}
pub(super) fn set_uniforms<'a>(
pub fn write_uniforms(
&mut self,
gl: &Context,
gradient: &Gradient,
transform: Option<Transformation>,
transform: &Transformation,
) {
update_transform(gl, self.program, transform);
if transform != &self.uniform_data.transform {
set_transform(gl, self.uniform_data.uniform_locations.transform_location, *transform);
}
if &self.uniform_data.current_gradient != gradient {
if &self.uniform_data.gradient != gradient {
match gradient {
Gradient::Linear(linear) => {
let gradient_start: [f32; 2] = (linear.start).into();
@ -104,31 +130,17 @@ impl GradientProgram {
}
}
self.uniform_data.current_gradient = gradient.clone();
self.uniform_data.gradient = gradient.clone();
}
}
}
#[derive(Debug)]
pub(super) struct GradientUniformData {
current_gradient: Gradient,
uniform_locations: GradientUniformLocations,
}
pub fn use_program(&mut self, gl: &glow::Context, gradient: &Gradient, transform: &Transformation) {
unsafe {
gl.use_program(Some(self.program))
}
#[derive(Debug)]
struct GradientUniformLocations {
gradient_start_location: <Context as HasContext>::UniformLocation,
gradient_end_location: <Context as HasContext>::UniformLocation,
color_stops_size_location: <Context as HasContext>::UniformLocation,
//currently the maximum number of stops is 64 due to needing to allocate the
//memory for the array of stops with a const value in GLSL
color_stops_locations: [ColorStopLocation; 64],
}
#[derive(Copy, Debug, Clone)]
struct ColorStopLocation {
color: <Context as HasContext>::UniformLocation,
offset: <Context as HasContext>::UniformLocation,
self.write_uniforms(gl, gradient, transform);
}
}
impl GradientUniformData {
@ -153,10 +165,7 @@ impl GradientUniformData {
&format!("color_stop_offsets[{}]", index),
)
}
.expect(&format!(
"Gradient - Color stop offset with index {}",
index
));
.expect("Gradient - Color stop offset location.");
let color = unsafe {
gl.get_uniform_location(
@ -164,25 +173,28 @@ impl GradientUniformData {
&format!("color_stop_colors[{}]", index),
)
}
.expect(&format!(
"Gradient - Color stop colors with index {}",
index
));
.expect("Gradient - Color stop color location.");
ColorStopLocation { color, offset }
});
let transform_location =
unsafe { gl.get_uniform_location(program, "u_Transform") }
.expect("Get transform location.");
GradientUniformData {
current_gradient: Gradient::Linear(Linear {
gradient: Gradient::Linear(Linear {
start: Default::default(),
end: Default::default(),
color_stops: vec![],
}),
transform: Transformation::identity(),
uniform_locations: GradientUniformLocations {
gradient_start_location,
gradient_end_location,
color_stops_size_location,
color_stops_locations,
transform_location,
},
}
}

62
glow/src/triangle/solid.rs
View file

@ -1,13 +1,38 @@
use crate::program::Version;
use crate::triangle::{simple_triangle_program, update_transform};
use crate::triangle::{set_transform, simple_triangle_program};
use crate::Color;
use glow::{Context, HasContext, NativeProgram};
use iced_graphics::Transformation;
#[derive(Debug)]
pub struct SolidProgram {
pub(crate) program: <Context as HasContext>::Program,
pub(crate) uniform_data: SolidUniformData,
program: <Context as HasContext>::Program,
uniform_data: SolidUniformData,
}
#[derive(Debug)]
pub(crate) struct SolidUniformData {
pub color: Color,
pub color_location: <Context as HasContext>::UniformLocation,
pub transform: Transformation,
pub transform_location: <Context as HasContext>::UniformLocation,
}
impl SolidUniformData {
fn new(gl: &Context, program: NativeProgram) -> Self {
Self {
color: Color::TRANSPARENT,
color_location: unsafe {
gl.get_uniform_location(program, "color")
}
.expect("Solid - Color uniform location."),
transform: Transformation::identity(),
transform_location: unsafe {
gl.get_uniform_location(program, "u_Transform")
}
.expect("Get transform location."),
}
}
}
impl SolidProgram {
@ -24,15 +49,17 @@ impl SolidProgram {
}
}
pub fn set_uniforms<'a>(
pub fn write_uniforms(
&mut self,
gl: &Context,
color: &Color,
transform: Option<Transformation>,
transform: &Transformation,
) {
update_transform(gl, self.program, transform);
if transform != &self.uniform_data.transform {
set_transform(gl, self.uniform_data.transform_location, *transform)
}
if &self.uniform_data.color != color {
if color != &self.uniform_data.color {
unsafe {
gl.uniform_4_f32(
Some(&self.uniform_data.color_location),
@ -46,22 +73,11 @@ impl SolidProgram {
self.uniform_data.color = *color;
}
}
}
#[derive(Debug)]
pub(crate) struct SolidUniformData {
pub color: Color,
pub color_location: <Context as HasContext>::UniformLocation,
}
impl SolidUniformData {
fn new(gl: &Context, program: NativeProgram) -> Self {
Self {
color: Color::TRANSPARENT,
color_location: unsafe {
gl.get_uniform_location(program, "color")
}
.expect("Solid - Color uniform location."),
pub fn use_program(&mut self, gl: &glow::Context, color: &Color, transform: &Transformation) {
unsafe {
gl.use_program(Some(self.program))
}
self.write_uniforms(gl, color, transform)
}
}
}