liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wgpu: Made Multiply, Add and Subtract blend modes use bitmap+blend

This commit is contained in:
Nathan Adams 2022-12-23 02:11:45 +01:00
parent e69d76fa41
commit f253abdbd1
4 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
render/wgpu/shaders/blend.wgsl
View File

@ -26,9 +26,6 @@ fn main_vertex(in: VertexInput) -> VertexOutput {
fn blend_func(src: vec3<f32>, dst: vec3<f32>) -> vec3<f32> {
switch (blend.mode) {
case 1: { // Multiply
return src * dst;
}
case 2: { // Screen
return (dst + src) - (dst * src);
}
@ -72,11 +69,7 @@ fn main_fragment(in: VertexOutput) -> @location(0) vec4<f32> {
var src: vec4<f32> = textureSample(current_texture, texture_sampler, in.uv);
if (src.a > 0.0) {
if (blend.mode == 6) { // Add
return src + dst;
} else if (blend.mode == 7) { // Subtract
return vec4<f32>(dst.rgb - src.rgb, src.a + dst.a);
} else if (blend.mode == 9) { // Alpha
if (blend.mode == 9) { // Alpha
return vec4<f32>(dst.rgb * src.a, src.a * dst.a);
} else if (blend.mode == 10) { // Erase
return vec4<f32>(dst.rgb * (1.0 - src.a), (1.0 - src.a) * dst.a);

2
render/wgpu/src/commands.rs
View File

@ -761,7 +761,7 @@ fn chunk_blends<'a>(
wgpu::TextureFormat::Rgba8Unorm,
);
let target = surface.draw_commands(
Some(wgpu::Color::TRANSPARENT),
Some(BlendType::from(*blend_mode).default_color()),
&descriptors,
&meshes,
commands,

3
render/wgpu/src/descriptors.rs
View File

@ -30,13 +30,10 @@ impl Descriptors {
let quad = Quad::new(&device);
let blend_buffers = enum_map! {
ComplexBlend::Multiply => 1,
ComplexBlend::Screen => 2,
ComplexBlend::Lighten => 3,
ComplexBlend::Darken => 4,
ComplexBlend::Difference => 5,
ComplexBlend::Add => 6,
ComplexBlend::Subtract => 7,
ComplexBlend::Invert => 8,
ComplexBlend::Alpha => 9,
ComplexBlend::Erase => 10,

68
render/wgpu/src/pipelines.rs
View File

@ -23,34 +23,31 @@ pub struct ShapePipeline {
#[derive(Enum, Debug, Copy, Clone)]
pub enum TrivialBlend {
Normal,
Multiply,
Add,
Subtract,
}
#[derive(Enum, Debug, Copy, Clone)]
pub enum ComplexBlend {
Multiply,
Screen,
Lighten,
Darken,
Difference,
Add,
Subtract,
Invert,
Alpha,
Erase,
Overlay,
HardLight,
Screen, // Can't be trivial. (dst + src) - (dst * src)
Lighten, // Might be trivial but I can't reproduce the right colors
Darken, // Might be trivial but I can't reproduce the right colors
Difference, // Can't be trivial, relies on abs operation
Invert, // May be trivial using a constant? Hard because it's without premultiplied alpha
Alpha, // Can't be trivial, requires layer tracking
Erase, // Can't be trivial, requires layer tracking
Overlay, // Can't be trivial, big math expression
HardLight, // Can't be trivial, big math expression
}
impl ComplexBlend {
pub fn id(&self) -> i32 {
match self {
ComplexBlend::Multiply => 1,
ComplexBlend::Screen => 2,
ComplexBlend::Lighten => 3,
ComplexBlend::Darken => 4,
ComplexBlend::Difference => 5,
ComplexBlend::Add => 6,
ComplexBlend::Subtract => 7,
ComplexBlend::Invert => 8,
ComplexBlend::Alpha => 9,
ComplexBlend::Erase => 10,
@ -62,7 +59,10 @@ impl ComplexBlend {
#[derive(Debug, Copy, Clone)]
pub enum BlendType {
/// Trivial blends can be expressed with just a "draw bitmap" with blend states
Trivial(TrivialBlend),
/// Complex blends require a shader to express, so they are separated out into their own render
Complex(ComplexBlend),
}
@ -71,13 +71,13 @@ impl BlendType {
match mode {
BlendMode::Normal => BlendType::Trivial(TrivialBlend::Normal),
BlendMode::Layer => BlendType::Trivial(TrivialBlend::Normal),
BlendMode::Multiply => BlendType::Complex(ComplexBlend::Multiply),
BlendMode::Multiply => BlendType::Trivial(TrivialBlend::Multiply),
BlendMode::Screen => BlendType::Complex(ComplexBlend::Screen),
BlendMode::Lighten => BlendType::Complex(ComplexBlend::Lighten),
BlendMode::Darken => BlendType::Complex(ComplexBlend::Darken),
BlendMode::Difference => BlendType::Complex(ComplexBlend::Difference),
BlendMode::Add => BlendType::Complex(ComplexBlend::Add),
BlendMode::Subtract => BlendType::Complex(ComplexBlend::Subtract),
BlendMode::Add => BlendType::Trivial(TrivialBlend::Add),
BlendMode::Subtract => BlendType::Trivial(TrivialBlend::Subtract),
BlendMode::Invert => BlendType::Complex(ComplexBlend::Invert),
BlendMode::Alpha => BlendType::Complex(ComplexBlend::Alpha),
BlendMode::Erase => BlendType::Complex(ComplexBlend::Erase),
@ -85,6 +85,13 @@ impl BlendType {
BlendMode::HardLight => BlendType::Complex(ComplexBlend::HardLight),
}
}
pub fn default_color(&self) -> wgpu::Color {
match self {
BlendType::Trivial(TrivialBlend::Multiply) => wgpu::Color::WHITE,
_ => wgpu::Color::TRANSPARENT,
}
}
}
#[derive(Debug)]
@ -178,7 +185,32 @@ impl Pipelines {
let bitmap_pipelines: [ShapePipeline; TrivialBlend::LENGTH] = (0..TrivialBlend::LENGTH)
.map(|blend| {
let blend = match TrivialBlend::from_usize(blend) {
// out = <src_factor> * src <operation> <dst_factor> * dst
TrivialBlend::Normal => wgpu::BlendState::PREMULTIPLIED_ALPHA_BLENDING,
TrivialBlend::Add => wgpu::BlendState {
color: wgpu::BlendComponent {
src_factor: wgpu::BlendFactor::One,
dst_factor: wgpu::BlendFactor::One,
operation: wgpu::BlendOperation::Add,
},
alpha: wgpu::BlendComponent::OVER,
},
TrivialBlend::Multiply => wgpu::BlendState {
color: wgpu::BlendComponent {
src_factor: wgpu::BlendFactor::Dst,
dst_factor: wgpu::BlendFactor::Zero,
operation: wgpu::BlendOperation::Add,
},
alpha: wgpu::BlendComponent::OVER,
},
TrivialBlend::Subtract => wgpu::BlendState {
color: wgpu::BlendComponent {
src_factor: wgpu::BlendFactor::One,
dst_factor: wgpu::BlendFactor::One,
operation: wgpu::BlendOperation::ReverseSubtract,
},
alpha: wgpu::BlendComponent::OVER,
},
};
let name = format!("Bitmap ({blend:?})");
create_shape_pipeline(