Support adapter-dependent color formats

kvark · Nov 28, 2021 · fa82c51 · fa82c51
1 parent 25c9a0f
commit fa82c51
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 24 deletions.
diff --git a/bin/boilerplate.rs b/bin/boilerplate.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::single_match)]
 use vangers::{
     config,
-    render::{ScreenTargets, COLOR_FORMAT, DEPTH_FORMAT},
+    render::{ScreenTargets, DEPTH_FORMAT},
 };
 
 use futures::executor::{LocalPool, LocalSpawner};
@@ -41,6 +41,7 @@ pub struct Harness {
     pub queue: wgpu::Queue,
     pub downlevel_caps: wgpu::DownlevelCapabilities,
     surface: wgpu::Surface,
+    pub color_format: wgpu::TextureFormat,
     pub extent: wgpu::Extent3d,
     reload_on_focus: bool,
     depth_target: wgpu::TextureView,
@@ -118,12 +119,15 @@ impl Harness {
 
         let config = wgpu::SurfaceConfiguration {
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
-            format: COLOR_FORMAT,
+            format: surface
+                .get_preferred_format(&adapter)
+                .unwrap_or(wgpu::TextureFormat::Bgra8UnormSrgb),
             width: extent.width,
             height: extent.height,
             present_mode: wgpu::PresentMode::Mailbox,
         };
         surface.configure(&device, &config);
+
         let depth_target = device
             .create_texture(&wgpu::TextureDescriptor {
                 label: Some("Depth"),
@@ -144,6 +148,7 @@ impl Harness {
             downlevel_caps,
             queue,
             surface,
+            color_format: config.format,
             extent,
             reload_on_focus: settings.window.reload_on_focus,
             depth_target,
@@ -165,6 +170,7 @@ impl Harness {
             queue,
             downlevel_caps: _,
             surface,
+            color_format,
             mut extent,
             reload_on_focus,
             mut depth_target,
@@ -188,7 +194,7 @@ impl Harness {
                     };
                     let config = wgpu::SurfaceConfiguration {
                         usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
-                        format: COLOR_FORMAT,
+                        format: color_format,
                         width: size.width,
                         height: size.height,
                         present_mode: wgpu::PresentMode::Mailbox,

diff --git a/bin/car/app.rs b/bin/car/app.rs
@@ -27,6 +27,7 @@ impl CarView {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         downlevel_caps: &wgpu::DownlevelCapabilities,
+        color_format: wgpu::TextureFormat,
     ) -> Self {
         info!("Initializing the render");
         let pal_data = level::read_palette(settings.open_palette(), None);
@@ -35,6 +36,7 @@ impl CarView {
         let global = render::global::Context::new(
             device,
             queue,
+            color_format,
             #[cfg(feature = "glsl")]
             store_init.resource(),
             None,

diff --git a/bin/car/main.rs b/bin/car/main.rs
@@ -32,6 +32,7 @@ fn main() {
         &harness.device,
         &harness.queue,
         &harness.downlevel_caps,
+        harness.color_format,
     );
 
     harness.main_loop(app);

diff --git a/bin/level/app.rs b/bin/level/app.rs
@@ -34,6 +34,7 @@ pub struct LevelView {
 impl LevelView {
     pub fn new(
         settings: &config::settings::Settings,
+        color_format: wgpu::TextureFormat,
         screen_extent: wgpu::Extent3d,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
@@ -114,6 +115,7 @@ impl LevelView {
             &level,
             &objects_palette,
             &settings.render,
+            color_format,
             screen_extent,
             #[cfg(feature = "glsl")]
             store_init.resource(),

diff --git a/bin/level/main.rs b/bin/level/main.rs
@@ -10,6 +10,7 @@ fn main() {
 
     let app = app::LevelView::new(
         &settings,
+        harness.color_format,
         harness.extent,
         &harness.device,
         &harness.queue,

diff --git a/bin/model/app.rs b/bin/model/app.rs
@@ -24,6 +24,7 @@ impl ResourceView {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         downlevel_caps: &wgpu::DownlevelCapabilities,
+        color_format: wgpu::TextureFormat,
     ) -> Self {
         info!("Initializing the render");
         let pal_data = level::read_palette(settings.open_palette(), None);
@@ -32,6 +33,7 @@ impl ResourceView {
         let global = render::global::Context::new(
             device,
             queue,
+            color_format,
             #[cfg(feature = "glsl")]
             store_init.resource(),
             None,

diff --git a/bin/model/main.rs b/bin/model/main.rs
@@ -31,6 +31,7 @@ fn main() {
         &harness.device,
         &harness.queue,
         &harness.downlevel_caps,
+        harness.color_format,
     );
 
     harness.main_loop(app);

diff --git a/bin/road/game.rs b/bin/road/game.rs
@@ -324,6 +324,7 @@ pub struct Game {
 impl Game {
     pub fn new(
         settings: &config::Settings,
+        color_format: wgpu::TextureFormat,
         screen_extent: wgpu::Extent3d,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
@@ -373,6 +374,7 @@ impl Game {
             &level,
             &pal_data,
             &settings.render,
+            color_format,
             screen_extent,
             #[cfg(feature = "glsl")]
             store_init.resource(),

diff --git a/bin/road/main.rs b/bin/road/main.rs
@@ -32,6 +32,7 @@ fn main() {
 
     let game = game::Game::new(
         &settings,
+        harness.color_format,
         harness.extent,
         &harness.device,
         &harness.queue,

diff --git a/src/render/debug.rs b/src/render/debug.rs
@@ -4,7 +4,7 @@ use crate::{
     render::{
         global::Context as GlobalContext,
         object::{Context as ObjectContext, Instance as ObjectInstance},
-        VertexStorageNotSupported, COLOR_FORMAT, DEPTH_FORMAT,
+        VertexStorageNotSupported, DEPTH_FORMAT,
     },
 };
 
@@ -102,6 +102,7 @@ pub struct Context {
     bind_group_line: wgpu::BindGroup,
     bind_group_face: wgpu::BindGroup,
     bind_group_edge: wgpu::BindGroup,
+    color_format: wgpu::TextureFormat,
     // hold the buffers alive
     vertex_buf: Option<wgpu::Buffer>,
     color_buf: Option<wgpu::Buffer>,
@@ -204,6 +205,7 @@ impl Context {
             bind_group_line,
             bind_group_face,
             bind_group_edge,
+            color_format: global.color_format,
             vertex_buf: None,
             color_buf: None,
         };
@@ -237,7 +239,7 @@ impl Context {
                     module: &shaders.fs,
                     entry_point: "main",
                     targets: &[wgpu::ColorTargetState {
-                        format: COLOR_FORMAT,
+                        format: self.color_format,
                         blend: Some(wgpu::BlendState {
                             alpha: wgpu::BlendComponent {
                                 src_factor: wgpu::BlendFactor::One,
@@ -312,7 +314,7 @@ impl Context {
                             module: &shader,
                             entry_point: "main_fs",
                             targets: &[wgpu::ColorTargetState {
-                                format: COLOR_FORMAT,
+                                format: self.color_format,
                                 blend: Some(wgpu::BlendState {
                                     color: blend,
                                     alpha: blend,

diff --git a/src/render/global.rs b/src/render/global.rs
@@ -39,12 +39,14 @@ pub struct Context {
     pub uniform_buf: wgpu::Buffer,
     pub bind_group: wgpu::BindGroup,
     pub shadow_bind_group: wgpu::BindGroup,
+    pub color_format: wgpu::TextureFormat,
 }
 
 impl Context {
     pub fn new(
         device: &wgpu::Device,
         queue: &wgpu::Queue,
+        color_format: wgpu::TextureFormat,
         #[cfg(feature = "glsl")] store_buffer: wgpu::BindingResource<'_>,
         shadow_view: Option<&wgpu::TextureView>,
     ) -> Self {
@@ -222,6 +224,7 @@ impl Context {
             uniform_buf,
             bind_group,
             shadow_bind_group,
+            color_format,
         }
     }
 }
diff --git a/src/render/mod.rs b/src/render/mod.rs
@@ -37,7 +37,6 @@ pub mod body {
 }
 
 pub use shadow::FORMAT as SHADOW_FORMAT;
-pub const COLOR_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Bgra8Unorm;
 pub const DEPTH_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Depth32Float;
 
 #[derive(Clone, Copy, Debug)]
@@ -536,6 +535,7 @@ impl Render {
         level: &level::Level,
         object_palette: &[[u8; 4]],
         settings: &settings::Render,
+        color_format: wgpu::TextureFormat,
         screen_size: wgpu::Extent3d,
         #[cfg(feature = "glsl")] store_buffer: wgpu::BindingResource<'_>,
     ) -> Self {
@@ -550,6 +550,7 @@ impl Render {
         let global = global::Context::new(
             device,
             queue,
+            color_format,
             #[cfg(feature = "glsl")]
             store_buffer,
             shadow.as_ref().map(|shadow| &shadow.view),

diff --git a/src/render/object.rs b/src/render/object.rs
@@ -1,7 +1,7 @@
 use crate::{
     render::{
         body::GpuBody, global::Context as GlobalContext, GpuTransform, Palette, PipelineSet,
-        VertexStorageNotSupported, COLOR_FORMAT, DEPTH_FORMAT, SHADOW_FORMAT,
+        VertexStorageNotSupported, DEPTH_FORMAT, SHADOW_FORMAT,
     },
     space::Transform,
 };
@@ -108,10 +108,15 @@ pub struct Context {
     pub shape_bind_group_layout: Result<wgpu::BindGroupLayout, VertexStorageNotSupported>,
     pub pipeline_layout: wgpu::PipelineLayout,
     pub pipelines: PipelineSet,
+    pub color_format: wgpu::TextureFormat,
 }
 
 impl Context {
-    fn create_pipelines(layout: &wgpu::PipelineLayout, device: &wgpu::Device) -> PipelineSet {
+    fn create_pipelines(
+        layout: &wgpu::PipelineLayout,
+        device: &wgpu::Device,
+        color_format: wgpu::TextureFormat,
+    ) -> PipelineSet {
         let vertex_descriptor = wgpu::VertexBufferLayout {
             array_stride: mem::size_of::<Vertex>() as wgpu::BufferAddress,
             step_mode: wgpu::VertexStepMode::Vertex,
@@ -131,7 +136,7 @@ impl Context {
             fragment: Some(wgpu::FragmentState {
                 module: &shader,
                 entry_point: "color_fs",
-                targets: &[COLOR_FORMAT.into()],
+                targets: &[color_format.into()],
             }),
             primitive: wgpu::PrimitiveState {
                 topology: wgpu::PrimitiveTopology::TriangleList,
@@ -319,17 +324,18 @@ impl Context {
             bind_group_layouts: &[&global.bind_group_layout, &bind_group_layout],
             push_constant_ranges: &[],
         });
-        let pipelines = Self::create_pipelines(&pipeline_layout, device);
+        let pipelines = Self::create_pipelines(&pipeline_layout, device, global.color_format);
 
         Context {
             bind_group,
             shape_bind_group_layout,
             pipeline_layout,
             pipelines,
+            color_format: global.color_format,
         }
     }
 
     pub fn reload(&mut self, device: &wgpu::Device) {
-        self.pipelines = Self::create_pipelines(&self.pipeline_layout, device);
+        self.pipelines = Self::create_pipelines(&self.pipeline_layout, device, self.color_format);
     }
 }