From 4956d611e0d35137419f65cbe5802c1afd0f5a9b Mon Sep 17 00:00:00 2001
From: hodasemi <michaelh.95@t-online.de>
Date: Sun, 22 Jan 2023 18:18:24 +0100
Subject: [PATCH] Get multi sampled text to work

---
 src/guihandler/guihandler.rs                 |  20 +++++++++----------
 src/guihandler/guishader/input_rect.frag     |  12 +++++++++++
 src/guihandler/guishader/input_rect.frag.spv | Bin 0 -> 612 bytes
 3 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 src/guihandler/guishader/input_rect.frag
 create mode 100644 src/guihandler/guishader/input_rect.frag.spv

diff --git a/src/guihandler/guihandler.rs b/src/guihandler/guihandler.rs
index 2fb05e5..1806c97 100644
--- a/src/guihandler/guihandler.rs
+++ b/src/guihandler/guihandler.rs
@@ -1301,22 +1301,20 @@ impl GuiHandler {
                     .add_target_info(CustomTarget {
                         usage: VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT.into(),
                         format: VK_FORMAT_R8G8B8A8_UNORM,
-                        clear_on_load: false,
+                        clear_on_load: true,
                         store_on_save: true,
                         attach_sampler: false,
                         use_as_input: false,
                         clear_value: ClearValue::Color([0.0, 0.0, 0.0, 0.0]),
                     })
                     .set_sample_count(sample_count)
-                    .add_resolve_targets(CustomTarget {
-                        usage: VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT.into(),
-                        format: VK_FORMAT_R8G8B8A8_UNORM,
-                        clear_on_load: true,
-                        store_on_save: true,
-                        attach_sampler: false,
-                        use_as_input: true,
-                        clear_value: ClearValue::Color([0.0, 0.0, 0.0, 0.0]),
-                    })
+                    .add_resolve_targets(CustomTarget::resolve(
+                        VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
+                        VK_FORMAT_R8G8B8A8_UNORM,
+                        None,
+                        false,
+                        true,
+                    ))
                     .use_queue(queue.clone())
                     .build(device)?,
             )
@@ -1512,7 +1510,7 @@ impl GuiHandler {
         )?;
         let fragment_shader = ShaderModule::from_slice(
             device.clone(),
-            include_bytes!("guishader/rect.frag.spv"),
+            include_bytes!("guishader/input_rect.frag.spv"),
             ShaderType::Fragment,
         )?;
 
diff --git a/src/guihandler/guishader/input_rect.frag b/src/guihandler/guishader/input_rect.frag
new file mode 100644
index 0000000..f23f9f7
--- /dev/null
+++ b/src/guihandler/guishader/input_rect.frag
@@ -0,0 +1,12 @@
+#version 450
+
+layout (location = 0) in vec2 uv;
+
+layout (input_attachment_index = 0, set = 0, binding = 0) uniform subpassInput image;
+
+layout (location = 0) out vec4 color;
+
+void main()
+{
+	color = subpassLoad(image);
+}
diff --git a/src/guihandler/guishader/input_rect.frag.spv b/src/guihandler/guishader/input_rect.frag.spv
new file mode 100644
index 0000000000000000000000000000000000000000..4df9377e69dda24ea0c3460ea9ac180fd9897e01
GIT binary patch
literal 612
zcmZ9I%Su9F6ot2*yrktN(`XV}lfaM$6+zV0iL;)-E`*Q?-5#)~Y7+Q;zbBG5Y}a1P
zb@t`Yibs`*Le!!fy;wy%iYO7{F<6gs;^WEfWc2p_FgiOw)!B$lNdGmX5*yU!d^&qk
z-z2+a3!gfJs4}`nd@-Pey6%_z&Hdte@e0bfz}bBI^q6>-`h9#xjC1b+x*^wlnAjg5
z{Nuwl?ry)|ci76k25G}cb&tA?)+hJq@BVUk?(<s(eF62WoV&l;K9|%${pNZ&$FN6z
zRVJ@J<lbR);SI1)7RX`Fo79FowLm@gJmJOUZBmb^rvti!9%t@?_EUGJ+_zA>poczh
iG`!^-r37B1deb)Pj(4cuzLRUtz2OVrK<$T)m*f&E_84sd

literal 0
HcmV?d00001