Main: Technique - allow compiling simple techniques without RS

OGRECave · Mar 10, 2024 · 1ec4f48 · 1ec4f48
1 parent c2725c9
commit 1ec4f48
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/OgreMain/src/OgreTechnique.cpp b/OgreMain/src/OgreTechnique.cpp
@@ -71,11 +71,7 @@ namespace Ogre {
     {
         StringStream errors;
 
-        if(!Root::getSingleton().getRenderSystem()) {
-            errors << "NULL RenderSystem";
-        } else {
-            mIsSupported = checkGPURules(errors) && checkHardwareSupport(autoManageTextureUnits, errors);
-        }
+        mIsSupported = checkGPURules(errors) && checkHardwareSupport(autoManageTextureUnits, errors);
 
         // Compile for categorised illumination on demand
         clearIlluminationPasses();
@@ -90,8 +86,15 @@ namespace Ogre {
         // Go through each pass, checking requirements
         Passes::iterator i;
         unsigned short passNum = 0;
-        const RenderSystemCapabilities* caps =
-            Root::getSingleton().getRenderSystem()->getCapabilities();
+        const RenderSystemCapabilities* caps = nullptr;
+        if (auto rs = Root::getSingleton().getRenderSystem())
+            caps = rs->getCapabilities();
+        else
+        {
+            static RenderSystemCapabilities nullCaps;
+            caps = &nullCaps;
+        }
+
         unsigned short numTexUnits = caps->getNumTextureUnits();
         for (i = mPasses.begin(); i != mPasses.end(); ++i, ++passNum)
         {
@@ -223,8 +226,15 @@ namespace Ogre {
     //---------------------------------------------------------------------
     bool Technique::checkGPURules(StringStream& errors)
     {
-        const RenderSystemCapabilities* caps =
-            Root::getSingleton().getRenderSystem()->getCapabilities();
+        const RenderSystemCapabilities* caps = nullptr;
+        if (auto rs = Root::getSingleton().getRenderSystem())
+            caps = rs->getCapabilities();
+
+        if (!caps && (!mGPUVendorRules.empty() || !mGPUDeviceNameRules.empty()))
+        {
+            errors << "GPU rules failed because the RenderSystem is NULL";
+            return false;
+        }
 
         StringStream includeRules;
         bool includeRulesPresent = false;