xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge branch 'main' into SP3-13-Assets-Manager

This commit is contained in:
Xiao Qi 2022-09-21 22:54:53 +08:00
parent ae3fb448d4 d2e2e85726
commit 4446d0a60d
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -31,6 +31,7 @@ x86/
bld/ bld/
[Bb]in/ [Bb]in/
[Bb]in-int/ [Bb]in-int/
[Bb]in_int/
[Oo]bj/ [Oo]bj/
[Ll]og/ [Ll]og/
[Ll]ogs/ [Ll]ogs/

5
SHADE_Engine/src/Graphics/Devices/SHVkPhysicalDeviceLibrary.cpp
View File

@ -1,4 +1,4 @@
#include "SHPch.h" #include "SHpch.h"
#include <iostream> #include <iostream>
#include <unordered_map> #include <unordered_map>
#include "SHVkPhysicalDeviceLibrary.h" #include "SHVkPhysicalDeviceLibrary.h"
@ -180,10 +180,13 @@ namespace SHADE
return; return;
} }
#ifdef DEBUG
SHLOG_TRACE("Successfully queried Physical Devices:"); SHLOG_TRACE("Successfully queried Physical Devices:");
for (auto const& device : physicalDevices) for (auto const& device : physicalDevices)
{ {
SHLOG_TRACE(std::string_view (std::string("\t-") + GetDeviceTypeName(device.getProperties().deviceType) + device.getProperties().deviceName.operator std::string())); SHLOG_TRACE(std::string_view (std::string("\t-") + GetDeviceTypeName(device.getProperties().deviceType) + device.getProperties().deviceName.operator std::string()));
} }
#endif
} }
} }

7
premake5.lua
View File

@ -7,16 +7,15 @@ workspace "SHADE"
configurations configurations
{ {
"Debug", "Debug",
"Release", "Release"
} }
flags flags
{ {
"MultiProcessorCompile" "MultiProcessorCompile"
} }
outputdir = "%{wks.location}/bin/%{cfg.buildcfg}" outputdir = "bin/%{cfg.architecture}"
interdir = "%{wks.location}/bin_int"
include "SHADE_Engine" include "SHADE_Engine"
include "SHADE_Application" include "SHADE_Application"