HYDRA-738 : Add support for Maya's AntiAliasing toggle to affect Hydra's MSAA toggle

lib/mayaHydra/mayaPlugin/renderOverride.cpp

@@ -625,6 +625,23 @@ MStatus MtohRenderOverride::Render(
     // Set Purpose tags
     SetRenderPurposeTags(delegateParams);
 
+    // Set MSAA as per Maya AntiAliasing settings
+    if (_isUsingHdSt)
+    {  
+        // Maya's MSAA toggle settings
+        bool isMultiSampled = framecontext->getPostEffectEnabled(MHWRender::MFrameContext::kAntiAliasing);
+
+        // Set MSAA on Color Buffer
+        HdAovDescriptor colorAovDesc = _taskController->GetRenderOutputSettings(HdAovTokens->color);
+        colorAovDesc.multiSampled = isMultiSampled;
+        _taskController->SetRenderOutputSettings(HdAovTokens->color, colorAovDesc);
+
+        // Set MSAA of Depth buffer
+        HdAovDescriptor depthAovDesc = _taskController->GetRenderOutputSettings(HdAovTokens->depth);
+        depthAovDesc.multiSampled = isMultiSampled;        
+        _taskController->SetRenderOutputSettings(HdAovTokens->depth, depthAovDesc);
+    }
+
     _taskController->SetFreeCameraMatrices(
         GetGfMatrixFromMaya(
             drawContext.getMatrix(MHWRender::MFrameContext::kViewMtx)),

test/lib/mayaUsd/render/mayaToHydra/cpp/testFlowViewportAPIViewportInformation.py

@@ -27,7 +27,7 @@ class TestFlowViewportAPIViewportInformation(mtohUtils.MayaHydraBaseTestCase):
     def test_RendererSwitching(self):
         with PluginLoaded('mayaHydraCppTests'):
             #Switch to Storm
-            self.setHdStormRenderer()
+            #self.setHdStormRenderer()
             cmds.refresh()
             cmds.mayaHydraCppTest(f="FlowViewportAPI.viewportInformationWithHydra")
             #Switch to VP2

test/lib/mayaUsd/render/mayaToHydra/cpp/testFvpViewportInformationMultipleViewports.cpp

@@ -44,12 +44,13 @@ TEST(FlowViewportAPI, viewportInformationMultipleViewportsInit)
     //Get all Hydra viewports information
     Fvp::InformationInterface::ViewportInformationSet allViewportsInformation;
     informationInterface.GetViewportsInformation(allViewportsInformation);
-    ASSERT_EQ(allViewportsInformation.size(), (size_t)0);//We should have 0 hydra viewport
+    ASSERT_EQ(allViewportsInformation.size(), (size_t)1);//We should have 1 hydra viewport init by the tests script
 
     //Check initial count for _infoClientTest callbacks
     ASSERT_EQ(_infoClientTest->GetSceneIndexAdded(), 0);
     ASSERT_EQ(_infoClientTest->GetSceneIndexRemoved(), 0);
-
+
+
     //We don't call UnregisterInformationClient on purpose as we want to check if the callbacks are called and will unregister it in the code below
 }
 
@@ -71,7 +72,7 @@ TEST(FlowViewportAPI, viewportInformationMultipleViewports2Viewports)
         ASSERT_EQ(info._rendererName, _stormRendererName);
     }
 
-    ASSERT_EQ(_infoClientTest->GetSceneIndexAdded(), 2);//Has been called twice
+    ASSERT_EQ(_infoClientTest->GetSceneIndexAdded(), 1);//Has been called once
     ASSERT_EQ(_infoClientTest->GetSceneIndexRemoved(), 0);
 }
 
@@ -94,7 +95,7 @@ TEST(FlowViewportAPI, viewportInformationMultipleViewports1Viewport)
     }
 
     //Both should have been called once only
-    ASSERT_EQ(_infoClientTest->GetSceneIndexAdded(), 2);
+    ASSERT_EQ(_infoClientTest->GetSceneIndexAdded(), 1);
     ASSERT_EQ(_infoClientTest->GetSceneIndexRemoved(), 1);
 }
 
@@ -112,7 +113,7 @@ TEST(FlowViewportAPI, viewportInformationMultipleViewports0Viewport)
     ASSERT_EQ(allViewportsInformation.size(), (size_t)0);//We should not have any hydra viewport
 
    ///Both should have been called once only
-    ASSERT_EQ(_infoClientTest->GetSceneIndexAdded(), 2);
+    ASSERT_EQ(_infoClientTest->GetSceneIndexAdded(), 1);
     ASSERT_EQ(_infoClientTest->GetSceneIndexRemoved(), 2);
 
     //Unregister our callbacks client

test/lib/mayaUsd/render/mayaToHydra/testMayaDisplayLayers.py

@@ -49,6 +49,10 @@ def setLayerDisplayType(self, val):
 
     def test_MayaDisplayLayers(self):
 
+        # set HdStorm as renderer
+        self.setHdStormRenderer()
+
+        #set up the scene
         sphere = cmds.sphere( n='sphere1' )
         cone = cmds.cone( n='cone1' )
         cmds.move( 1, 5, 1 )

test/testUtils/mayaUtils.py

@@ -39,6 +39,9 @@
 
 mayaSeparator = "|"
 
+HD_STORM = "HdStormRendererPlugin"
+HD_STORM_OVERRIDE = "mayaHydraRenderOverride_" + HD_STORM
+
 def loadPlugin(pluginName):
     """ 
         Load all given plugins created or needed by maya-ufe-plugin 
@@ -124,9 +127,18 @@ def getMayaSelectionList():
     else:
         return [x for x in cmds.ls(sl=True)]
 
+def setHdStormRenderer():
+    activeEditor = cmds.playblast(activeEditor=1)
+    cmds.modelEditor(
+        activeEditor, e=1,
+        rendererOverrideName=HD_STORM_OVERRIDE)
+    cmds.setAttr("hardwareRenderingGlobals.multiSampleEnable", True)
+    cmds.refresh(f=1)     
+
 def openTestScene(*args):
     filePath = testUtils.getTestScene(*args)
     cmds.file(filePath, force=True, open=True)
+    setHdStormRenderer()
 
 def openTopLayerScene():
     '''

test/testUtils/mtohUtils.py

@@ -53,22 +53,24 @@ class MayaHydraBaseTestCase(unittest.TestCase):
     def setUpClass(cls):
         if cls._file is None:
             raise ValueError("Subclasses of MayaHydraBaseTestCase must "
-                             "define `_file = __file__`")
+                            "define `_file = __file__`")
         # Set up all tests with their own test directory to write out test-specific coverage information
         fixturesUtils.setUpClass(cls._file, 'mayaHydra',
-                                         initializeStandalone=False)
+                                        initializeStandalone=False)
 
     def setUp(self):
         # Maya is not closed/reset between each test of a test suite,
         # so open a new file before each test to minimize leftovers
         # from previous tests.
         cmds.file(new=True, force=True)
+        self.setHdStormRenderer()
 
     def setHdStormRenderer(self):
         self.activeEditor = cmds.playblast(activeEditor=1)
         cmds.modelEditor(
             self.activeEditor, e=1,
-            rendererOverrideName=HD_STORM_OVERRIDE)
+            rendererOverrideName=HD_STORM_OVERRIDE)        
+        cmds.setAttr("hardwareRenderingGlobals.multiSampleEnable", True)
         cmds.refresh(f=1)
         self.delegateId = cmds.mayaHydra(renderer=HD_STORM,
                                     sceneDelegateId="MayaHydraSceneDelegate")
@@ -156,7 +158,7 @@ def setUpClass(cls):
             if not inputDirName.endswith('Test'):
                 inputDirName += 'Test'
             cls._inputDir = os.path.join(inputPath, inputDirName)
-
+      
         cls._testDir = os.path.abspath('.')
 
     def resolveRefImage(self, refImage, imageVersion):