Fix build errors with OGRE_SHADER_COMPILATION_THREADING_MODE = 2

Additionally fix race conditions as some ParticleSystme code was usingthe wrong tid parameter.
OGRECave · Jul 27, 2024 · 5545cb1 · 5545cb1
1 parent aa6117b
commit 5545cb1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp b/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp
@@ -1386,7 +1386,7 @@ namespace Ogre
         // This is a regular property!
         setProperty( tid, "samplerStateStart", samplerStateStart );
 
-        if( getProperty( HlmsBaseProp::ParticleSystem ) )
+        if( getProperty( tid, HlmsBaseProp::ParticleSystem ) )
         {
             setProperty( tid, "particleSystemConstSlot", mParticleSystemConstSlot );
             if( mVaoManager->readOnlyIsTexBuffer() )
@@ -1396,10 +1396,10 @@ namespace Ogre
 
             if( !casterPass )
             {
-                setProperty( kNoTid, HlmsBaseProp::Normal, 1 );
-                setProperty( kNoTid, HlmsBaseProp::Tangent, 1 );
+                setProperty( tid, HlmsBaseProp::Normal, 1 );
+                setProperty( tid, HlmsBaseProp::Tangent, 1 );
             }
-            setProperty( kNoTid, HlmsBaseProp::UvCount, 1 );
+            setProperty( tid, HlmsBaseProp::UvCount, 1 );
         }
     }
     //-----------------------------------------------------------------------------------

diff --git a/Components/Hlms/Unlit/src/OgreHlmsUnlit.cpp b/Components/Hlms/Unlit/src/OgreHlmsUnlit.cpp
@@ -615,7 +615,7 @@ namespace Ogre
             }
         }
 
-        if( getProperty( HlmsBaseProp::ParticleSystem ) )
+        if( getProperty( tid, HlmsBaseProp::ParticleSystem ) )
         {
             setProperty( tid, "particleSystemConstSlot", mParticleSystemConstSlot );
             if( mVaoManager->readOnlyIsTexBuffer() )