Working with Nvidia and Intel graphics driver Will not work with AMD …

…as of now
AzadKshitij · Jul 25, 2021 · 72f51d5 · 72f51d5
1 parent aa01815
commit 72f51d5
Show file tree

Hide file tree

Showing 20 changed files with 312 additions and 240 deletions.
diff --git a/Dependencies.lua b/Dependencies.lua
@@ -20,7 +20,7 @@ LibraryDir = {}
 
 LibraryDir["VulkanSDK"] = "%{VULKAN_SDK}/Lib"
 LibraryDir["VulkanSDK_Debug"] = "%{wks.location}/Triger/vendor/VulkanSDK/Lib"
-
+LibraryDir["VulkanSDK_DebugDLL"] = "%{wks.location}/Triger/vendor/VulkanSDK/Bin"
 Library = {}
 Library["Vulkan"] = "%{LibraryDir.VulkanSDK}/vulkan-1.lib"
 Library["VulkanUtils"] = "%{LibraryDir.VulkanSDK}/VkLayer_utils.lib"

diff --git a/Sandbox/premake5.lua b/Sandbox/premake5.lua
@@ -2,7 +2,7 @@ project "Sandbox"
 	kind "ConsoleApp"
 	language "C++"
 	cppdialect "C++17"
-	staticruntime "on"
+	staticruntime "off"
 
 	targetdir ("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
 	objdir ("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}")

diff --git a/Tridor/imgui.ini b/Tridor/imgui.ini
@@ -58,7 +58,7 @@ Collapsed=0
 DockId=0x0000000A,0
 
 [Docking][Data]
-DockSpace           ID=0x3BC79352 Window=0x4647B76E Pos=137,191 Size=1280,695 Split=X Selected=0x1C33C293
+DockSpace           ID=0x3BC79352 Window=0x4647B76E Pos=41,95 Size=1280,695 Split=X Selected=0x1C33C293
   DockNode          ID=0x00000005 Parent=0x3BC79352 SizeRef=771,994 Split=X
     DockNode        ID=0x00000001 Parent=0x00000005 SizeRef=298,701 Selected=0x1C33C293
     DockNode        ID=0x00000003 Parent=0x00000005 SizeRef=980,701 Split=X Selected=0x995B0CF8

diff --git a/Tridor/premake5.lua b/Tridor/premake5.lua
@@ -39,12 +39,27 @@ project "Tridor"
 		runtime "Debug"
 		symbols "on"
 
+		postbuildcommands
+		{
+			"{COPYDIR} \"%{LibraryDir.VulkanSDK_DebugDLL}\" \"%{cfg.targetdir}\""
+		}
+
 	filter "configurations:Release"
 		defines "TR_RELEASE"
 		runtime "Release"
 		optimize "on"
+
+		postbuildcommands
+		{
+			"{COPYDIR} \"%{LibraryDir.VulkanSDK_DebugDLL}\" \"%{cfg.targetdir}\""
+		}
 
 	filter "configurations:Dist"
 		defines "TR_DIST"
 		runtime "Release"
 		optimize "on"
+
+		postbuildcommands
+		{
+			"{COPYDIR} \"%{LibraryDir.VulkanSDK_DebugDLL}\" \"%{cfg.targetdir}\""
+		}
diff --git a/Tridor/src/EditorLayer.cpp b/Tridor/src/EditorLayer.cpp
@@ -13,13 +13,20 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
-#include "Log/AppLog.h"
-#include "Triger.h"
+#include "Triger/Scene/SceneSerializer.h"
+
+#include "Triger/Utils/PlatformUtils.h"
 
 #include "ImGuizmo.h"
 
 #include "Triger/Math/Math.h"
 
+#include "Log/AppLog.h"
+
+#include "ImGuizmo.h"
+
+#include "Triger/Math/Math.h" 
+
 namespace Triger
 {
 
@@ -566,11 +573,11 @@ namespace Triger
 	}
 	void EditorLayer::SaveSceneAs()
 	{
-		std::optional<std::string> filepath = FileDialogs::SaveFile("Triger Scene (*.triger)\0*.triger\0");
-		if (filepath)
+		std::string filepath = FileDialogs::SaveFile("Triger Scene (*.triger)\0*.triger\0");
+		if (!filepath.empty())
 		{
 			SceneSerializer serializer(m_ActiveScene);
-			serializer.Serialize(*filepath);
+			serializer.Serialize(filepath);
 		}
 	}
 

diff --git a/Tridor/src/EditorLayer.h b/Tridor/src/EditorLayer.h
@@ -11,7 +11,6 @@
 
 #include "Triger.h"
 #include "Panels/SceneHierarchyPanel.h"
-#include "Triger/Renderer/EditorCamera.h"
 
 namespace Triger
 {

diff --git a/Triger/src/Triger/Core/Assert.h b/Triger/src/Triger/Core/Assert.h
@@ -12,7 +12,7 @@
     {                                                  \
         if (!(check))                                  \
         {                                              \
-            HZ##type##ERROR(msg, __VA_ARGS__);         \
+            TR##type##ERROR(msg, __VA_ARGS__);         \
             TR_DEBUGBREAK();                           \
         }                                              \
     }

diff --git a/Triger/src/Triger/Debug/Instrumentor.h b/Triger/src/Triger/Debug/Instrumentor.h
@@ -19,7 +19,7 @@
 #include <sstream>
 #include "Triger/Core/Log.h"
 
-	namespace Triger
+namespace Triger
 {
 
 	using FloatingPointMicroseconds = std::chrono::duration<double, std::micro>;

diff --git a/Triger/src/Triger/Platform/Linux/LinuxWindow.h b/Triger/src/Triger/Platform/Linux/LinuxWindow.h
@@ -8,7 +8,7 @@
 //   Created By  : Azad Kshitij @AzadKshitij
 //--------------------------------------------------------------------------*/
 
-#pragma one
+#pragma once
 
 #include "Triger/Core/Window.h"
 #include "Triger/Renderer/GraphicsContext.h"
@@ -57,4 +57,4 @@ namespace Triger
 
         WindowData m_Data;
     };
-}
+}
diff --git a/Triger/src/Triger/Platform/OpenGL/OpenGLRendererAPI.cpp b/Triger/src/Triger/Platform/OpenGL/OpenGLRendererAPI.cpp
@@ -82,4 +82,4 @@ namespace Triger
 		glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, nullptr);
 		glBindTexture(GL_TEXTURE_2D, 0);
 	}
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,4 +82,4 @@ namespace Triger @@
     		glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, nullptr);
     		glBindTexture(GL_TEXTURE_2D, 0);
     	}
-    }
+    }