github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[rs] Use srgb for swapchain when possible

Browse Source
This commit is contained in:
Joshua Groves
2020-04-18 00:48:19 -02:30
committed by Josh Groves
parent f35c3fb3cd
commit 930d2cd791
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wgpu/examples/framework.rs
View File

@@ -76,7 +76,12 @@ async fn run_async<E: Example>(event_loop: EventLoop<()>, window: Window) {
let mut sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8Unorm,
// TODO: Allow srgb unconditionally
format: if cfg!(target_arch = "wasm32") {
wgpu::TextureFormat::Bgra8Unorm
} else {
wgpu::TextureFormat::Bgra8UnormSrgb
},
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Mailbox,

13
wgpu/examples/hello-triangle/main.rs
View File

@@ -4,7 +4,7 @@ use winit::{
window::Window,
};
async fn run(event_loop: EventLoop<()>, window: Window) {
async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::TextureFormat) {
let size = window.inner_size();
let surface = wgpu::Surface::create(&window);
@@ -84,7 +84,7 @@ async fn run(event_loop: EventLoop<()>, window: Window) {
let mut sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8Unorm,
format: swapchain_format,
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Mailbox,
@@ -143,7 +143,8 @@ fn main() {
#[cfg(not(target_arch = "wasm32"))]
{
env_logger::init();
futures::executor::block_on(run(event_loop, window));
// Temporarily avoid srgb formats for the swapchain on the web
futures::executor::block_on(run(event_loop, window, wgpu::TextureFormat::Bgra8Unorm));
}
#[cfg(target_arch = "wasm32")]
{
@@ -159,6 +160,10 @@ fn main() {
.ok()
})
.expect("couldn't append canvas to document body");
wasm_bindgen_futures::spawn_local(run(event_loop, window));
wasm_bindgen_futures::spawn_local(run(
event_loop,
window,
wgpu::TextureFormat::Bgra8UnormSrgb,
));
}
}