AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/boo

This commit is contained in:
Jack Andersen 2018-01-13 20:37:41 -10:00
parent 5d310c008f 68de1b5041
commit 41cfb56c36
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/win/ApplicationWin32.cpp
View File

@ -131,7 +131,7 @@ public:
bool yes12 = false;
bool noD3d = false;
#if BOO_HAS_VULKAN
bool useVulkan = true;
bool useVulkan = false;
#endif
if (!gfxApi.empty())
{
@ -144,6 +144,7 @@ public:
if (!gfxApi.compare("Vulkan"))
{
noD3d = true;
useVulkan = true;
}
if (!gfxApi.compare("OpenGL"))
{
@ -164,6 +165,13 @@ public:
{
useVulkan = false;
yes12 = true;
noD3d = false;
}
if (!arg.compare(L"--d3d11"))
{
useVulkan = false;
yes12 = false;
noD3d = false;
}
if (!arg.compare(L"--vulkan"))
{
@ -176,7 +184,15 @@ public:
}
#else
if (!arg.compare(L"--d3d12"))
{
yes12 = true;
noD3d = false;
}
if (!arg.compare(L"--d3d11"))
{
yes12 = false;
noD3d = false;
}
if (!arg.compare(L"--gl"))
noD3d = true;
#endif

4
lib/x11/ApplicationUnix.cpp
View File

@ -68,10 +68,10 @@ int ApplicationRun(IApplication::EPlatformType platform,
if (APP)
return 1;
if (platform == IApplication::EPlatformType::Wayland)
APP = new ApplicationWayland(cb, uniqueName, friendlyName, pname, args, samples, anisotropy, singleInstance);
APP = new ApplicationWayland(cb, uniqueName, friendlyName, pname, args, gfxApi, samples, anisotropy, singleInstance);
else if (platform == IApplication::EPlatformType::Xlib ||
platform == IApplication::EPlatformType::Auto)
APP = new ApplicationXlib(cb, uniqueName, friendlyName, pname, args, samples, anisotropy, singleInstance);
APP = new ApplicationXlib(cb, uniqueName, friendlyName, pname, args, gfxApi, samples, anisotropy, singleInstance);
else
return 1;
return APP->run();

1
lib/x11/ApplicationWayland.hpp
View File

@ -32,6 +32,7 @@ public:
std::string_view friendlyName,
std::string_view pname,
const std::vector<std::string>& args,
std::string_view gfxApi,
uint32_t samples,
uint32_t anisotropy,
bool singleInstance)

3
lib/x11/ApplicationXlib.hpp
View File

@ -225,6 +225,7 @@ public:
std::string_view friendlyName,
std::string_view pname,
const std::vector<std::string>& args,
std::string_view gfxApi,
uint32_t samples,
uint32_t anisotropy,
bool singleInstance)
@ -240,6 +241,8 @@ public:
#if BOO_HAS_VULKAN
/* Check for Vulkan presence and preference */
bool tryVulkan = true;
if (!gfxApi.compare("OpenGL"))
tryVulkan = false;
for (const std::string& arg : args)
{
if (!arg.compare("--gl"))