better fix for HlmsLowLevel::createShaderCacheEntry() - get casterPas…

…s from passCache rather then from ThreadDataVec
OGRECave · Oct 23, 2024 · 12eef28 · 12eef28
1 parent 99a76ae
commit 12eef28
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/OgreMain/src/OgreHlms.cpp b/OgreMain/src/OgreHlms.cpp
@@ -3660,13 +3660,8 @@ namespace Ogre
                 // Low level is a special case because it doesn't (yet?) support parallel compilation
                 if( !parallelQueue || mType == HLMS_LOW_LEVEL )
                 {
-                    bool saveShadowCasterProp = getProperty( kNoTid, HlmsBaseProp::ShadowCaster );
-                    if( saveShadowCasterProp != casterPass )
-                        setProperty( kNoTid, HlmsBaseProp::ShadowCaster, casterPass );
                     lastReturnedValue = createShaderCacheEntry( hash[0], passCache, finalHash,
                                                                 queuedRenderable, nullptr, kNoTid );
-                    if( saveShadowCasterProp != casterPass )
-                        setProperty( kNoTid, HlmsBaseProp::ShadowCaster, saveShadowCasterProp );
                 }
                 else
                 {

diff --git a/OgreMain/src/OgreHlmsLowLevel.cpp b/OgreMain/src/OgreHlmsLowLevel.cpp
@@ -98,7 +98,7 @@ namespace Ogre
         if( pass->hasFragmentProgram() )
             pso.pixelShader = pass->getFragmentProgram();
 
-        bool casterPass = getProperty( tid, HlmsBaseProp::ShadowCaster ) != 0;
+        bool casterPass = getProperty( passCache.setProperties, HlmsBaseProp::ShadowCaster ) != 0;
 
         const HlmsDatablock *datablock = queuedRenderable.renderable->getDatablock();
         pso.macroblock = datablock->getMacroblock( casterPass );