From 4bcafb0c46c0f7cc6b3b08e2eb071ec6a2293872 Mon Sep 17 00:00:00 2001
From: Robear Selwans <robear.selwans@outlook.com>
Date: Fri, 1 May 2026 20:31:42 +0300
Subject: [PATCH] Minor Cleanup

---
 .vscode/launch.json                       | 13 +++++--------
 build_options/meson-clang-linux           | 10 +++++-----
 evk/evkDescriptor.c                       |  2 +-
 evk/evkPipeline.c                         |  2 +-
 evk/evkSwapChain.c                        |  2 +-
 subprojects/packagefiles/volk/meson.build |  2 +-
 subprojects/packagefiles/volk/volk_impl.c |  2 --
 subprojects/shaderc_cmake.wrap            |  2 --
 8 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 subprojects/packagefiles/volk/volk_impl.c
 delete mode 100644 subprojects/shaderc_cmake.wrap

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5e36b6b..9552433 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,16 +2,13 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "lldb",
+            "type": "codelldb",
             "request": "launch",
-            "name": "c",
-            "stdio": [
-                "input.txt",
-                null
-            ],
-            "preLaunchTask": "Compile",
+            "name": "Debug evk (codelldb)",
+            "preLaunchTask": "Build",
             "expressions": "native",
-            "program": "${workspaceFolder}/build/evk.exe"
+            "cwd": "${workspaceFolder}",
+            "program": "${workspaceFolder}/build/evk"
         }
     ]
 }
diff --git a/build_options/meson-clang-linux b/build_options/meson-clang-linux
index 9ad442e..8c1a4c4 100644
--- a/build_options/meson-clang-linux
+++ b/build_options/meson-clang-linux
@@ -1,11 +1,11 @@
 [binaries]
-c = 'clang-19'
-c_ld = 'lld-19'
-cpp = 'clang++-19'
-cpp_ld = 'lld-19'
+c = 'clang'
+c_ld = 'lld'
+cpp = 'clang++'
+cpp_ld = 'lld'
 
 [properties]
 c_args = ['-DEV_CC_CLANG=1','-fcolor-diagnostics', '-fansi-escape-codes', '-fms-extensions']
 
 [cmake]
-CMAKE_C_COMPILER = 'clang-19'
+CMAKE_C_COMPILER = 'clang'
diff --git a/evk/evkDescriptor.c b/evk/evkDescriptor.c
index 7ea4499..f91a782 100644
--- a/evk/evkDescriptor.c
+++ b/evk/evkDescriptor.c
@@ -108,7 +108,7 @@ evkDescriptorSetLayout evkCreateDescriptorSetLayoutFromShaders(evkDevice* device
   vec(evkDescriptorBinding) bindings = vec_init(evkDescriptorBinding);
   for(int i = 0; i < vec_len(&shaders); i++)
   {
-    vec_append(&bindings, &shaders[i].reflect.bindings, vec_len(&shaders[i].reflect.bindings));
+    vec_append(&bindings, (void**)&shaders[i].reflect.bindings, vec_len(&shaders[i].reflect.bindings));
   }
   evkDescriptorBindingDedup(bindings);
   return evkCreateDescriptorSetLayoutFromBindings(device, bindings);
diff --git a/evk/evkPipeline.c b/evk/evkPipeline.c
index 7ce048e..f1fa742 100644
--- a/evk/evkPipeline.c
+++ b/evk/evkPipeline.c
@@ -210,7 +210,7 @@ evkPipeline evkCreateGraphicsPipeline(evkDevice device, evkPipelineCreateInfo cr
     .layout = res.layout.vk,
   };
 
-  vkCreateGraphicsPipelines(device.vk, VK_NULL_HANDLE, 1, &graphicsPipelineCreateInfo, NULL, &res.vk);
+  EVK_ASSERT(vkCreateGraphicsPipelines(device.vk, VK_NULL_HANDLE, 1, &graphicsPipelineCreateInfo, NULL, &res.vk));
 
   res._device = device;
 
diff --git a/evk/evkSwapChain.c b/evk/evkSwapChain.c
index 6b6505b..d6434fc 100644
--- a/evk/evkSwapChain.c
+++ b/evk/evkSwapChain.c
@@ -36,7 +36,7 @@ evkSwapChain evkCreateSwapChain(evkSwapChainCreateInfo createInfo)
   if(imageExtent.width == UInt32.MAX)
     imageExtent.width = createInfo.width;
   if(imageExtent.height == UInt32.MAX)
-    imageExtent.height = createInfo.width;
+    imageExtent.height = createInfo.height;
 
   VkSwapchainCreateInfoKHR swapChainCreateInfo = {
     .sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR,
diff --git a/subprojects/packagefiles/volk/meson.build b/subprojects/packagefiles/volk/meson.build
index d6e6745..597521f 100644
--- a/subprojects/packagefiles/volk/meson.build
+++ b/subprojects/packagefiles/volk/meson.build
@@ -8,7 +8,7 @@ vulkan_dep = dependency('vulkan').partial_dependency(compile_args : true)
 
 volk_inc = include_directories('.')
 
-volk_src = files('volk_impl.c')
+volk_src = files('volk.c')
 
 volk_lib = library(
   'volk',
diff --git a/subprojects/packagefiles/volk/volk_impl.c b/subprojects/packagefiles/volk/volk_impl.c
deleted file mode 100644
index 2a7e037..0000000
--- a/subprojects/packagefiles/volk/volk_impl.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define VOLK_IMPLEMENTATION
-#include "volk.h"
diff --git a/subprojects/shaderc_cmake.wrap b/subprojects/shaderc_cmake.wrap
deleted file mode 100644
index 7a06c7e..0000000
--- a/subprojects/shaderc_cmake.wrap
+++ /dev/null
@@ -1,2 +0,0 @@
-[wrap-redirect]
-filename = shaderc/subprojects/shaderc_cmake.wrap