Fix Ogre2RenderTarget::TargetFSAA

traversaro · web-flow · commit a4295c9dd049 · 2022-07-01T10:20:18.000+02:00
Fix Ogre2RenderTarget::TargetFSAA method that caused black screen when used with llvmpipe (i.e. software rendering on Linux)

The Ogre2RenderTarget::TargetFSAA method has a logic to check if the selected antialiasing level is supported.

If the requested antialiasing level is not supported, the 0 level is selected instead. Furthermore, a warning is printed only once for process. Before this PR, the 0 level was only set only when the warning was printed, resulting in an unsupported antialiasing being set if Ogre2RenderTarget::TargetFSAA was called two or more times.

Signed-off-by: Silvio &lt;silvio@traversaro.it&gt;
diff --git a/ogre2/src/Ogre2RenderTarget.cc b/ogre2/src/Ogre2RenderTarget.cc
@@ -575,9 +575,9 @@ uint8_t Ogre2RenderTarget::TargetFSAA() const
       ignwarn << "Anti-aliasing level of '" << this->antiAliasing << "' "
               << "is not supported; valid FSAA levels are: " << os.str()
               << ". Setting to 0" << std::endl;
-      targetFSAA = 0u;
       ogre2FSAAWarn = true;
     }
+    targetFSAA = 0u;
   }
 
   if (targetFSAA == 0u)

Original file line number	Diff line number	Diff line change
`@@ -575,9 +575,9 @@ uint8_t Ogre2RenderTarget::TargetFSAA() const`
`575`	`575`	`ignwarn << "Anti-aliasing level of '" << this->antiAliasing << "' "`
`576`	`576`	`<< "is not supported; valid FSAA levels are: " << os.str()`
`577`	`577`	`<< ". Setting to 0" << std::endl;`
`578`		`- targetFSAA = 0u;`
`579`	`578`	`ogre2FSAAWarn = true;`
`580`	`579`	`}`
	`580`	`+ targetFSAA = 0u;`
`581`	`581`	`}`
`582`	`582`
`583`	`583`	`if (targetFSAA == 0u)`