From 304afe54fea20152ac94fb7272d818ab3d011630 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Mon, 3 May 2021 14:30:26 +0200
Subject: [PATCH] [#15] First trial to fix VS compiler warnings
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
src/vkcv/Context.cpp | 2 ++
src/vkcv/Context.hpp | 5 +----
src/vkcv/Window.hpp | 3 ---
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/vkcv/Context.cpp b/src/vkcv/Context.cpp
index ddb7d762..4e6bc21a 100644
--- a/src/vkcv/Context.cpp
+++ b/src/vkcv/Context.cpp
@@ -1,6 +1,8 @@
#include "Context.hpp"
#include "CoreManager.hpp"
+#include <iostream>
+
namespace vkcv {
Context::Context(vk::Instance instance, vk::PhysicalDevice physicalDevice, vk::Device device)
diff --git a/src/vkcv/Context.hpp b/src/vkcv/Context.hpp
index 779c5b85..2c9ee315 100644
--- a/src/vkcv/Context.hpp
+++ b/src/vkcv/Context.hpp
@@ -1,8 +1,5 @@
#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);
diff --git a/src/vkcv/Window.hpp b/src/vkcv/Window.hpp
index 2c79287b..9dd4c1b1 100644
--- a/src/vkcv/Window.hpp
+++ b/src/vkcv/Window.hpp
@@ -1,9 +1,6 @@
#pragma once
-#include <vulkan/vulkan.hpp>
-
#define GLFW_INCLUDE_VULKAN
-
#include <GLFW/glfw3.h>
namespace vkcv {
--
GitLab