mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-03 21:08:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix blend node execution

Browse source
This commit is contained in:
Dennis Kobert 2023-05-26 00:52:32 +02:00 • committed by Keavon Chambers
parent f06360ae9a
commit 0bf9b0c13f
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
node-graph/gcore/src/raster.rs
View file

@ -14,6 +14,9 @@ pub mod color;
pub mod discrete_srgb;
pub use adjustments::*;
#[cfg(target_arch = "spirv")]
use num_traits::Float;
pub trait Linear {
fn from_f32(x: f32) -> Self;
fn to_f32(self) -> f32;

2
node-graph/gcore/src/raster/discrete_srgb.rs
View file

@ -68,7 +68,7 @@ pub fn float_to_srgb_u8(mut f: f32) -> u8 {
// We clamped f to [0, 1], and the integer representations
// of the positive finite non-NaN floats are monotonic.
// This makes the later LUT lookup panicless.
unsafe { std::hint::unreachable_unchecked() }
unsafe { core::hint::unreachable_unchecked() }
}
// Compute a piecewise linear interpolation that is always

10
node-graph/gstd/src/executor.rs
View file

@ -304,7 +304,7 @@ async fn blend_gpu_image(foreground: ImageFrame<Color>, background: ImageFrame<C
graphene_core::value::CopiedNode::new({}),
).eval((
i1[_global_index.x as usize],
if _global_index.x < i3[2] {{
if _global_index.x < i2[2] {{
i0[_global_index.x as usize]
}} else {{
Color::from_rgbaf32_unchecked(0.0, 0.0, 0.0, 0.0)
@ -336,7 +336,7 @@ async fn blend_gpu_image(foreground: ImageFrame<Color>, background: ImageFrame<C
ShaderInput::StorageBuffer((), concrete!(Color)), // background image
ShaderInput::StorageBuffer((), concrete!(Color)), // foreground image
ShaderInput::StorageBuffer((), concrete!(u32)), // width/height of the background image
ShaderInput::StorageBuffer((), concrete!(u32)), // width/height/length of the foreground image
//ShaderInput::StorageBuffer((), concrete!(u32)), // width/height/length of the foreground image
ShaderInput::OutputBuffer((), concrete!(Color)),
],
output: ShaderInput::OutputBuffer((), concrete!(Color)),
@ -347,7 +347,9 @@ async fn blend_gpu_image(foreground: ImageFrame<Color>, background: ImageFrame<C
let len = background.image.data.len();
log::debug!("instances: {}", len);
let executor = NewExecutor::new().await.unwrap();
let executor = NewExecutor::new()
.await
.expect("Failed to create wgpu executor. Please make sure that webgpu is enabled for your browser.");
log::debug!("creating buffer");
let bg_storage_buffer = executor
.create_storage_buffer(
@ -403,7 +405,7 @@ async fn blend_gpu_image(foreground: ImageFrame<Color>, background: ImageFrame<C
let readback_buffer = Arc::new(readback_buffer);
log::debug!("created buffer");
let bind_group = Bindgroup {
buffers: vec![bg_storage_buffer.clone(), fg_storage_buffer.clone(), bg_dimensions_uniform.clone(), fg_dimensions_uniform.clone()],
buffers: vec![bg_storage_buffer.clone(), fg_storage_buffer.clone(), fg_dimensions_uniform.clone()], //bg_dimensions_uniform.clone()], //, fg_dimensions_uniform.clone()],
};
let shader = gpu_executor::Shader {