Browse Source

Adapt to Corrade changes.

pull/527/head
Vladimír Vondruš 5 years ago
parent
commit
48838c442f
  1. 2
      doc/generated/easings.cpp
  2. 6
      src/Magnum/GL/Context.cpp
  3. 6
      src/Magnum/Vk/Device.cpp
  4. 8
      src/Magnum/Vk/Instance.cpp

2
doc/generated/easings.cpp

@ -204,7 +204,7 @@ const Color3 success = 0x3bd267_srgbf;
int main() { int main() {
using namespace Animation::Easing; using namespace Animation::Easing;
#define _c(name) Utility::String::lowercase(#name), name #define _c(name) Utility::String::lowercase(std::string{#name}), name
generate(_c(linear), {}, generate(_c(linear), {},
/* [linear] */ /* [linear] */
CubicBezier2D{Vector2{0.0f}, Vector2{1.0f/3.0f}, CubicBezier2D{Vector2{0.0f}, Vector2{1.0f/3.0f},

6
src/Magnum/GL/Context.cpp

@ -719,7 +719,7 @@ Context::Context(NoCreateT, Utility::Arguments& args, Int argc, const char** arg
bother with String allocations. */ bother with String allocations. */
const Containers::StringView disabledWorkarounds = args.value<Containers::StringView>("disable-workarounds"); const Containers::StringView disabledWorkarounds = args.value<Containers::StringView>("disable-workarounds");
if(!disabledWorkarounds.isEmpty()) { if(!disabledWorkarounds.isEmpty()) {
const Containers::Array<Containers::StringView> split = disabledWorkarounds.splitWithoutEmptyParts(); const Containers::Array<Containers::StringView> split = disabledWorkarounds.splitOnWhitespaceWithoutEmptyParts();
arrayReserve(_driverWorkarounds, split.size()); arrayReserve(_driverWorkarounds, split.size());
for(const Containers::StringView workaround: split) for(const Containers::StringView workaround: split)
disableDriverWorkaround(workaround); disableDriverWorkaround(workaround);
@ -730,7 +730,7 @@ Context::Context(NoCreateT, Utility::Arguments& args, Int argc, const char** arg
and another binary search in tryCreate(). */ and another binary search in tryCreate(). */
const Containers::StringView disabledExtensions = args.value<Containers::StringView>("disable-extensions"); const Containers::StringView disabledExtensions = args.value<Containers::StringView>("disable-extensions");
if(!disabledExtensions.isEmpty()) { if(!disabledExtensions.isEmpty()) {
const Containers::Array<Containers::StringView> split = disabledExtensions.splitWithoutEmptyParts(); const Containers::Array<Containers::StringView> split = disabledExtensions.splitOnWhitespaceWithoutEmptyParts();
arrayReserve(_disabledExtensions, split.size()); arrayReserve(_disabledExtensions, split.size());
for(const Containers::StringView extension: split) { for(const Containers::StringView extension: split) {
if(const Extension* found = findExtension(extension)) { if(const Extension* found = findExtension(extension)) {
@ -1074,7 +1074,7 @@ Containers::Array<Containers::StringView> Context::extensionStrings() const {
#ifndef MAGNUM_TARGET_GLES3 #ifndef MAGNUM_TARGET_GLES3
/* OpenGL 2.1 / OpenGL ES 2.0 doesn't have glGetStringi() */ /* OpenGL 2.1 / OpenGL ES 2.0 doesn't have glGetStringi() */
return Containers::StringView{reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)), Containers::StringViewFlag::Global}.splitWithoutEmptyParts(); return Containers::StringView{reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)), Containers::StringViewFlag::Global}.splitOnWhitespaceWithoutEmptyParts();
#endif #endif
} }

6
src/Magnum/Vk/Device.cpp

@ -141,7 +141,7 @@ DeviceCreateInfo::DeviceCreateInfo(DeviceProperties& deviceProperties, const Ext
we don't need to bother with String allocations. */ we don't need to bother with String allocations. */
Containers::StringView disabledWorkarounds = args.value<Containers::StringView>("disable-workarounds"); Containers::StringView disabledWorkarounds = args.value<Containers::StringView>("disable-workarounds");
if(!disabledWorkarounds.isEmpty()) { if(!disabledWorkarounds.isEmpty()) {
const Containers::Array<Containers::StringView> split = disabledWorkarounds.splitWithoutEmptyParts(); const Containers::Array<Containers::StringView> split = disabledWorkarounds.splitOnWhitespaceWithoutEmptyParts();
arrayReserve(_state->encounteredWorkarounds, split.size()); arrayReserve(_state->encounteredWorkarounds, split.size());
for(const Containers::StringView workaround: split) for(const Containers::StringView workaround: split)
Implementation::disableWorkaround(_state->encounteredWorkarounds, workaround); Implementation::disableWorkaround(_state->encounteredWorkarounds, workaround);
@ -152,7 +152,7 @@ DeviceCreateInfo::DeviceCreateInfo(DeviceProperties& deviceProperties, const Ext
Containers::String disabledExtensions = args.value<Containers::String>("disable-extensions"); Containers::String disabledExtensions = args.value<Containers::String>("disable-extensions");
if(!disabledExtensions.isEmpty()) { if(!disabledExtensions.isEmpty()) {
_state->disabledExtensionsStorage = std::move(disabledExtensions); _state->disabledExtensionsStorage = std::move(disabledExtensions);
_state->disabledExtensions = Containers::StringView{_state->disabledExtensionsStorage}.splitWithoutEmptyParts(); _state->disabledExtensions = Containers::StringView{_state->disabledExtensionsStorage}.splitOnWhitespaceWithoutEmptyParts();
std::sort(_state->disabledExtensions.begin(), _state->disabledExtensions.end()); std::sort(_state->disabledExtensions.begin(), _state->disabledExtensions.end());
} }
@ -164,7 +164,7 @@ DeviceCreateInfo::DeviceCreateInfo(DeviceProperties& deviceProperties, const Ext
allocation-free, the strings will be turned into owning copies because allocation-free, the strings will be turned into owning copies because
none of them is null-terminated or global -- could be a better idea to none of them is null-terminated or global -- could be a better idea to
just grow one giant string internally (once we have growable strings) */ just grow one giant string internally (once we have growable strings) */
addEnabledExtensions(args.value<Containers::StringView>("enable-extensions").splitWithoutEmptyParts()); addEnabledExtensions(args.value<Containers::StringView>("enable-extensions").splitOnWhitespaceWithoutEmptyParts());
/* Enable implicit extensions unless that's forbidden */ /* Enable implicit extensions unless that's forbidden */
/** @todo move this somewhere else as this will grow significantly? */ /** @todo move this somewhere else as this will grow significantly? */

8
src/Magnum/Vk/Instance.cpp

@ -104,14 +104,14 @@ InstanceCreateInfo::InstanceCreateInfo(const Int argc, const char** const argv,
if(!_state) _state.emplace(); if(!_state) _state.emplace();
_state->disabledLayersStorage = std::move(disabledLayers); _state->disabledLayersStorage = std::move(disabledLayers);
_state->disabledLayers = Containers::StringView{_state->disabledLayersStorage}.splitWithoutEmptyParts(); _state->disabledLayers = Containers::StringView{_state->disabledLayersStorage}.splitOnWhitespaceWithoutEmptyParts();
std::sort(_state->disabledLayers.begin(), _state->disabledLayers.end()); std::sort(_state->disabledLayers.begin(), _state->disabledLayers.end());
} }
if(!disabledExtensions.isEmpty()) { if(!disabledExtensions.isEmpty()) {
if(!_state) _state.emplace(); if(!_state) _state.emplace();
_state->disabledExtensionsStorage = std::move(disabledExtensions); _state->disabledExtensionsStorage = std::move(disabledExtensions);
_state->disabledExtensions = Containers::StringView{_state->disabledExtensionsStorage}.splitWithoutEmptyParts(); _state->disabledExtensions = Containers::StringView{_state->disabledExtensionsStorage}.splitOnWhitespaceWithoutEmptyParts();
std::sort(_state->disabledExtensions.begin(), _state->disabledExtensions.end()); std::sort(_state->disabledExtensions.begin(), _state->disabledExtensions.end());
} }
@ -123,8 +123,8 @@ InstanceCreateInfo::InstanceCreateInfo(const Int argc, const char** const argv,
allocation-free, the strings will be turned into owning copies because allocation-free, the strings will be turned into owning copies because
none of them is null-terminated or global -- could be a better idea to none of them is null-terminated or global -- could be a better idea to
just grow one giant string internally (once we have growable strings) */ just grow one giant string internally (once we have growable strings) */
addEnabledLayers(args.value<Containers::StringView>("enable-layers").splitWithoutEmptyParts()); addEnabledLayers(args.value<Containers::StringView>("enable-layers").splitOnWhitespaceWithoutEmptyParts());
addEnabledExtensions(args.value<Containers::StringView>("enable-instance-extensions").splitWithoutEmptyParts()); addEnabledExtensions(args.value<Containers::StringView>("enable-instance-extensions").splitOnWhitespaceWithoutEmptyParts());
/** @todo use this (enabling debug layers etc.) */ /** @todo use this (enabling debug layers etc.) */
static_cast<void>(layerProperties); static_cast<void>(layerProperties);

Loading…
Cancel
Save