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

Update logvisor

This commit is contained in:
Jack Andersen 2019-09-30 21:22:37 -10:00
parent 9b8ef4695f
commit b918c0c4f8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/graphicsdev/GL.cpp
View File

@ -1845,7 +1845,7 @@ struct GLCommandQueue final : IGraphicsCommandQueue {
} }
#ifdef BOO_GRAPHICS_DEBUG_GROUPS #ifdef BOO_GRAPHICS_DEBUG_GROUPS
void pushDebugGroup(const char* name, const std::array<float, 4>& color) { void pushDebugGroup(const char* name, const std::array<float, 4>& color) override {
if (GLEW_KHR_debug) { if (GLEW_KHR_debug) {
std::vector<Command>& cmds = m_cmdBufs[m_fillBuf]; std::vector<Command>& cmds = m_cmdBufs[m_fillBuf];
auto& cmd = cmds.emplace_back(Command::Op::PushDebugGroup); auto& cmd = cmds.emplace_back(Command::Op::PushDebugGroup);
@ -1853,7 +1853,7 @@ struct GLCommandQueue final : IGraphicsCommandQueue {
} }
} }
void popDebugGroup() { void popDebugGroup() override {
if (GLEW_KHR_debug) { if (GLEW_KHR_debug) {
std::vector<Command>& cmds = m_cmdBufs[m_fillBuf]; std::vector<Command>& cmds = m_cmdBufs[m_fillBuf];
cmds.emplace_back(Command::Op::PopDebugGroup); cmds.emplace_back(Command::Op::PopDebugGroup);

2
lib/graphicsdev/nx/CMakeLists.txt
View File

@ -1,4 +1,4 @@
option(ENABLE_NX "Build mesa for offline NX shader compilation and runtime" ON) option(ENABLE_NX "Build mesa for offline NX shader compilation and runtime" OFF)
find_program(MESON_PROG meson) find_program(MESON_PROG meson)
find_program(NINJA_PROG ninja) find_program(NINJA_PROG ninja)
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/mesa/meson.build AND if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/mesa/meson.build AND

6
lib/x11/ApplicationXlib.hpp
View File

@ -220,14 +220,14 @@ public:
/* Check for Vulkan presence and preference */ /* Check for Vulkan presence and preference */
bool tryVulkan = true; bool tryVulkan = true;
if (!gfxApi.compare("OpenGL")) if (gfxApi == "OpenGL")
tryVulkan = false; tryVulkan = false;
for (const std::string& arg : args) { for (const std::string& arg : args) {
if (!arg.compare("--gl")) { if (arg == "--gl") {
tryVulkan = false; tryVulkan = false;
break; break;
} }
if (!arg.compare("--vulkan")) { if (arg == "--vulkan") {
tryVulkan = true; tryVulkan = true;
break; break;
} }

2
logvisor

@ -1 +1 @@
Subproject commit f623ace3b4620c56722a1460ff2d9db61621f659 Subproject commit f04a9777eb034ff28200ec109511455627736a81