From 8586d09c4e5f971ad3c8a1f5fdf8d2c2fcd24193 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sun, 28 Nov 2021 01:56:26 +0100 Subject: [PATCH] Docs: add Metal and Vulkan to modules and remove GLSupport the latter is private only --- RenderSystems/GLSupport/include/OgreGLNativeSupport.h | 9 +-------- RenderSystems/Metal/include/OgreMetalRenderSystem.h | 10 ++++++++-- RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h | 10 ++++++++-- RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/RenderSystems/GLSupport/include/OgreGLNativeSupport.h b/RenderSystems/GLSupport/include/OgreGLNativeSupport.h index a9e064c383c..88e87e6ac71 100644 --- a/RenderSystems/GLSupport/include/OgreGLNativeSupport.h +++ b/RenderSystems/GLSupport/include/OgreGLNativeSupport.h @@ -39,12 +39,8 @@ namespace Ogre { class GLPBuffer; - /** \addtogroup RenderSystems RenderSystems - * @{ - */ - /** \defgroup GLSupport GLSupport + /** * provides OpenGL Context creation using GLX, WGL, EGL, Cocoa - * @{ */ class _OgreGLExport GLNativeSupport { @@ -116,9 +112,6 @@ namespace Ogre ContextProfile mContextProfile; }; - /** @} */ - /** @} */ - } #endif diff --git a/RenderSystems/Metal/include/OgreMetalRenderSystem.h b/RenderSystems/Metal/include/OgreMetalRenderSystem.h index f149a6e0fca..2a634649ba3 100644 --- a/RenderSystems/Metal/include/OgreMetalRenderSystem.h +++ b/RenderSystems/Metal/include/OgreMetalRenderSystem.h @@ -41,8 +41,12 @@ namespace Ogre { class HardwareBufferManager; - /** - Implementation of Metal as a rendering system. + /** \addtogroup RenderSystems RenderSystems + * @{ + */ + /** \defgroup Metal Metal + * Implementation of Metal as a rendering system. + * @{ */ class _OgreMetalExport MetalRenderSystem : public RenderSystem { @@ -171,6 +175,8 @@ namespace Ogre void _notifyActiveComputeEnded(void); void _notifyDeviceStalled(void); }; + /** @} */ + /** @} */ } #endif diff --git a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h index abb52acb695..d4bf8bf2651 100644 --- a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h +++ b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h @@ -40,8 +40,12 @@ namespace Ogre { class VulkanHardwareBufferManager; - /** - Implementation of Vulkan as a rendering system. + /** \addtogroup RenderSystems RenderSystems + * @{ + */ + /** \defgroup Vulkan Vulkan + * Implementation of Vulkan as a rendering system. + * @{ */ class _OgreVulkanExport VulkanRenderSystem : public RenderSystem { @@ -211,6 +215,8 @@ namespace Ogre void _setSampler(size_t texUnit, Sampler& s) override; MultiRenderTarget * createMultiRenderTarget(const String & name) { return NULL; } }; + /** @} */ + /** @} */ } // namespace Ogre #endif diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp index d36027ab6a0..3036402c115 100644 --- a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp +++ b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp @@ -52,7 +52,7 @@ THE SOFTWARE. #include "OgreVulkanWindow.h" #include "OgrePixelFormat.h" -#define USE_VALIDATION_LAYERS 1 +#define USE_VALIDATION_LAYERS 0 namespace Ogre {