Leave initial scissor/viewport state to the user

These are usually already set.
SecondHalfGames · Nov 29, 2023 · bcb4463 · bcb4463
1 parent 232a7a8
commit bcb4463
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/crates/yakui-vulkan/examples/demo.rs b/crates/yakui-vulkan/examples/demo.rs
@@ -626,6 +626,14 @@ impl VulkanTest {
                     },
                 },
             ];
+            let viewports = [vk::Viewport {
+                x: 0.0,
+                y: 0.0,
+                width: self.swapchain_info.surface_resolution.width as f32,
+                height: self.swapchain_info.surface_resolution.height as f32,
+                min_depth: 0.0,
+                max_depth: 1.0,
+            }];
 
             let render_pass_begin_info = vk::RenderPassBeginInfo::builder()
                 .render_pass(self.render_pass)
@@ -638,6 +646,12 @@ impl VulkanTest {
                 &render_pass_begin_info,
                 vk::SubpassContents::INLINE,
             );
+            device.cmd_set_viewport(self.draw_command_buffer, 0, &viewports);
+            device.cmd_set_scissor(
+                self.draw_command_buffer,
+                0,
+                &[self.swapchain_info.surface_resolution.into()],
+            );
         }
         present_index
     }

diff --git a/crates/yakui-vulkan/src/lib.rs b/crates/yakui-vulkan/src/lib.rs
@@ -388,6 +388,7 @@ impl YakuiVulkan {
     ///
     /// ## Safety
     /// - `vulkan_context` must be the same as the one used to create this [`YakuiVulkan`] instance
+    /// - `cmd` must be in rendering state, with viewport and scissor dynamic states set.
     pub unsafe fn paint(
         &mut self,
         paint: &yakui_core::paint::PaintDom,
@@ -416,15 +417,6 @@ impl YakuiVulkan {
     ) {
         let device = vulkan_context.device;
 
-        let viewports = [vk::Viewport {
-            x: 0.0,
-            y: 0.0,
-            width: resolution.width as f32,
-            height: resolution.height as f32,
-            min_depth: 0.0,
-            max_depth: 1.0,
-        }];
-
         let surface_size = UVec2::new(resolution.width, resolution.height);
 
         unsafe {
@@ -433,11 +425,8 @@ impl YakuiVulkan {
                 vk::PipelineBindPoint::GRAPHICS,
                 self.graphics_pipeline,
             );
-            device.cmd_set_viewport(command_buffer, 0, &viewports);
             let default_scissor = [resolution.into()];
 
-            // We set the scissor first here as it's against the spec not to do so.
-            device.cmd_set_scissor(command_buffer, 0, &default_scissor);
             device.cmd_bind_vertex_buffers(command_buffer, 0, &[self.vertex_buffer.handle], &[0]);
             device.cmd_bind_index_buffer(
                 command_buffer,