Added renderdoc layer and cleanup

Also added stubs for compute

Author: nigeljw3

controller.cpp

@@ -22,7 +22,12 @@
 #include <cstdio>
 #include <limits>
 
-const char* layer = "VK_LAYER_LUNARG_standard_validation";
+const char* layers[] = {
+	"VK_LAYER_LUNARG_standard_validation",
+	"VK_LAYER_RENDERDOC_Capture"
+};
+
+const uint32_t numLayers = 2;
 
 Controller::Controller()
 {
@@ -115,24 +120,27 @@ bool Controller::Init()
 
 	supported = false;
 
-	for(uint32_t i = 0; i < layerCount; ++i)
+	for(uint32_t i = 0; i < numLayers; ++i)
 	{
-		if (strcmp(layer, availableLayers[i].layerName) == 0)
+		for(uint32_t j = 0; j < layerCount; ++j)
 		{
-			supported = true;
-			break;
+			if (strcmp(layers[i], availableLayers[j].layerName) == 0)
+			{
+				supported = true;
+				break;
+			}
+			
+			std::cout << availableLayers[j].layerName << std::endl;
 		}
 
-		std::cout << availableLayers[i].layerName << std::endl;
-	}
-	
-	if (supported == false)
-	{
-		std::cout << "Layer not supported:" << layer << std::endl;
+		if (supported == false)
+		{
+			std::cout << "Layer not supported:" << layers[i] << std::endl;
+		}
 	}
 
 	createInfo.enabledLayerCount = 1;
-    createInfo.ppEnabledLayerNames = &layer;
+    createInfo.ppEnabledLayerNames = layers;
 
 
 	VkResult result = vkCreateInstance(&createInfo, nullptr, &instance);
@@ -216,7 +224,7 @@ bool Controller::SetupQueue()
 
 	for (uint32_t i = 0; i < queueFamilyCount; ++i)
 	{
-		std::cout << queueFamilies[i].queueCount << ", " << std::hex << queueFamilies[i].queueFlags << std::endl;
+		std::cout << "queue families: " << queueFamilies[i].queueCount << ", " << std::hex << queueFamilies[i].queueFlags << std::dec << std::endl;
 
 		if (queueFamilies[i].queueCount > 0 && queueFamilies[i].queueFlags & VK_QUEUE_GRAPHICS_BIT)
 		{
@@ -286,7 +294,7 @@ bool Controller::SetupDevice(VkSurfaceKHR& surface)
 	deviceCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
 	deviceCreateInfo.pEnabledFeatures = &deviceFeatures;
 	deviceCreateInfo.enabledLayerCount = 1;
-    deviceCreateInfo.ppEnabledLayerNames = &layer;
+    deviceCreateInfo.ppEnabledLayerNames = layers;
 	deviceCreateInfo.pQueueCreateInfos = &queueCreateInfo;
 	deviceCreateInfo.queueCreateInfoCount = 1;
 	deviceCreateInfo.enabledExtensionCount = requestedDeviceExtensionCount;

makefile

@@ -11,14 +11,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VULKAN_PATH = /c/Dev/VulkanSDK/1.0.26.0
+VULKAN_PATH = /c/Dev/VulkanSDK/1.0.30.0
 GLFW_PATH = /c/Dev/glfw/glfw-3.2.1.bin.WIN32
 GLM_PATH = /C/Dev/glm
 
 CFLAGS = -std=c++11 -Wall
 INCLUDE = -I$(VULKAN_PATH)/include -I$(GLFW_PATH)/include -I$(GLM_PATH)
-LDFLAGS = -L$(VULKAN_PATH)/lib -L$(GLFW_PATH)/lib-mingw
-LDLIBS = -lvulkan -lglfw3 -lgdi32
+LDFLAGS = -L$(VULKAN_PATH)/Bin32 -L$(GLFW_PATH)/lib-mingw
+LDLIBS = -lvulkan-1 -lglfw3 -lgdi32
 DEFINES = -DVK_USE_PLATFORM_WIN32_KHR
 OBJS = renderer.o system.o controller.o compositor.o
 

renderer.cpp

@@ -34,53 +34,30 @@
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/ext.hpp> //"glm/gtx/string_cast.hpp"
 
-float vertexInfo2[][3] = {
-	{-0.5f, -0.5f, 0.0f}, {1.0f, 0.0f, 0.0f},
-	{0.5f, -0.5f, 0.0f}, {0.0f, 1.0f, 0.0f},
-	{0.5f, 0.5f, 0.0f}, {0.0f, 0.0f, 1.0f},
-	{-0.5f, 0.5f, 0.0f}, {1.0f, 1.0f, 1.0f}
-};
-
-const uint16_t indices2[] = {
-	0, 1, 2, 2, 3, 1
-};
-
 Renderer::Renderer(VkExtent2D& extent, VkPhysicalDeviceMemoryProperties& memProps)
 :	imageExtent(extent),
 	memProperties(memProps)
-{
-	numVertsX = 7;
-	numVertsY = 7;
-	
+{	
 	numVerts = numVertsX * numVertsY;
 	numPrims = (numVertsX - 1) * (numVertsY - 1) * 2;
+	vertexInfoSize = sizeof(float) * numComponents * numVerts * 2;
+	numIndices = numPrims * numComponents;
+	indicesBufferSize = sizeof(uint16_t) * numIndices;
 
-	uint32_t numComponents = 3;
-	
-	uint32_t vertInfoSize = sizeof(float)*numComponents*numVerts*2;
-	
-	mat4Size = vertInfoSize;
-	
-	vertexInfo = static_cast<float*>(malloc(vertInfoSize));
-	
-	numIndices = numPrims * 3;
-	
-	indicesBufferSize = sizeof(uint16_t)*numIndices;
-	
+	vertexInfo = static_cast<float*>(malloc(vertexInfoSize));
 	indices = static_cast<uint16_t*>(malloc(indicesBufferSize));
-	
 	framebuffers = static_cast<VkFramebuffer*>(malloc(sizeof(VkFramebuffer)*numFBOs));
 	drawCommandBuffers = static_cast<VkCommandBuffer*>(malloc(sizeof(VkCommandBuffer)*numDrawCmdBuffers));
 	attributeDescriptions = static_cast<VkVertexInputAttributeDescription*>(malloc(sizeof(VkVertexInputAttributeDescription)*numAttrDesc));
 }
 
 Renderer::~Renderer()
 {
+	free(vertexInfo);
+	free(indices);
 	free(framebuffers);
 	free(drawCommandBuffers);
 	free(attributeDescriptions);
-	free(vertexInfo);
-	free(indices);
 }
 
 bool Renderer::Init(VkDevice& device, const VkFormat& surfaceFormat, const VkImageView* imageViews, uint32_t queueFamilyId)
@@ -105,8 +82,8 @@ bool Renderer::Init(VkDevice& device, const VkFormat& surfaceFormat, const VkIma
 		for (uint32_t j = 0; j < numVertsX; ++j)
 		{
 			vertexInfo[index] = xPos;
-			vertexInfo[index + 1] = yPos;
-			vertexInfo[index + 2] = zPos;
+			vertexInfo[index + 1] = zPos;
+			vertexInfo[index + 2] = yPos;
 
 			vertexInfo[index + 3] = 0.0f;
 			vertexInfo[index + 4] = 0.0f;
@@ -117,7 +94,6 @@ bool Renderer::Init(VkDevice& device, const VkFormat& surfaceFormat, const VkIma
 		}
 
 		xPos = xStartPos;
-		
 		yPos += delta;
 	}
 
@@ -140,11 +116,8 @@ bool Renderer::Init(VkDevice& device, const VkFormat& surfaceFormat, const VkIma
 	}
 
 	SetupServerSideVertexBuffer(device);
-	
 	SetupIndexBuffer(device);
-		
 	SetupUniformBuffer(device);
-	
 	SetupShaderParameters(device);
 
 	std::ifstream file("vert.spv", std::ios::ate | std::ios::binary);
@@ -499,18 +472,12 @@ void Renderer::ConstructFrames()
 		renderPassBeginInfo.framebuffer = framebuffers[i];
 
 		vkBeginCommandBuffer(drawCommandBuffers[i], &beginInfo);
-		
 		vkCmdBeginRenderPass(drawCommandBuffers[i], &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE);
-		
 		vkCmdBindDescriptorSets(drawCommandBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, nullptr);
-			
 		vkCmdBindPipeline(drawCommandBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
-			
 		vkCmdBindVertexBuffers(drawCommandBuffers[i], 0, 1, &vertexBuffer, offsets);
 		vkCmdBindIndexBuffer(drawCommandBuffers[i], indexBuffer, 0, VK_INDEX_TYPE_UINT16);
-		
 		vkCmdDrawIndexed(drawCommandBuffers[i], numIndices, 1, 0, 0, 0);
-		
 		vkCmdEndRenderPass(drawCommandBuffers[i]);
 
 		result = vkEndCommandBuffer(drawCommandBuffers[i]);
@@ -589,7 +556,7 @@ bool Renderer::SetupShaderParameters(VkDevice& device)
 	VkDescriptorBufferInfo bufferInfo = {};
 	bufferInfo.buffer = uniformBuffer;
 	bufferInfo.offset = 0;
-	bufferInfo.range = mat4Size;
+	bufferInfo.range = mvpSize;
 
 	VkWriteDescriptorSet descriptorWrite = {};
 	descriptorWrite.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
@@ -638,12 +605,10 @@ bool Renderer::SetupClientSideVertexBuffer(VkDevice& device)
 {
 	VkBufferCreateInfo bufferInfo = {};
 	bufferInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
-	bufferInfo.size = sizeof(float[3]) * numVertices * 2;
+	bufferInfo.size = vertexInfoSize;
 	bufferInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT;
 	bufferInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
-	
-	std::cout << bufferInfo.size << std::endl;
-	
+
 	VkResult result = vkCreateBuffer(device, &bufferInfo, nullptr, &vertexBuffer);
 
 	if (result != VK_SUCCESS)
@@ -684,7 +649,7 @@ bool Renderer::SetupClientSideVertexBuffer(VkDevice& device)
 
 bool Renderer::SetupServerSideVertexBuffer(VkDevice& device)
 {
-	VkDeviceSize size = mat4Size; //sizeof(vertexInfo);
+	VkDeviceSize size = vertexInfoSize;
 
 	VkMemoryPropertyFlags properties = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
 	VkBufferUsageFlags usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
@@ -721,10 +686,12 @@ void Renderer::SetupDynamicTransfer(VkDevice& device)
 	vkBeginCommandBuffer(dynamicTransferCommandBuffer, &beginInfo);
 
 	VkBufferCopy copyRegion = {};
-	copyRegion.size = mat4Size;
-	
+	copyRegion.size = mvpSize;
 	vkCmdCopyBuffer(dynamicTransferCommandBuffer, uniformTransferBuffer, uniformBuffer, 1, &copyRegion);
 
+	copyRegion.size = vertexInfoSize;
+	vkCmdCopyBuffer(dynamicTransferCommandBuffer, vertexTransferBuffer, vertexBuffer, 1, &copyRegion);
+		
 	vkEndCommandBuffer(dynamicTransferCommandBuffer);
 }
 
@@ -748,9 +715,6 @@ VkCommandBuffer& Renderer::TransferStaticBuffers(VkDevice& device)
 	//copyRegion.srcOffset = 0;
 	//copyRegion.dstOffset = 0;
 
-	copyRegion.size = mat4Size;//sizeof(vertexInfo);
-	vkCmdCopyBuffer(staticTransferCommandBuffer, vertexTransferBuffer, vertexBuffer, 1, &copyRegion);
-	
 	copyRegion.size = indicesBufferSize;
 	vkCmdCopyBuffer(staticTransferCommandBuffer, indexTransferBuffer, indexBuffer, 1, &copyRegion);
 
@@ -766,14 +730,14 @@ VkCommandBuffer& Renderer::TransferDynamicBuffers(VkDevice& device)
     auto currentTime = std::chrono::high_resolution_clock::now();
     float time = std::chrono::duration_cast<std::chrono::milliseconds>(currentTime - startTime).count() / 1000.0f;
 
-	glm::mat4 model = glm::rotate(glm::mat4(), time * glm::radians(90.0f), glm::vec3(0.0f, 0.0f, 1.0f));
-	glm::mat4 view = glm::lookAt(glm::vec3(2.0f, 2.0f, 2.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 1.0f));
-	glm::mat4 proj = glm::perspective(glm::radians(45.0f), imageExtent.width / (float) imageExtent.height, 0.1f, 100.0f);
+	glm::mat4 model; // = glm::rotate(glm::mat4(), time * glm::radians(90.0f), glm::vec3(0.0f, 0.0f, 1.0f));
+	glm::mat4 view = glm::lookAt(glm::vec3(0.0f, 3.0f, 3.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
+	glm::mat4 proj = glm::perspective(glm::radians(90.0f), imageExtent.width / (float) imageExtent.height, 0.1f, 100.0f);
 	proj[1][1] *= -1;
 
 	mvp = proj * view * model;
 
-	VkDeviceSize size = mat4Size;
+	VkDeviceSize size = mvpSize;
 
 	void* data;
     vkMapMemory(device, uniformTransferBufferMemory, 0, size, 0, &data);
@@ -842,7 +806,7 @@ bool Renderer::SetupBuffer(VkDevice& device, VkBuffer& buffer, VkDeviceMemory& m
 
 void Renderer::SetupUniformBuffer(VkDevice &device)
 {
-	VkDeviceSize size = mat4Size;
+	VkDeviceSize size = mvpSize;
 
 	VkMemoryPropertyFlags properties = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
 	VkBufferUsageFlags usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;

renderer.h

@@ -47,7 +47,7 @@ class Renderer
 	bool SetupServerSideVertexBuffer(VkDevice& device);
 	void SetupUniformBuffer(VkDevice &device);
 	void SetupDynamicTransfer(VkDevice &device);
-	void SetupBufferTransfer(VkDevice &device);
+	void SetupStaticTransfer(VkDevice &device);
 
 	bool SetupShaderParameters(VkDevice& device);
 	uint32_t GetMemoryTypeIndex(VkDevice& device, VkBuffer& buffer, VkMemoryPropertyFlags properties, uint32_t& allocSize);
@@ -92,24 +92,23 @@ class Renderer
 	const uint32_t numAttrDesc = 2;
 	const uint32_t numVertices = 3;
 
-	//float mvp[4][4] = {};
 	glm::mat4 mvp;
-	//const uint32_t mat4Size = sizeof(float[4][4]);
-	
-	uint32_t mat4Size;
 
 	float* vertexInfo;
-	
 	uint16_t* indices;
-	uint16_t numIndices;
-	uint32_t indicesBufferSize;
 
-	uint32_t numVertsX;
-	uint32_t numVertsY;
+	const uint32_t mvpSize = sizeof(float)*16;
 
+	uint32_t vertexInfoSize;
+	uint16_t numIndices;
+	uint32_t indicesBufferSize;
 	uint32_t numVerts;
-	
 	uint32_t numPrims;
+	
+	const uint32_t numVertsX = 10;
+	const uint32_t numVertsY = 10;
+	const uint32_t numComponents = 3;
+	
 };
 
 #endif