From fb29c70a816f7768fa00e2dd758b4d81bf2b385c Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sat, 21 Sep 2024 17:03:35 +0200 Subject: [PATCH 1/5] Volume: hide MCTables safe to do, as they were never exported --- Components/Volume/{include => src}/OgreVolumeIsoSurfaceTablesMC.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Components/Volume/{include => src}/OgreVolumeIsoSurfaceTablesMC.h (100%) diff --git a/Components/Volume/include/OgreVolumeIsoSurfaceTablesMC.h b/Components/Volume/src/OgreVolumeIsoSurfaceTablesMC.h similarity index 100% rename from Components/Volume/include/OgreVolumeIsoSurfaceTablesMC.h rename to Components/Volume/src/OgreVolumeIsoSurfaceTablesMC.h From 4ae8d344cb07322021c3057c5c9dcc786cfd2210 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sat, 21 Sep 2024 17:03:39 +0200 Subject: [PATCH 2/5] GL: hide GLSLProgramFactory forward declaration --- RenderSystems/GL/include/OgreGLRenderSystem.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/RenderSystems/GL/include/OgreGLRenderSystem.h b/RenderSystems/GL/include/OgreGLRenderSystem.h index 7b01bb8821b..b79d1767b45 100644 --- a/RenderSystems/GL/include/OgreGLRenderSystem.h +++ b/RenderSystems/GL/include/OgreGLRenderSystem.h @@ -47,10 +47,6 @@ namespace Ogre { * @{ */ - namespace GLSL { - class GLSLProgramFactory; - } - /** Implementation of GL as a rendering system. */ @@ -101,7 +97,7 @@ namespace Ogre { HardwareBufferManager* mHardwareBufferManager; GLGpuProgramManager* mGpuProgramManager; - GLSL::GLSLProgramFactory* mGLSLProgramFactory; + GpuProgramFactory* mGLSLProgramFactory; unsigned short mCurrentLights; From 9b1db08400bfac3dcb041b20b4136506049bcb73 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sat, 21 Sep 2024 17:04:10 +0200 Subject: [PATCH 3/5] Docs: only include main RenderSystem headers --- Docs/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Docs/CMakeLists.txt b/Docs/CMakeLists.txt index cf0d5931d2a..5bbd8b7ddb0 100644 --- a/Docs/CMakeLists.txt +++ b/Docs/CMakeLists.txt @@ -35,6 +35,7 @@ if(DOXYGEN_FOUND) file(GLOB BASIC_TUTORIALS ${PROJECT_SOURCE_DIR}/Docs/src/tutorials/basictutorials/*.md) file(GLOB COMPONENTS ${PROJECT_SOURCE_DIR}/Components/*/include) file(GLOB PLUGINS ${PROJECT_SOURCE_DIR}/PlugIns/*/include) + file(GLOB RENDERSYSTEMS ${PROJECT_SOURCE_DIR}/RenderSystems/*/include/Ogre*RenderSystem.h) set(CMAKE_DOXYGEN_INPUT_LIST ${PROJECT_SOURCE_DIR}/OgreMain/include @@ -44,7 +45,8 @@ if(DOXYGEN_FOUND) ${PLUGINS} ${PROJECT_SOURCE_DIR}/PlugIns/PCZSceneManager/docs/readme.md ${PROJECT_SOURCE_DIR}/PlugIns/DotScene/README.md - ${PROJECT_SOURCE_DIR}/RenderSystems + ${RENDERSYSTEMS} + ${PROJECT_SOURCE_DIR}/RenderSystems/Direct3D9/include/OgreD3D9ResourceManager.h ${BASIC_TUTORIALS} ${PROJECT_SOURCE_DIR}/Docs/src/apimainpage.md ${PROJECT_SOURCE_DIR}/Docs/src/manual.md From a6e9cb6df4c2b5df21cd1637d4232896c7e3aa8f Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sat, 21 Sep 2024 17:07:59 +0200 Subject: [PATCH 4/5] D3D9: drop unused mLights --- RenderSystems/Direct3D9/include/OgreD3D9RenderSystem.h | 4 ---- RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp | 5 ----- 2 files changed, 9 deletions(-) diff --git a/RenderSystems/Direct3D9/include/OgreD3D9RenderSystem.h b/RenderSystems/Direct3D9/include/OgreD3D9RenderSystem.h index 32cc85bd867..44144868a4b 100644 --- a/RenderSystems/Direct3D9/include/OgreD3D9RenderSystem.h +++ b/RenderSystems/Direct3D9/include/OgreD3D9RenderSystem.h @@ -44,7 +44,6 @@ namespace Ogre * Implementation of DirectX9 as a rendering system. * @{ */ -#define MAX_LIGHTS 8 class D3D9DriverList; class D3D9Driver; @@ -112,9 +111,6 @@ namespace Ogre /// Saved manual colour blends ColourValue mManualBlendColours[OGRE_MAX_TEXTURE_LAYERS][2]; - // Array of up to 8 lights, indexed as per API - // Note that a null value indicates a free slot - Light* mLights[MAX_LIGHTS]; D3D9DriverList* getDirect3DDrivers(); void refreshD3DSettings(); void refreshFSAAOptions(); diff --git a/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp b/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp index cdacbfb0474..1f00fc92d22 100644 --- a/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp +++ b/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp @@ -109,11 +109,6 @@ namespace Ogre // Create the resource manager. mResourceManager = OGRE_NEW D3D9ResourceManager(); - - // init lights - for(int i = 0; i < MAX_LIGHTS; i++ ) - mLights[i] = 0; - // Create our Direct3D object if( NULL == (mD3D = Direct3DCreate9(D3D_SDK_VERSION)) ) OGRE_EXCEPT( Exception::ERR_INTERNAL_ERROR, "Failed to create Direct3D9 object", "D3D9RenderSystem::D3D9RenderSystem" ); From f904b1c79b81dbf1c432f034fd13a6ca39a04cde Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sat, 21 Sep 2024 17:11:15 +0200 Subject: [PATCH 5/5] Vulkan: move USE_VALIDATION_LAYERS define to header --- RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h | 3 +++ RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h index c4b232eb881..c47dc58d037 100644 --- a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h +++ b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h @@ -47,6 +47,9 @@ namespace Ogre * Implementation of Vulkan as a rendering system. * @{ */ + + #define USE_VALIDATION_LAYERS 0 + class _OgreVulkanExport VulkanRenderSystem : public RenderSystem { friend class VulkanSampler; diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp index bb510c94bf2..3f566e954e4 100644 --- a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp +++ b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp @@ -52,8 +52,6 @@ THE SOFTWARE. #include "OgreVulkanWindow.h" #include "OgrePixelFormat.h" -#define USE_VALIDATION_LAYERS 0 - namespace Ogre { static const uint32 VERTEX_ATTRIBUTE_INDEX[VES_COUNT] =