Passed in compute buffer to vexter shader

Still a bug in compute shader layout

Author: nigeljw3

commands.cpp

@@ -1,3 +1,18 @@
+/**
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "commands.h"
 
 #include "types.h"

commands.h

@@ -1,3 +1,18 @@
+/**
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef commands_h
 #define commands_h
 

compositor.cpp

@@ -127,7 +127,15 @@ bool Compositor::Init(VkDevice& device,
 
 	VkCommandBuffer& dynamicTransferCommandBuffer = graphicsEngine->TransferDynamicBuffers(device);
 
-	graphicsEngine->ConstructFrames();
+	computer = new Compute(grid, memProperties);
+	
+	computer->Init(device);
+	
+	computer->SetupQueue(device, queueFamilyId);
+	
+	computeCommandBuffer = computer->SetupCommandBuffer(device, queueFamilyId);	
+	
+	graphicsEngine->ConstructFrames(computer->GetStorageBuffer());
 
 	VkCommandBuffer transferCommandBuffers[] = { staticTransferCommandBuffer, dynamicTransferCommandBuffer };
 
@@ -147,14 +155,6 @@ bool Compositor::Init(VkDevice& device,
 	vkCreateSemaphore(device, &semaphoreInfo, nullptr, &waitSemaphore);
 	vkCreateSemaphore(device, &semaphoreInfo, nullptr, &signalSemaphore);
 
-	computer = new Compute(grid, memProperties);
-	
-	computer->Init(device);
-	
-	computer->SetupQueue(device, queueFamilyId);
-	
-	computeCommandBuffer = computer->SetupCommandBuffer(device, queueFamilyId);
-	
 	return true;
 }
 
@@ -182,6 +182,8 @@ bool Compositor::Destroy(VkDevice& device)
 	return true;
 }
 
+bool once = true;
+
 bool Compositor::Draw(VkDevice& device)
 {
 	VkSubmitInfo submitInfo = {};
@@ -192,6 +194,12 @@ bool Compositor::Draw(VkDevice& device)
 	vkQueueSubmit(computeQueue, 1, &submitInfo, VK_NULL_HANDLE);
 	vkQueueWaitIdle(computeQueue);
 
+	if(once)
+	{
+		computer->PrintResults(device);
+		once = false;
+	}
+	
 	transferCommandBuffer = &graphicsEngine->TransferDynamicBuffers(device);
 
 	submitInfo = {};

compute.cpp

@@ -1,3 +1,18 @@
+/**
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "compute.h"
 
 #include <stdexcept>
@@ -25,7 +40,7 @@ void Compute::Init(VkDevice& device)
 {	
 	//size = sizeof(float)*extent.width*extent.height;
 
-	VkFormat format = VK_FORMAT_R32_SFLOAT;
+	//VkFormat format = VK_FORMAT_R32_SFLOAT;
 
 	//assert(formatProperties.optimalTilingFeatures & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT);
 
@@ -43,7 +58,8 @@ void Compute::Init(VkDevice& device)
 
 	size = extent.width*extent.height*sizeof(float);
 
-	properties = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+	properties = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+	//properties = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
 	usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
 
 	SetupBuffer(device, storageBuffer, storageBufferMemory, size, properties, usage);
@@ -79,23 +95,13 @@ void Compute::Destroy(VkDevice& device)
 	vkDestroyFence(device, fence, nullptr);
 }
 
-void Compute::SetupBuffers(VkDevice& device)
+/*void Compute::SetupBuffers(VkDevice& device)
 {
 	
-}
+}*/
 
 void Compute::SetupQueue(VkDevice& device, uint32_t queueFamilyId)
-{
-	/*VkDeviceQueueCreateInfo queueCreateInfo = {};
-	queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
-	queueCreateInfo.pNext = NULL;
-	queueCreateInfo.queueFamilyIndex = queueIndex;
-	queueCreateInfo.queueCount = 1;
-	
-	vkGetDeviceQueue(device, queueFamilyId, 0, &queue);*/
-	
-	//uint32_t computeQueueFamilyId = 0;
-	
+{	
 	uint32_t uniformIndex = 0;
 	uint32_t storageIndex = 1;
 
@@ -125,29 +131,6 @@ void Compute::SetupQueue(VkDevice& device, uint32_t queueFamilyId)
 		throw std::runtime_error("Descriptor set layout creation failed");
 	}
 
-	/*VkDescriptorSetLayoutCreateInfo layoutCreateInfo = {};
-	layoutCreateInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
-	layoutCreateInfo.bindingCount = 1;
-	layoutCreateInfo.pBindings = &layoutBindings[uniformIndex];
-
-	VkResult result = vkCreateDescriptorSetLayout(device, &layoutCreateInfo, nullptr, &descriptorSetLayouts[uniformIndex]);
-	
-	if (result != VK_SUCCESS)
-	{
-		throw std::runtime_error("Descriptor set layout creation failed");
-	}
-	
-	layoutCreateInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
-	layoutCreateInfo.bindingCount = 1;
-	layoutCreateInfo.pBindings = &layoutBindings[storageIndex];
-
-	result = vkCreateDescriptorSetLayout(device, &layoutCreateInfo, nullptr, &descriptorSetLayouts[storageIndex]);
-	
-	if (result != VK_SUCCESS)
-	{
-		throw std::runtime_error("Descriptor set layout creation failed");
-	}*/
-	
 	VkDescriptorPoolSize poolSizes[2];
 	poolSizes[0].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
 	poolSizes[0].descriptorCount = 1;
@@ -290,21 +273,21 @@ VkCommandBuffer* Compute::SetupCommandBuffer(VkDevice& device, uint32_t queueFam
 		throw std::runtime_error("Compute command buffer beign failed");
 	}
 
-	//memoryBarrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
-	//memoryBarrier.buffer = storageBuffer;
-	//memoryBarrier.size = storageBufferSize;
-	//memoryBarrier.srcAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
-	//memoryBarrier.dstAccessMask = VK_ACCESS_SHADER_WRITE_BIT;
-	//memoryBarrier.srcQueueFamilyIndex = graphicsQueueFamilyId;
-	//memoryBarrier.dstQueueFamilyIndex = computeQueueFamilyId;
+	memoryBarrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
+	memoryBarrier.buffer = storageBuffer;
+	memoryBarrier.size = storageBufferSize;
+	memoryBarrier.srcAccessMask = VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
+	memoryBarrier.dstAccessMask = VK_ACCESS_SHADER_WRITE_BIT;
+	memoryBarrier.srcQueueFamilyIndex = queueFamilyId;
+	memoryBarrier.dstQueueFamilyIndex = queueFamilyId;
 
-	/*vkCmdPipelineBarrier(commandBuffer,
+	vkCmdPipelineBarrier(commandBuffer,
 						 VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
 						 VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
 						 0,
 					     0, nullptr,
 						 1, &memoryBarrier,
-						 0, nullptr);*/
+						 0, nullptr);
 
 	vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, pipeline);
 	vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, pipelineLayout, 0, 1, &descriptorSet, 0, 0);
@@ -331,29 +314,21 @@ VkCommandBuffer* Compute::SetupCommandBuffer(VkDevice& device, uint32_t queueFam
 	return &commandBuffer;
 }
 
-/*uint32_t Compute::GetMemoryTypeIndex(VkDevice& device, VkBuffer& buffer, VkPhysicalDeviceMemoryProperties& props, VkMemoryPropertyFlags propFlags, uint32_t& allocSize)
+void Compute::PrintResults(VkDevice& device)
 {
-	VkMemoryRequirements memRequirements;
+	void* data;
+	uint32_t size = extent.width*extent.height*sizeof(float);
+    vkMapMemory(device, storageBufferMemory, 0, size, 0, &data);
 
-	vkGetImageMemoryRequirements(device, buffer, &memRequirements);
-		
-	uint32_t memTypeIndex = InvalidIndex;
-	
-	for (uint32_t i = 0; i < props.memoryTypeCount; ++i)
+	for(uint32_t i = 0; i < extent.width; ++i)
 	{
-		if ((memRequirements.memoryTypeBits & (1 << i)) &&
-			(props.memoryTypes[i].propertyFlags & propFlags) == propFlags)
+		for(uint32_t j = 0; j < extent.height; ++j)
 		{
-			memTypeIndex = i;
+			std::cout << static_cast<float*>(data)[i*j] << ", ";
 		}
+		
+		std::cout << std::endl;
 	}
 
-	if (memTypeIndex == InvalidIndex)
-	{
-		throw std::runtime_error("Memory property combination not supported");
-	}
-	
-	allocSize = memRequirements.size;
-	
-	return memTypeIndex;
-}*/
+    vkUnmapMemory(device, storageBufferMemory);
+}

compute.h

@@ -1,3 +1,18 @@
+/**
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef compute_h
 #define compute_h
 
@@ -18,10 +33,14 @@ class Compute : Commands
 	void SetupQueue(VkDevice& device, uint32_t queueFamilyId);
 	VkCommandBuffer* SetupCommandBuffer(VkDevice& device, uint32_t queueFamilyId);
 
+	VkBuffer& GetStorageBuffer() { return storageBuffer; }
+	
+	void PrintResults(VkDevice& device);
+	
 private:
 	//uint32_t GetMemoryTypeIndex(VkDevice& device, VkImage& image, VkPhysicalDeviceMemoryProperties& props, VkMemoryPropertyFlags propFlags, uint32_t& allocSize);
 
-	void SetupBuffers(VkDevice& device);
+	//void SetupBuffers(VkDevice& device);
 	//void SetupCommandBuffer();
 	//std::function<uint32_t(VkDevice& device, VkBuffer& buffer, VkPhysicalDeviceMemoryProperties& props, VkMemoryPropertyFlags properties, uint32_t& allocSize)> GetMemoryTypeIndexCallback;
 

makefile

@@ -33,16 +33,16 @@ system.o: system.h system.cpp
 commands.o: commands.h commands.cpp
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) -c commands.cpp -o $@
 
-renderer.o: renderer.h renderer.cpp commands.o
+renderer.o: renderer.h renderer.cpp commands.h
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) -c renderer.cpp -o $@
 
-compute.o: compute.h compute.cpp
+compute.o: compute.h compute.cpp commands.h
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) -c compute.cpp -o $@
 
 controller.o: controller.h controller.cpp
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) -c controller.cpp -o $@
 
-compositor.o: compositor.h compositor.cpp
+compositor.o: compositor.h compositor.cpp renderer.h compute.h
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) -c compositor.cpp -o $@
 
 test: vulkan

renderer.cpp

@@ -53,6 +53,7 @@ Renderer::Renderer(VkExtent2D& extent, const VkExtent3D& gridDim, VkPhysicalDevi
 	framebuffers = static_cast<VkFramebuffer*>(malloc(sizeof(VkFramebuffer)*numFBOs));
 	drawCommandBuffers = static_cast<VkCommandBuffer*>(malloc(sizeof(VkCommandBuffer)*numDrawCmdBuffers));
 	attributeDescriptions = static_cast<VkVertexInputAttributeDescription*>(malloc(sizeof(VkVertexInputAttributeDescription)*numAttrDesc));
+	bindingDescriptions = static_cast<VkVertexInputBindingDescription*>(malloc(sizeof(VkVertexInputBindingDescription)*numBindDesc));
 }
 
 Renderer::~Renderer()
@@ -62,6 +63,7 @@ Renderer::~Renderer()
 	free(framebuffers);
 	free(drawCommandBuffers);
 	free(attributeDescriptions);
+	free(bindingDescriptions);
 }
 
 bool Renderer::Init(VkDevice& device, const VkFormat& surfaceFormat, const VkImageView* imageViews, uint32_t queueFamilyId)
@@ -183,9 +185,9 @@ bool Renderer::Init(VkDevice& device, const VkFormat& surfaceFormat, const VkIma
 
 	VkPipelineVertexInputStateCreateInfo vertexInputInfo = {};
 	vertexInputInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
-	vertexInputInfo.vertexBindingDescriptionCount = 1;
+	vertexInputInfo.vertexBindingDescriptionCount = 2;
 	vertexInputInfo.vertexAttributeDescriptionCount = numAttrDesc;
-	vertexInputInfo.pVertexBindingDescriptions = &bindingDescription;
+	vertexInputInfo.pVertexBindingDescriptions = bindingDescriptions;
 	vertexInputInfo.pVertexAttributeDescriptions = attributeDescriptions;
 
 	VkPipelineInputAssemblyStateCreateInfo inputAssembly = {};
@@ -447,7 +449,7 @@ bool Renderer::Destroy(VkDevice& device)
 	return true;
 }
 
-void Renderer::ConstructFrames()
+void Renderer::ConstructFrames(VkBuffer& heightBuffer)
 {
 	bool result = false;
 
@@ -469,6 +471,8 @@ void Renderer::ConstructFrames()
 
 	VkDeviceSize offsets[] = {0};
 
+	VkBuffer buffers[] = { vertexBuffer, heightBuffer };
+	
 	assert(numDrawCmdBuffers == numFBOs);
 
 	for (uint32_t i = 0; i < numDrawCmdBuffers; ++i)
@@ -479,7 +483,7 @@ void Renderer::ConstructFrames()
 		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);
+		vkCmdBindVertexBuffers(drawCommandBuffers[i], 0, 2, buffers, offsets);
 		vkCmdBindIndexBuffer(drawCommandBuffers[i], indexBuffer, 0, VK_INDEX_TYPE_UINT16);
 		vkCmdDrawIndexed(drawCommandBuffers[i], numIndices, 1, 0, 0, 0);
 		vkCmdEndRenderPass(drawCommandBuffers[i]);
@@ -495,9 +499,13 @@ void Renderer::ConstructFrames()
 
 bool Renderer::SetupShaderParameters(VkDevice& device)
 {
-	bindingDescription.binding = 0;
-	bindingDescription.stride = sizeof(float[3]) * 2;
-	bindingDescription.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
+	bindingDescriptions[0].binding = 0;
+	bindingDescriptions[0].stride = sizeof(float[3]) * 2;
+	bindingDescriptions[0].inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
+	
+	bindingDescriptions[1].binding = 1;
+	bindingDescriptions[1].stride = sizeof(float);
+	bindingDescriptions[1].inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
 
 	attributeDescriptions[0].binding = 0;
 	attributeDescriptions[0].location = 0;
@@ -508,6 +516,11 @@ bool Renderer::SetupShaderParameters(VkDevice& device)
 	attributeDescriptions[1].location = 1;
 	attributeDescriptions[1].format = VK_FORMAT_R32G32B32_SFLOAT;
 	attributeDescriptions[1].offset = sizeof(float[3]);
+	
+	attributeDescriptions[2].binding = 1;
+	attributeDescriptions[2].location = 2;
+	attributeDescriptions[2].format = VK_FORMAT_R32_SFLOAT;
+	attributeDescriptions[2].offset = 0;
 
     uboLayoutBinding.binding = 0;
     uboLayoutBinding.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;