Merge branch '15-visualstudio-warning-mess' into 'develop'

Small little additions to the collection

Closes #15

See merge request !10

CMakeLists.txt

@@ -4,6 +4,11 @@ project(vkcv)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+if (CMAKE_BUILD_TYPE)
+	string(TOLOWER "${CMAKE_BUILD_TYPE}" _vkcv_build_type)
+	set(vkcv_build_${_vkcv_build_type} 1)
+endif()
+
 message("-- Language: [ C++ " ${CMAKE_CXX_STANDARD} " ]")
 
 set(vkcv_config ${PROJECT_SOURCE_DIR}/config)
@@ -15,6 +20,10 @@ set(vkcv_source ${PROJECT_SOURCE_DIR}/src)
 
 set(vkcv_flags ${CMAKE_CXX_FLAGS})
 
+if (vkcv_build_debug)
+	set(vkcv_flags ${vkcv_flags} " -Wextra -Wall -pedantic")
+endif()
+
 include(${vkcv_config}/Sources.cmake)
 include(${vkcv_config}/Libraries.cmake)
 

src/vkcv/Context.cpp

@@ -145,7 +145,7 @@ namespace vkcv {
 		vk::PhysicalDevice phyDevice;
 		std::vector<vk::PhysicalDevice> devices = instance.enumeratePhysicalDevices();
 
-		if (devices.size() == 0) {
+		if (devices.empty()) {
 			throw std::runtime_error("failed to find GPUs with Vulkan support!");
 		}
 
@@ -172,7 +172,7 @@ namespace vkcv {
 	/// <param name="physicalDevice"> The physical device. </param>
 	/// <returns></returns>
 	int Context::deviceScore(const vk::PhysicalDevice& physicalDevice) {
-		int score = 0;
+		uint32_t score = 0;
 		vk::PhysicalDeviceProperties properties = physicalDevice.getProperties();
 		std::vector<vk::QueueFamilyProperties> qFamilyProperties = physicalDevice.getQueueFamilyProperties();
 
@@ -227,7 +227,7 @@ namespace vkcv {
 		}
 
 		uint32_t create = queueCount;
-		for (int i = 0; i < qFamilyCandidates.size() && create > 0; i++) {
+		for (uint32_t i = 0; i < qFamilyCandidates.size() && create > 0; i++) {
 			const int maxCreatableQueues = std::min(create, qFamilyCandidates[i].queueCount);		
 			vk::DeviceQueueCreateInfo qCreateInfo(
 				vk::DeviceQueueCreateFlags(),

src/vkcv/Context.hpp

 #pragma once
 #include <vulkan/vulkan.hpp>
-#include <GLFW/glfw3.h>
-#include <iostream>
-
 
 namespace vkcv {
 
@@ -33,7 +30,7 @@ namespace vkcv {
 		Context& operator=(const Context &other) = delete;
 		Context& operator=(Context &&other) = default;
 
-		static Context create(const char* applicationName, uint32_t applicationVersion, uint32_t queueCount = 1, const std::vector<vk::QueueFlagBits> queueFlags = {}, std::vector<const char*> instanceExtensions = {}, std::vector<const char*> deviceExtensions = {});
+		static Context create(const char* applicationName, uint32_t applicationVersion, uint32_t queueCount = 1, std::vector<vk::QueueFlagBits> queueFlags = {}, std::vector<const char*> instanceExtensions = {}, std::vector<const char*> deviceExtensions = {});
 		static bool checkSupport(std::vector<const char*> &supported, std::vector<const char*> &check);
 		static std::vector<const char*> getRequiredExtensions();
 		static vk::PhysicalDevice pickPhysicalDevice(vk::Instance& instance);

src/vkcv/CoreManager.cpp

-#define GLFW_INCLUDE_VULKAN
 
 #include "CoreManager.hpp"
 
@@ -24,4 +23,4 @@ namespace vkcv {
         }
         glfwCounter--;
     }
-}
\ No newline at end of file
+}

src/vkcv/CoreManager.hpp

-#ifndef VKCV_COREMANAGER_HPP
-#define VKCV_COREMANAGER_HPP
+#pragma once
 
 #include <GLFW/glfw3.h>
 #include <stdexcept>
@@ -15,5 +14,3 @@ namespace vkcv {
      */
     void terminateGLFW();
 }
-
-#endif //VKCV_COREMANAGER_HPP

src/vkcv/Window.hpp

 #pragma once
 
-#include <vulkan/vulkan.hpp>
-
 #define GLFW_INCLUDE_VULKAN
-
 #include <GLFW/glfw3.h>
 
 namespace vkcv {