[Ogre2] fix invalid anti-aliasing level warning

- Fix a bug where the warning of an invalid anti-aliasing level in Ogre2RenderTarget was not being output - Set the FSAA level to 0 if the target level is invalid - Provide a list of valid options in the warning Signed-off-by: Rhys Mainwaring <[email protected]>
gazebosim · Oct 14, 2021 · daa62d8 · daa62d8
1 parent 1c77a8a
commit daa62d8
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/ogre2/src/Ogre2RenderTarget.cc b/ogre2/src/Ogre2RenderTarget.cc
@@ -560,10 +560,20 @@ uint8_t Ogre2RenderTarget::TargetFSAA() const
   {
     // output warning but only do it once
     static bool ogre2FSAAWarn = false;
-    if (ogre2FSAAWarn)
+    if (!ogre2FSAAWarn)
     {
+      std::ostringstream os;
+      os << "[ ";
+      for (auto &&level : fsaaLevels)
+      {
+        os << level << " ";
+      }
+      os << "]";
+
       ignwarn << "Anti-aliasing level of '" << this->antiAliasing << "' "
-              << "is not supported. Setting to 0" << std::endl;
+              << "is not supported; valid FSAA levels are: " << os.str()
+              << ". Setting to 0" << std::endl;
+      targetFSAA = 0u;
       ogre2FSAAWarn = true;
     }
   }