From 1d0dbcd1750cb1dd0060fc8dfa3ba8a64b7f8afe Mon Sep 17 00:00:00 2001
From: tcmal <me@aria.rip>
Date: Sun, 25 Aug 2024 17:44:24 +0100
Subject: fix(skeleton): add used_layout to renderpass

fixes validation errors
---
 stockton-render/src/ui.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'stockton-render/src/ui.rs')

diff --git a/stockton-render/src/ui.rs b/stockton-render/src/ui.rs
index ad53d80..0d53c4f 100644
--- a/stockton-render/src/ui.rs
+++ b/stockton-render/src/ui.rs
@@ -4,8 +4,8 @@ use crate::window::UiState;
 use stockton_skeleton::{
     buffers::draw::DrawBuffers,
     builders::{
-        CompletePipeline, PipelineSpecBuilder, RenderpassSpec, ShaderDesc, VertexBufferSpec,
-        VertexPrimitiveAssemblerSpec,
+        AttachmentSpec, CompletePipeline, PipelineSpecBuilder, RenderpassSpec, ShaderDesc,
+        VertexBufferSpec, VertexPrimitiveAssemblerSpec,
     },
     context::RenderingContext,
     draw_passes::{util::TargetSpecificResources, DrawPass, IntoDrawPass, PassPosition},
@@ -33,6 +33,7 @@ use hal::{
     buffer::SubRange,
     command::{ClearColor, ClearValue, RenderAttachmentInfo, SubpassContents},
     format::Format,
+    image::Layout,
     pass::Attachment,
     pso::{
         BlendDesc, BlendOp, BlendState, ColorBlendDesc, ColorMask, DepthStencilDesc, Face, Factor,
@@ -261,12 +262,15 @@ impl<'a, P: PassPosition> IntoDrawPass<UiDrawPass<'a>, P> for () {
             })
             .push_constants(vec![(ShaderStageFlags::VERTEX, 0..8)])
             .renderpass(RenderpassSpec {
-                colors: vec![Attachment {
-                    format: Some(context.target_chain().properties().format),
-                    samples: 1,
-                    ops: P::attachment_ops(),
-                    stencil_ops: P::attachment_ops(),
-                    layouts: P::layout_as_range(),
+                colors: vec![AttachmentSpec {
+                    attachment: Attachment {
+                        format: Some(context.target_chain().properties().format),
+                        samples: 1,
+                        ops: P::attachment_ops(),
+                        stencil_ops: P::attachment_ops(),
+                        layouts: P::layout_as_range(),
+                    },
+                    used_layout: Layout::ColorAttachmentOptimal,
                 }],
                 depth: None,
                 inputs: vec![],
-- 
cgit v1.2.3