From c10031ac953a001a8148a6a537bdfaec9dfd4d6d Mon Sep 17 00:00:00 2001
From: Robear Selwans <robear.selwans@outlook.com>
Date: Thu, 26 Mar 2026 13:28:57 +0200
Subject: [PATCH] Minor changes

---
 .vscode/tasks.json |  2 +-
 evk/evkTypes.h     | 29 +++++++++++++++++++++++++++++
 main.c             | 15 +++++----------
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 75a0dcf..97dd860 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -34,7 +34,7 @@
         {
           "label": "Build & Run",
           "dependsOn": ["Build", "Run"],
-          "dependsOrder": "sequence",
+          "dependsOrder": "sequence"
         }
     ]
 }
diff --git a/evk/evkTypes.h b/evk/evkTypes.h
index bd619eb..6d60bf7 100644
--- a/evk/evkTypes.h
+++ b/evk/evkTypes.h
@@ -2,6 +2,7 @@
 
 #include "evkCommon.h"
 #include "shaderc/shaderc.h"
+#include "vulkan/vulkan_core.h"
 
 TYPEDATA_GEN(VkInstance, INVALID(VK_NULL_HANDLE));
 TYPEDATA_GEN(VkDevice, INVALID(VK_NULL_HANDLE));
@@ -36,6 +37,34 @@ TYPEDATA_GEN(VkViewport,
   )
 )
 
+TYPEDATA_GEN(VkImageSubresourceRange,
+  DEFAULT(
+    .aspectMask = VK_IMAGE_ASPECT_NONE,
+    .baseMipLevel = 0,
+    .levelCount = 1,
+    .baseArrayLayer = 0,
+    .layerCount = 1
+  )
+);
+
+TYPEDATA_GEN(VkImageMemoryBarrier,
+  DEFAULT(
+    .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+    .pNext = NULL,
+    .srcAccessMask = 0,
+    .dstAccessMask = 0,
+    .oldLayout = 0,
+    .newLayout = 0,
+    .subresourceRange = {
+      .aspectMask = VK_IMAGE_ASPECT_NONE,
+      .baseMipLevel = 0,
+      .levelCount = 1,
+      .baseArrayLayer = 0,
+      .layerCount = 1,
+    },
+  )
+)
+
 TYPEDATA_GEN(VkRect2D, 
   DEFAULT(0)
 )
diff --git a/main.c b/main.c
index 184d9c0..3c7d330 100644
--- a/main.c
+++ b/main.c
@@ -261,16 +261,11 @@ int main(void)
 
       vkCmdEndRenderingKHR(cmdbuf.vk);
 
-      VkImageMemoryBarrier imageMemoryBarrier = {
-        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-        .image = swapChain.images[swapChainImageIdx].vk,
-        .newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
-        .subresourceRange = {
-          .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
-          .layerCount = 1,
-          .levelCount = 1,
-        },
-      };
+      VkImageMemoryBarrier imageMemoryBarrier = EV_DEFAULT(VkImageMemoryBarrier,
+        image = swapChain.images[swapChainImageIdx].vk,
+        newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
+        subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT
+      );
 
       vkCmdPipelineBarrier(cmdbuf.vk, 0, 0, 0, 0, NULL, 0, NULL, 1, &imageMemoryBarrier);
     }