WIP Samples

.editorconfig

@@ -1,17 +0,0 @@
-root = true
-
-# All (Defaults)
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = false
-trim_trailing_whitespace = true
-max_line_length = 80
-indent_style = space
-indent_size = 2
-
-
-# C
-# [*.{c,h}]
-# indent_style = space
-# indent_size = 2

.gitignore

@@ -59,6 +59,3 @@ compile_commands.json
 /subprojects/*
 !/subprojects/*.wrap
 !/subprojects/packagefiles
-
-# Internal wrap that is moved here during the configure step
-/subprojects/shaderc_cmake.wrap

.vscode/launch.json

@@ -8,7 +8,7 @@
             "preLaunchTask": "Build",
             "expressions": "native",
             "cwd": "${workspaceFolder}",
-            "program": "${workspaceFolder}/build/samples/descriptor_heap/descriptor_heap"
+            "program": "${workspaceFolder}/build/evk"
         }
     ]
 }

.vscode/tasks.json

@@ -23,7 +23,7 @@
         {
             "label": "Run",
             "type": "shell",
-            "command": "./build/samples/descriptor_heap/descriptor_heap",
+            "command": "./build/evk",
             "windows": {
               "command": "build/evk.exe"
             },

evk/evkBuffer.c

@@ -18,11 +18,11 @@ evkBuffer evkCreateBuffer(evkDevice* device, evkBufferCreateInfo createInfo)
 
   if(buffer.vk != VK_NULL_HANDLE)
   {
-    buffer.addressRange.address = vkGetBufferDeviceAddressKHR(device->vk, &(VkBufferDeviceAddressInfo){
+    buffer.sizeInBytes = createInfo.sizeInBytes;
+    buffer.address = vkGetBufferDeviceAddressKHR(device->vk, &(VkBufferDeviceAddressInfo){
       .sType = VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO, 
       .buffer = buffer.vk
     });
-    buffer.addressRange.size = createInfo.sizeInBytes;
   }
 
   return buffer;

evk/evkCommon.h

@@ -88,9 +88,9 @@ static inline const char* VkResultStrings(VkResult res) {
   }
 };
 
-static VkResult __evk_check_result_internal;
-#define EVK_CHECK(fn) (                                                                                                                                                \
-    __evk_check_result_internal = fn,                                                                                                                                  \
-    __evk_check_result_internal != VK_SUCCESS?                                                                                                                         \
-      ev_log_error("[VulkanError] `%s` returned error code %d ('%s')", EV_STRINGIZE(fn), __evk_check_result_internal, VkResultStrings(__evk_check_result_internal)):0, \
-    __evk_check_result_internal)
+#define EVK_ASSERT(fn) do { \
+  VkResult __vk_assert_result_internal = fn; \
+  if(__vk_assert_result_internal != VK_SUCCESS) { \
+    ev_log_error("[VulkanError] `%s` returned error code %d ('%s')", EV_STRINGIZE(fn), __vk_assert_result_internal, VkResultStrings(__vk_assert_result_internal));\
+  } \
+} while (0)

evk/evkDescriptor.c

@@ -137,8 +137,8 @@ void evkSetDescriptor(evkDescriptorSet* set, evstring name, evkBuffer* buf)
 
   VkDescriptorAddressInfoEXT addressInfo = {
     VK_STRUCTURE_TYPE_DESCRIPTOR_ADDRESS_INFO_EXT,
-    .address = buf->addressRange.address,
-    .range = buf->addressRange.size,
+    .address = buf->address,
+    .range = buf->sizeInBytes,
     .format = VK_FORMAT_UNDEFINED,
   };
 
@@ -168,7 +168,7 @@ void evkCmdBindDescriptorSets(evkCommandBuffer* cmdbuf, evkPipeline* pipeline, v
   {
     bindingInfos[i] = (VkDescriptorBufferBindingInfoEXT) {
       .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_INFO_EXT,
-      .address = sets[setIndices[i]].buffer.addressRange.address,
+      .address = sets[setIndices[i]].buffer.address,
       .usage = sets[setIndices[i]].buffer.usage,
     };
     setOffsets[i] = offset;

evk/evkDevice.c

@@ -27,25 +27,6 @@ VkPhysicalDeviceDescriptorBufferFeaturesEXT descriptorBufFeature = {
   // )
 };
 
-VkPhysicalDeviceDescriptorHeapFeaturesEXT descriptorHeapFeature = {
-  VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_HEAP_FEATURES_EXT,
-  .descriptorHeap = VK_TRUE,
-
-  EV_DEBUG(
-    .descriptorHeapCaptureReplay = VK_TRUE,
-  )
-};
-
-VkPhysicalDeviceShaderUntypedPointersFeaturesKHR shaderUntypedPointersFeature = {
-  VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_UNTYPED_POINTERS_FEATURES_KHR,
-  .shaderUntypedPointers = VK_TRUE,
-};
-
-VkPhysicalDeviceShaderObjectFeaturesEXT shaderObjectFeature = {
-  VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_OBJECT_FEATURES_EXT,
-  .shaderObject = VK_TRUE,
-};
-
 typedef struct {
   evstring name;
   void* data;
@@ -54,9 +35,6 @@ typedef struct {
 
 const evkDeviceExtension evkSupportedExtensions[] = {
   { evstr(VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME)    , &descriptorBufFeature   , &descriptorBufFeature.pNext },
-  { evstr(VK_EXT_DESCRIPTOR_HEAP_EXTENSION_NAME)        , &descriptorHeapFeature       , &descriptorHeapFeature.pNext },
-  { evstr(VK_KHR_SHADER_UNTYPED_POINTERS_EXTENSION_NAME), &shaderUntypedPointersFeature, &shaderUntypedPointersFeature.pNext },
-  { evstr(VK_EXT_SHADER_OBJECT_EXTENSION_NAME)          , &shaderObjectFeature         , &shaderObjectFeature.pNext },
 };
 const u32 evkSupportedExtensionsCount = EV_ARRSIZE(evkSupportedExtensions);
 
@@ -232,7 +210,7 @@ evkDevice evkCreateDevice(evkDeviceCreateInfo createInfo)
 		}
 	}
 
-	EVK_CHECK(vkCreateDevice(device._physicalDevice, &vkDeviceCreateInfo, evkGetAllocationCallbacks(), &device.vk));
+	EVK_ASSERT(vkCreateDevice(device._physicalDevice, &vkDeviceCreateInfo, evkGetAllocationCallbacks(), &device.vk));
 
 	vec_fini(&queueCreateInfoList);
   vec_fini(&priorities);

evk/evkMemory.c

@@ -56,7 +56,6 @@ evkImage evkGPUCreateImage(evkGPUAllocationCreateInfo allocationCreateInfo, VkIm
     .flags = allocationCreateInfo.allocationFlags,
     .pool = allocationCreateInfo.pool.vma,
   };
-  img.allocData.allocator = allocationCreateInfo.allocator;
 
   vmaCreateImage(allocationCreateInfo.allocator.vma, imageCreateInfo, &vmaAllocCreateInfo, &img.vk, &img.allocData.allocation.vma, &img.allocData.allocationInfo.vma);
 
@@ -80,7 +79,6 @@ evkBuffer evkGPUCreateBuffer(evkGPUAllocationCreateInfo allocationCreateInfo, Vk
 
   vmaCreateBuffer(allocationCreateInfo.allocator.vma, bufferCreateInfo, &vmaAllocCreateInfo, &buf.vk, &buf.allocData.allocation.vma, &buf.allocData.allocationInfo.vma);
   buf.usage = bufferCreateInfo->usage;
-  buf.allocData.allocator = allocationCreateInfo.allocator;
 
   return buf;
 }

evk/evkPipeline.c

@@ -59,14 +59,8 @@ evkPipeline evkCreateGraphicsPipeline(evkDevice device, evkPipelineCreateInfo cr
   for(int i = 0; i < colorAttachmentCount; i++)
     colorAttachmentFormats[i] = createInfo.colorAttachments[i].format;
 
-  VkPipelineCreateFlags2CreateInfo pipelineCreateFlags2CreateInfo = {
-    .sType = VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO,
-    .flags = VK_PIPELINE_CREATE_2_DESCRIPTOR_HEAP_BIT_EXT,
-  };
-
   VkPipelineRenderingCreateInfoKHR pipelineRenderingCreateInfo = {
       .sType = VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR,
-      .pNext = &pipelineCreateFlags2CreateInfo,
       .colorAttachmentCount = colorAttachmentCount,
       .pColorAttachmentFormats = colorAttachmentFormats,
       .depthAttachmentFormat = createInfo.depthAttachmentFormat,
@@ -197,13 +191,13 @@ evkPipeline evkCreateGraphicsPipeline(evkDevice device, evkPipelineCreateInfo cr
   }
   else
   {
-    // assert(!"Set Layout construction through shader reflection not implemented yet.");
+    assert(!"Set Layout construction through shader reflection not implemented yet.");
   }
 
   VkGraphicsPipelineCreateInfo graphicsPipelineCreateInfo = {
     .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
     .pNext = &pipelineRenderingCreateInfo,
-    .flags = 0,
+    .flags = VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT,
     .stageCount = shaderStageCount,
     .pStages = shaderStageCreateInfos,
     .pVertexInputState = &vertexInputStateCreateInfo,
@@ -216,9 +210,7 @@ evkPipeline evkCreateGraphicsPipeline(evkDevice device, evkPipelineCreateInfo cr
     .layout = res.layout.vk,
   };
 
-
-
-  EVK_CHECK(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;
 

evk/evkShader.c

@@ -13,7 +13,7 @@ evkShader evkInitShaderFromBytes(evkDevice device, const u8* shaderBytes, u32 sh
   };
   vkCreateShaderModule(device.vk, &createInfo, NULL, &shader.vk);
 
-  // shader.reflect = evkGenerateShaderReflectionData(shaderBytes, shaderLen);
+  shader.reflect = evkGenerateShaderReflectionData(shaderBytes, shaderLen);
 
   return shader;
 }
@@ -96,7 +96,6 @@ evkShaderCompiler evkCreateShaderCompiler()
   evkShaderCompiler compiler;
   compiler.sc = shaderc_compiler_initialize();
   compiler.scopt = shaderc_compile_options_initialize();
-  shaderc_compile_options_set_target_spirv(compiler.scopt, shaderc_spirv_version_1_3);
   shaderc_compile_options_set_include_callbacks(compiler.scopt, _shader_include_resolve, _shader_include_release, NULL);
   shaderc_compile_options_set_generate_debug_info(compiler.scopt);
   return compiler;
@@ -108,28 +107,27 @@ void evkDestroyShaderCompiler(evkShaderCompiler compiler)
   shaderc_compiler_release(compiler.sc);
 }
 
-evkShader evkInitShaderFromString(evkDevice device, evkShaderCompiler compiler,evstring shaderName, evstring shaderText, VkShaderStageFlags stage)
+evkShader evkInitShaderFromFile(evkDevice device, evkShaderCompiler compiler, evstring shaderPath)
 {
-  shaderc_compilation_result_t compilation_result = shaderc_compile_into_spv(compiler.sc, shaderText, evstring_getLength(shaderText), shaderc_glsl_infer_from_source, shaderName, "main", compiler.scopt);
+  evstring shaderText = evstring_readFile(shaderPath);
+
+  shaderc_compilation_result_t compilation_result = shaderc_compile_into_spv(compiler.sc, shaderText, evstring_getLength(shaderText), shaderc_glsl_infer_from_source, shaderPath, "main", compiler.scopt);
 
   shaderc_compilation_status status = shaderc_result_get_compilation_status(compilation_result);
 
   u32 errorCount = shaderc_result_get_num_errors(compilation_result);
   u32 warnCount = shaderc_result_get_num_warnings(compilation_result);
-  ev_log_info("[[evkShader]] %s Compilation Status: %d ( %d Errors, %d Warnings )", shaderName, status, errorCount, warnCount);
+  ev_log_info("[[evkShader]] %s Compilation Status: %d ( %d Errors, %d Warnings )", shaderPath, status, errorCount, warnCount);
   if(errorCount + warnCount > 0)
   {
     ev_log_error("Errors:\n%s", shaderc_result_get_error_message(compilation_result));
   }
 
-  evkShader res = evkInitShaderFromBytes(device, (u8*)shaderc_result_get_bytes(compilation_result), shaderc_result_get_length(compilation_result));
-  res.reflect.stage = stage;
-  return res;
-}
-evkShader evkInitShaderFromFile(evkDevice device, evkShaderCompiler compiler, evstring shaderPath)
-{
-  evstring shaderText = evstring_readFile(shaderPath);
-  return evkInitShaderFromString(device, compiler, shaderPath, shaderText, 0);
+  evkShader shader = evkInitShaderFromBytes(device, (u8*)shaderc_result_get_bytes(compilation_result), shaderc_result_get_length(compilation_result));
+
+  evstring_free(shaderText);
+
+  return shader;
 }
 
 VkPipelineShaderStageCreateInfo evkGetShaderStageCreateInfo(evkShader shader)

evk/evkShader.h

@@ -4,9 +4,6 @@
 
 [[nodiscard("Leaking VkShaderModule")]]
 evkShader evkInitShaderFromBytes(evkDevice device, const u8* shaderBytes, u32 shaderLen);
-[[nodiscard("Leaking VkShaderModule")]]
-evkShader evkInitShaderFromString(evkDevice device, evkShaderCompiler compiler, evstring shaderName, evstring shaderText, VkShaderStageFlags stage);
-[[nodiscard("Leaking VkShaderModule")]]
 evkShader evkInitShaderFromFile(evkDevice device, evkShaderCompiler compiler, evstring shaderPath);
 void evkDestroyShader(evkDevice device, evkShader shader);
 

evk/evkSwapChain.c

@@ -56,7 +56,7 @@ evkSwapChain evkCreateSwapChain(evkSwapChainCreateInfo createInfo)
     .oldSwapchain = VK_NULL_HANDLE,
   };
 
-  EVK_CHECK(vkCreateSwapchainKHR(createInfo.device.vk, &swapChainCreateInfo, NULL, &swapChain.vk));
+  EVK_ASSERT(vkCreateSwapchainKHR(createInfo.device.vk, &swapChainCreateInfo, NULL, &swapChain.vk));
 
   vkGetSwapchainImagesKHR(createInfo.device.vk, swapChain.vk, &buffering, NULL);
   VkImage swapChainVkImages[buffering];

evk/evkTypes.h

@@ -365,8 +365,9 @@ typedef struct {
 typedef struct {
   VkBuffer vk;
   evkGPUAllocationData allocData;
+  u32 sizeInBytes;
   VkBufferUsageFlags usage;
-  VkDeviceAddressRangeEXT addressRange;
+  VkDeviceAddress address;
 } evkBuffer;
 
 typedef struct {

meson.build

@@ -1,15 +1,11 @@
-project(
-  'evk',
-  ['c', 'cpp'],
+project('evk', ['c','cpp'],
   version : '0.1',
-  default_options: {
-    'c_std': 'c23',
-    'default_library': 'static',
-    'c_args': '-fcolor-diagnostics -fansi-escape-codes',
-    'cpp_args': '-fcolor-diagnostics -fansi-escape-codes',
-  },
-  meson_version: '>=1.2',
-)
+  default_options : [
+    'c_std=c23',
+    'default_library=static',
+    'c_args=-fcolor-diagnostics -fansi-escape-codes',
+    'cpp_args=-fcolor-diagnostics -fansi-escape-codes',
+  ])
 
 build_config = configuration_data()
 
@@ -30,9 +26,7 @@ disabled_warnings = {
   ],
 }
 
-subproject('evol-headers', default_options: {'build_tests': false})
-# subproject('volk')
-# subproject('shaderc')
+subproject('evol-headers')
 
 evk_c_args = []
 
@@ -48,11 +42,9 @@ foreach w : disabled_warnings[cc.get_id()]
   evk_c_args += '-Wno-'+w
 endforeach
 
-evk_incdir = include_directories(
-  [
+evk_incdir = include_directories([
   '.',
-  ],
-)
+])
 
 evk_src = [
   'evk/evkInstance.c',
@@ -78,25 +70,21 @@ evk_lib = library(
   include_directories: evk_incdir,
   dependencies: [ 
     dependency('evol-headers'),
+
     dependency('vma'),
+
     dependency('volk'),
+    dependency('glfw3'),
+
     dependency('shaderc'),
     dependency('spvref'),
   ],
   c_args: evk_c_args,
 )
 
-evk_dep = declare_dependency(
-  link_with: evk_lib,
-  include_directories: evk_incdir,
-  dependencies: [
-    dependency('volk').partial_dependency(includes: true, compile_args: true),
-    dependency('vma').partial_dependency(includes: true),
-    dependency('evol-headers').partial_dependency(includes: true),
-  ],
-)
+evk_dep = declare_dependency(link_with: evk_lib, include_directories: evk_incdir)
 meson.override_dependency('evk', evk_dep)
 
-if get_option('build_samples')
+# if build_samples
 subdir('samples')
-endif
+# endif

meson.options

@@ -1 +1 @@
-option('build_samples', type: 'boolean', value: true, description: 'Build the evk samples')
+option('build_evh_tests', type: 'boolean', value: false, description: 'Build the evol-headers tests')

samples/basic_triangle/basic_triangle.c

@@ -8,15 +8,6 @@
 
 evstring PROJECT_NAME = evstr("basic_triangle");
 
-char vertexShaderBytes[] = {
-#embed "shaders/basic_triangle.vert"
-  ,'\0'
-};
-char fragmentShaderBytes[] = {
-#embed "shaders/basic_triangle.frag"
-  ,'\0'
-};
-
 int main(void) 
 {
   u32 width = 1280;
@@ -91,7 +82,7 @@ int main(void)
   }
 
   VkSurfaceKHR surface;
-  VkResult err = EVK_CHECK(glfwCreateWindowSurface(instance.vk, window, NULL, &surface));
+  VkResult err = glfwCreateWindowSurface(instance.vk, window, NULL, &surface);
   if (err)
   {
     ev_log_error("Surface creation failed.");
@@ -118,14 +109,8 @@ int main(void)
 
   evkShaderCompiler compiler = evkCreateShaderCompiler();
 
-  evstring vertexShaderText = evstring_new(vertexShaderBytes);
-  evstring fragmentShaderText = evstring_new(fragmentShaderBytes);
-
-  evkShader vertShader = evkInitShaderFromString(device, compiler, evstr("basic_triangle.vert"),vertexShaderText);
-  evkShader fragShader = evkInitShaderFromString(device, compiler, evstr("basic_triangle.frag"), fragmentShaderText);
-
-  evstring_free(vertexShaderText);
-  evstring_free(fragmentShaderText);
+  evkShader vertShader = evkInitShaderFromFile(device, compiler, "shaders/tri.vert");
+  evkShader fragShader = evkInitShaderFromFile(device, compiler, "shaders/tri.frag");
   
   evkDestroyShaderCompiler(compiler);
 
@@ -147,7 +132,6 @@ int main(void)
   //   })
   // );
   // evkDescriptorSetLayout setLayout_0 = evkCreateDescriptorSetLayoutFromBindings(&device, vertShader.reflect.bindings);
-
   evkDescriptorSetLayout setLayout_0 = evkCreateDescriptorSetLayoutFromShaders(&device, svec_init(evkShader, {vertShader, fragShader}));
 
   evkPipelineCreateInfo pipelineCreateInfo = EV_DEFAULT(evkPipelineCreateInfo,
@@ -244,7 +228,7 @@ int main(void)
   {
     imageIdx = (imageIdx + 1) % imageCount;
     u32 swapChainImageIdx;
-    EVK_CHECK(vkAcquireNextImageKHR(device.vk, swapChain.vk, UInt64.MAX, imageAcquiredSemaphores[imageIdx], VK_NULL_HANDLE, &swapChainImageIdx));
+    EVK_ASSERT(vkAcquireNextImageKHR(device.vk, swapChain.vk, UInt64.MAX, imageAcquiredSemaphores[imageIdx], VK_NULL_HANDLE, &swapChainImageIdx));
 
     evkCommandBuffer cmdbuf = commandBuffers[imageIdx];
 
@@ -285,7 +269,6 @@ int main(void)
 
       evkCmdImageBarrier(&cmdbuf, EV_DEFAULT(VkImageMemoryBarrier,
         image = swapChain.images[swapChainImageIdx].vk,
-        oldLayout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR,
         newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
         subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT
       ));
@@ -338,9 +321,6 @@ int main(void)
 
   evkDestroyPipeline(graphicsPipeline);
 
-  evkDestroyBuffer(vertBuf);
-  evkDestroyBuffer(uniBuf);
-
   evkDestroyDescriptorSet(&device, &set_0);
   evkDestroyDescriptorSetLayout(&device, &setLayout_0);
 
@@ -350,8 +330,6 @@ int main(void)
   evkFreeCommandBuffers(device, commandPool, commandBuffers);
   evkDestroyCommandPool(device, commandPool);
 
-  evkGPUDestroyAllocator(allocator);
-
   evkDestroySwapChain(device, swapChain);
 
 // SwapchainCreationFailed:

samples/basic_triangle/meson.build

@@ -2,9 +2,5 @@
 executable(
   'basic_triangle',
   'basic_triangle.c',
-  dependencies: [
-    dependency('evk'),
-    dependency('glfw3'),
-  ],
-  c_args: evk_c_args,
+  dependencies: [dependency('evk')],
 )

samples/basic_triangle/shaders/basic_triangle.vert

@@ -1,7 +1,7 @@
 #version 450
 #pragma shader_stage(vertex)
 
-in layout(location=0) vec2 position;
+// in layout(location=0) vec2 position;
 
 layout(set=0, binding=0) uniform data {
   vec4 positions[3];
@@ -12,5 +12,4 @@ void main() {
     // gl_Position = vec4(position, 0.0, 1.0);
     // gl_Position = vec4(inputData.positions[gl_VertexIndex], 0.0, 1.0);
     gl_Position = vertexData.positions[gl_VertexIndex];
-    // gl_Position = vec4(position, 0.0, 1.0);
 }

samples/descriptor_heap/descriptor_heap.c

@@ -1,372 +0,0 @@
-#include <evk/evk.h>
-#include <ev_numeric.h>
-#include <ev_helpers.h>
-#include <ev_log.h>
-
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-
-evstring PROJECT_NAME = evstr("heap_triangle");
-
-char vertexShaderBytes[] = {
-#embed "shaders/heap_triangle.vert"
-  ,'\0'
-};
-char fragmentShaderBytes[] = {
-#embed "shaders/heap_triangle.frag"
-  ,'\0'
-};
-
-int main(void)
-{
-  u32 width = 1280;
-  u32 height = 800;
-
-  evkInstance instance = evkCreateInstance((evkInstanceCreateInfo){
-    .applicationInfo = EV_DEFAULT(evkApplicationInfo),
-    .layers = svec_init(evstring, {
-      evstr("VK_LAYER_KHRONOS_validation"),
-    }),
-    .extensions = svec_init(evstring, {
-      evstr("VK_KHR_surface"),
-// TODO Get these from GLFW
-#if EV_OS_WINDOWS
-      evstr("VK_KHR_win32_surface"),
-#elif EV_OS_LINUX
-      evstr("VK_KHR_xcb_surface"),
-#endif
-    }),
-  });
-
-  if(instance.vk == EV_INVALID(VkInstance))
-  {
-    ev_log_error("Instance creation failed.");
-    goto InstanceCreationFailed;
-  }
-  ev_log_info("Instance was created successfully.");
-
-  evkDevice device = evkCreateDevice((evkDeviceCreateInfo) {
-      .instance = instance,
-      // TODO Add a fallback physical device option.
-      // .physicalDeviceType = VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU,
-      .physicalDeviceType = VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU,
-      .queueRequirements = svec_init(evkDeviceQueueRequirement, {
-          { VK_QUEUE_GRAPHICS_BIT, 1 },
-          { VK_QUEUE_COMPUTE_BIT , 1 },
-      }),
-      .deviceExtensions = svec_init(evstring, {
-        evstr("VK_KHR_swapchain"),
-        evstr("VK_KHR_dynamic_rendering"),
-        evstr("VK_KHR_depth_stencil_resolve"),
-        evstr("VK_KHR_create_renderpass2"),
-        evstr("VK_KHR_synchronization2"),
-        evstr("VK_KHR_buffer_device_address"),
-        evstr("VK_EXT_descriptor_indexing"),
-        evstr("VK_KHR_maintenance5"),
-        evstr("VK_EXT_descriptor_heap"),
-        evstr(VK_EXT_SHADER_OBJECT_EXTENSION_NAME),
-        evstr(VK_KHR_SHADER_UNTYPED_POINTERS_EXTENSION_NAME),
-      }),
-  });
-
-  if(device.vk == EV_INVALID(VkDevice))
-  {
-    ev_log_error("Couldn't create a VkDevice");
-    goto DeviceCreationFailed;
-  }
-  ev_log_info("Logical Device created successfully.");
-
-  VkQueue graphicsQueue;
-  vkGetDeviceQueue(device.vk, device.queueFamilies[VK_QUEUE_GRAPHICS_BIT].familyIndex, 0, &graphicsQueue);
-
-  if (!glfwInit())
-  {
-    ev_log_error("GLFW Initialization failed.");
-    goto GLFWInitFailed;
-  }
-
-  glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
-  GLFWwindow* window = glfwCreateWindow(width, height, "evk", NULL, NULL);
-  if(!window)
-  {
-    ev_log_error("Window Creation Failed.");
-    goto WindowCreationFailed;
-  }
-
-  VkSurfaceKHR surface;
-  VkResult err = EVK_CHECK(glfwCreateWindowSurface(instance.vk, window, NULL, &surface));
-  if (err)
-  {
-    ev_log_error("Surface creation failed.");
-    goto VKSurfaceCreationFailed;
-  }
-
-  evkGPUAllocator allocator = evkGPUCreateAllocator(device);
-
-  evkSwapChain swapChain = evkCreateSwapChain((evkSwapChainCreateInfo){
-    .device = device,
-    .surface = surface,
-    .width = width,
-    .height = height,
-    .imageCount = 3,
-  });
-
-  evkCommandPool commandPool = evkCreateCommandPool((evkCommandPoolCreateInfo) {
-    .device = device,
-    .queueFlags = VK_QUEUE_GRAPHICS_BIT,
-    .poolFlags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT
-  });
-
-  vec(evkCommandBuffer) commandBuffers = evkAllocateCommandBuffers(device, commandPool, vec_len(&swapChain.images), true);
-
-  evkShaderCompiler compiler = evkCreateShaderCompiler();
-
-  evstring vertexShaderText = evstring_new(vertexShaderBytes);
-  evstring fragmentShaderText = evstring_new(fragmentShaderBytes);
-
-  evkShader vertShader = evkInitShaderFromString(device, compiler, evstr("heap_triangle.vert"),vertexShaderText, VK_SHADER_STAGE_VERTEX_BIT);
-  evkShader fragShader = evkInitShaderFromString(device, compiler, evstr("heap_triangle.frag"), fragmentShaderText, VK_SHADER_STAGE_FRAGMENT_BIT);
-
-  evstring_free(vertexShaderText);
-  evstring_free(fragmentShaderText);
-
-  evkDestroyShaderCompiler(compiler);
-
-  evkColorAttachment colorAttachment0 = {
-    swapChain.surfaceFormat.format,
-    EV_DEFAULT(VkPipelineColorBlendAttachmentState)
-  };
-
-  // TODO Get this from shader reflection data
-  // evkDescriptorSetLayout setLayout_0 = evkCreateDescriptorSetLayout(
-  //   &device, svec_init(evkDescriptorBinding, {
-  //     {
-  //       .name = evstr("positions"),
-  //       .binding = 0,
-  //       .descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-  //       .descriptorCount = 1,
-  //       .stageFlags = VK_SHADER_STAGE_ALL_GRAPHICS,
-  //     },
-  //   })
-  // );
-  // evkDescriptorSetLayout setLayout_0 = evkCreateDescriptorSetLayoutFromBindings(&device, vertShader.reflect.bindings);
-
-  // evkDescriptorSetLayout setLayout_0 = evkCreateDescriptorSetLayoutFromShaders(&device, svec_init(evkShader, {vertShader, fragShader}));
-
-  evkPipelineCreateInfo pipelineCreateInfo = EV_DEFAULT(evkPipelineCreateInfo,
-    dynamicStates = svec_init(VkDynamicState, {
-      VK_DYNAMIC_STATE_VIEWPORT,
-      VK_DYNAMIC_STATE_SCISSOR,
-    }),
-    shaderStages = svec_init(evkShader, {
-      vertShader,
-      fragShader,
-    }),
-    colorAttachments = svec_init(evkColorAttachment, {
-      colorAttachment0,
-    }),
-    viewportCountOverride = 1,
-
-    vertexBufferLayouts = svec_init(evkVertexBufferLayout, {
-      {{ // VB #0
-        { EVK_VERTEX_ATTRIBUTE_POSITION, EVK_FMT_FLOAT32, 2 },
-      }},
-    }),
-
-    // setLayouts = svec_init(evkDescriptorSetLayout, {setLayout_0}),
-  );
-
-  evkBuffer resourceDescriptorHeap = evkCreateBuffer(&device, (evkBufferCreateInfo) {
-    .sizeInBytes = 16 * 4, // bufferDescriptorSize is 16 on my current device
-    .usage = VK_BUFFER_USAGE_DESCRIPTOR_HEAP_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
-    .exclusive = true,
-    .allocationCreateInfo = {
-      .allocationFlags = EVK_GPU_ALLOCATION_CREATE_MAPPED_BIT | EVK_GPU_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT,
-      .allocator = allocator,
-    }
-  });
-
-
-  evkBuffer uniBuf = evkCreateBuffer(&device, (evkBufferCreateInfo) {
-    .sizeInBytes = 12 * 4,
-    .usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
-    .allocationCreateInfo = {
-      .allocationFlags = EVK_GPU_ALLOCATION_CREATE_MAPPED_BIT | EVK_GPU_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT,
-      .allocator = allocator,
-    },
-    .exclusive = true,
-  });
-
-  float* uni_arr = (float*)uniBuf.allocData.allocationInfo.vma.pMappedData;
-  uni_arr[0] =  0.0f; uni_arr[1] = -0.5f; uni_arr[2]  = 0.0f; uni_arr[3]  = 1.0f;
-  uni_arr[4] =  0.5f; uni_arr[5] =  0.5f; uni_arr[6]  = 0.0f; uni_arr[7]  = 1.0f;
-  uni_arr[8] = -0.5f; uni_arr[9] =  0.5f; uni_arr[10] = 0.0f; uni_arr[11] = 1.0f;
-
-  // evkSetDescriptor(&set_0, evstr("vertexData"), &uniBuf);
-
-  VkResourceDescriptorInfoEXT resource = {
-    .sType = VK_STRUCTURE_TYPE_RESOURCE_DESCRIPTOR_INFO_EXT,
-    .type  = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-    .data.pAddressRange = &uniBuf.addressRange
-  };
-
-  VkHostAddressRangeEXT descriptor = {
-    .address = resourceDescriptorHeap.allocData.allocationInfo.vma.pMappedData,
-    .size = 16
-  };
-
-  vkWriteResourceDescriptorsEXT(device.vk, 1, &resource, &descriptor);
-
-  VkViewport viewport = EV_DEFAULT(VkViewport, width=width, height=height);
-  VkRect2D scissor = EV_DEFAULT(VkRect2D,extent.width=width, extent.height=height);
-
-  evkPipeline graphicsPipeline = evkCreatePipeline(device, pipelineCreateInfo);
-
-  u32 imageCount = vec_len(&swapChain.images);
-
-  VkFence drawFence = evkCreateFence(device, false);
-  vec(VkSemaphore) imageAcquiredSemaphores = vec_init(VkSemaphore);
-  vec(VkSemaphore) drawFinishedSemaphores = vec_init(VkSemaphore);
-  for(u32 i = 0; i < imageCount; i++)
-  {
-    imageAcquiredSemaphores[i] = evkCreateSemaphore(device);
-    drawFinishedSemaphores[i] = evkCreateSemaphore(device);
-  }
-  // VkSemaphore imageAcquiredSemaphore = evkCreateSemaphore(device);
-  // VkSemaphore drawFinishedSemaphore = evkCreateSemaphore(device);
-
-  i32 imageIdx = -1;
-  while(!glfwWindowShouldClose(window))
-  {
-    imageIdx = (imageIdx + 1) % imageCount;
-    u32 swapChainImageIdx;
-    EVK_CHECK(vkAcquireNextImageKHR(device.vk, swapChain.vk, UInt64.MAX, imageAcquiredSemaphores[imageIdx], VK_NULL_HANDLE, &swapChainImageIdx));
-
-    evkCommandBuffer cmdbuf = commandBuffers[imageIdx];
-
-    VkRenderingAttachmentInfoKHR colorAttachment = EV_DEFAULT(VkRenderingAttachmentInfoKHR,
-      imageView = swapChain.imageViews[swapChainImageIdx].vk,
-      loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR,
-      storeOp= VK_ATTACHMENT_STORE_OP_STORE,
-    );
-
-    VkRenderingInfo renderingInfo = EV_DEFAULT(VkRenderingInfo,
-      renderArea.extent = ((VkExtent2D){width, height}),
-      pColorAttachments = &colorAttachment,
-      colorAttachmentCount = 1,
-    );
-
-    evkBeginPrimaryCommandBuffer(&cmdbuf);
-    {
-      evkCmdImageBarrier(&cmdbuf, EV_DEFAULT(VkImageMemoryBarrier,
-        image = swapChain.images[swapChainImageIdx].vk,
-        newLayout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR,
-        subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT
-      ));
-
-      // VkDeviceSize offset = 0;
-      // vkCmdBindVertexBuffers(cmdbuf.vk, 0, 1, &vertBuf.vk, &offset);
-
-      // evkCmdBindDescriptorSets(&cmdbuf, &graphicsPipeline, svec_init(evkDescriptorSet, { set_0 }), svec_init(u32, { 0 }));
-
-      vkCmdSetScissor(cmdbuf.vk, 0, 1, &scissor);
-      vkCmdSetViewport(cmdbuf.vk, 0, 1, &viewport);
-
-      vkCmdBindResourceHeapEXT(cmdbuf.vk, &(VkBindHeapInfoEXT) {
-        .sType = VK_STRUCTURE_TYPE_BIND_HEAP_INFO_EXT,
-        .heapRange = resourceDescriptorHeap.addressRange,
-      });
-
-      vkCmdBeginRenderingKHR(cmdbuf.vk, &renderingInfo);
-
-      evkCmdBindPipeline(&cmdbuf, &graphicsPipeline);
-      vkCmdDraw(cmdbuf.vk, 3, 1, 0, 0);
-
-      vkCmdEndRenderingKHR(cmdbuf.vk);
-
-      evkCmdImageBarrier(&cmdbuf, EV_DEFAULT(VkImageMemoryBarrier,
-        image = swapChain.images[swapChainImageIdx].vk,
-        oldLayout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR,
-        newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
-        subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT
-      ));
-    }
-    evkEndCommandBuffer(&cmdbuf);
-
-    VkPipelineStageFlags waitStages[] = {VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT};
-
-    VkSubmitInfo submitInfo = {
-      .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
-      .pCommandBuffers = &cmdbuf.vk, // TODO This won't work with more than a single cmdbuf
-      .commandBufferCount = 1,
-      .waitSemaphoreCount = 1,
-      .pWaitSemaphores = &imageAcquiredSemaphores[imageIdx],
-      .pWaitDstStageMask = waitStages,
-      .signalSemaphoreCount = 1,
-      .pSignalSemaphores = &drawFinishedSemaphores[swapChainImageIdx],
-    };
-
-    vkQueueSubmit(graphicsQueue, 1, &submitInfo, drawFence);
-    vkWaitForFences(device.vk, 1, &drawFence, VK_TRUE, UInt64.MAX);
-    vkResetFences(device.vk, 1, &drawFence);
-
-    VkPresentInfoKHR presentInfo = {
-      .sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR,
-      .waitSemaphoreCount = 1,
-      .pWaitSemaphores = &drawFinishedSemaphores[swapChainImageIdx],
-      .swapchainCount = 1,
-      .pSwapchains = &swapChain.vk,
-      .pImageIndices = &swapChainImageIdx,
-    };
-    vkQueuePresentKHR(graphicsQueue, &presentInfo);
-
-    vkResetCommandBuffer(cmdbuf.vk,VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT);
-
-    // Main Loop
-    glfwPollEvents();
-  }
-
-  vkQueueWaitIdle(graphicsQueue);
-
-  vkDestroyFence(device.vk, drawFence, NULL);
-  for(u32 i = 0; i < imageCount; i++)
-  {
-    vkDestroySemaphore(device.vk, imageAcquiredSemaphores[i], NULL);
-    vkDestroySemaphore(device.vk, drawFinishedSemaphores[i], NULL);
-  }
-  // vkDestroySemaphore(device.vk, imageAcquiredSemaphore, NULL);
-  // vkDestroySemaphore(device.vk, drawFinishedSemaphore, NULL);
-
-  evkDestroyPipeline(graphicsPipeline);
-
-  // evkDestroyBuffer(vertBuf);
-  evkDestroyBuffer(uniBuf);
-
-  // evkDestroyDescriptorSet(&device, &set_0);
-  // evkDestroyDescriptorSetLayout(&device, &setLayout_0);
-
-  evkDestroyShader(device, vertShader);
-  evkDestroyShader(device, fragShader);
-
-  evkFreeCommandBuffers(device, commandPool, commandBuffers);
-  evkDestroyCommandPool(device, commandPool);
-
-  evkGPUDestroyAllocator(allocator);
-
-  evkDestroySwapChain(device, swapChain);
-
-// SwapchainCreationFailed:
-  vkDestroySurfaceKHR(instance.vk, swapChain.surface, NULL);
-
-VKSurfaceCreationFailed:
-WindowCreationFailed:
-  glfwTerminate();
-
-GLFWInitFailed:
-  evkDestroyDevice(device);
-
-DeviceCreationFailed:
-  evkDestroyInstance(instance);
-InstanceCreationFailed:
-  return 0;
-}

samples/descriptor_heap/meson.build

@@ -1,10 +0,0 @@
-
-executable(
-  'descriptor_heap',
-  'descriptor_heap.c',
-  dependencies: [
-    dependency('evk'),
-    dependency('glfw3'),
-  ],
-  c_args: evk_c_args,
-)

samples/descriptor_heap/shaders/heap_triangle.frag

@@ -1,10 +0,0 @@
-#version 450
-#pragma shader_stage(fragment)
-
-#extension GL_EXT_descriptor_heap: require
-
-layout(location = 0) out vec4 outColor;
-
-void main() {
-    outColor = vec4(0.f, 1.f, 0.f, 1.f);
-}

samples/descriptor_heap/shaders/heap_triangle.vert

@@ -1,12 +0,0 @@
-#version 450
-#pragma shader_stage(vertex)
-
-#extension GL_EXT_descriptor_heap: require
-
-layout(descriptor_heap) uniform data {
-  vec4 positions[3];
-} vertexData[];
-
-void main() {
-  gl_Position = vertexData[0].positions[gl_VertexIndex];
-}

samples/meson.build

@@ -1,2 +1 @@
-# subdir('basic_triangle')
-subdir('descriptor_heap')
+subdir('basic_triangle')

subprojects/packagefiles/shaderc/fixes.diff

@@ -15,3 +15,13 @@ index d44f62a..16bad95 100644
      add_subdirectory(${SHADERC_GLSLANG_DIR} glslang)
    endif()
    if (NOT TARGET glslang)
+diff --git a/utils/git-sync-deps b/utils/git-sync-deps
+index eecfbe9..73df6e5 100755
+--- a/utils/git-sync-deps
++++ b/utils/git-sync-deps
+@@ -279,4 +279,4 @@ def main(argv):
+ 
+ 
+ if __name__ == '__main__':
+-  exit(main(sys.argv[1:]))
++  sys.exit(main(sys.argv[1:]))

subprojects/packagefiles/shaderc/meson.build

@@ -2,7 +2,6 @@ project('libshaderc', 'cpp')
 
 python = find_program('python3')
 run_command(python, './utils/git-sync-deps', check: true)
-run_command(python, './utils/update_build_version.py', check: true)
 
 cmake  = import('cmake')
 opts = cmake.subproject_options()

subprojects/shaderc.wrap

@@ -2,7 +2,7 @@
 directory = shaderc
 
 url = https://github.com/google/shaderc
-revision = v2026.2
+revision = v2024.4
 depth=1
 patch_directory = shaderc
 

subprojects/vma.wrap

@@ -5,6 +5,3 @@ revision = v3.3.0
 depth = 1
 
 patch_directory = vma
-
-[provide]
-dependency_names = vma