diff --git a/doc/changelog.dox b/doc/changelog.dox index 6b246bc48..3a57a5f7a 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -219,6 +219,8 @@ See also: @ref Platform::WindowlessWglApplication and @ref Platform::WindowlessWindowsEglApplication (see [mosra/magnum#433](https://github.com/mosra/magnum/pull/433) and [mosra/magnum#437](https://github.com/mosra/magnum/pull/437)) +- CUDA device selection in @ref Platform::WindowlessEglApplication (see + [mosra/magnum#449](https://github.com/mosra/magnum/pull/449)) - Added @ref Platform::GlfwApplication::Configuration::WindowFlag::Borderless - Added @ref Platform::Sdl2Application::Configuration::WindowFlag::FullscreenDesktop, @ref Platform::Sdl2Application::Configuration::WindowFlag::AlwaysOnTop "AlwaysOnTop", diff --git a/doc/credits.dox b/doc/credits.dox index d29fe0465..dd7f68abe 100644 --- a/doc/credits.dox +++ b/doc/credits.dox @@ -121,7 +121,8 @@ Are the below lists missing your name or something's wrong? - **Émile Grégoire** ([\@emgre](https://github.com/emgre)) --- documentation updates, algorithm bugfixes - **Erik Wijmans** ([\@erikwijmans](https://github.com/erikwijmans)) --- - NVidia-specific workarounds for headless EGL contexts + NVidia-specific workarounds for headless EGL contexts, CUDA device + selection in @ref Platform::WindowlessEglApplication - **Florian Goujeon** ([\@fgoujeon](https://github.com/fgoujeon)) --- iOS fixes in the @ref Shaders library - **Gerhard de Clercq** --- Windows RT (Store/Phone) port diff --git a/src/Magnum/Platform/WindowlessEglApplication.cpp b/src/Magnum/Platform/WindowlessEglApplication.cpp index 01a2a0307..bb42c0bfe 100644 --- a/src/Magnum/Platform/WindowlessEglApplication.cpp +++ b/src/Magnum/Platform/WindowlessEglApplication.cpp @@ -1,8 +1,9 @@ /* This file is part of Magnum. - Copyright © 2010, 2011, 2012, 2013, 2014, 2015 - Vladimír Vondruš + Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, + 2020 Vladimír Vondruš + Copyright © 2020 Erik Wijmans Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Platform/WindowlessEglApplication.h b/src/Magnum/Platform/WindowlessEglApplication.h index 6587dddfc..f0b72c793 100644 --- a/src/Magnum/Platform/WindowlessEglApplication.h +++ b/src/Magnum/Platform/WindowlessEglApplication.h @@ -3,8 +3,9 @@ /* This file is part of Magnum. - Copyright © 2010, 2011, 2012, 2013, 2014, 2015 - Vladimír Vondruš + Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, + 2020 Vladimír Vondruš + Copyright © 2020 Erik Wijmans Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),