3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further ChromeOS support: Detect removable media mounted through ChromeOS

Browse Source
This commit is contained in:
Vojtech Bubnik 2021-03-11 12:22:06 +01:00
parent 9c80c6a4af
commit 2b19708720
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/OpenGLManager.cpp
View File

@ -256,11 +256,13 @@ bool OpenGLManager::init_gl()
} }
if (valid_version) { if (valid_version) {
#ifdef __linux__
if (s_gl_info.get_renderer() == "virgl") if (s_gl_info.get_renderer() == "virgl")
// Disable multi-sampling with virgl (VirtualGL) on Linux. // Disable multi-sampling with virgl (VirtualGL) on Linux.
// Namely, on ChromeOS virgl flips red/blue channels at least on some computers with multi-sampling enabled. // Namely, on ChromeOS virgl flips red/blue channels at least on some computers with multi-sampling enabled.
// It seems it is sufficient to disable multi-sampling after the OpenGL context is created. // It seems it is sufficient to disable multi-sampling after the OpenGL context is created.
s_multisample = EMultisampleState::Disabled; s_multisample = EMultisampleState::Disabled;
#endif // __linux__
// load shaders // load shaders
auto [result, error] = m_shaders_manager.init(); auto [result, error] = m_shaders_manager.init();
if (!result) { if (!result) {

3
src/slic3r/GUI/RemovableDriveManager.cpp
View File

@ -247,6 +247,9 @@ std::vector<DriveData> RemovableDriveManager::search_for_removable_drives() cons
path = "/run" + path; path = "/run" + path;
pp = "/run"+pp; pp = "/run"+pp;
search_for_drives_internal::search_path(path, pp, current_drives); search_for_drives_internal::search_path(path, pp, current_drives);
// ChromeOS specific: search /mnt/chromeos/removable/* folder
search_for_drives_internal::search_path("/mnt/chromeos/removable/*", "/mnt/chromeos/removable", current_drives);
#endif #endif
return current_drives; return current_drives;