Skip to content

Enable dual-source blending (requires unreleased wgpu changes) #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andyleiserson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable dual-source blending (requires unreleased wgpu changes) #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions crates/kas-wgpu/src/draw/images.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,9 @@ impl Images {
);

let mut atlas_rgba_mask = None;
// FIXME: This is disabled because of a wgpu validation error
#[allow(clippy::overly_complex_bool_expr)]
if false
&& device
.features()
.contains(wgpu::Features::DUAL_SOURCE_BLENDING)
if device
.features()
.contains(wgpu::Features::DUAL_SOURCE_BLENDING)
{
atlas_rgba_mask = Some(atlases::Pipeline::new(
device,
Expand Down
4 changes: 2 additions & 2 deletions crates/kas-wgpu/src/draw/shaders/subpixel.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ precision mediump float;
layout(location = 0) in vec2 tex_coord;
layout(location = 1) in vec4 col;

layout(location = 0) out vec4 frag_color;
layout(location = 1) out vec4 blend_color;
layout(location = 0, index = 0) out vec4 frag_color;
layout(location = 0, index = 1) out vec4 blend_color;

layout(set = 1, binding = 0) uniform texture2D tex;
layout(set = 1, binding = 1) uniform sampler tex_sampler;
Expand Down
Binary file modified crates/kas-wgpu/src/draw/shaders/subpixel.frag.spv
View file
Open in desktop
Binary file not shown.