Uniforms example

.gitignore

@@ -4,4 +4,5 @@ Debug/
 Release/
 *.vcxproj
 *.vcxproj.*
-*.o
+obj/
+build/

Makefile

@@ -6,7 +6,7 @@ LINUX_LIBS = -lglfw -lvulkan
 linux-vulkan-examples: linux-vulkan-static
 	clang -c src/main.c $(shell find src -type f -name "example*.c") src/kgfx_gh/kgfx_gh_xlib.c $(FLAGS) $(EXTRA)
 	mv *.o build/
-	clang build/*.o $(LINUX_LIBS) $(EXTRA) -Lbuild -l:libkgfx.a -lm -o kgfx-examples
+	clang++ build/*.o $(LINUX_LIBS) $(EXTRA) -Lbuild -l:libkgfx.a -lm -o kgfx-examples
 
 linux-vulkan-static: clean
 	clang++ -static -c src/kgfx/kgfx_vulkan.cpp $(FLAGS) $(LINUX_LIBS) $(EXTRA) -o obj/kgfx_vulkan.o

include/kgfx/kgfx.h

@@ -115,10 +115,10 @@ typedef enum {
 } KGFXinputrate;
 
 typedef enum {
-	KGFX_BINDPOINT_VERTEX = 0,
-	KGFX_BINDPOINT_FRAGMENT = 1,
-	KGFX_BINDPOINT_GEOMETRY = 2,
-	KGFX_BINDPOINT_COMPUTE = 3,
+	KGFX_BINDPOINT_VERTEX = 1,
+	KGFX_BINDPOINT_FRAGMENT = 16,
+	KGFX_BINDPOINT_GEOMETRY = 4,
+	KGFX_BINDPOINT_COMPUTE = 8,
 	KGFX_BINDPOINT_COUNT,
 	KGFX_BINDPOINT_MAX = KGFX_BINDPOINT_COMPUTE,
 	KGFX_BINDPOINT_MIN = KGFX_BINDPOINT_VERTEX,

src/examples.h

@@ -3,5 +3,6 @@
 
 int example_current();
 int example_triangle();
+int example_uniforms();
 
 #endif

src/kgfx/kgfx_vulkan.cpp

@@ -361,6 +361,24 @@ constexpr VkDescriptorType descriptorUsageVkUsage(KGFXdescriptorusage usage) {
 	return VK_DESCRIPTOR_TYPE_MAX_ENUM;
 }
 
+const VkShaderStageFlags bindpointVkShaderStageFlags(KGFXbindpoint bindpoint) {
+	VkShaderStageFlags flags = 0;
+	if (bindpoint & KGFX_BINDPOINT_VERTEX) {
+		flags |= VK_SHADER_STAGE_VERTEX_BIT;
+	}
+	if (bindpoint & KGFX_BINDPOINT_FRAGMENT) {
+		flags |= VK_SHADER_STAGE_FRAGMENT_BIT;
+	}
+	if (bindpoint & KGFX_BINDPOINT_GEOMETRY) {
+		flags |= VK_SHADER_STAGE_GEOMETRY_BIT;
+	}
+	if (bindpoint & KGFX_BINDPOINT_COMPUTE) {
+		flags |= VK_SHADER_STAGE_COMPUTE_BIT;
+	}
+
+	return flags;
+}
+
 constexpr VkMemoryPropertyFlags bufferLocationVkMemoryPropertyFlags(KGFXbufferlocation location) {
 	switch (location) {
 	case KGFX_BUFFER_LOCATION_CPU:
@@ -997,7 +1015,7 @@ void Vulkan::render(KGFXpipeline pipeline) {
 			return;
 		}
 		res = recreateSwapchain();
-		if (res != VK_SUCCESS) {
+		if (res != VK_SUCCESS && res != VK_SUBOPTIMAL_KHR) {
 			DEBUG_OUT("Failed to recreate swapchain");
 		}
 		return;
@@ -1127,8 +1145,12 @@ void Vulkan::render(KGFXpipeline pipeline) {
 
 	res = vkQueuePresentKHR(presentQueue, &presentInfo);
 	if (res == VK_ERROR_OUT_OF_DATE_KHR || res == VK_SUBOPTIMAL_KHR) {
+		extent = getWindowExtent();
+		if (extent.width == 0 || extent.height == 0 || extent.width < surfaceCapabilities.minImageExtent.width || extent.height < surfaceCapabilities.minImageExtent.height || extent.width > surfaceCapabilities.maxImageExtent.width || extent.height > surfaceCapabilities.maxImageExtent.height) {
+			return;
+		}
 		res = recreateSwapchain();
-		if (res != VK_SUCCESS) {
+		if (res != VK_SUCCESS || res != VK_SUBOPTIMAL_KHR) {
 			DEBUG_OUT("Failed to recreate swapchain");
 		}
 		return;
@@ -1489,7 +1511,7 @@ KGFXpipeline Vulkan::createPipeline(KGFXpipelinedesc pipelineDesc) {
 		descriptorSetLayoutBindings[i].binding = pipelineDesc.layout.pDescriptorSets[i].binding;
 		descriptorSetLayoutBindings[i].descriptorType = descriptorUsageVkUsage(pipelineDesc.layout.pDescriptorSets[i].usage);
 		descriptorSetLayoutBindings[i].descriptorCount = 1;
-		descriptorSetLayoutBindings[i].stageFlags = stageFlags[pipelineDesc.layout.pDescriptorSets[i].bindpoint];
+		descriptorSetLayoutBindings[i].stageFlags = bindpointVkShaderStageFlags(pipelineDesc.layout.pDescriptorSets[i].bindpoint);
 		descriptorSetLayoutBindings[i].pImmutableSamplers = nullptr;
 	}
 
@@ -1807,6 +1829,11 @@ VkExtent2D Vulkan::getWindowExtent() {
 }
 
 VkResult Vulkan::recreateSwapchain() {
+	VkExtent2D extent = getWindowExtent();
+	if (extent.width == 0 || extent.height == 0) {
+		return VK_SUBOPTIMAL_KHR;
+	}
+
 	vkDestroySemaphore(device, imageAvailableSemaphore, nullptr);
 
 	VkSemaphoreCreateInfo semaphoreCreateInfo = {};

src/main.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include "examples.h"
 
-#define EXAMPLE_COUNT 2
+#define EXAMPLE_COUNT 3
 #define FLAG_COUNT 3
 
 typedef int (*example_func)(void);
@@ -15,6 +15,7 @@ struct example_entry {
 struct example_entry examples[EXAMPLE_COUNT] = {
 	{ .func = example_current, .name = "current" },
 	{ .func = example_triangle, .name = "triangle" },
+	{ .func = example_uniforms, .name = "uniforms" },
 };
 
 typedef void (*flag_func)(void);