Skip to content

Commit

Permalink
typo
Browse files Browse the repository at this point in the history
  • Loading branch information
eugenegff committed Aug 22, 2024
1 parent 1b31aeb commit e5f6cc5
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Docs/src/manual/Rendering/HlmsThreading.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
4 changes: 2 additions & 2 deletions OgreMain/include/OgreRenderQueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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 );
};

Expand Down
2 changes: 1 addition & 1 deletion OgreMain/include/OgreRenderSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
2 changes: 1 addition & 1 deletion OgreMain/src/OgreHlmsDiskCache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
6 changes: 3 additions & 3 deletions OgreMain/src/OgreRenderQueue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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() );
Expand Down
2 changes: 1 addition & 1 deletion OgreMain/src/OgreRenderSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/Metal/include/OgreMetalRenderSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/Metal/src/OgreMetalRenderSystem.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e5f6cc5

Please sign in to comment.