CloudNebulaProject/wayray
1
0
Fork 0
mirror of https://github.com/CloudNebulaProject/wayray.git synced 2026-04-10 13:10:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix black screen: convert ARGB8888 to BGRA8 in client display

Browse source 
Server (PixmanRenderer) outputs ARGB8888, client GPU texture expects
BGRA8. Added byte-order conversion in update_frame(). Also changed
texture format from Bgra8UnormSrgb to Bgra8Unorm for correct colors.
This commit is contained in:
Till Wegmueller 2026-04-07 18:06:41 +02:00
parent ab8f9e0d03
commit 6b15ee819e
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/wrclient/src/display.rs
View file

@ -132,7 +132,7 @@ impl Display {
mip_level_count: 1, mip_level_count: 1,
sample_count: 1, sample_count: 1,
dimension: wgpu::TextureDimension::D2, dimension: wgpu::TextureDimension::D2,
format: wgpu::TextureFormat::Bgra8UnormSrgb, format: wgpu::TextureFormat::Bgra8Unorm,
usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
view_formats: &[], view_formats: &[],
}); });
@ -246,9 +246,8 @@ impl Display {
/// Upload framebuffer pixel data to the GPU texture. /// Upload framebuffer pixel data to the GPU texture.
/// ///
/// `pixel_data` must be BGRA8 format, `width * height * 4` bytes. /// `pixel_data` is ARGB8888 format from the server (PixmanRenderer).
/// If the server sends ARGB8888, the caller should convert byte order /// This method converts to BGRA8 for the GPU texture.
/// before calling this method.
pub fn update_frame(&self, pixel_data: &[u8]) { pub fn update_frame(&self, pixel_data: &[u8]) {
let expected = (self.width * self.height * 4) as usize; let expected = (self.width * self.height * 4) as usize;
if pixel_data.len() != expected { if pixel_data.len() != expected {
@ -259,9 +258,18 @@ impl Display {
return; return;
} }
// Convert ARGB8888 → BGRA8: [A,R,G,B] → [B,G,R,A]
let mut bgra = Vec::with_capacity(pixel_data.len());
for pixel in pixel_data.chunks_exact(4) {
bgra.push(pixel[3]); // B
bgra.push(pixel[2]); // G
bgra.push(pixel[1]); // R
bgra.push(pixel[0]); // A
}
self.queue.write_texture( self.queue.write_texture(
self.frame_texture.as_image_copy(), self.frame_texture.as_image_copy(),
pixel_data, &bgra,
wgpu::TexelCopyBufferLayout { wgpu::TexelCopyBufferLayout {
offset: 0, offset: 0,
bytes_per_row: Some(self.width * 4), bytes_per_row: Some(self.width * 4),