diff --git a/Docs/src/manual/Rendering/HlmsThreading.md b/Docs/src/manual/Rendering/HlmsThreading.md index 93ddf40037b..103bc751e5e 100644 --- a/Docs/src/manual/Rendering/HlmsThreading.md +++ b/Docs/src/manual/Rendering/HlmsThreading.md @@ -5,7 +5,7 @@ Starting OgreNext 4.0, the following features were added: - Multithreaded shader compilation. - Multithreaded PSO generation. -Actual support depends on RenderSystems & CMake build settings. The user can call `Ogre::RenderSystems::supportsMultithreadedShaderCompliation` to query whether it is currently supported. +Actual support depends on RenderSystems & CMake build settings. The user can call `Ogre::RenderSystems::supportsMultithreadedShaderCompilation` to query whether it is currently supported. # CMake Options {#HlmsThreading_CMakeOptions} diff --git a/OgreMain/include/OgreRenderQueue.h b/OgreMain/include/OgreRenderQueue.h index 467c0895bca..8366383e840 100644 --- a/OgreMain/include/OgreRenderQueue.h +++ b/OgreMain/include/OgreRenderQueue.h @@ -110,7 +110,7 @@ namespace Ogre The work is done in updateThread() and is in charge of compiling shaders AND generating PSOs. @remarks - This function must not be called if RenderSystem::supportsMultithreadedShaderCompliation + This function must not be called if RenderSystem::supportsMultithreadedShaderCompilation is false. @param sceneManager */ @@ -137,7 +137,7 @@ namespace Ogre const HlmsCache *passCaches ); /// Serial alternative of fireWarmUpParallel() + updateWarmUpThread() for when - /// RenderSystem::supportsMultithreadedShaderCompliation is false. + /// RenderSystem::supportsMultithreadedShaderCompilation is false. void warmUpSerial( HlmsManager *hlmsManager, const HlmsCache *passCaches ); }; diff --git a/OgreMain/include/OgreRenderSystem.h b/OgreMain/include/OgreRenderSystem.h index 74dbf09aa27..ac093c8b5bd 100644 --- a/OgreMain/include/OgreRenderSystem.h +++ b/OgreMain/include/OgreRenderSystem.h @@ -216,7 +216,7 @@ namespace Ogre /// Returns true if RenderSystem supports multithreaded shader and PSO compilation. /// Support depends on the API, our implementation, and CMake setting /// OGRE_SHADER_COMPILATION_THREADING_MODE with which OgreNext was built. - virtual bool supportsMultithreadedShaderCompliation() const; + virtual bool supportsMultithreadedShaderCompilation() const; /** Create an object for performing hardware occlusion queries. */ diff --git a/OgreMain/src/OgreHlmsDiskCache.cpp b/OgreMain/src/OgreHlmsDiskCache.cpp index ee33a775d44..82532f90baa 100644 --- a/OgreMain/src/OgreHlmsDiskCache.cpp +++ b/OgreMain/src/OgreHlmsDiskCache.cpp @@ -372,7 +372,7 @@ namespace Ogre CompilerJobParams jobParams( hlms, mCache.sourceCode, mTemplatesOutOfDate ); // Compile shaders - if( hlms->getRenderSystem()->supportsMultithreadedShaderCompliation() && numThreads > 1u ) + if( hlms->getRenderSystem()->supportsMultithreadedShaderCompilation() && numThreads > 1u ) { hlms->_setNumThreads( numThreads ); diff --git a/OgreMain/src/OgreRenderQueue.cpp b/OgreMain/src/OgreRenderQueue.cpp index 5d4059d2e68..6103a0c6d7b 100644 --- a/OgreMain/src/OgreRenderQueue.cpp +++ b/OgreMain/src/OgreRenderQueue.cpp @@ -315,7 +315,7 @@ namespace Ogre const size_t numWorkerThreads = mSceneManager->getNumWorkerThreads(); const bool bUseMultithreadedShaderCompliation = - mRoot->getRenderSystem()->supportsMultithreadedShaderCompliation() && + mRoot->getRenderSystem()->supportsMultithreadedShaderCompilation() && mSceneManager->getNumWorkerThreads() > 1u; for( size_t i = 0; i < HLMS_MAX; ++i ) @@ -374,7 +374,7 @@ namespace Ogre ParallelHlmsCompileQueue *parallelCompileQueue = 0; - if( rs->supportsMultithreadedShaderCompliation() && mSceneManager->getNumWorkerThreads() > 1u ) + if( rs->supportsMultithreadedShaderCompilation() && mSceneManager->getNumWorkerThreads() > 1u ) { parallelCompileQueue = &mParallelHlmsCompileQueue; mParallelHlmsCompileQueue.start( mSceneManager ); @@ -574,7 +574,7 @@ namespace Ogre { OgreProfileBeginGroup( "RenderQueue::warmUpShadersTrigger", OGREPROF_RENDERING ); - if( rs->supportsMultithreadedShaderCompliation() && mSceneManager->getNumWorkerThreads() > 1u ) + if( rs->supportsMultithreadedShaderCompilation() && mSceneManager->getNumWorkerThreads() > 1u ) mParallelHlmsCompileQueue.fireWarmUpParallel( mSceneManager ); else mParallelHlmsCompileQueue.warmUpSerial( mHlmsManager, mPendingPassCaches.data() ); diff --git a/OgreMain/src/OgreRenderSystem.cpp b/OgreMain/src/OgreRenderSystem.cpp index b62ced5902d..e85c7a6d525 100644 --- a/OgreMain/src/OgreRenderSystem.cpp +++ b/OgreMain/src/OgreRenderSystem.cpp @@ -1254,7 +1254,7 @@ namespace Ogre //----------------------------------------------------------------------- size_t RenderSystem::getNumPriorityConfigOptions() const { return 0u; } //----------------------------------------------------------------------- - bool RenderSystem::supportsMultithreadedShaderCompliation() const { return false; } + bool RenderSystem::supportsMultithreadedShaderCompilation() const { return false; } //----------------------------------------------------------------------- void RenderSystem::destroyHardwareOcclusionQuery( HardwareOcclusionQuery *hq ) { diff --git a/RenderSystems/Metal/include/OgreMetalRenderSystem.h b/RenderSystems/Metal/include/OgreMetalRenderSystem.h index c918f94c86c..c56747ef026 100644 --- a/RenderSystems/Metal/include/OgreMetalRenderSystem.h +++ b/RenderSystems/Metal/include/OgreMetalRenderSystem.h @@ -157,7 +157,7 @@ namespace Ogre ConfigOptionMap &getConfigOptions() override { return mOptions; } void setConfigOption( const String &name, const String &value ) override; - bool supportsMultithreadedShaderCompliation() const override; + bool supportsMultithreadedShaderCompilation() const override; HardwareOcclusionQuery *createHardwareOcclusionQuery() override; diff --git a/RenderSystems/Metal/src/OgreMetalRenderSystem.mm b/RenderSystems/Metal/src/OgreMetalRenderSystem.mm index 4a55d354982..afe8274a309 100644 --- a/RenderSystems/Metal/src/OgreMetalRenderSystem.mm +++ b/RenderSystems/Metal/src/OgreMetalRenderSystem.mm @@ -255,7 +255,7 @@ of this software and associated documentation files (the "Software"), to deal return SampleDescription( samples, sampleDesc.getMsaaPattern() ); } //------------------------------------------------------------------------- - bool MetalRenderSystem::supportsMultithreadedShaderCompliation() const + bool MetalRenderSystem::supportsMultithreadedShaderCompilation() const { #ifndef OGRE_SHADER_THREADING_BACKWARDS_COMPATIBLE_API return true; diff --git a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h index 6b078e60147..f15db2f9329 100644 --- a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h +++ b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h @@ -167,7 +167,7 @@ namespace Ogre void setConfigOption( const String &name, const String &value ) override; const char *getPriorityConfigOption( size_t idx ) const override; size_t getNumPriorityConfigOptions() const override; - bool supportsMultithreadedShaderCompliation() const override; + bool supportsMultithreadedShaderCompilation() const override; HardwareOcclusionQuery *createHardwareOcclusionQuery() override; diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp index 197ef71c0ee..d3857b324d9 100644 --- a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp +++ b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp @@ -454,7 +454,7 @@ namespace Ogre //------------------------------------------------------------------------- size_t VulkanRenderSystem::getNumPriorityConfigOptions() const { return 1u; } //------------------------------------------------------------------------- - bool VulkanRenderSystem::supportsMultithreadedShaderCompliation() const + bool VulkanRenderSystem::supportsMultithreadedShaderCompilation() const { #ifndef OGRE_SHADER_THREADING_BACKWARDS_COMPATIBLE_API return true;