From 8009972ccbb68a252050a353aada458e9e05b893 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 6 Mar 2023 18:16:36 +0100 Subject: main: don't override magnum's cmdline options --- main/setup.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'main/setup.cpp') diff --git a/main/setup.cpp b/main/setup.cpp index 9030eaf7..8e0e36b9 100644 --- a/main/setup.cpp +++ b/main/setup.cpp @@ -45,22 +45,16 @@ auto main_impl::make_window_flags(const fm_settings& s) -> Configuration::Window auto main_impl::make_conf(const fm_settings& s) -> Configuration { return Configuration{} - .setTitle(s.title) + .setTitle(s.title ? (StringView)s.title : "floormat editor"_s) .setSize(s.resolution) .setWindowFlags(make_window_flags(s)); } -auto main_impl::make_gl_conf(const fm_settings& s) -> GLConfiguration +auto main_impl::make_gl_conf(const fm_settings&) -> GLConfiguration { GLConfiguration::Flags flags{}; using f = GLConfiguration::Flag; flags |= f::ForwardCompatible; - if (s.gpu_debug >= fm_gpu_debug::on) - flags |= f::Debug | f::GpuValidation; - if (s.gpu_debug >= fm_gpu_debug::robust) - flags |= f::RobustAccess | f::ResetIsolation; - else if (s.gpu_debug <= fm_gpu_debug::no_error) - flags |= f::NoError; return GLConfiguration{}.setFlags(flags); } -- cgit v1.2.3