ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Adapt to Corrade changes.

pull/605/head
Vladimír Vondruš 4 years ago
parent
8616927a75
commit
2fbdd85671
16 changed files with 17 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      doc/snippets/MagnumVk.cpp
  2. 1
      doc/snippets/plugins.cpp
  3. 1
      src/Magnum/GL/Test/ContextGLTest.cpp
  4. 1
      src/Magnum/GL/Test/ContextTest.cpp
  5. 1
      src/Magnum/Platform/gl-info.cpp
  6. 1
      src/Magnum/ShaderTools/shaderconverter.cpp
  7. 1
      src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
  8. 1
      src/Magnum/Shaders/Test/FlatGLTest.cpp
  9. 3
      src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
  10. 1
      src/Magnum/Shaders/Test/PhongGLTest.cpp
  11. 1
      src/Magnum/Shaders/Test/VectorGLTest.cpp
  12. 1
      src/Magnum/Shaders/Test/VertexColorGLTest.cpp
  13. 1
      src/Magnum/Trade/Implementation/converterUtilities.h
  14. 1
      src/Magnum/Vk/vk-info.cpp
  15. 1
      src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp
  16. 1
      src/MagnumPlugins/Implementation/propagateConfiguration.h

1
doc/snippets/MagnumVk.cpp
Unescape View File

@ -26,6 +26,7 @@
#include <string> #include <string>
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Containers/Optional.h> #include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Utility/Algorithms.h> #include <Corrade/Utility/Algorithms.h>
#include <Corrade/Utility/Path.h> #include <Corrade/Utility/Path.h>

1
doc/snippets/plugins.cpp
Unescape View File

@ -1,3 +1,4 @@
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/Utility/ConfigurationGroup.h> #include <Corrade/Utility/ConfigurationGroup.h>

1
src/Magnum/GL/Test/ContextGLTest.cpp
Unescape View File

@ -26,6 +26,7 @@
#include <algorithm> /* std::find() */ #include <algorithm> /* std::find() */
#include <sstream> #include <sstream>
#include <Corrade/Containers/ScopeGuard.h> #include <Corrade/Containers/ScopeGuard.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Containers/StringStl.h> #include <Corrade/Containers/StringStl.h>
#include <Corrade/Containers/StringView.h> #include <Corrade/Containers/StringView.h>
#include <Corrade/TestSuite/Compare/Numeric.h> #include <Corrade/TestSuite/Compare/Numeric.h>

1
src/Magnum/GL/Test/ContextTest.cpp
Unescape View File

@ -25,6 +25,7 @@
#include <set> #include <set>
#include <sstream> #include <sstream>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Containers/StringView.h> #include <Corrade/Containers/StringView.h>
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Container.h> #include <Corrade/TestSuite/Compare/Container.h>

1
src/Magnum/Platform/gl-info.cpp
Unescape View File

@ -24,6 +24,7 @@
*/ */
#include <Corrade/Cpu.h> #include <Corrade/Cpu.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Utility/Arguments.h> #include <Corrade/Utility/Arguments.h>
#include <Corrade/Utility/Debug.h> #include <Corrade/Utility/Debug.h>

1
src/Magnum/ShaderTools/shaderconverter.cpp
Unescape View File

@ -25,6 +25,7 @@
#include <Corrade/Containers/GrowableArray.h> #include <Corrade/Containers/GrowableArray.h>
#include <Corrade/Containers/Optional.h> #include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Containers/Pair.h> #include <Corrade/Containers/Pair.h>
#include <Corrade/Utility/Arguments.h> #include <Corrade/Utility/Arguments.h>
#include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/DebugStl.h>

1
src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
Unescape View File

@ -28,6 +28,7 @@
#include <Corrade/Containers/Optional.h> #include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/StridedArrayView.h> #include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */ #include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/DebugStl.h>

1
src/Magnum/Shaders/Test/FlatGLTest.cpp
Unescape View File

@ -28,6 +28,7 @@
#include <Corrade/Containers/Optional.h> #include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/StridedArrayView.h> #include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */ #include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/DebugStl.h>

3
src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
Unescape View File

@ -27,8 +27,9 @@
#include <numeric> #include <numeric>
#include <sstream> #include <sstream>
#include <Corrade/Containers/ArrayViewStl.h> #include <Corrade/Containers/ArrayViewStl.h>
#include <Corrade/Containers/String.h>
#include <Corrade/Containers/StridedArrayView.h> #include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/FormatStl.h> #include <Corrade/Utility/FormatStl.h>

1
src/Magnum/Shaders/Test/PhongGLTest.cpp
Unescape View File

@ -28,6 +28,7 @@
#include <Corrade/Containers/Optional.h> #include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/StridedArrayView.h> #include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */ #include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/TestSuite/Compare/Numeric.h> #include <Corrade/TestSuite/Compare/Numeric.h>

1
src/Magnum/Shaders/Test/VectorGLTest.cpp
Unescape View File

@ -28,6 +28,7 @@
#include <Corrade/Containers/Optional.h> #include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/StridedArrayView.h> #include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */ #include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractImporter is <string>-free */
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/DebugStl.h>

1
src/Magnum/Shaders/Test/VertexColorGLTest.cpp
Unescape View File

@ -27,6 +27,7 @@
#include <sstream> #include <sstream>
#include <Corrade/Containers/StridedArrayView.h> #include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/Format.h> #include <Corrade/Utility/Format.h>

1
src/Magnum/Trade/Implementation/converterUtilities.h
Unescape View File

@ -32,6 +32,7 @@
#include <Corrade/Containers/Pair.h> #include <Corrade/Containers/Pair.h>
#include <Corrade/Containers/Reference.h> #include <Corrade/Containers/Reference.h>
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/PluginManager/PluginMetadata.h> #include <Corrade/PluginManager/PluginMetadata.h>
#include <Corrade/Utility/Format.h> #include <Corrade/Utility/Format.h>
#include <Corrade/Utility/FormatStl.h> /** @todo drop once String::replaceAll() has a StringView overload */ #include <Corrade/Utility/FormatStl.h> /** @todo drop once String::replaceAll() has a StringView overload */

1
src/Magnum/Vk/vk-info.cpp
Unescape View File

@ -24,6 +24,7 @@
*/ */
#include <Corrade/Cpu.h> #include <Corrade/Cpu.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Utility/Arguments.h> #include <Corrade/Utility/Arguments.h>
#include "Magnum/Vk/DeviceFeatures.h" #include "Magnum/Vk/DeviceFeatures.h"

1
src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp
Unescape View File

@ -26,6 +26,7 @@
#include <sstream> #include <sstream>
#include <Corrade/Containers/ArrayView.h> #include <Corrade/Containers/ArrayView.h>
#include <Corrade/Containers/Optional.h> #include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/PluginManager/Manager.h> #include <Corrade/PluginManager/Manager.h>
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/String.h> #include <Corrade/TestSuite/Compare/String.h>

1
src/MagnumPlugins/Implementation/propagateConfiguration.h
Unescape View File

@ -27,6 +27,7 @@
#include <Corrade/Containers/Pair.h> #include <Corrade/Containers/Pair.h>
#include <Corrade/Containers/Reference.h> #include <Corrade/Containers/Reference.h>
#include <Corrade/Containers/StringIterable.h>
#include <Corrade/Utility/ConfigurationGroup.h> #include <Corrade/Utility/ConfigurationGroup.h>
#include "Magnum/Magnum.h" #include "Magnum/Magnum.h"

Write Preview
Loading…
Cancel
Save