Smooth shading with vertex normals from compute

Pretty... :)

Author: nigeljw3

comp.spv

@@ -182,7 +182,7 @@ bool Compositor::Destroy(VkDevice& device)
 	return true;
 }
 
-//bool once = true;
+bool once = true;
 
 bool Compositor::Draw(VkDevice& device)
 {
@@ -196,11 +196,11 @@ bool Compositor::Draw(VkDevice& device)
 	vkQueueSubmit(computeQueue, 1, &submitInfo, VK_NULL_HANDLE);
 	vkQueueWaitIdle(computeQueue);
 
-	/*if(once)
+	if(once)
 	{
 		computer->PrintResults(device);
 		once = false;
-	}*/
+	}
 
 	transferCommandBuffer = &graphicsEngine->TransferDynamicBuffers(device);
 

compositor.cpp

@@ -27,7 +27,7 @@ Compute::Compute(VkExtent3D inputExtent, VkPhysicalDeviceMemoryProperties& props
   extent(inputExtent),
   uniformBufferSize(sizeof(float) * numWaveComponents),
   storageBufferSize(sizeof(float) * inputExtent.width * inputExtent.height),
-  normalBufferSize(sizeof(float[3]) * inputExtent.width * inputExtent.height),  
+  normalBufferSize(sizeof(float[4]) * inputExtent.width * inputExtent.height),  
   startTime(std::chrono::high_resolution_clock::now())
 {
 	//GetMemoryTypeIndexCallback = memTypeIndexCallback;
@@ -61,7 +61,7 @@ void Compute::Init(VkDevice& device)
 
 	SetupBuffer(device, storageBuffer, storageBufferMemory, storageBufferSize, properties, usage);
 
-	properties = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+	properties = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
 	usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT;
 
 	SetupBuffer(device, normalBuffer, normalBufferMemory, normalBufferSize, properties, usage);
@@ -385,17 +385,25 @@ void Compute::UpdateWave(VkDevice& device)
 void Compute::PrintResults(VkDevice& device)
 {
 	void* data;
-    vkMapMemory(device, storageBufferMemory, 0, storageBufferSize, 0, &data);
+    //vkMapMemory(device, storageBufferMemory, 0, storageBufferSize, 0, &data);
+	
+	vkMapMemory(device, normalBufferMemory, 0, normalBufferSize, 0, &data);
+	
+	float* mem = static_cast<float*>(data);
 
 	for(uint32_t i = 0; i < extent.width; ++i)
 	{
 		for(uint32_t j = 0; j < extent.height; ++j)
 		{
-			std::cout << static_cast<float*>(data)[i*extent.width + j] << ", ";
+			//std::cout << static_cast<float*>(data)[i*extent.width + j] << ", ";
+			std::cout << "{ " << mem[i*extent.width + j*4] << ", "
+							  << mem[i*extent.width + j*4 + 1] << ", "
+							  << mem[i*extent.width + j*4 + 2] << ", "
+							  << mem[i*extent.width + j*4 + 3] << " }";
 		}
 
 		std::cout << std::endl;
 	}
 
-    vkUnmapMemory(device, storageBufferMemory);
+    vkUnmapMemory(device, normalBufferMemory);
 }

compute.cpp

@@ -180,11 +180,15 @@ bool Controller::Init()
 
 	bool foundDiscreteGPU = false;
 
+	std::cout << "Device count: " << deviceCount << std::endl;
+	
 	for (uint32_t i = 0; i < deviceCount; ++i)
 	{
 		vkGetPhysicalDeviceProperties(devices[i], &deviceProperties);
 
-		std::cout << deviceProperties.deviceType << std::endl;
+		std::cout << "Device type: " << deviceProperties.deviceType << std::endl;
+		
+		std::cout << "Storage buffer offset alignment: " << deviceProperties.limits.minStorageBufferOffsetAlignment << std::endl;
 
 		if (deviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU)
 		{

controller.cpp

@@ -498,7 +498,7 @@ void Renderer::ConstructFrames(VkBuffer& heightBuffer, VkBuffer& normalBuffer)
 		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, 3, buffers, offsets);
+		vkCmdBindVertexBuffers(drawCommandBuffers[i], 0, numBindDesc, buffers, offsets);
 		vkCmdBindIndexBuffer(drawCommandBuffers[i], indexBuffer, 0, VK_INDEX_TYPE_UINT16);
 		vkCmdDrawIndexed(drawCommandBuffers[i], numIndices, 1, 0, 0, 0);
 		vkCmdEndRenderPass(drawCommandBuffers[i]);
@@ -523,7 +523,7 @@ bool Renderer::SetupShaderParameters(VkDevice& device)
 	bindingDescriptions[1].inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
 
 	bindingDescriptions[2].binding = 2;
-	bindingDescriptions[2].stride = sizeof(float[3]);
+	bindingDescriptions[2].stride = sizeof(float[4]);
 	bindingDescriptions[2].inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
 
 	attributeDescriptions[0].binding = 0;

renderer.cpp

@@ -32,9 +32,9 @@ layout(std430, binding = 1) buffer Height
    float height[];
 };
 
-layout(std430, binding = 2) buffer Normal 
+layout(std140, binding = 2) buffer Normal 
 {
-   vec3 normal[];
+   vec4 normal[];
 };
 
 layout (local_size_x = 10, local_size_y = 10) in;
@@ -63,4 +63,5 @@ void main()
 	normal[index].x = -ubo.amplitude*cos(kx - ubo.omega*ubo.time);
 	normal[index].y = 1.0;
 	normal[index].z = 0.0;
+	normal[index].w = 1.0;
 }

shader.comp

@@ -18,7 +18,7 @@
 
 layout(location = 0) in vec3 inPosition;
 layout(location = 1) in vec3 inColor;
-layout(location = 3) in vec3 inNormal;
+layout(location = 3) in vec4 inNormal;
 layout(location = 2) in float inHeight;
 
 layout(binding = 0) uniform UBO {
@@ -48,7 +48,7 @@ void main() {
 	outSpecularConst = 0.25;
 	outSpecularLight = vec4(0.5, 0.5, 0.5, 1.0); 
 
-	outNormal = normalize(inNormal);
+	outNormal = normalize(inNormal.xyz);
 	mat4 modelView = ubo.view * ubo.model;
 	vec4 pos = modelView * vec4(inPosition.x, inHeight, inPosition.z, 1.0);	
 	outEyePos = vec3(modelView * pos);