Skip to content

fix Firefox color rendering by respecting surface texture format #3910

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

Draft
Ayush2k02 wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

fix Firefox color rendering by respecting surface texture format #3910

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
02ac81b
fix Firefox color rendering by respecting surface texture format pref…
Ayush2k02 Mar 18, 2026
fbbeadd
apply gemini suggestions
Ayush2k02 Mar 18, 2026
1ad5ed2
use direct copy for chrome and convert for firefox
Ayush2k02 Mar 24, 2026
c19c6a0
bug fix : simplify surface format selection by using preferred format…
Ayush2k02 Mar 24, 2026
dfba7f9
Merge branch 'master' into firefox-inverting-colours
Ayush2k02 Mar 24, 2026
2d7c52c
fix unnecessary bind group recreation during viewport panning
Ayush2k02 Apr 17, 2026
7701283
Cache blitter bind group to prevent GPU resource leak during viewport…
Ayush2k02 Apr 17, 2026
8d0bc3d
cleanup
Ayush2k02 Apr 17, 2026
4e39e06
refactor CachedBlitter into its own module with separate shader file
Ayush2k02 Apr 20, 2026
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
24 changes: 8 additions & 16 deletions editor/src/node_graph_executor/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,13 @@ impl NodeRuntime {
// Configure the surface at physical resolution (for HiDPI displays)
let surface_inner = &surface.surface.inner;
let surface_caps = surface_inner.get_capabilities(&executor.context.adapter);
// Use the surface's preferred format (Firefox WebGL prefers Bgra8Unorm, Chrome prefers Rgba8Unorm)
let surface_format = surface_caps.formats.iter().copied().find(|f| f.is_srgb()).unwrap_or(surface_caps.formats[0]);
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Outdated
surface_inner.configure(
&executor.context.device,
&vello::wgpu::SurfaceConfiguration {
usage: vello::wgpu::TextureUsages::RENDER_ATTACHMENT | vello::wgpu::TextureUsages::COPY_DST,
format: vello::wgpu::TextureFormat::Rgba8Unorm,
format: surface_format,
width: physical_resolution.x,
height: physical_resolution.y,
present_mode: surface_caps.present_modes[0],
Expand All @@ -365,21 +367,11 @@ impl NodeRuntime {
let surface_texture = surface_inner.get_current_texture().expect("Failed to get surface texture");
self.current_viewport_texture = Some(image_texture.clone());

encoder.copy_texture_to_texture(
vello::wgpu::TexelCopyTextureInfoBase {
texture: image_texture.texture.as_ref(),
mip_level: 0,
origin: Default::default(),
aspect: Default::default(),
},
vello::wgpu::TexelCopyTextureInfoBase {
texture: &surface_texture.texture,
mip_level: 0,
origin: Default::default(),
aspect: Default::default(),
},
image_texture.texture.size(),
);
// Use the blitter to copy the texture to the surface, handling format conversion
// (e.g., Rgba8Unorm source to Bgra8Unorm surface on Firefox)
let source_view = image_texture.texture.create_view(&vello::wgpu::TextureViewDescriptor::default());
let target_view = surface_texture.texture.create_view(&vello::wgpu::TextureViewDescriptor::default());
surface.surface.blitter.copy(&executor.context.device, &mut encoder, &source_view, &target_view);

executor.context.queue.submit([encoder.finish()]);
surface_texture.present();
Expand Down
5 changes: 4 additions & 1 deletion node-graph/libraries/wgpu-executor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@ impl WgpuExecutor {
}

pub fn create_surface_inner(&self, surface: wgpu::Surface<'static>, window_id: SurfaceId) -> Result<SurfaceHandle<Surface>> {
let blitter = TextureBlitter::new(&self.context.device, VELLO_SURFACE_FORMAT);
// Get the surface's preferred format (Firefox WebGL may prefer Bgra8Unorm, Chrome prefers Rgba8Unorm)
let surface_caps = surface.get_capabilities(&self.context.adapter);
let surface_format = surface_caps.formats.iter().copied().find(|f| f.is_srgb()).unwrap_or(surface_caps.formats[0]);
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic to determine the surface format is also present in editor/src/node_graph_executor/runtime.rs. To avoid this duplication and improve maintainability, consider storing the determined surface_format in the Surface struct and reusing it.

You could add a format field to the Surface struct:

pub struct Surface {
	pub inner: wgpu::Surface<'static>,
	pub target_texture: Mutex<Option<TargetTexture>>,
	pub blitter: TextureBlitter,
	pub format: wgpu::TextureFormat,
}

Then, you can populate it in create_surface_inner and use surface.surface.format in runtime.rs to avoid recalculating it.

let blitter = TextureBlitter::new(&self.context.device, surface_format);
Ok(SurfaceHandle {
window_id,
surface: Surface {
Expand Down
Loading