Jelajahi Sumber

Fixed a mistake in MeshExampleComponent where MaterialPipelineTag was not set correctly. This caused draw items from the main pipeline to get rendered in the alternate pipelines, in addition to the expected draw items. This impacted all transparency tests on the LowEndPipeline and DeferredPipeline. After correcting this mistake, the 009_Opacity_Blended_LowEndPipeline screenshot test passes again, and I had to update several of the "MaterailPipelineTest_" screenshots with new expected results.

Signed-off-by: santorac <[email protected]>
santorac 2 tahun lalu
induk
melakukan
f100d9dd64

+ 2 - 0
Gem/Code/Source/MeshExampleComponent.cpp

@@ -87,6 +87,7 @@ namespace AtomSampleViewer
         AZ::RPI::RenderPipelineDescriptor pipelineDesc;
         AZ::RPI::RenderPipelineDescriptor pipelineDesc;
         pipelineDesc.m_mainViewTagName = "MainCamera";
         pipelineDesc.m_mainViewTagName = "MainCamera";
         pipelineDesc.m_name = "LowEndPipeline";
         pipelineDesc.m_name = "LowEndPipeline";
+        pipelineDesc.m_materialPipelineTag = "LowEndPipeline";
         pipelineDesc.m_rootPassTemplate = "LowEndPipelineTemplate";
         pipelineDesc.m_rootPassTemplate = "LowEndPipelineTemplate";
         pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
         pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
 
 
@@ -103,6 +104,7 @@ namespace AtomSampleViewer
         AZ::RPI::RenderPipelineDescriptor pipelineDesc;
         AZ::RPI::RenderPipelineDescriptor pipelineDesc;
         pipelineDesc.m_mainViewTagName = "MainCamera";
         pipelineDesc.m_mainViewTagName = "MainCamera";
         pipelineDesc.m_name = "DeferredPipeline";
         pipelineDesc.m_name = "DeferredPipeline";
+        pipelineDesc.m_materialPipelineTag = "DeferredPipeline";
         pipelineDesc.m_rootPassTemplate = "DeferredPipelineTemplate";
         pipelineDesc.m_rootPassTemplate = "DeferredPipelineTemplate";
         pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
         pipelineDesc.m_renderSettings.m_multisampleState.m_samples = 4;
         pipelineDesc.m_allowModification = true; // MainPipeline allows modifications, so the DeferredPipeline must as well, to get a consistent result.
         pipelineDesc.m_allowModification = true; // MainPipeline allows modifications, so the DeferredPipeline must as well, to get a consistent result.

+ 2 - 2
Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_tintedtransparent_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:a17b9ec676460ae2d142b8ff6c4c6ac13f1d55a00a4f9e14057027be86afb058
-size 1056268
+oid sha256:b590b90ee55cd08bdea61943f562c116315cc7652d16de4d931d28c0b5d24706
+size 1005290

+ 2 - 2
Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_enhanced_transparent_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:114d727ff503851eae0478e1f4249281b0cc454f723bf18705c744e9411698b6
-size 1034425
+oid sha256:b0e8175257391e9aa4d8b4015fbe85cb36b02f0a0ef7f271b6cca824d08b783f
+size 979318

+ 2 - 2
Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_tintedtransparent_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ab06c0c89fec09b5d3b82f23f42e3a096e7981439636a0f40f3009f86dc4aa6
-size 1188792
+oid sha256:9543945a5cb14a0ed7531abf097b004b0d9328d8e14e80c7d18af15dd7b11550
+size 1186358

+ 2 - 2
Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_transparent_deferredpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ffafb6245e3ff3fadf22f2309e47c0b919735d299641a2e73e3cf99255bf9e4
-size 1173057
+oid sha256:d2cc9511e3a97cff03261af952afa1d731733e0f0c2ba22c8ac4323d76942c55
+size 1088002

+ 2 - 2
Scripts/ExpectedScreenshots/MaterialPipelineSystem/materialpipelinetest_standard_transparent_lowendpipeline.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:45cdf7b9ea8c42aa300cacbfd1c02570909e482ba6d5daac7fb7780b3b416ac5
-size 1172412
+oid sha256:e2c8246bca09c7290f35e87810fb2ef7fb26a1643678e29c16f34530a3707a54
+size 1087071