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

DebugTools: somehow still referring to unprefixed CMake options here.

master
Vladimír Vondruš 4 days ago
parent
7dc0f9c3f4
commit
7a0da1d914
5 changed files with 34 additions and 34 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. 8
      src/Magnum/DebugTools/BufferData.h
  2. 8
      src/Magnum/DebugTools/ForceRenderer.h
  3. 8
      src/Magnum/DebugTools/ObjectRenderer.h
  4. 4
      src/Magnum/DebugTools/ResourceManager.h
  5. 40
      src/Magnum/DebugTools/TextureImage.h

8
src/Magnum/DebugTools/BufferData.h
Unescape View File

@ -78,8 +78,8 @@ to a newly-allocated array. On desktop GL and WebGL 2.0 it's just an alias to
@ref GL::Buffer::subData(). @ref GL::Buffer::subData().
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
@requires_gles30 Extension @gl_extension{EXT,map_buffer_range} in OpenGL ES @requires_gles30 Extension @gl_extension{EXT,map_buffer_range} in OpenGL ES
2.0. 2.0.
@ -123,8 +123,8 @@ newly-allocated array. On desktop GL and WebGL 2.0 it's just an alias to
@ref GL::Buffer::data(). @ref GL::Buffer::data().
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
@requires_gles30 Extension @gl_extension{EXT,map_buffer_range} in OpenGL ES @requires_gles30 Extension @gl_extension{EXT,map_buffer_range} in OpenGL ES
2.0. 2.0.

8
src/Magnum/DebugTools/ForceRenderer.h
Unescape View File

@ -60,8 +60,8 @@ namespace Magnum { namespace DebugTools {
See @ref ForceRenderer documentation for more information. See @ref ForceRenderer documentation for more information.
@note This class is available only if Magnum is compiled with @note This class is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" and `MAGNUM_WITH_SCENEGRAPH` enabled @ref MAGNUM_TARGET_GL and `MAGNUM_WITH_SCENEGRAPH` enabled (done by
(done by default). See @ref building-features for more information. default). See @ref building-features for more information.
*/ */
class CORRADE_DEPRECATED("use Primitives::arrow2D() or arrow3D() in a custom drawable instead") ForceRendererOptions { class CORRADE_DEPRECATED("use Primitives::arrow2D() or arrow3D() in a custom drawable instead") ForceRendererOptions {
public: public:
@ -122,8 +122,8 @@ to it.
@snippet DebugTools-gl.cpp ForceRenderer @snippet DebugTools-gl.cpp ForceRenderer
@note This class is available only if Magnum is compiled with @note This class is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" and `MAGNUM_WITH_SCENEGRAPH` enabled @ref MAGNUM_TARGET_GL and `MAGNUM_WITH_SCENEGRAPH` enabled (done by
(done by default). See @ref building-features for more information. default). See @ref building-features for more information.
@see @ref ForceRenderer2D, @ref ForceRenderer3D, @ref ForceRendererOptions @see @ref ForceRenderer2D, @ref ForceRenderer3D, @ref ForceRendererOptions
*/ */

8
src/Magnum/DebugTools/ObjectRenderer.h
Unescape View File

@ -59,8 +59,8 @@ namespace Magnum { namespace DebugTools {
See @ref ObjectRenderer documentation for more information. See @ref ObjectRenderer documentation for more information.
@note This class is available only if Magnum is compiled with @note This class is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" and `MAGNUM_WITH_SCENEGRAPH` enabled @ref MAGNUM_TARGET_GL and `MAGNUM_WITH_SCENEGRAPH` enabled (done by
(done by default). See @ref building-features for more information. default). See @ref building-features for more information.
*/ */
class CORRADE_DEPRECATED("use Primitives::axis2D() or axis3D() in a custom drawable instead") ObjectRendererOptions { class CORRADE_DEPRECATED("use Primitives::axis2D() or axis3D() in a custom drawable instead") ObjectRendererOptions {
public: public:
@ -100,8 +100,8 @@ Example code:
@snippet DebugTools-gl.cpp ObjectRenderer @snippet DebugTools-gl.cpp ObjectRenderer
@note This class is available only if Magnum is compiled with @note This class is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" and `MAGNUM_WITH_SCENEGRAPH` enabled @ref MAGNUM_TARGET_GL and `MAGNUM_WITH_SCENEGRAPH` enabled (done by
(done by default). See @ref building-features for more information. default). See @ref building-features for more information.
@see @ref ObjectRenderer2D, @ref ObjectRenderer3D, @ref ObjectRendererOptions @see @ref ObjectRenderer2D, @ref ObjectRenderer3D, @ref ObjectRendererOptions
*/ */

4
src/Magnum/DebugTools/ResourceManager.h
Unescape View File

@ -72,8 +72,8 @@ Stores various data used by debug renderers. See @ref debug-tools for more
information. information.
@note This class is available only if Magnum is compiled with @note This class is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the base types */ CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the base types */
class CORRADE_DEPRECATED("use Primitives::arrow2D() / axis2D or arrow3D() / axis3D() in a custom drawable instead") MAGNUM_DEBUGTOOLS_EXPORT ResourceManager: public Magnum::ResourceManager<GL::AbstractShaderProgram, GL::Buffer, GL::Mesh, GL::MeshView, DebugTools::ForceRendererOptions, DebugTools::ObjectRendererOptions> class CORRADE_DEPRECATED("use Primitives::arrow2D() / axis2D or arrow3D() / axis3D() in a custom drawable instead") MAGNUM_DEBUGTOOLS_EXPORT ResourceManager: public Magnum::ResourceManager<GL::AbstractShaderProgram, GL::Buffer, GL::Mesh, GL::MeshView, DebugTools::ForceRendererOptions, DebugTools::ObjectRendererOptions>

40
src/Magnum/DebugTools/TextureImage.h
Unescape View File

@ -61,8 +61,8 @@ desktop GL, @ref GL::PixelType::Float is guaranteed to be supported. No similar
treatment is done for any other types. treatment is done for any other types.
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT void textureSubImage(GL::Texture2D& texture, Int level, const Range2Di& range, Image2D& image); MAGNUM_DEBUGTOOLS_EXPORT void textureSubImage(GL::Texture2D& texture, Int level, const Range2Di& range, Image2D& image);
@ -74,8 +74,8 @@ Convenience alternative to the above, example usage:
@snippet DebugTools-gl.cpp textureSubImage-2D-rvalue @snippet DebugTools-gl.cpp textureSubImage-2D-rvalue
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT Image2D textureSubImage(GL::Texture2D& texture, Int level, const Range2Di& range, Image2D&& image); MAGNUM_DEBUGTOOLS_EXPORT Image2D textureSubImage(GL::Texture2D& texture, Int level, const Range2Di& range, Image2D&& image);
@ -98,8 +98,8 @@ it.
@requires_webgl20 Array textures are not available in WebGL 1.0. @requires_webgl20 Array textures are not available in WebGL 1.0.
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT void textureSubImage(GL::Texture2DArray& texture, Int level, Int layer, const Range2Di& range, Image2D& image); MAGNUM_DEBUGTOOLS_EXPORT void textureSubImage(GL::Texture2DArray& texture, Int level, Int layer, const Range2Di& range, Image2D& image);
@ -112,8 +112,8 @@ Convenience alternative to the above, example usage:
@snippet DebugTools-gl.cpp textureSubImage-array-rvalue @snippet DebugTools-gl.cpp textureSubImage-array-rvalue
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT Image2D textureSubImage(GL::Texture2DArray& texture, Int level, Int layer, const Range2Di& range, Image2D&& image); MAGNUM_DEBUGTOOLS_EXPORT Image2D textureSubImage(GL::Texture2DArray& texture, Int level, Int layer, const Range2Di& range, Image2D&& image);
#endif #endif
@ -131,8 +131,8 @@ framebuffer-readable and that the @ref GL::PixelFormat and @ref GL::PixelType
combination or the generic @relativeref{Magnum,PixelFormat} is compatible with combination or the generic @relativeref{Magnum,PixelFormat} is compatible with
it. it.
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT void textureSubImage(GL::CubeMapTexture& texture, GL::CubeMapCoordinate coordinate, Int level, const Range2Di& range, Image2D& image); MAGNUM_DEBUGTOOLS_EXPORT void textureSubImage(GL::CubeMapTexture& texture, GL::CubeMapCoordinate coordinate, Int level, const Range2Di& range, Image2D& image);
@ -144,8 +144,8 @@ Convenience alternative to the above, example usage:
@snippet DebugTools-gl.cpp textureSubImage-cubemap-rvalue @snippet DebugTools-gl.cpp textureSubImage-cubemap-rvalue
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT Image2D textureSubImage(GL::CubeMapTexture& texture, GL::CubeMapCoordinate coordinate, Int level, const Range2Di& range, Image2D&& image); MAGNUM_DEBUGTOOLS_EXPORT Image2D textureSubImage(GL::CubeMapTexture& texture, GL::CubeMapCoordinate coordinate, Int level, const Range2Di& range, Image2D&& image);
@ -173,8 +173,8 @@ it.
@requires_webgl20 Pixel buffer objects are not available in WebGL 1.0. @requires_webgl20 Pixel buffer objects are not available in WebGL 1.0.
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT CORRADE_DEPRECATED("use textureSubImage(GL::Texture2D&, Int, const Range2Di&, Image2D&) instead") void textureSubImage(GL::Texture2D& texture, Int level, const Range2Di& range, GL::BufferImage2D& image, GL::BufferUsage usage); MAGNUM_DEBUGTOOLS_EXPORT CORRADE_DEPRECATED("use textureSubImage(GL::Texture2D&, Int, const Range2Di&, Image2D&) instead") void textureSubImage(GL::Texture2D& texture, Int level, const Range2Di& range, GL::BufferImage2D& image, GL::BufferUsage usage);
@ -193,8 +193,8 @@ Convenience alternative to the above, example usage:
@snippet DebugTools-gl.cpp textureSubImage-2D-rvalue-buffer @snippet DebugTools-gl.cpp textureSubImage-2D-rvalue-buffer
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT CORRADE_DEPRECATED("use textureSubImage(GL::Texture2D&, Int, const Range2Di&, Image2D&&) instead") GL::BufferImage2D textureSubImage(GL::Texture2D& texture, Int level, const Range2Di& range, GL::BufferImage2D&& image, GL::BufferUsage usage); MAGNUM_DEBUGTOOLS_EXPORT CORRADE_DEPRECATED("use textureSubImage(GL::Texture2D&, Int, const Range2Di&, Image2D&&) instead") GL::BufferImage2D textureSubImage(GL::Texture2D& texture, Int level, const Range2Di& range, GL::BufferImage2D&& image, GL::BufferUsage usage);
@ -220,8 +220,8 @@ it.
@requires_webgl20 Pixel buffer objects are not available in WebGL 1.0. @requires_webgl20 Pixel buffer objects are not available in WebGL 1.0.
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT CORRADE_DEPRECATED("use textureSubImage(GL::CubeMapTexture2D&, GL::CubeMapCoordinate, Int, const Range2Di&, Image2D&) instead") void textureSubImage(GL::CubeMapTexture& texture, GL::CubeMapCoordinate coordinate, Int level, const Range2Di& range, GL::BufferImage2D& image, GL::BufferUsage usage); MAGNUM_DEBUGTOOLS_EXPORT CORRADE_DEPRECATED("use textureSubImage(GL::CubeMapTexture2D&, GL::CubeMapCoordinate, Int, const Range2Di&, Image2D&) instead") void textureSubImage(GL::CubeMapTexture& texture, GL::CubeMapCoordinate coordinate, Int level, const Range2Di& range, GL::BufferImage2D& image, GL::BufferUsage usage);
@ -240,8 +240,8 @@ Convenience alternative to the above, example usage:
@snippet DebugTools-gl.cpp textureSubImage-cubemap-rvalue-buffer @snippet DebugTools-gl.cpp textureSubImage-cubemap-rvalue-buffer
@note This function is available only if Magnum is compiled with @note This function is available only if Magnum is compiled with
@ref MAGNUM_TARGET_GL "TARGET_GL" enabled (done by default). See @ref MAGNUM_TARGET_GL enabled (done by default). See @ref building-features
@ref building-features for more information. for more information.
*/ */
MAGNUM_DEBUGTOOLS_EXPORT CORRADE_DEPRECATED("use textureSubImage(GL::CubeMapTexture2D&, GL::CubeMapCoordinate, Int, const Range2Di&, Image2D&&) instead") GL::BufferImage2D textureSubImage(GL::CubeMapTexture& texture, GL::CubeMapCoordinate coordinate, Int level, const Range2Di& range, GL::BufferImage2D&& image, GL::BufferUsage usage); MAGNUM_DEBUGTOOLS_EXPORT CORRADE_DEPRECATED("use textureSubImage(GL::CubeMapTexture2D&, GL::CubeMapCoordinate, Int, const Range2Di&, Image2D&&) instead") GL::BufferImage2D textureSubImage(GL::CubeMapTexture& texture, GL::CubeMapCoordinate coordinate, Int level, const Range2Di& range, GL::BufferImage2D&& image, GL::BufferUsage usage);
#endif #endif

Write Preview
Loading…
Cancel
Save