commit 645ee1943edc97b87cbcfafd2bca342adcaf65f1
author Shahbaz Youssefi <syoussefi@chromium.org> Mon Jul 18 21:48:59 2022 -0400
committer Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 19 02:56:07 2022 +0000
tree 1513ebd591ce4d23f2a94bd3ec7812703ab59b9f
parent d4e54b8195668357c03769fe9212a771f1220530

Vulkan: Only modify input attachment images for FF MSAA fix up

Previously all OpTypeImages were changed to MSAA, but only the ones with
the SubpassData dimension should have been.

Bug: angleproject:6195
Change-Id: I1caadd23420f0d9cffdee4e3b9d63cf6fa93982e
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3770645
Reviewed-by: Yuxin Hu <yuxinhu@google.com>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

src/libANGLE/renderer/glslang_wrapper_utils.cpp

diff --git a/src/libANGLE/renderer/glslang_wrapper_utils.cpp b/src/libANGLE/renderer/glslang_wrapper_utils.cpp
index 933429d..85c3f4f 100644
--- a/src/libANGLE/renderer/glslang_wrapper_utils.cpp
+++ b/src/libANGLE/renderer/glslang_wrapper_utils.cpp
@@ -2943,6 +2943,12 @@
     spirv::ParseTypeImage(instruction, &idResult, &sampledType, &dim, &depth, &arrayed, &ms,
                           &sampled, &imageFormat, &accessQualifier);
 
+    // Only transform input attachment image types.
+    if (dim != spv::DimSubpassData)
+    {
+        return TransformationState::Unchanged;
+    }
+
     ms = spirv::LiteralInteger(1);
     spirv::WriteTypeImage(blobOut, idResult, sampledType, dim, depth, arrayed, ms, sampled,
                           imageFormat, nullptr);