diff --git a/lib/graphicsdev/GL.cpp b/lib/graphicsdev/GL.cpp index 0b36ed8..9670012 100644 --- a/lib/graphicsdev/GL.cpp +++ b/lib/graphicsdev/GL.cpp @@ -1845,7 +1845,7 @@ struct GLCommandQueue final : IGraphicsCommandQueue { } #ifdef BOO_GRAPHICS_DEBUG_GROUPS - void pushDebugGroup(const char* name, const std::array& color) { + void pushDebugGroup(const char* name, const std::array& color) override { if (GLEW_KHR_debug) { std::vector& cmds = m_cmdBufs[m_fillBuf]; 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) { std::vector& cmds = m_cmdBufs[m_fillBuf]; cmds.emplace_back(Command::Op::PopDebugGroup); diff --git a/lib/graphicsdev/nx/CMakeLists.txt b/lib/graphicsdev/nx/CMakeLists.txt index 4068048..4fb5c27 100644 --- a/lib/graphicsdev/nx/CMakeLists.txt +++ b/lib/graphicsdev/nx/CMakeLists.txt @@ -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(NINJA_PROG ninja) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/mesa/meson.build AND diff --git a/lib/x11/ApplicationXlib.hpp b/lib/x11/ApplicationXlib.hpp index 0d97d18..b06d8b3 100644 --- a/lib/x11/ApplicationXlib.hpp +++ b/lib/x11/ApplicationXlib.hpp @@ -220,14 +220,14 @@ public: /* Check for Vulkan presence and preference */ bool tryVulkan = true; - if (!gfxApi.compare("OpenGL")) + if (gfxApi == "OpenGL") tryVulkan = false; for (const std::string& arg : args) { - if (!arg.compare("--gl")) { + if (arg == "--gl") { tryVulkan = false; break; } - if (!arg.compare("--vulkan")) { + if (arg == "--vulkan") { tryVulkan = true; break; } diff --git a/logvisor b/logvisor index f623ace..f04a977 160000 --- a/logvisor +++ b/logvisor @@ -1 +1 @@ -Subproject commit f623ace3b4620c56722a1460ff2d9db61621f659 +Subproject commit f04a9777eb034ff28200ec109511455627736a81