Clean up part 2

Dead code removal

Fixed some dependenies

Author: nigeljw3

comp.spv

@@ -48,8 +48,8 @@ class Compositor
 	void Loop();
 	bool Destroy(VkDevice& device);
 	bool CheckExtensionsSupport(uint32_t extensionCount, VkExtensionProperties* extensions);
-	VkFormat GetSurfaceFormat() { return surfaceFormat; }
-	VkPresentModeKHR GetPresentMode() { return presentMode; }
+	VkFormat GetSurfaceFormat() const { return surfaceFormat; }
+	VkPresentModeKHR GetPresentMode() const { return presentMode; }
 
 	bool Draw(VkDevice& device);
 

compositor.h

@@ -50,12 +50,11 @@ class Controller
 	VkPhysicalDeviceMemoryProperties& GetMemoryProperties() { return memProperties; }
 
 	//VkSurfaceCapabilitiesKHR* GetCapabilities() { return &capabilities; }
-	//uint32_t GetQueueFamilyId() { return queueFamilyId; }
 
-	uint32_t GetQueueFamilyId() { return queueFamilyId; }
-	uint32_t GetGraphicsQueueIndex() { return graphicsQueueIndex; }
-	uint32_t GetPresentQueueIndex(){ return presentQueueIndex; }
-	uint32_t GetComputeQueueIndex(){ return computeQueueIndex; }
+	uint32_t GetQueueFamilyId() const { return queueFamilyId; }
+	uint32_t GetGraphicsQueueIndex() const { return graphicsQueueIndex; }
+	uint32_t GetPresentQueueIndex() const { return presentQueueIndex; }
+	uint32_t GetComputeQueueIndex() const { return computeQueueIndex; }
 
 	bool CheckFormatPropertyType(VkFormat format, VkFormatFeatureFlagBits flags);
 

controller.h

@@ -32,6 +32,8 @@
 
 int main()
 {	
+	///@note Static window size for now
+	/// If dynamic window resizing is added, then swap chain reconstruction is necessary
 	const uint32_t width = 1920;
 	const uint32_t height = 1080;
 
@@ -44,15 +46,13 @@ int main()
 		vfsme::Controller devCtrl;
 
 		devCtrl.Init();
-
 		devCtrl.SetupQueue();
 
 		VkSurfaceKHR surface;
 
 		window.CreateSurface(devCtrl.GetInstance(), &surface);
 
 		devCtrl.SetupDevice(surface);
-		
 		devCtrl.Configure(surface);
 
 		vfsme::Compositor composer(devCtrl.GetMemoryProperties());

frag.spv

@@ -26,13 +26,13 @@ OBJS = commands.o renderer.o system.o controller.o compositor.o compute.o
 
 .PHONY: clean test shaders
 
-vulkan: main.cpp $(OBJS)
+vulkan: main.cpp $(OBJS) shaders
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) $(LDFLAGS) -o vulkan main.cpp $(OBJS) $(LDLIBS)
 
 system.o: system.h system.cpp
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) -c system.cpp -o $@	
 
-commands.o: commands.h commands.cpp
+commands.o: commands.h commands.cpp shared.h
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) -c commands.cpp -o $@
 
 renderer.o: renderer.h renderer.cpp commands.h
@@ -41,7 +41,7 @@ renderer.o: renderer.h renderer.cpp commands.h
 compute.o: compute.h compute.cpp commands.h
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) -c compute.cpp -o $@
 
-controller.o: controller.h controller.cpp
+controller.o: controller.h controller.cpp shared.h
 	g++ $(CFLAGS) $(DEFINES) $(INCLUDE) -c controller.cpp -o $@
 
 compositor.o: compositor.h compositor.cpp renderer.h compute.h
@@ -56,4 +56,4 @@ shaders:
 	$(VULKAN_PATH)/Bin32/glslangValidator.exe -V shader.comp
 
 clean:
-	rm *.exe *.o
+	rm *.exe *.o *.spv

main.cpp

@@ -43,8 +43,6 @@ Renderer::Renderer(VkExtent2D& extent, const VkExtent3D& gridDim, VkPhysicalDevi
 	imageExtent(extent),
 	grid(gridDim)
 {	
-	//GetMemoryTypeIndexCallback = memTypeIndexCallback;
-
 	numVerts = grid.width * grid.height;
 	numPrims = (grid.width - 1) * (grid.height - 1) * 2;
 	vertexInfoSize = sizeof(float) * numComponents * numVerts * numVertexElements;
@@ -59,12 +57,6 @@ Renderer::Renderer(VkExtent2D& extent, const VkExtent3D& gridDim, VkPhysicalDevi
 	drawCommandBuffers = new VkCommandBuffer[numDrawCmdBuffers];
 	attributeDescriptions = new VkVertexInputAttributeDescription[numAttrDesc];
 	bindingDescriptions = new VkVertexInputBindingDescription[numBindDesc];
-	//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));
-	//bindingDescriptions = static_cast<VkVertexInputBindingDescription*>(malloc(sizeof(VkVertexInputBindingDescription)*numBindDesc));
 }
 
 Renderer::~Renderer()
@@ -696,10 +688,10 @@ VkCommandBuffer& Renderer::TransferStaticBuffers(VkDevice& device)
 
 VkCommandBuffer& Renderer::TransferDynamicBuffers(VkDevice& device)
 {
-	static auto startTime = std::chrono::high_resolution_clock::now();
+	//static auto startTime = std::chrono::high_resolution_clock::now();
 
-    auto currentTime = std::chrono::high_resolution_clock::now();
-    float time = std::chrono::duration_cast<std::chrono::milliseconds>(currentTime - startTime).count() / 1000.0f;
+    //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(0.0f, 6.0f, 10.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
@@ -708,15 +700,11 @@ VkCommandBuffer& Renderer::TransferDynamicBuffers(VkDevice& device)
 
 	float lightPos[] = { 10.0, 10.0, 0.0 };
 
-	//mvp = proj * view * model;
-	
 	VkDeviceSize size = uboSize;
 
 	void* data;
     vkMapMemory(device, uniformTransferBufferMemory, 0, size, 0, &data);
 
-	//memcpy(data, glm::value_ptr(mvp), (size_t) size);
-	
 	char* bytes = static_cast<char*>(data);
 
 	memcpy(bytes, glm::value_ptr(model), (size_t) mat4Size);

makefile

@@ -30,7 +30,6 @@ namespace vfsme
 class Renderer : Commands
 {
 public:
-	//Renderer(VkExtent2D& screenExtent, const VkExtent3D& gridDim, VkPhysicalDeviceMemoryProperties& memProperties, std::function<uint32_t(VkDevice& device, VkBuffer& buffer, VkPhysicalDeviceMemoryProperties& props, VkMemoryPropertyFlags properties, uint32_t& allocSize)> memTypeIndexCallback);
 	Renderer(VkExtent2D& screenExtent, const VkExtent3D& gridDim, VkPhysicalDeviceMemoryProperties& memProps);
 	~Renderer();
 

renderer.cpp

@@ -45,19 +45,9 @@ void main()
 {
     // Current SSBO index
     //uint index = gl_LocalInvocationID.x;
-	uint index = gl_LocalInvocationIndex;	
-
+	uint index = gl_LocalInvocationIndex;
 	//uint index = gl_GlobalInvocationID.x + gl_GlobalInvocationID.y * gl_NumWorkGroups.x * gl_WorkGroupSize.x;
-	
-	//uint index = 0;
-	
-    float value = 1.0;
 
-	//for(int i = 0; i < height.length(); ++i)
-	//{
-	//	height[i] = 1.0;
-	//}
-	
 	float kx = ubo.k * gl_LocalInvocationID.x * ubo.dx;
 
     height[index] = ubo.amplitude*sin(kx - ubo.omega*ubo.time);

renderer.h

@@ -30,9 +30,7 @@ layout(location = 7) in float inSpecularConst;
 layout(location = 0) out vec4 outColor;
 
 void main() {
-    //outColor = vec4(inColor, 1.0);
-
-	vec3 eyeVec = normalize(-inEyePos);
+    vec3 eyeVec = normalize(-inEyePos);
 	vec3 reflected = normalize(reflect(-inLightVec, inNormal)); 
 	vec4 diffuse = inDiffuseLight * max(dot(inNormal, inLightVec), 0.0);
 	vec4 specular = inSpecularLight * pow(max(dot(reflected, eyeVec), 0.0), 0.8) * inSpecularConst; 

shader.comp

@@ -40,10 +40,6 @@ layout(location = 6) out vec4 outSpecularLight;
 layout(location = 7) out float outSpecularConst;
 
 void main() {
-	//gl_Position = vec4(inPosition, 1.0);
-    //gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
-    
-	//gl_Position = ubo.mvp * vec4(inPosition.x, inHeight, inPosition.z, 1.0);
     outColor = inColor;
 	outAmbientLight = vec4(0.3, 0.3, 0.3, 1.0);
 	outDiffuseLight = vec4(0.7, 0.7, 0.7, 1.0);