From 5e094036dd1bf7cbae4a7f7e322de7c3f1f77aef Mon Sep 17 00:00:00 2001
From: Squareys <Squareys@googlemail.com>
Date: Sun, 1 May 2016 19:51:00 +0200
Subject: [PATCH] WIP/TEMP

---
 src/Magnum/Platform/GlfwApplication.cpp | 5 +++++
 src/Magnum/Vk/Context.cpp               | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Magnum/Platform/GlfwApplication.cpp b/src/Magnum/Platform/GlfwApplication.cpp
index 4be5c8c54..41e98f637 100644
--- a/src/Magnum/Platform/GlfwApplication.cpp
+++ b/src/Magnum/Platform/GlfwApplication.cpp
@@ -128,6 +128,7 @@ bool GlfwApplication::tryCreateContext(const Configuration& configuration) {
     } else {
         glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
     }
+    glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
 
     /* Set context flags */
     _window = glfwCreateWindow(configuration.size().x(), configuration.size().y(), configuration.title().c_str(), monitor, nullptr);
@@ -147,11 +148,15 @@ bool GlfwApplication::tryCreateContext(const Configuration& configuration) {
     glfwMakeContextCurrent(_window);
 
     /* Return true if the initialization succeeds */
+<<<<<<< HEAD
     if(configuration.version() != Version::None) {
         return _context->tryCreate();
     } else {
         return true;
     }
+=======
+    return true; //_context->tryCreate();
+>>>>>>> WIP/TEMP
 }
 
 GlfwApplication::~GlfwApplication() {
diff --git a/src/Magnum/Vk/Context.cpp b/src/Magnum/Vk/Context.cpp
index 7e2953b3b..af6c569ca 100644
--- a/src/Magnum/Vk/Context.cpp
+++ b/src/Magnum/Vk/Context.cpp
@@ -32,12 +32,14 @@
 
 namespace Magnum { namespace Vk {
 
+unsigned int layerCount = 2;
 const char *validationLayerNames[] =
 {
     // This is a meta layer that enables all of the standard
     // validation layers in the correct order :
     // threading, parameter_validation, device_limits, object_tracker, image, core_validation, swapchain, and unique_objects
-    "VK_LAYER_LUNARG_standard_validation"
+    "VK_LAYER_LUNARG_standard_validation",
+    "VK_LAYER_LUNARG_api_dump"
 };
 
 Context* Context::_current = nullptr;