From 8fb0cca684e078cd2537070c53ad970ebbc2e9a7 Mon Sep 17 00:00:00 2001
From: Eleni Maria Stea <estea@igalia.com>
Date: Tue, 23 Jan 2018 12:07:48 +0200
Subject: [PATCH] rewriting swapchain/image/allocation parts atm doing the
 simplest thing, will optimize allocator etc later

---
 src/vulkan/allocator.cc |   23 ++
 src/vulkan/allocator.h  |    9 +
 src/vulkan/image.cc     |   36 +++
 src/vulkan/image.h      |   10 +
 src/vulkan/vk.cc        |  577 +++++++++++++++++++++++++++++++++++------------
 src/vulkan/vkutil.cc    |  111 +++++----
 src/vulkan/vkutil.h     |   13 +-
 7 files changed, 588 insertions(+), 191 deletions(-)
 create mode 100644 src/vulkan/allocator.cc
 create mode 100644 src/vulkan/allocator.h
 create mode 100644 src/vulkan/image.cc
 create mode 100644 src/vulkan/image.h

diff --git a/src/vulkan/allocator.cc b/src/vulkan/allocator.cc
new file mode 100644
index 0000000..5228a72
--- /dev/null
+++ b/src/vulkan/allocator.cc
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <string.h>
+
+#include "allocator.h"
+#include "vk.h"
+#include "vkutil.h"
+
+VkDeviceMemory vk_allocate(int size)
+{
+	VkDeviceMemory gpu_mem;
+
+	VkMemoryAllocateInfo gpu_alloc_inf;
+	memset(&gpu_alloc_inf, 0, sizeof gpu_alloc_inf);
+	gpu_alloc_inf.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
+	gpu_alloc_inf.allocationSize = size;
+
+	if(vkAllocateMemory(vk_device, &gpu_alloc_inf, 0, &gpu_mem) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to allocate device memory, mem size: %d\n");
+		return 0;
+	}
+
+	return gpu_mem;
+}
diff --git a/src/vulkan/allocator.h b/src/vulkan/allocator.h
new file mode 100644
index 0000000..dd730e3
--- /dev/null
+++ b/src/vulkan/allocator.h
@@ -0,0 +1,9 @@
+#ifndef ALLOCATOR_H_
+#define ALLOCATOR_H_
+
+#include <vulkan/vulkan.h>
+
+VkDeviceMemory vk_allocate(int size);
+void vk_free(VkDeviceMemory gpu_memory);
+
+#endif // ALLOCATOR_H_
diff --git a/src/vulkan/image.cc b/src/vulkan/image.cc
new file mode 100644
index 0000000..780bfa0
--- /dev/null
+++ b/src/vulkan/image.cc
@@ -0,0 +1,36 @@
+#include <stdio.h>
+#include <string.h>
+
+#include "allocator.h"
+#include "image.h"
+#include "vk.h"
+#include "vkutil.h"
+
+bool vk_image_set_layout(VkCommandBuffer cmd_buf, VkImage img, VkImageAspectFlags aspect_flags,
+		VkImageLayout old_layout, VkImageLayout new_layout, VkAccessFlagBits access_mask)
+{
+	VkImageMemoryBarrier imb;
+	memset(&imb, 0, sizeof imb);
+	imb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+	imb.srcAccessMask = access_mask;
+	imb.oldLayout = old_layout;
+	imb.newLayout = new_layout;
+	imb.image = img;
+	imb.subresourceRange = {aspect_flags, 0, 1, 0, 1};
+
+	if(new_layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
+		imb.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
+	} else if (new_layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) {
+		imb.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+	} else if (new_layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) {
+		imb.dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+	} else if (new_layout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) {
+		imb.dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT;
+	}
+
+	VkPipelineStageFlags src_stages = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+	VkPipelineStageFlags dst_stages = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
+
+	vkCmdPipelineBarrier(cmd_buf, src_stages, dst_stages, 0, 0, 0, 0, 0, 1, &imb);
+	return true;
+}
diff --git a/src/vulkan/image.h b/src/vulkan/image.h
new file mode 100644
index 0000000..7427c6a
--- /dev/null
+++ b/src/vulkan/image.h
@@ -0,0 +1,10 @@
+#ifndef IMAGE_H_
+#define IMAGE_H_
+
+#include <vulkan/vulkan.h>
+
+bool vk_image_set_layout(VkCommandBuffer cmd_buf, VkImage img, VkImageAspectFlags aspect_flags,
+		VkImageLayout old_layout, VkImageLayout new_layout, VkAccessFlagBits access_mask);
+
+
+#endif
diff --git a/src/vulkan/vk.cc b/src/vulkan/vk.cc
index 0e3725b..f5829ab 100644
--- a/src/vulkan/vk.cc
+++ b/src/vulkan/vk.cc
@@ -2,6 +2,7 @@
 #include <GLFW/glfw3.h>
 
 #include <alloca.h>
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <string>
@@ -9,14 +10,30 @@
 
 #include <gmath/gmath.h>
 
+#include "allocator.h"
 #include "gfxapi.h"
+#include "image.h"
 #include "vkutil.h"
+#include "vk.h"
 
 /* global variables */
 extern GLFWwindow *win;
 extern int win_w;
 extern int win_h;
 
+static VkCommandBuffer cmd_buf; // command buffer used at zbuffer creation
+//depth buffer
+static VkImage dimg;
+static VkImageView dview;
+//swapchain
+static VkImage *images;
+static VkImageView *iviews;
+static uint32_t num_images;
+
+/* static variables */
+static VkDeviceMemory gpu_mem; // to be replaced when I fix the allocator
+// zbuffer image, view:
+
 VkCommandBuffer *swapchain_cmd_bufs;
 
 /* static functions */
@@ -30,20 +47,16 @@ static void swapbuffers();
 static void begin_drawing();
 static void end_drawing();
 
-static bool create_swapchain_cmd_bufs(VkCommandPool vkcmdpool);
+static bool create_swapchain();
+static bool begin_command_buffer();
+static bool create_swapchain_image_views(VkFormat format);
+static bool create_zbuffer();
+
+static bool create_swapchain_cmd_bufs(VkCommandPool vk_pool);
 static bool record_cmd_clear(float r, float g, float b);
 
 bool init_vulkan()
 {
-	gfx_clear = clear;
-	gfx_viewport = viewport;
-	gfx_zbuffer = zbuffer;
-	gfx_cull_face = cull_face;
-	gfx_reshape = reshape;
-	gfx_swapbuffers = swapbuffers;
-	gfx_begin_drawing = begin_drawing;
-	gfx_end_drawing = end_drawing;
-
 	if(!glfwInit()) {
 		fprintf(stderr, "Failed to initialize GLFW.\n");
 		return false;
@@ -54,14 +67,16 @@ bool init_vulkan()
 		return false;
 	}
 
+	//TODO: remove later
 	glfwSetErrorCallback(error_callback);
 
+	/* create device and command pool! */
 	if(!vku_create_device()) {
 		fprintf(stderr, "Failed to initialize vulkan.\n");
 		return false;
 	}
 
-	if(!glfwGetPhysicalDevicePresentationSupport(vkinst, vkpdev, vkqfamily)) {
+	if(!glfwGetPhysicalDevicePresentationSupport(vkinst, vk_physical, vkqfamily)) {
 		fprintf(stderr, "Presentation support not found.\n");
 		return false;
 	}
@@ -72,46 +87,326 @@ bool init_vulkan()
 		return false;
 	}
 
-	if(VkResult err = glfwCreateWindowSurface(vkinst, win, 0, &vksurface)) {
-		fprintf(stderr, "Failed to create KHR surface: %s\n", vku_get_vulkan_error_str(err));
+	VkResult res = glfwCreateWindowSurface(vkinst, win, 0, &vk_surface);
+	if(res != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create KHR surface: %s\n", vku_get_vulkan_error_str(res));
 		return false;
 	}
 
+	if(!create_swapchain()) {
+		fprintf(stderr, "Failed to create swapchain.\n");
+		return false;
+	}
+
+	cmd_buf = VK_NULL_HANDLE;
+	if(!begin_command_buffer()) {
+		fprintf(stderr, "Failed to start VK_NULL_HANDLE command buffer.\n");
+		return false;
+	}
+
+	if(!create_zbuffer()) {
+		fprintf(stderr, "Failed to create depth buffer.\n");
+		return false;
+	}
+
+	gfx_clear = clear;
+	gfx_viewport = viewport;
+	gfx_zbuffer = zbuffer;
+	gfx_cull_face = cull_face;
+	gfx_reshape = reshape;
+	gfx_swapbuffers = swapbuffers;
+	gfx_begin_drawing = begin_drawing;
+	gfx_end_drawing = end_drawing;
+
+
+/*
 	if(!vku_create_semaphores())
 		return false;
 
-	if(!(vkswapchain = vku_create_swapchain(vksurface, win_w, win_h, 2,
-	                                        VK_PRESENT_MODE_FIFO_KHR, 0))) {
+	if(!(vk_swapchain = vku_create_swapchain(vk_surface, win_w, win_h, 2,
+	                                        VK_PRESENT_MODE_IMMEDIATE_KHR, 0))) {
 		fprintf(stderr, "Failed to create swapchain.\n");
 		return false;
 	}
 
-	vkswapchain_images = vku_get_swapchain_images(vkswapchain, &vknum_swapchain_images);
+	vkswapchain_images = vku_get_swapchain_images(vk_swapchain, &vknum_swapchain_images);
 	if(!vkswapchain_images) {
 		fprintf(stderr, "Failed to get swapchain images.\n");
 		return false;
 	}
 
-	/*	vkswapchain_views = vku_create_image_views(vkswapchain_images, vknum_swapchain_images);
-		if(!vkswapchain_views) {
-			fprintf(stderr, "Failed to create swapchain image views.\n");
-			delete [] vkswapchain_images;
+//		vkswapchain_views = vku_create_image_views(vkswapchain_images, vknum_swapchain_images);
+//		if(!vkswapchain_views) {
+//			fprintf(stderr, "Failed to create swapchain image views.\n");
+//			delete [] vkswapchain_images;
+//			return false;
+//		}
+
+	if(!create_swapchain_cmd_bufs(vk_pool)) {
+		return false;
+	}
+
+	if(!record_cmd_clear(1.0, 0.1, 0.1))
+		return false;
+	*/
+
+	return true;
+}
+
+static bool create_swapchain()
+{
+	/* surface capabilities */
+	VkSurfaceCapabilitiesKHR scap;
+	if(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical, vk_surface, &scap) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to get physical device surface capabilities\n");
+		return false;
+	}
+
+	/* presentation modes */
+	uint32_t prmode_cnt;
+	if(vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical, vk_surface, &prmode_cnt, 0) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to get physical device surface presentation modes count.\n");
+		return false;
+	}
+
+	if(prmode_cnt == 0) {
+		fprintf(stderr, "Presentation modes not found.\n");
+		return false;
+	}
+
+	VkPresentModeKHR scmode = VK_PRESENT_MODE_FIFO_KHR;
+	VkPresentModeKHR *modes = new VkPresentModeKHR[prmode_cnt];
+
+	if(vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical, vk_surface, &prmode_cnt, modes) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to get physical device presentation modes.\n");
+		return false;
+	}
+
+	for(uint32_t i=0; i<prmode_cnt; i++) {
+		if(modes[i] == VK_PRESENT_MODE_MAILBOX_KHR) {
+			scmode = VK_PRESENT_MODE_MAILBOX_KHR;
+			break;
+		}
+		if((scmode != VK_PRESENT_MODE_MAILBOX_KHR) && (modes[i] == VK_PRESENT_MODE_IMMEDIATE_KHR)) {
+				//fallback
+				scmode = VK_PRESENT_MODE_IMMEDIATE_KHR;
+		}
+	}
+
+	/* swapchain extents */
+	VkExtent2D scextent;
+	if(scap.currentExtent.width == 0xffffffff || scap.currentExtent.height == 0xffffffff) {
+		scextent.width = win_w;
+		scextent.height = win_h;
+	}
+	else {
+		scextent = scap.currentExtent;
+		win_w = scextent.width;
+		win_h = scextent.height;
+	}
+
+	/* number of swapchain images (on intel that's 3: maybe should hardcode it to 2?) */
+	num_images = scap.minImageCount; //+ 1;
+	/* intel doesn't set the maxImageCount */
+	if(scap.maxImageCount > 0 && num_images > scap.maxImageCount)
+		num_images = scap.maxImageCount;
+
+	printf("num_images : %u\n", num_images);
+	assert(num_images > 0);
+
+	/* transform flags */
+	VkSurfaceTransformFlagBitsKHR pre_transf = scap.currentTransform;
+	if(scap.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
+		pre_transf = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
+
+	/* find suitable colorspace, format */
+	uint32_t fcount;
+	if(vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical, vk_surface, &fcount, 0) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to get format count for physical device.\n");
+		return false;
+	}
+	if(fcount == 0) {
+		fprintf(stderr, "No color formats were found.\n");
+		return false;
+	}
+
+	VkFormat format;
+	VkColorSpaceKHR colorspace;
+
+	VkSurfaceFormatKHR *formats = new VkSurfaceFormatKHR[fcount];
+	if(vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical, vk_surface, &fcount, formats) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to get surface formats.\n");
+		return false;
+	}
+	if((fcount == 1) && (formats[0].format == VK_FORMAT_UNDEFINED)) {
+		format = VK_FORMAT_B8G8R8_UNORM;
+	} else {
+		format = formats[0].format;
+	}
+	colorspace = formats[0].colorSpace;
+
+	/* creating the swapchain */
+	VkSwapchainCreateInfoKHR sinfo;
+	memset(&sinfo, 0, sizeof sinfo);
+
+	sinfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
+	sinfo.surface = vk_surface;
+	sinfo.minImageCount = num_images;
+	sinfo.imageFormat = format;
+	sinfo.imageColorSpace = colorspace;
+	sinfo.imageExtent = scextent;
+	sinfo.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+	sinfo.preTransform = pre_transf;
+	sinfo.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
+	sinfo.imageArrayLayers = 1;
+	sinfo.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+	sinfo.presentMode = scmode;
+	sinfo.oldSwapchain = VK_NULL_HANDLE; //TODO
+	sinfo.clipped = VK_TRUE; //TODO
+
+	if(vkCreateSwapchainKHR(vk_device, &sinfo, 0, &vk_swapchain) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create swapchain.\n");
+		return false;
+	}
+
+	if(vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &num_images, 0) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to get the number of the swapchain images.\n");
+		return false;
+	}
+
+	images = new VkImage[num_images];
+	if(vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &num_images, images) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to get the swapchain images.\n");
+		return false;
+	}
+	assert(images);
+
+	if(!create_swapchain_image_views(format)) {
+		fprintf(stderr, "Failed to create image views for the swapchain images.\n");
+		return false;
+	}
+
+	// create renderpass
+
+
+	return true;
+}
+
+static bool create_swapchain_image_views(VkFormat format)
+{
+	VkImageViewCreateInfo ivinf;
+	memset(&ivinf, 0, sizeof ivinf);
+
+	ivinf.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+	ivinf.format = format;
+	ivinf.components = {
+		VK_COMPONENT_SWIZZLE_R,
+		VK_COMPONENT_SWIZZLE_G,
+		VK_COMPONENT_SWIZZLE_B,
+		VK_COMPONENT_SWIZZLE_A
+	};
+	ivinf.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+	ivinf.subresourceRange.levelCount = 1;
+	ivinf.subresourceRange.layerCount = 1;
+	ivinf.viewType = VK_IMAGE_VIEW_TYPE_2D;
+
+	iviews = new VkImageView[num_images];
+	for(uint32_t i=0; i<num_images; i++) {
+		ivinf.image = images[i];
+		if(vkCreateImageView(vk_device, &ivinf, 0, &iviews[i]) != VK_SUCCESS) {
+			fprintf(stderr, "Failed to create view for the swapchain image: %d.\n", i);
 			return false;
 		}
-	*/
-	if(!create_swapchain_cmd_bufs(vkcmdpool)) {
+	}
+	return true;
+}
+
+static bool begin_command_buffer()
+{
+	if(cmd_buf == VK_NULL_HANDLE) {
+		cmd_buf = vku_alloc_cmdbuf(vk_pool, VK_COMMAND_BUFFER_LEVEL_PRIMARY);
+
+		VkCommandBufferInheritanceInfo ciinf;
+		memset(&ciinf, 0, sizeof ciinf);
+		ciinf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO;
+		ciinf.renderPass = VK_NULL_HANDLE;
+		ciinf.framebuffer = VK_NULL_HANDLE;
+		ciinf.occlusionQueryEnable = VK_FALSE;
+
+		VkCommandBufferBeginInfo cbinf;
+		memset(&cbinf, 0, sizeof cbinf);
+		cbinf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+		cbinf.pInheritanceInfo = &ciinf;
+
+		if(vkBeginCommandBuffer(cmd_buf, &cbinf) != VK_SUCCESS) {
+			fprintf(stderr, "Failed to begin command buffer.\n");
+			return false;
+		}
+	}
+	return true;
+}
+
+static bool create_zbuffer()
+{
+	VkFormat dformat = VK_FORMAT_D32_SFLOAT_S8_UINT;
+
+	VkImageCreateInfo dinfo;
+	memset(&dinfo, 0, sizeof dinfo);
+
+	dinfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
+	dinfo.imageType = VK_IMAGE_TYPE_2D;
+	dinfo.format = dformat;
+	dinfo.extent = {win_w, win_h, 1};
+	dinfo.mipLevels = 1;
+	dinfo.arrayLayers = 1;
+	dinfo.samples = VK_SAMPLE_COUNT_1_BIT;
+	dinfo.tiling = VK_IMAGE_TILING_OPTIMAL;
+	dinfo.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
+
+	if(vkCreateImage(vk_device, &dinfo, 0, &dimg) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create depth buffer image.\n");
 		return false;
 	}
 
-	if(!record_cmd_clear(1.0, 0.1, 0.1))
+	VkMemoryRequirements dmem_reqs;
+	vkGetImageMemoryRequirements(vk_device, dimg, &dmem_reqs);
+
+	gpu_mem = vk_allocate(dmem_reqs.size);
+
+	if(!gpu_mem)
 		return false;
 
+	vkBindImageMemory(vk_device, dimg, gpu_mem, 0);
+
+	// XXX set image layout
+	if(!vk_image_set_layout(cmd_buf, dimg, VK_IMAGE_ASPECT_DEPTH_BIT,
+			VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+			(VkAccessFlagBits)0)) {
+		fprintf(stderr, "Failed to set depth buffer layout.\n");
+		return false;
+	}
+
+	VkImageViewCreateInfo div_inf;
+	memset(&div_inf, 0, sizeof div_inf);
+
+	div_inf.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+	div_inf.image = dimg;
+	div_inf.format = dformat;
+	div_inf.subresourceRange.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
+	div_inf.subresourceRange.levelCount = 1;
+	div_inf.subresourceRange.layerCount = 1;
+	div_inf.viewType = VK_IMAGE_VIEW_TYPE_2D;
+
+	if(vkCreateImageView(vk_device, &div_inf, 0, &dview) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create image view for depth buffer.\n");
+	}
+
 	return true;
 }
 
 void cleanup_vulkan()
 {
-	vkFreeCommandBuffers(vkdev, vkcmdpool, vknum_swapchain_images, swapchain_cmd_bufs);
+	vkFreeCommandBuffers(vk_device, vk_pool, vknum_swapchain_images, swapchain_cmd_bufs);
 	if(win) {
 		glfwDestroyWindow(win);
 	}
@@ -130,16 +425,16 @@ static void error_callback(int error, const char *description)
 static void reshape(int width, int height)
 {
 	VkSwapchainKHR sc;
-	if(!(sc = vku_create_swapchain(vksurface, width, height, 2, VK_PRESENT_MODE_FIFO_KHR,
-	                               vkswapchain))) {
+	if(!(sc = vku_create_swapchain(vk_surface, width, height, 2, VK_PRESENT_MODE_FIFO_KHR,
+	                               vk_swapchain))) {
 		fprintf(stderr, "Failed to create %dx%d double-buffered swapchain\n", width, height);
 		return;
 	}
-	vkswapchain = sc;
+	vk_swapchain = sc;
 
 	delete [] vkswapchain_images;
 	vkswapchain_images = vku_get_swapchain_images(sc, 0);
-	vk_curr_swapchain_image = vku_get_next_image(vkswapchain);
+	vk_curr_swapchain_image = vku_get_next_image(vk_swapchain);
 }
 
 static void clear(float r, float g, float b)
@@ -164,129 +459,129 @@ static void swapbuffers()
 
 static void begin_drawing()
 {
-	if((vk_curr_swapchain_image = vku_get_next_image(vkswapchain)) == -1) {
-		fprintf(stderr, "Failed to get swapchain image. Exiting.\n");
-		exit(1);
-	}
+	// if((vk_curr_swapchain_image = vku_get_next_image(vk_swapchain)) == -1) {
+	// 	fprintf(stderr, "Failed to get swapchain image. Exiting.\n");
+	// 	exit(1);
+	// }
 }
 
 static void end_drawing()
 {
 	/* submit queue */
 
-	VkSubmitInfo sinf;
-	memset(&sinf, 0, sizeof sinf);
-	sinf.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
-	sinf.waitSemaphoreCount = 1;
-	sinf.pWaitSemaphores = &vk_img_avail_sema;
-	sinf.signalSemaphoreCount = 1;
-	sinf.pSignalSemaphores = &vk_rend_done_sema;
-
-	// the queue should wait on the semaphore
-
-	VkPipelineStageFlags wait_flags = VK_PIPELINE_STAGE_TRANSFER_BIT;
-	sinf.pWaitDstStageMask = &wait_flags;
-	sinf.commandBufferCount = 1;
-	sinf.pCommandBuffers = &swapchain_cmd_bufs[vk_curr_swapchain_image];
-
-	if(vkQueueSubmit(vkq, 1, &sinf, VK_NULL_HANDLE) != VK_SUCCESS) {
-		fprintf(stderr, "Failed to submit drawing command buffer\n");
-		exit(1);
-	}
-
-	/* present drawn image */
-	VkPresentInfoKHR pinf;
-	memset(&pinf, 0, sizeof pinf);
-	pinf.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
-	pinf.waitSemaphoreCount = 1;
-	pinf.pWaitSemaphores = &vk_rend_done_sema;
-	pinf.swapchainCount = 1;
-	pinf.pSwapchains = &vkswapchain;
-	pinf.pImageIndices = (uint32_t *)&vk_curr_swapchain_image;
-
-	if(vkQueuePresentKHR(vkq, &pinf) != VK_SUCCESS) {
-		fprintf(stderr, "Failed to submit presentation command buffer.\n");
-		exit(1);
-	}
+	// VkSubmitInfo sinf;
+	// memset(&sinf, 0, sizeof sinf);
+	// sinf.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+	// sinf.waitSemaphoreCount = 1;
+	// sinf.pWaitSemaphores = &vk_img_avail_sema;
+	// sinf.signalSemaphoreCount = 1;
+	// sinf.pSignalSemaphores = &vk_rend_done_sema;
+
+	// // the queue should wait on the semaphore
+
+	// VkPipelineStageFlags wait_flags = VK_PIPELINE_STAGE_TRANSFER_BIT;
+	// sinf.pWaitDstStageMask = &wait_flags;
+	// sinf.commandBufferCount = 1;
+	// sinf.pCommandBuffers = &swapchain_cmd_bufs[vk_curr_swapchain_image];
+
+	// if(vkQueueSubmit(vk_queue, 1, &sinf, VK_NULL_HANDLE) != VK_SUCCESS) {
+	// 	fprintf(stderr, "Failed to submit drawing command buffer\n");
+	// 	exit(1);
+	// }
+
+	// /* present drawn image */
+	// VkPresentInfoKHR pinf;
+	// memset(&pinf, 0, sizeof pinf);
+	// pinf.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
+	// pinf.waitSemaphoreCount = 1;
+	// pinf.pWaitSemaphores = &vk_rend_done_sema;
+	// pinf.swapchainCount = 1;
+	// pinf.pSwapchains = &vk_swapchain;
+	// pinf.pImageIndices = (uint32_t *)&vk_curr_swapchain_image;
+
+	// if(vkQueuePresentKHR(vk_queue, &pinf) != VK_SUCCESS) {
+	// 	fprintf(stderr, "Failed to submit presentation command buffer.\n");
+	// 	exit(1);
+	// }
 }
 
 static bool record_cmd_clear(float r, float g, float b)
 {
-	VkCommandBufferBeginInfo binf;
-	binf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
-	binf.flags = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
-
-	/* this function must be called outside a renderpass instance */
-	const VkClearColorValue pcolor[4] = {r, g, b, 1.0};
-
-	VkImageSubresourceRange range;
-	memset(&range, 0, sizeof range);
-	range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-	range.baseMipLevel = 0;
-	range.baseArrayLayer = 0;
-	range.layerCount = 1;
-
-	for(int i=0; i<vknum_swapchain_images; i++) {
-		/* layout for clearing */
-		VkImageMemoryBarrier cb;
-		memset(&cb, 0, sizeof cb);
-		cb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
-		cb.srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
-		cb.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-		cb.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-		cb.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-		cb.srcQueueFamilyIndex = vkqfamily;
-		cb.dstQueueFamilyIndex = vkqfamily;
-		cb.image = vkswapchain_images[i];
-		cb.subresourceRange = range;
-
-		/* layout for presenting */
-		VkImageMemoryBarrier pb;
-		memset(&pb, 0, sizeof pb);
-		pb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
-		pb.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-		pb.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
-		pb.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-		pb.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-		pb.srcQueueFamilyIndex = vkqfamily;
-		pb.dstQueueFamilyIndex = vkqfamily;
-		pb.image = vkswapchain_images[i];
-		pb.subresourceRange = range;
-
-		vkBeginCommandBuffer(swapchain_cmd_bufs[i], &binf);
-		vkCmdPipelineBarrier(swapchain_cmd_bufs[i], VK_PIPELINE_STAGE_TRANSFER_BIT,
-		                     VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, 0, 0, 0, 1, &pb);
-
-		vkCmdClearColorImage(swapchain_cmd_bufs[i], vkswapchain_images[vk_curr_swapchain_image], VK_IMAGE_LAYOUT_GENERAL,
-		                     pcolor, 1, &range);
-
-		vkCmdPipelineBarrier(swapchain_cmd_bufs[i], VK_PIPELINE_STAGE_TRANSFER_BIT,
-		                     VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, 0, 0, 0, 0, 1, &cb);
-
-		if(vkEndCommandBuffer(swapchain_cmd_bufs[i]) != VK_SUCCESS) {
-			fprintf(stderr, "Failed to record command buffer.\n");
-			return false;
-		}
-	}
-	return true;
-}
-
-static bool create_swapchain_cmd_bufs(VkCommandPool cpool)
-{
-	swapchain_cmd_bufs = new VkCommandBuffer[vknum_swapchain_images];
-
-	VkCommandBufferAllocateInfo ainf;
-	memset(&ainf, 0, sizeof ainf);
-
-	ainf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
-	ainf.commandPool = cpool;
-	ainf.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
-	ainf.commandBufferCount = (uint32_t)vknum_swapchain_images;
-
-	if(vkAllocateCommandBuffers(vkdev, &ainf, swapchain_cmd_bufs) != VK_SUCCESS) {
-		fprintf(stderr, "Failed to allocate the swapchain command buffers.\n");
-		return false;
-	}
+// 	VkCommandBufferBeginInfo binf;
+// 	binf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+// 	binf.flags = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
+
+// 	/* this function must be called outside a renderpass instance */
+// 	const VkClearColorValue pcolor[4] = {r, g, b, 1.0};
+
+// 	VkImageSubresourceRange range;
+// 	memset(&range, 0, sizeof range);
+// 	range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+// 	range.baseMipLevel = 0;
+// 	range.baseArrayLayer = 0;
+// 	range.layerCount = 1;
+
+// 	for(int i=0; i<vknum_swapchain_images; i++) {
+// 		/* layout for clearing */
+// 		VkImageMemoryBarrier cb;
+// 		memset(&cb, 0, sizeof cb);
+// 		cb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+// 		cb.srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+// 		cb.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+// 		cb.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+// 		cb.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+// 		cb.srcQueueFamilyIndex = vkqfamily;
+// 		cb.dstQueueFamilyIndex = vkqfamily;
+// 		cb.image = vkswapchain_images[i];
+// 		cb.subresourceRange = range;
+
+// 		/* layout for presenting */
+// 		VkImageMemoryBarrier pb;
+// 		memset(&pb, 0, sizeof pb);
+// 		pb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+// 		pb.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
+// 		pb.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+// 		pb.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+// 		pb.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+// 		pb.srcQueueFamilyIndex = vkqfamily;
+// 		pb.dstQueueFamilyIndex = vkqfamily;
+// 		pb.image = vkswapchain_images[i];
+// 		pb.subresourceRange = range;
+
+// 		vkBeginCommandBuffer(swapchain_cmd_bufs[i], &binf);
+// 		vkCmdPipelineBarrier(swapchain_cmd_bufs[i], VK_PIPELINE_STAGE_TRANSFER_BIT,
+// 		                     VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, 0, 0, 0, 1, &pb);
+
+// 		vkCmdClearColorImage(swapchain_cmd_bufs[i], vkswapchain_images[vk_curr_swapchain_image], VK_IMAGE_LAYOUT_GENERAL,
+// 		                     pcolor, 1, &range);
+
+// 		vkCmdPipelineBarrier(swapchain_cmd_bufs[i], VK_PIPELINE_STAGE_TRANSFER_BIT,
+// 		                     VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, 0, 0, 0, 0, 1, &cb);
+
+// 		if(vkEndCommandBuffer(swapchain_cmd_bufs[i]) != VK_SUCCESS) {
+// 			fprintf(stderr, "Failed to record command buffer.\n");
+// 			return false;
+// 		}
+// 	}
+// 	return true;
+// }
+
+// static bool create_swapchain_cmd_bufs(VkCommandPool cpool)
+// {
+// 	swapchain_cmd_bufs = new VkCommandBuffer[vknum_swapchain_images];
+
+// 	VkCommandBufferAllocateInfo ainf;
+// 	memset(&ainf, 0, sizeof ainf);
+
+// 	ainf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
+// 	ainf.commandPool = cpool;
+// 	ainf.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+// 	ainf.commandBufferCount = (uint32_t)vknum_swapchain_images;
+
+// 	if(vkAllocateCommandBuffers(vk_device, &ainf, swapchain_cmd_bufs) != VK_SUCCESS) {
+// 		fprintf(stderr, "Failed to allocate the swapchain command buffers.\n");
+// 		return false;
+// 	}
 
 	return true;
 }
diff --git a/src/vulkan/vkutil.cc b/src/vulkan/vkutil.cc
index 25f3ad3..65467c5 100644
--- a/src/vulkan/vkutil.cc
+++ b/src/vulkan/vkutil.cc
@@ -10,22 +10,22 @@
 #include "vkutil.h"
 
 /* global variables */
+VkPhysicalDevice vk_physical;
+VkDevice vk_device;
+VkCommandPool vk_pool;
+VkQueue vk_queue;
+VkSurfaceKHR vk_surface;
+VkSwapchainKHR vk_swapchain;
 
 VkPipeline *vkgparent_pipeline;
 VkFramebuffer *vkfbufs;
 VkRenderPass vkrpass;
-VkSurfaceKHR vksurface;
 VkInstance vkinst;
-VkPhysicalDevice vkpdev;
-VkDevice vkdev;
-VkQueue vkq;
-VkCommandPool vkcmdpool;
 VkCommandBuffer vkcmdbuf;	/* primary command buffer */
 int vkqfamily;
 
 VkSemaphore vk_img_avail_sema;
 VkSemaphore vk_rend_done_sema;
-VkSwapchainKHR vkswapchain;
 VkImage *vkswapchain_images;
 VkImageView *vkswapchain_views;
 int vknum_swapchain_images;
@@ -200,7 +200,7 @@ bool vku_create_device()
 
 	if(sel_dev < 0 || sel_qfamily < 0) {
 		fprintf(stderr, "failed to find any device with a graphics-capable command queue\n");
-		vkDestroyDevice(vkdev, 0);
+		vkDestroyDevice(vk_device, 0);
 		return false;
 	}
 
@@ -226,16 +226,16 @@ bool vku_create_device()
 	dev_info.enabledExtensionCount = sizeof devext_names / sizeof *devext_names;
 	dev_info.ppEnabledExtensionNames = devext_names;
 
-	if(vkCreateDevice(phys_devices[sel_dev], &dev_info, 0, &vkdev) != 0) {
+	if(vkCreateDevice(phys_devices[sel_dev], &dev_info, 0, &vk_device) != 0) {
 		fprintf(stderr, "failed to create device %d\n", sel_dev);
 		return false;
 	}
 	printf("created device %d\n", sel_dev);
 
-	vkpdev = phys_devices[sel_dev];
+	vk_physical = phys_devices[sel_dev];
 	vkqfamily = sel_qfamily;
 
-	vkGetDeviceQueue(vkdev, sel_qfamily, 0, &vkq);
+	vkGetDeviceQueue(vk_device, sel_qfamily, 0, &vk_queue);
 
 	/* create command buffer pool */
 	memset(&cmdpool_info, 0, sizeof cmdpool_info);
@@ -243,15 +243,15 @@ bool vku_create_device()
 	cmdpool_info.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
 	cmdpool_info.queueFamilyIndex = sel_qfamily;
 
-	if(vkCreateCommandPool(vkdev, &cmdpool_info, 0, &vkcmdpool) != 0) {
-		fprintf(stderr, "failed to get command quque!\n");
+	if(vkCreateCommandPool(vk_device, &cmdpool_info, 0, &vk_pool) != 0) {
+		fprintf(stderr, "failed to get command queue!\n");
 		return false;
 	}
 
-	if(!(vkcmdbuf = vku_alloc_cmdbuf(vkcmdpool, VK_COMMAND_BUFFER_LEVEL_PRIMARY))) {
+/*	if(!(vkcmdbuf = vku_alloc_cmdbuf(vk_pool, VK_COMMAND_BUFFER_LEVEL_PRIMARY))) {
 		fprintf(stderr, "failed to create primary command buffer\n");
 		return false;
-	}
+	} */
 
 	return true;
 }
@@ -259,13 +259,13 @@ bool vku_create_device()
 void vku_cleanup()
 {
 	if(vkinst) {
-		vkDeviceWaitIdle(vkdev);
-		vkDestroyCommandPool(vkdev, vkcmdpool, 0);
+		vkDeviceWaitIdle(vk_device);
+		vkDestroyCommandPool(vk_device, vk_pool, 0);
 
-		vkDestroySemaphore(vkdev, vk_img_avail_sema, 0);
-		vkDestroySemaphore(vkdev, vk_rend_done_sema, 0);
+		vkDestroySemaphore(vk_device, vk_img_avail_sema, 0);
+		vkDestroySemaphore(vk_device, vk_rend_done_sema, 0);
 
-		vkDestroyDevice(vkdev, 0);
+		vkDestroyDevice(vk_device, 0);
 		vkDestroyInstance(vkinst, 0);
 		vkinst = 0;
 	}
@@ -280,12 +280,12 @@ bool vku_create_semaphores()
 	memset(&sinf, 0, sizeof sinf);
 
 	sinf.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
-	if(vkCreateSemaphore(vkdev, &sinf, 0, &vk_img_avail_sema) != VK_SUCCESS) {
+	if(vkCreateSemaphore(vk_device, &sinf, 0, &vk_img_avail_sema) != VK_SUCCESS) {
 		fprintf(stderr, "Failed to create semaphore\n");
 		return false;
 	}
 
-	if(vkCreateSemaphore(vkdev, &sinf, 0, &vk_rend_done_sema) != VK_SUCCESS) {
+	if(vkCreateSemaphore(vk_device, &sinf, 0, &vk_rend_done_sema) != VK_SUCCESS) {
 		fprintf(stderr, "Failed to create semaphore\n");
 		return false;
 	}
@@ -304,7 +304,7 @@ VkCommandBuffer vku_alloc_cmdbuf(VkCommandPool pool, VkCommandBufferLevel level)
 	inf.level = level;
 	inf.commandBufferCount = 1;
 
-	if(vkAllocateCommandBuffers(vkdev, &inf, &cmdbuf) != 0) {
+	if(vkAllocateCommandBuffers(vk_device, &inf, &cmdbuf) != 0) {
 		return 0;
 	}
 	return cmdbuf;
@@ -312,7 +312,7 @@ VkCommandBuffer vku_alloc_cmdbuf(VkCommandPool pool, VkCommandBufferLevel level)
 
 void vku_free_cmdbuf(VkCommandPool pool, VkCommandBuffer buf)
 {
-	vkFreeCommandBuffers(vkdev, pool, 1, &buf);
+	vkFreeCommandBuffers(vk_device, pool, 1, &buf);
 }
 
 void vku_begin_cmdbuf(VkCommandBuffer buf, unsigned int flags)
@@ -352,26 +352,49 @@ void vku_submit_cmdbuf(VkQueue q, VkCommandBuffer buf, VkFence done_fence)
 VkSwapchainKHR vku_create_swapchain(VkSurfaceKHR surf, int xsz, int ysz, int n,
                                     VkPresentModeKHR pmode, VkSwapchainKHR prev)
 {
+	VkSurfaceCapabilitiesKHR scap;
+	vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical, surf, &scap);
+
+	VkPhysicalDeviceMemoryProperties mprops;
+	vkGetPhysicalDeviceMemoryProperties(vk_physical, &mprops);
+
+	uint32_t pmcnt;
+	vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical, surf, &pmcnt, 0);
+	VkPresentModeKHR scpm = VK_PRESENT_MODE_IMMEDIATE_KHR;
+	VkExtent2D scext;
+	scext.width = xsz;
+	scext.height = ysz;
+
+//	VkSurfaceTransformFlagBitsKHR pretransf;
+//	if(scap.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) {
+//		pretransf = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
+//	} else {
+//		pretransf = scap.currentTransform;
+//	}
+
 	VkSwapchainKHR sc;
 	VkSwapchainCreateInfoKHR inf;
 
+	VkSurfaceFormatKHR sformat;
+	sformat.format = VK_FORMAT_B8G8R8A8_UNORM;
+
 	memset(&inf, 0, sizeof inf);
 	inf.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
 	inf.surface = surf;
 	inf.minImageCount = n;
-	inf.imageFormat = VK_FORMAT_B8G8R8A8_UNORM;	/* TODO enumerate and choose */
-	inf.imageColorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
-	inf.imageExtent.width = xsz;
-	inf.imageExtent.height = ysz;
+	inf.imageFormat = sformat.format;	/* TODO enumerate and choose */
+	inf.imageColorSpace = sformat.colorSpace;
+	inf.imageExtent = scext;
 	inf.imageArrayLayers = 1;
 	inf.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
 	inf.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;	/* XXX make this an option? */
 	inf.preTransform = VK_SURFACE_TRANSFORM_INHERIT_BIT_KHR;
 	inf.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
 	inf.presentMode = pmode;
-	inf.oldSwapchain = prev;
+	inf.oldSwapchain = VK_NULL_HANDLE;
+	inf.clipped = VK_TRUE;
 
-	if(vkCreateSwapchainKHR(vkdev, &inf, 0, &sc) != 0) {
+	if(vkCreateSwapchainKHR(vk_device, &inf, 0, &sc) != 0) {
 		return 0;
 	}
 	return sc;
@@ -382,11 +405,11 @@ VkImage *vku_get_swapchain_images(VkSwapchainKHR sc, int *count)
 	uint32_t nimg;
 	VkImage *images;
 
-	if(vkGetSwapchainImagesKHR(vkdev, sc, &nimg, 0) != 0) {
+	if(vkGetSwapchainImagesKHR(vk_device, sc, &nimg, 0) != 0) {
 		return 0;
 	}
 	images = new VkImage[nimg];
-	vkGetSwapchainImagesKHR(vkdev, sc, &nimg, images);
+	vkGetSwapchainImagesKHR(vk_device, sc, &nimg, images);
 
 	if(count) *count = (int)nimg;
 	return images;
@@ -411,7 +434,7 @@ VkImageView *vku_create_image_views(VkImage *images, int count)
 		inf.subresourceRange.levelCount = 1;
 		inf.subresourceRange.layerCount = 1;
 
-		if(vkCreateImageView(vkdev, &inf, 0, iviews) != 0) {
+		if(vkCreateImageView(vk_device, &inf, 0, iviews) != 0) {
 			fprintf(stderr, "Failed to create image views.\n");
 			delete iviews;
 			return 0;
@@ -425,7 +448,7 @@ int vku_get_next_image(VkSwapchainKHR sc)
 {
 	uint32_t next;
 
-	if(vkAcquireNextImageKHR(vkdev, sc, UINT64_MAX, 0, 0, &next) != 0) {
+	if(vkAcquireNextImageKHR(vk_device, sc, UINT64_MAX, 0, 0, &next) != 0) {
 		return -1;
 	}
 	return (int)next;
@@ -444,7 +467,7 @@ void vku_present(VkSwapchainKHR sc, int img_idx)
 	inf.pImageIndices = &index;
 	inf.pResults = &res;
 
-	vkQueuePresentKHR(vkq, &inf);
+	vkQueuePresentKHR(vk_queue, &inf);
 }
 
 bool vku_create_renderpass()
@@ -497,7 +520,7 @@ bool vku_create_renderpass()
 	inf.subpassCount = 1;
 	inf.pSubpasses = &subpass_desc;
 
-	if(vkCreateRenderPass(vkdev, &inf, 0, &vkrpass) != VK_SUCCESS) {
+	if(vkCreateRenderPass(vk_device, &inf, 0, &vkrpass) != VK_SUCCESS) {
 		return false;
 	}
 
@@ -521,7 +544,7 @@ bool vku_create_framebuffers(VkImageView *image_views, int count, int w, int h)
 	inf.layers = 1;
 
 	for(int i=0; i<count; i++) {
-		if(vkCreateFramebuffer(vkdev, &inf, 0, &vkfbufs[i]) != VK_SUCCESS) {
+		if(vkCreateFramebuffer(vk_device, &inf, 0, &vkfbufs[i]) != VK_SUCCESS) {
 			fprintf(stderr, "Failed to create framebuffer for image view: %d\n", i);
 			delete vkfbufs;
 			return false;
@@ -543,7 +566,7 @@ struct vku_buffer *vku_create_buffer(int sz, unsigned int usage)
 	binfo.usage = usage;
 	binfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
 
-	if(vkCreateBuffer(vkdev, &binfo, 0, &buf->buf) != 0) {
+	if(vkCreateBuffer(vk_device, &binfo, 0, &buf->buf) != 0) {
 		fprintf(stderr, "failed to create %d byte buffer (usage: %x)\n", sz, usage);
 		return 0;
 	}
@@ -554,7 +577,7 @@ struct vku_buffer *vku_create_buffer(int sz, unsigned int usage)
 void vku_destroy_buffer(struct vku_buffer *buf)
 {
 	if(buf) {
-		vkDestroyBuffer(vkdev, buf->buf, 0);
+		vkDestroyBuffer(vk_device, buf->buf, 0);
 		delete buf;
 	}
 }
@@ -679,13 +702,13 @@ bool vku_create_graphics_pipeline(VkPipelineLayout *layout)
 	vs.scissorCount = 1;
 
 	/* dynamic states: that can be changed later */
-	std::vector<VkDynamicState> ds_enabled;
-	ds_enabled.push_back(VK_DYNAMIC_STATE_VIEWPORT);
+//	std::vector<VkDynamicState> ds_enabled;
+//	ds_enabled.push_back(VK_DYNAMIC_STATE_VIEWPORT);
 	//ds_enabled.push_back(VK_DYNAMIC_STATE_SCISSOR);
-	VkPipelineDynamicStateCreateInfo ds;
-	ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
-	ds.pDynamicStates = ds_enabled.data();
-	ds.dynamicStateCount = static_cast<uint32_t>(ds_enabled.size());
+//	VkPipelineDynamicStateCreateInfo ds;
+//	ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
+//	ds.pDynamicStates = ds_enabled.data();
+//	ds.dynamicStateCount = static_cast<uint32_t>(ds_enabled.size());
 
 	/* depth tests */
 	VkPipelineDepthStencilStateCreateInfo dsi;
diff --git a/src/vulkan/vkutil.h b/src/vulkan/vkutil.h
index eda0e71..396209f 100644
--- a/src/vulkan/vkutil.h
+++ b/src/vulkan/vkutil.h
@@ -4,21 +4,22 @@
 #include <vulkan/vulkan.h>
 #include <vector>
 
+extern VkPhysicalDevice vk_physical;
+extern VkDevice vk_device;
+extern VkCommandPool vk_pool;
+extern VkQueue vk_queue;
+extern VkSwapchainKHR vk_swapchain;
+extern VkSurfaceKHR vk_surface;
+
 extern VkPipeline *vkgparent_pipeline;
 extern VkDescriptorSet *vkdescset;
 extern VkFramebuffer *vkfbufs;
 extern VkRenderPass vkrpass;
 extern VkInstance vkinst;
-extern VkPhysicalDevice vkpdev;
-extern VkDevice vkdev;
-extern VkQueue vkq;
-extern VkCommandPool vkcmdpool;
 extern VkCommandBuffer vkcmdbuf;	/* primary command buffer */
 extern int vkqfamily;
 
 /* presentation */
-extern VkSurfaceKHR vksurface;
-extern VkSwapchainKHR vkswapchain;
 extern int vknum_swapchain_images;
 extern VkImage *vkswapchain_images;
 extern VkImageView *vkswapchain_views;
-- 
1.7.10.4